[MBL-18862][All] - Unifying automation packages and naming conventions

apps/parent/flank.yml

@@ -12,7 +12,7 @@ gcloud:
   record-video: true
   timeout: 60m
   test-targets:
-    - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.FlakyE2E, com.instructure.canvas.espresso.KnownBug, com.instructure.canvas.espresso.OfflineE2E
+    - notAnnotation com.instructure.canvas.espresso.annotations.E2E, com.instructure.canvas.espresso.annotations.Stub, com.instructure.canvas.espresso.annotations.FlakyE2E, com.instructure.canvas.espresso.annotations.KnownBug, com.instructure.canvas.espresso.annotations.OfflineE2E
   device:
     - model: Pixel2.arm
       version: 29

apps/parent/flank_coverage.yml

@@ -19,7 +19,7 @@ gcloud:
   directories-to-pull:
     - /sdcard/
   test-targets:
-    - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.OfflineE2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.StubCoverage
+    - notAnnotation com.instructure.canvas.espresso.annotations.E2E, com.instructure.canvas.espresso.annotations.OfflineE2E, com.instructure.canvas.espresso.annotations.Stub, com.instructure.canvas.espresso.annotations.StubCoverage
   device:
     - model: Pixel2.arm
       version: 29

apps/parent/flank_e2e.yml

@@ -12,8 +12,8 @@ gcloud:
   record-video: true
   timeout: 60m
   test-targets:
-    - annotation com.instructure.canvas.espresso.E2E
-    - notAnnotation com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.FlakyE2E, com.instructure.canvas.espresso.KnownBug, com.instructure.canvas.espresso.OfflineE2E
+    - annotation com.instructure.canvas.espresso.annotations.E2E
+    - notAnnotation com.instructure.canvas.espresso.annotations.Stub, com.instructure.canvas.espresso.annotations.FlakyE2E, com.instructure.canvas.espresso.annotations.KnownBug, com.instructure.canvas.espresso.annotations.OfflineE2E
   device:
     - model: Pixel2.arm
       version: 29

apps/parent/flank_landscape.yml

@@ -12,7 +12,7 @@ gcloud:
   record-video: true
   timeout: 60m
   test-targets:
-    - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.StubLandscape, com.instructure.canvas.espresso.OfflineE2E
+    - notAnnotation com.instructure.canvas.espresso.annotations.E2E, com.instructure.canvas.espresso.annotations.Stub, com.instructure.canvas.espresso.annotations.StubLandscape, com.instructure.canvas.espresso.annotations.OfflineE2E
   device:
     - model: Pixel2.arm
       version: 29

apps/parent/flank_multi_api_level.yml

@@ -12,7 +12,7 @@ gcloud:
   record-video: true
   timeout: 60m
   test-targets:
-    - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.StubMultiAPILevel, com.instructure.canvas.espresso.FlakyE2E, com.instructure.canvas.espresso.KnownBug, com.instructure.canvas.espresso.OfflineE2E
+    - notAnnotation com.instructure.canvas.espresso.annotations.E2E, com.instructure.canvas.espresso.annotations.Stub, com.instructure.canvas.espresso.annotations.StubMultiAPILevel, com.instructure.canvas.espresso.annotations.FlakyE2E, com.instructure.canvas.espresso.annotations.KnownBug, com.instructure.canvas.espresso.annotations.OfflineE2E
   device:
     - model: NexusLowRes
       version: 27

apps/parent/flank_tablet.yml

@@ -12,7 +12,7 @@ gcloud:
   record-video: true
   timeout: 60m
   test-targets:
-    - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.StubTablet, com.instructure.canvas.espresso.OfflineE2E
+    - notAnnotation com.instructure.canvas.espresso.annotations.E2E, com.instructure.canvas.espresso.annotations.Stub, com.instructure.canvas.espresso.annotations.StubTablet, com.instructure.canvas.espresso.annotations.OfflineE2E
   device:
     - model: MediumTablet.arm
       version: 29

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/HelpMenuE2ETest.kt → apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/classic/HelpMenuE2ETest.kt

@@ -14,21 +14,21 @@
  *     limitations under the License.
  *
  */
-package com.instructure.parentapp.ui.e2e
+package com.instructure.parentapp.ui.e2e.classic
 
 import android.util.Log
 import androidx.test.espresso.intent.Intents
-import com.instructure.canvas.espresso.E2E
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
-import com.instructure.canvas.espresso.Stub
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
+import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.Stub
 import com.instructure.canvas.espresso.checkToastText
 import com.instructure.parentapp.R
 import com.instructure.parentapp.utils.ParentComposeTest
-import com.instructure.parentapp.utils.seedData
-import com.instructure.parentapp.utils.tokenLogin
+import com.instructure.parentapp.utils.extensions.seedData
+import com.instructure.parentapp.utils.extensions.tokenLogin
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
 

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/AlertsE2ETest.kt → apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/AlertsE2ETest.kt

@@ -13,15 +13,16 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-package com.instructure.parentapp.ui.e2e
+package com.instructure.parentapp.ui.e2e.compose
 
 import android.util.Log
 import androidx.test.espresso.Espresso
-import com.instructure.canvas.espresso.E2E
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
+import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.canvasapi2.models.AlertType
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.api.SubmissionsApi
@@ -30,10 +31,9 @@ import com.instructure.dataseeding.model.SubmissionType
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
-import com.instructure.espresso.ViewUtils
 import com.instructure.parentapp.utils.ParentComposeTest
-import com.instructure.parentapp.utils.seedData
-import com.instructure.parentapp.utils.tokenLogin
+import com.instructure.parentapp.utils.extensions.seedData
+import com.instructure.parentapp.utils.extensions.tokenLogin
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
 
@@ -74,7 +74,7 @@ class AlertsE2ETest : ParentComposeTest() {
         studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_HIGH, "80")
 
         Log.d(STEP_TAG, "Navigate back to Dashboard Page.")
-        ViewUtils.pressBackButton(2)
+        pressBackButton(2)
 
         Log.d(STEP_TAG, "Open the Alerts Page.")
         dashboardPage.clickAlertsBottomMenu()
@@ -133,7 +133,7 @@ class AlertsE2ETest : ParentComposeTest() {
         Thread.sleep(5000) // Allow the grading to propagate
 
         Log.d(STEP_TAG, "Navigate back to Alerts Page and refresh it.")
-        ViewUtils.pressBackButton(2)
+        pressBackButton(2)
         alertsPage.refresh()
 
         Log.d(ASSERTION_TAG, "Assert that the 'Assignment Grade Below 20' alert is displayed.")
@@ -180,7 +180,7 @@ class AlertsE2ETest : ParentComposeTest() {
         studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_HIGH, "80")
 
         Log.d(STEP_TAG, "Navigate back to Dashboard Page.")
-        ViewUtils.pressBackButton(2)
+        pressBackButton(2)
 
         Log.d(STEP_TAG, "Open the Alerts Page.")
         dashboardPage.clickAlertsBottomMenu()
@@ -298,7 +298,7 @@ class AlertsE2ETest : ParentComposeTest() {
         studentAlertSettingsPage.assertPercentageThreshold(AlertType.COURSE_GRADE_LOW, "Never")
 
         Log.d(STEP_TAG, "Navigate back to Dashboard Page.")
-        ViewUtils.pressBackButton(2)
+        pressBackButton(2)
 
         Log.d(STEP_TAG, "Open the Alerts Page.")
         dashboardPage.clickAlertsBottomMenu()
@@ -377,7 +377,7 @@ class AlertsE2ETest : ParentComposeTest() {
         studentAlertSettingsPage.assertPercentageThreshold(AlertType.COURSE_GRADE_HIGH, "80%")
 
         Log.d(STEP_TAG, "Navigate back to Dashboard Page.")
-        ViewUtils.pressBackButton(2)
+        pressBackButton(2)
 
         Log.d(STEP_TAG, "Open the Alerts Page.")
         dashboardPage.clickAlertsBottomMenu()

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/AssignmentDetailsE2ETest.kt → apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/AssignmentDetailsE2ETest.kt

@@ -14,27 +14,27 @@
  *     limitations under the License.
  *
  */
-package com.instructure.parentapp.ui.e2e
+package com.instructure.parentapp.ui.e2e.compose
 
 import android.util.Log
-import com.instructure.canvas.espresso.E2E
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.SecondaryFeatureCategory
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
+import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.api.SubmissionsApi
 import com.instructure.dataseeding.model.GradingType
 import com.instructure.dataseeding.model.SubmissionType
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
-import com.instructure.espresso.ViewUtils
 import com.instructure.espresso.retryWithIncreasingDelay
 import com.instructure.parentapp.utils.ParentComposeTest
-import com.instructure.parentapp.utils.seedData
-import com.instructure.parentapp.utils.tokenLogin
+import com.instructure.parentapp.utils.extensions.seedData
+import com.instructure.parentapp.utils.extensions.tokenLogin
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
 
@@ -113,7 +113,7 @@ class AssignmentDetailsE2ETest : ParentComposeTest() {
         assignmentDetailsPage.assertSelectedAttempt(1)
 
         Log.d(STEP_TAG, "Navigate back to the course list page of the selected student.")
-        ViewUtils.pressBackButton(2)
+        pressBackButton(2)
 
         Log.d(STEP_TAG, "Select the other student, '${student2.name}', who does not have any grade (and submission) for the given assignment and select this student.")
         dashboardPage.openStudentSelector()