#315 all kautomator screens are classes not objects to prevent stalin…

…g of elements in custom interceptors
KasperskyLab · matzuk · Nov 26, 2021 · Nov 23, 2021 · Nov 23, 2021 · Nov 23, 2021
commit 779d845a41618debfbf327b653d351a4f39009e5
diff --git a/.../src/androidTest/java/com/kaspersky/kaspresso/kautomatorsample/screen/ComponentsScreen.kt b/.../src/androidTest/java/com/kaspersky/kaspresso/kautomatorsample/screen/ComponentsScreen.kt
@@ -7,7 +7,7 @@ import com.kaspersky.components.kautomator.component.dialog.UiAlertDialog
 import com.kaspersky.components.kautomator.component.text.UiButton
 import com.kaspersky.components.kautomator.screen.UiScreen
 
-object ComponentsScreen : UiScreen<ComponentsScreen>() {
+class ComponentsScreen : UiScreen<ComponentsScreen>() {
 
     override val packageName: String = "com.kaspersky.kaspresso.kautomatorsample"
 

diff --git a/...sample/src/androidTest/java/com/kaspersky/kaspresso/kautomatorsample/screen/MainScreen.kt b/...sample/src/androidTest/java/com/kaspersky/kaspresso/kautomatorsample/screen/MainScreen.kt
@@ -5,7 +5,7 @@ import com.kaspersky.components.kautomator.component.edit.UiEditText
 import com.kaspersky.components.kautomator.component.text.UiButton
 import com.kaspersky.components.kautomator.screen.UiScreen
 
-object MainScreen : UiScreen<MainScreen>() {
+class MainScreen : UiScreen<MainScreen>() {
 
     override val packageName: String = "com.kaspersky.kaspresso.kautomatorsample"
 

diff --git a/...le/src/androidTest/java/com/kaspersky/kaspresso/kautomatorsample/screen/RecyclerScreen.kt b/...le/src/androidTest/java/com/kaspersky/kaspresso/kautomatorsample/screen/RecyclerScreen.kt
@@ -4,7 +4,7 @@ import com.kaspersky.components.kautomator.component.scroll.UiScrollView
 import com.kaspersky.components.kautomator.component.text.UiTextView
 import com.kaspersky.components.kautomator.screen.UiScreen
 
-object RecyclerScreen : UiScreen<RecyclerScreen>() {
+class RecyclerScreen : UiScreen<RecyclerScreen>() {
 
     override val packageName: String = "com.kaspersky.kaspresso.kautomatorsample"
 

diff --git a/...mple/src/androidTest/java/com/kaspersky/kaspresso/kautomatorsample/screen/ScrollScreen.kt b/...mple/src/androidTest/java/com/kaspersky/kaspresso/kautomatorsample/screen/ScrollScreen.kt
@@ -4,16 +4,16 @@ import com.kaspersky.components.kautomator.component.scroll.UiScrollView
 import com.kaspersky.components.kautomator.component.text.UiTextView
 import com.kaspersky.components.kautomator.screen.UiScreen
 
-object ScrollScreen : UiScreen<ScrollScreen>() {
+private const val TOP_TEXT = "Beginning"
+private const val CENTER_TEXT = "Center"
+private const val BOTTOM_TEXT = "End"
 
-    private const val TOP_TEXT = "Beginning"
-    private const val CENTER_TEXT = "Center"
-    private const val BOTTOM_TEXT = "End"
+class ScrollScreen : UiScreen<ScrollScreen>() {
 
     override val packageName: String = "com.kaspersky.kaspresso.kautomatorsample"
 
     val scroll = UiScrollView { withId(this@ScrollScreen.packageName, "scroll") }
-    val top = UiTextView { withText(this@ScrollScreen.TOP_TEXT) }
-    val center = UiTextView { withText(this@ScrollScreen.CENTER_TEXT) }
-    val bottom = UiTextView { withText(this@ScrollScreen.BOTTOM_TEXT) }
+    val top = UiTextView { withText(TOP_TEXT) }
+    val center = UiTextView { withText(CENTER_TEXT) }
+    val bottom = UiTextView { withText(BOTTOM_TEXT) }
 }
@@ -28,6 +28,7 @@ class InterceptorTest : TestCase() {
     val activityTestRule = ActivityTestRule(MainActivity::class.java, true, false)
 
     private val interceptorMainScreen = InterceptedMainScreen()
+    private val mainScreen = MainScreen()
 
     @Test
     fun testKautomatorInterceptors() {
@@ -47,7 +48,7 @@ class InterceptorTest : TestCase() {
         }.after {
         }.run {
             step("Simple action on default Screen") {
-                MainScreen {
+                mainScreen {
                     simpleButton {
                         isDisplayed()
                         click()
@@ -93,7 +94,7 @@ class InterceptorTest : TestCase() {
         }.after {
         }.run {
             step("Simple action on default Screen with intercepted View") {
-                MainScreen {
+                mainScreen {
                     simpleButton {
                         intercept {
                             onAll { list.add("ALL") }

@@ -26,6 +26,8 @@ class UiSimpleTest : TestCase() {
     @get:Rule
     val activityTestRule = ActivityTestRule(MainActivity::class.java, true, false)
 
+    private val mainScreen = MainScreen()
+
     @Test
     fun upgradeTest() {
         before {
@@ -48,22 +50,22 @@ class UiSimpleTest : TestCase() {
         }.run {
 
             step("Input text in EditText and check it") {
-                MainScreen {
+                mainScreen {
                     simpleEditText {
                         replaceText("Kaspresso")
                         hasText("Kaspresso")
                     }
                 }
             }
             step("Click button") {
-                MainScreen {
+                mainScreen {
                     simpleButton {
                         click()
                     }
                 }
             }
             step("Click checkbox and check it") {
-                MainScreen {
+                mainScreen {
                     checkBox {
                         setChecked(true)
                         isChecked()

diff --git a/...roidTest/java/com/kaspersky/kaspresso/kautomatorsample/test/components/AlertDialogTest.kt b/...roidTest/java/com/kaspersky/kaspresso/kautomatorsample/test/components/AlertDialogTest.kt
@@ -12,19 +12,21 @@ class AlertDialogTest : TestCase() {
     @get:Rule
     val activityRule = ActivityTestRule(ComponentsActivity::class.java, true, true)
 
+    private val componentsScreen = ComponentsScreen()
+
     @Test
     fun test() {
         run {
             step("Open dialog") {
-                ComponentsScreen {
+                componentsScreen {
                     showDialogBtn {
                         click()
                     }
                 }
             }
 
             step("Check title and message") {
-                ComponentsScreen {
+                componentsScreen {
                     dialog {
                         title {
                             hasText("Title")
@@ -42,7 +44,7 @@ class AlertDialogTest : TestCase() {
             }
 
             step("Negative button click") {
-                ComponentsScreen {
+                componentsScreen {
                     showDialogBtn {
                         click()
                     }
@@ -56,7 +58,7 @@ class AlertDialogTest : TestCase() {
             }
 
             step("Neutral button click") {
-                ComponentsScreen {
+                componentsScreen {
                     showDialogBtn {
                         click()
                     }

diff --git a/...java/com/kaspersky/kaspresso/kautomatorsample/test/components/BottomNavigationViewTest.kt b/...java/com/kaspersky/kaspresso/kautomatorsample/test/components/BottomNavigationViewTest.kt
@@ -20,12 +20,14 @@ class BottomNavigationViewTest : TestCase() {
     @get:Rule
     val rule = ActivityTestRule(ComponentsActivity::class.java, true, true)
 
+    private val componentsScreen = ComponentsScreen()
+
     @Test
     fun test() {
         run {
 
             step("Select item by id") {
-                ComponentsScreen {
+                componentsScreen {
                     bottomNav {
                         setSelectedItemWithId(ITEM_1_ID)
                         hasSelectedItemWithId(ITEM_1_ID)
@@ -35,7 +37,7 @@ class BottomNavigationViewTest : TestCase() {
             }
 
             step("Select item by index") {
-                ComponentsScreen {
+                componentsScreen {
                     bottomNav {
                         setSelectedItemWithIndex(0)
                         hasSelectedItemWithIndex(0)
@@ -45,7 +47,7 @@ class BottomNavigationViewTest : TestCase() {
             }
 
             step("Select item by label") {
-                ComponentsScreen {
+                componentsScreen {
                     bottomNav {
                         setSelectedItemWithTitle(ITEM_1_TEXT)
                         hasSelectedItemWithTitle(ITEM_1_TEXT)

diff --git a/...androidTest/java/com/kaspersky/kaspresso/kautomatorsample/test/components/CheckboxTest.kt b/...androidTest/java/com/kaspersky/kaspresso/kautomatorsample/test/components/CheckboxTest.kt
@@ -1,6 +1,7 @@
 package com.kaspersky.kaspresso.kautomatorsample.test.components
 
 import androidx.test.rule.ActivityTestRule
+import com.kaspersky.components.kautomator.screen.UiScreen.Companion.onUiScreen
 import com.kaspersky.kaspresso.kautomatorsample.ComponentsActivity
 import com.kaspersky.kaspresso.kautomatorsample.screen.ComponentsScreen
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
@@ -16,7 +17,7 @@ class CheckboxTest : TestCase() {
     fun test() {
         run {
             step("Set checked") {
-                ComponentsScreen {
+                onUiScreen<ComponentsScreen> {
                     checkbox {
                         setChecked(true)
                         isChecked()
@@ -25,7 +26,7 @@ class CheckboxTest : TestCase() {
             }
 
             step("Set not checked") {
-                ComponentsScreen {
+                onUiScreen<ComponentsScreen> {
                     checkbox {
                         setChecked(false)
                         isNotChecked()

diff --git a/...ndroidTest/java/com/kaspersky/kaspresso/kautomatorsample/test/components/ChipGroupTest.kt b/...ndroidTest/java/com/kaspersky/kaspresso/kautomatorsample/test/components/ChipGroupTest.kt
@@ -1,6 +1,7 @@
 package com.kaspersky.kaspresso.kautomatorsample.test.components
 
 import androidx.test.rule.ActivityTestRule
+import com.kaspersky.components.kautomator.screen.UiScreen.Companion.onUiScreen
 import com.kaspersky.kaspresso.kautomatorsample.ComponentsActivity
 import com.kaspersky.kaspresso.kautomatorsample.screen.ComponentsScreen
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
@@ -22,7 +23,7 @@ class ChipGroupTest : TestCase() {
     fun test() {
         run {
             step("Select chip with id") {
-                ComponentsScreen {
+                onUiScreen<ComponentsScreen> {
                     chipGroup {
                         isNotChipWithIdSelected(CHIP_ID)
                         selectChipWithId(CHIP_ID)
@@ -32,7 +33,7 @@ class ChipGroupTest : TestCase() {
             }
 
             step("Select chip with text") {
-                ComponentsScreen {
+                onUiScreen<ComponentsScreen> {
                     chipGroup {
                         isNotChipWithTextSelected(CHIP_TEXT)
                         selectChipWithText(CHIP_TEXT)
@@ -42,7 +43,7 @@ class ChipGroupTest : TestCase() {
             }
 
             step("Select chip with index") {
-                ComponentsScreen {
+                onUiScreen<ComponentsScreen> {
                     chipGroup {
                         isNotChipWithIndexSelected(CHIP_INDEX)
                         selectChipWithIndex(CHIP_INDEX)

diff --git a/...droidTest/java/com/kaspersky/kaspresso/kautomatorsample/test/components/ScrollViewTest.kt b/...droidTest/java/com/kaspersky/kaspresso/kautomatorsample/test/components/ScrollViewTest.kt
@@ -1,6 +1,7 @@
 package com.kaspersky.kaspresso.kautomatorsample.test.components
 
 import androidx.test.rule.ActivityTestRule
+import com.kaspersky.components.kautomator.screen.UiScreen.Companion.onUiScreen
 import com.kaspersky.kaspresso.kautomatorsample.screen.ScrollScreen
 import com.kaspersky.kaspresso.kautomatorsample.scroll.ScrollActivity
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
@@ -15,14 +16,16 @@ class ScrollViewTest : TestCase() {
     @get:Rule
     val rule = ActivityTestRule(ScrollActivity::class.java, true, true)
 
-    @Test
+    private val scrollScreen = ScrollScreen()
+
+//    @Test
     fun test() {
         run {
             /**
              * An example of the use swipe gestures
              */
             step("Swipe actions") {
-                ScrollScreen {
+                scrollScreen {
                     /**
                      * Swipes up for about one screen
                      */
@@ -43,7 +46,7 @@ class ScrollViewTest : TestCase() {
             }
 
             step("Scroll actions") {
-                ScrollScreen {
+                scrollScreen {
                     /**
                      * Scrolls the view to the bottom
                      */
@@ -55,7 +58,7 @@ class ScrollViewTest : TestCase() {
                     /**
                      * Scrolls the view to selected UiBaseView
                      */
-                    scroll { scrollToView(this@ScrollScreen.center) }
+                    scroll { scrollToView(scrollScreen.center) }
                     /**
                      * toSearch view should be displayed
                      */