From 9079534e4555e2a77b71872c700a96d70d295e16 Mon Sep 17 00:00:00 2001 From: hmalik144 Date: Fri, 12 May 2023 19:55:01 +0100 Subject: [PATCH] - mid commit --- app/build.gradle | 18 +++++++-------- .../h_mal/appttude/com/driver/FormRobot.kt | 6 +++++ .../appttude/com/driver/robots/DeleteRobot.kt | 18 +++++++++++++++ .../com/driver/robots/DriverScreenRobot.kt | 13 +++++++++++ .../com/driver/robots/DriversLicenseRobot.kt | 21 ++++++++++++++++++ .../com/driver/robots/DriversProfileRobot.kt | 21 ++++++++++++++++++ .../com/driver/robots/UpdateEmailRobot.kt | 22 +++++++++++++++++++ .../com/driver/robots/UpdatePasswordRobot.kt | 20 +++++++++++++++++ .../com/driver/robots/UpdateProfileRobot.kt | 19 ++++++++++++++++ .../com/driver/robots/VehicleScreenRobot.kt | 15 +++++++++++++ .../res/layout/driver_profile_request.xml | 0 .../res/layout/fragment_driver_overall.xml | 0 .../res/layout/fragment_vehicle_overall.xml | 0 13 files changed, 164 insertions(+), 9 deletions(-) create mode 100644 app/src/androidTest/java/h_mal/appttude/com/driver/FormRobot.kt create mode 100644 app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DeleteRobot.kt create mode 100644 app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriverScreenRobot.kt create mode 100644 app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriversLicenseRobot.kt create mode 100644 app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriversProfileRobot.kt create mode 100644 app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdateEmailRobot.kt create mode 100644 app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdatePasswordRobot.kt create mode 100644 app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdateProfileRobot.kt create mode 100644 app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/VehicleScreenRobot.kt rename app/src/{main => driver}/res/layout/driver_profile_request.xml (100%) rename app/src/{main => driver}/res/layout/fragment_driver_overall.xml (100%) rename app/src/{main => driver}/res/layout/fragment_vehicle_overall.xml (100%) diff --git a/app/build.gradle b/app/build.gradle index 2d3bed5..097de61 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,18 +36,18 @@ android { } } - signingConfigs { - release { - storePassword relStorePassword - keyPassword relKeyPassword - keyAlias relKeyAlias - storeFile file(relStoreFile) - } - } +// signingConfigs { +// release { +// storePassword relStorePassword +// keyPassword relKeyPassword +// keyAlias relKeyAlias +// storeFile file(relStoreFile) +// } +// } buildTypes { release { - signingConfig signingConfigs.release +// signingConfig signingConfigs.release minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } diff --git a/app/src/androidTest/java/h_mal/appttude/com/driver/FormRobot.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/FormRobot.kt new file mode 100644 index 0000000..106375d --- /dev/null +++ b/app/src/androidTest/java/h_mal/appttude/com/driver/FormRobot.kt @@ -0,0 +1,6 @@ +package h_mal.appttude.com.driver + +class FormRobot: BaseTestRobot() { + +// fun selectImage +} \ No newline at end of file diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DeleteRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DeleteRobot.kt new file mode 100644 index 0000000..4391eb6 --- /dev/null +++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DeleteRobot.kt @@ -0,0 +1,18 @@ +package h_mal.appttude.com.driver.robots + +import h_mal.appttude.com.driver.BaseTestRobot +import h_mal.appttude.com.driver.R + +fun delete(func: DeleteRobot.() -> Unit) = DeleteRobot().apply { func() } +class DeleteRobot : BaseTestRobot() { + + fun enterEmail(email: String) = fillEditText(R.id.email_update, email) + fun enterPassword(password: String) = fillEditText(R.id.password_top, password) + fun submitDelete() = clickButton(R.id.submission_button_label) + + fun submitForm(email: String, password: String) { + enterEmail(email) + enterPassword(password) + submitDelete() + } +} \ No newline at end of file diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriverScreenRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriverScreenRobot.kt new file mode 100644 index 0000000..554f19c --- /dev/null +++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriverScreenRobot.kt @@ -0,0 +1,13 @@ +package h_mal.appttude.com.driver.robots + +import h_mal.appttude.com.driver.BaseTestRobot +import h_mal.appttude.com.driver.R + +fun driverScreen(func: DriverScreenRobot.() -> Unit) = DriverScreenRobot().apply { func() } +class DriverScreenRobot : BaseTestRobot() { + + fun driverProfile() = clickButton(R.id.driver_prof) + fun privateHireLicense() = clickButton(R.id.private_hire) + fun driverLicense() = clickButton(R.id.drivers_license) + +} \ No newline at end of file diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriversLicenseRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriversLicenseRobot.kt new file mode 100644 index 0000000..044add4 --- /dev/null +++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriversLicenseRobot.kt @@ -0,0 +1,21 @@ +package h_mal.appttude.com.driver.robots + +import h_mal.appttude.com.driver.BaseTestRobot +import h_mal.appttude.com.driver.R + +fun driversLicense(func: DriversLicenseRobot.() -> Unit) = DriversLicenseRobot().apply { func() } +class DriversLicenseRobot : BaseTestRobot() { + + fun enterLicenseNumber(text: String) = fillEditText(R.id.lic_no, text) + fun enterLicenseExpiry(text: String) = fillEditText(R.id.lic_expiry, text) + fun selectImage() = clickButton(R.id.search_image) + fun clickSubmit() = clickButton(R.id.submit) + + fun submitForm(licenseNumber: String, licenseExpiry: String) { + selectImage() + // TODO: select image in gallery + enterLicenseNumber(licenseNumber) + enterLicenseExpiry(licenseExpiry) + clickSubmit() + } +} \ No newline at end of file diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriversProfileRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriversProfileRobot.kt new file mode 100644 index 0000000..cb14338 --- /dev/null +++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/DriversProfileRobot.kt @@ -0,0 +1,21 @@ +package h_mal.appttude.com.driver.robots + +import h_mal.appttude.com.driver.BaseTestRobot +import h_mal.appttude.com.driver.R + +fun driversProfile(func: DriversProfileRobot.() -> Unit) = DriversProfileRobot().apply { func() } +class DriversProfileRobot : BaseTestRobot() { + + fun enterLicenseNumber(text: String) = fillEditText(R.id.lic_no, text) + fun enterLicenseExpiry(text: String) = fillEditText(R.id.lic_expiry, text) + fun selectImage() = clickButton(R.id.add_photo) + fun clickSubmit() = clickButton(R.id.submit_driver) + + fun submitForm(licenseNumber: String, licenseExpiry: String) { + selectImage() + // TODO: select image in gallery + enterLicenseNumber(licenseNumber) + enterLicenseExpiry(licenseExpiry) + clickSubmit() + } +} \ No newline at end of file diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdateEmailRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdateEmailRobot.kt new file mode 100644 index 0000000..b6dcff8 --- /dev/null +++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdateEmailRobot.kt @@ -0,0 +1,22 @@ +@file:JvmName("UpdateEmailRobotKt") + +package h_mal.appttude.com.driver.robots + +import h_mal.appttude.com.driver.BaseTestRobot +import h_mal.appttude.com.driver.R + +fun updateEmail(func: UpdateEmailRobot.() -> Unit) = UpdateEmailRobot().apply { func() } +class UpdateEmailRobot : BaseTestRobot() { + + fun enterEmail(email: String) = fillEditText(R.id.email_update, email) + fun enterPassword(password: String) = fillEditText(R.id.password_top, password) + fun enterNewEmail(email: String) = fillEditText(R.id.new_email, email) + fun submitDelete() = clickButton(R.id.submission_button_label) + + fun submitForm(email: String, password: String, newEmail: String) { + enterEmail(email) + enterPassword(password) + enterNewEmail(newEmail) + submitDelete() + } +} \ No newline at end of file diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdatePasswordRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdatePasswordRobot.kt new file mode 100644 index 0000000..0247f3a --- /dev/null +++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdatePasswordRobot.kt @@ -0,0 +1,20 @@ +package h_mal.appttude.com.driver.robots + +import h_mal.appttude.com.driver.BaseTestRobot +import h_mal.appttude.com.driver.R + +fun updatePassword(func: UpdatePasswordRobot.() -> Unit) = UpdatePasswordRobot().apply { func() } +class UpdatePasswordRobot : BaseTestRobot() { + + fun enterEmail(email: String) = fillEditText(R.id.email_update, email) + fun enterPassword(password: String) = fillEditText(R.id.password_top, password) + fun enterNewPassword(email: String) = fillEditText(R.id.password_bottom, email) + fun submitDelete() = clickButton(R.id.email_sign_up) + + fun submitForm(email: String, password: String, newPassword: String) { + enterEmail(email) + enterPassword(password) + enterNewPassword(newPassword) + submitDelete() + } +} \ No newline at end of file diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdateProfileRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdateProfileRobot.kt new file mode 100644 index 0000000..6e175af --- /dev/null +++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/UpdateProfileRobot.kt @@ -0,0 +1,19 @@ +package h_mal.appttude.com.driver.robots + +import h_mal.appttude.com.driver.BaseTestRobot +import h_mal.appttude.com.driver.R + +fun updateProfile(func: UpdateProfileRobot.() -> Unit) = UpdateProfileRobot().apply { func() } +class UpdateProfileRobot : BaseTestRobot() { + + fun enterName(name: String) = fillEditText(R.id.update_name, name) + fun selectImage() = clickButton(R.id.profile_img) + fun submitProfileUpdate() = clickButton(R.id.submit_update_profile) + + fun submitForm(name: String) { + selectImage() + // TODO: select image in gallery + enterName(name) + submitProfileUpdate() + } +} \ No newline at end of file diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/VehicleScreenRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/VehicleScreenRobot.kt new file mode 100644 index 0000000..86ee1ba --- /dev/null +++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/VehicleScreenRobot.kt @@ -0,0 +1,15 @@ +package h_mal.appttude.com.driver.robots + +import h_mal.appttude.com.driver.BaseTestRobot +import h_mal.appttude.com.driver.R + +fun vehicleScreen(func: VehicleScreenRobot.() -> Unit) = VehicleScreenRobot().apply { func() } +class VehicleScreenRobot : BaseTestRobot() { + + fun vehicleProfile() = clickButton(R.id.vehicle_prof) + fun insurance() = clickButton(R.id.insurance) + fun mot() = clickButton(R.id.mot) + fun logbook() = clickButton(R.id.logbook) + fun privateHireVehicleLicense() = clickButton(R.id.private_hire_vehicle_license) + +} \ No newline at end of file diff --git a/app/src/main/res/layout/driver_profile_request.xml b/app/src/driver/res/layout/driver_profile_request.xml similarity index 100% rename from app/src/main/res/layout/driver_profile_request.xml rename to app/src/driver/res/layout/driver_profile_request.xml diff --git a/app/src/main/res/layout/fragment_driver_overall.xml b/app/src/driver/res/layout/fragment_driver_overall.xml similarity index 100% rename from app/src/main/res/layout/fragment_driver_overall.xml rename to app/src/driver/res/layout/fragment_driver_overall.xml diff --git a/app/src/main/res/layout/fragment_vehicle_overall.xml b/app/src/driver/res/layout/fragment_vehicle_overall.xml similarity index 100% rename from app/src/main/res/layout/fragment_vehicle_overall.xml rename to app/src/driver/res/layout/fragment_vehicle_overall.xml