add another manual card order test

Razeeman · Razeeman · commit 71038be57476 · 2021-08-21T12:13:47.000+03:00
diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/SettingsTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/SettingsTest.kt
@@ -5,7 +5,11 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.ViewAssertion
 import androidx.test.espresso.assertion.PositionAssertions.isCompletelyAbove
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyBelow
 import androidx.test.espresso.assertion.PositionAssertions.isCompletelyLeftOf
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyRightOf
+import androidx.test.espresso.assertion.PositionAssertions.isLeftAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isTopAlignedWith
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
@@ -17,6 +21,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withSubstring
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
 import com.example.util.simpletimetracker.core.mapper.ColorMapper
 import com.example.util.simpletimetracker.domain.model.DayOfWeek
@@ -384,6 +389,49 @@ class SettingsTest : BaseUiTest() {
         check(name3, name1) { matcher -> isCompletelyLeftOf(matcher) }
     }
 
+    @Test
+    fun cardOrderManual2() {
+        val name = "Test"
+
+        // Add activities
+        (1..15).forEach {
+            testUtils.addActivity("$name$it")
+        }
+
+        // Change settings
+        NavUtils.openSettingsScreen()
+        NavUtils.openCardSizeScreen()
+        Thread.sleep(1000)
+        clickOnViewWithText("4")
+        pressBack()
+        clickOnSpinnerWithId(R.id.spinnerSettingsRecordTypeSort)
+        clickOnViewWithText(R.string.settings_sort_by_color)
+        clickOnSpinnerWithId(R.id.spinnerSettingsRecordTypeSort)
+        clickOnViewWithText(R.string.settings_sort_manually)
+        Thread.sleep(1000)
+
+        val resources = InstrumentationRegistry.getInstrumentation().targetContext.resources
+        val screenWidth = resources.displayMetrics.widthPixels
+        val screenHeight = resources.displayMetrics.heightPixels
+
+        // Drag
+        (1..15).forEach {
+            onView(allOf(isDescendantOfA(withId(R.id.viewRecordTypeItem)), withText("$name$it")))
+                .perform(
+                    drag(Direction.RIGHT, screenWidth),
+                    drag(Direction.DOWN, screenHeight),
+                )
+        }
+
+        // Check order in settings
+        checkManualOrder(name)
+
+        // Check order on main
+        pressBack()
+        NavUtils.openRunningRecordsScreen()
+        checkManualOrder(name)
+    }
+
     @Test
     fun enableNotifications() {
         val name1 = "Test1"
@@ -756,4 +804,65 @@ class SettingsTest : BaseUiTest() {
             matcher(allOf(isDescendantOfA(withId(R.id.viewRecordTypeItem)), withText(second)))
         )
     }
+
+    private fun checkManualOrder(name: String) {
+        check(name + 2, name + 1) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+        check(name + 3, name + 2) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+        check(name + 4, name + 3) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+
+        check(name + 5, name + 1) { matcher ->
+            isCompletelyBelow(matcher)
+            isLeftAlignedWith(matcher)
+        }
+        check(name + 6, name + 5) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+        check(name + 7, name + 6) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+        check(name + 8, name + 7) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+
+        check(name + 9, name + 5) { matcher ->
+            isCompletelyBelow(matcher)
+            isLeftAlignedWith(matcher)
+        }
+        check(name + 10, name + 9) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+        check(name + 11, name + 10) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+        check(name + 12, name + 11) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+
+        check(name + 13, name + 9) { matcher ->
+            isCompletelyBelow(matcher)
+        }
+        check(name + 14, name + 13) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+        check(name + 15, name + 14) { matcher ->
+            isCompletelyRightOf(matcher)
+            isTopAlignedWith(matcher)
+        }
+    }
 }
diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt
@@ -5,12 +5,15 @@ import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.PickerActions
+import androidx.test.espresso.contrib.PickerActions.setTime
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.example.util.simpletimetracker.R
 import org.hamcrest.CoreMatchers
+import org.hamcrest.CoreMatchers.equalTo
 
 object NavUtils {
 
@@ -170,14 +173,14 @@ object NavUtils {
 
         // Time started
         clickOnViewWithId(R.id.tvChangeRecordTimeStarted)
-        onView(ViewMatchers.withClassName(CoreMatchers.equalTo(TimePicker::class.java.name)))
-            .perform(PickerActions.setTime(hourStarted, minutesStarted))
+        onView(withClassName(equalTo(TimePicker::class.java.name)))
+            .perform(setTime(hourStarted, minutesStarted))
         clickOnViewWithId(R.id.btnDateTimeDialogPositive)
 
         // Time ended
         clickOnViewWithId(R.id.tvChangeRecordTimeEnded)
-        onView(ViewMatchers.withClassName(CoreMatchers.equalTo(TimePicker::class.java.name)))
-            .perform(PickerActions.setTime(hourEnded, minutesEnded))
+        onView(withClassName(equalTo(TimePicker::class.java.name)))
+            .perform(setTime(hourEnded, minutesEnded))
         clickOnViewWithId(R.id.btnDateTimeDialogPositive)
 
         // Comment
diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/ViewActions.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/ViewActions.kt
@@ -24,7 +24,7 @@ import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.anyOf
 
 enum class Direction {
-    UP, DOWN, LEFT, RIGHT
+    UP, DOWN, LEFT, RIGHT, COORDINATES
 }
 
 fun selectTabAtPosition(tabIndex: Int): ViewAction = object : ViewAction {
@@ -76,8 +76,12 @@ fun nestedScrollTo(): ViewAction = object : ViewAction {
     }
 }
 
-fun drag(direction: Direction, offset: Int): ViewAction = object : ViewAction {
-    private val SWIPE_EVENT_COUNT = 10
+fun drag(
+    direction: Direction = Direction.COORDINATES,
+    offset: Int = 0,
+    coordinates: FloatArray = FloatArray(2) { 0.0f }
+): ViewAction = object : ViewAction {
+    private val SWIPE_EVENT_COUNT = 50
 
     override fun getDescription(): String = "dragging"
 
@@ -143,13 +147,14 @@ fun drag(direction: Direction, offset: Int): ViewAction = object : ViewAction {
     }
 
     private fun getDestinationCoordinates(initial: FloatArray): FloatArray {
-        val destination = initial.clone()
+        var destination = initial.clone()
 
         when (direction) {
             Direction.UP -> destination[1] = destination[1] - offset
             Direction.DOWN -> destination[1] = destination[1] + offset
             Direction.LEFT -> destination[0] = destination[0] - offset
             Direction.RIGHT -> destination[0] = destination[0] + offset
+            Direction.COORDINATES -> destination = coordinates
         }
 
         return destination
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt b/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt
@@ -62,7 +62,8 @@ class TestUtils @Inject constructor(
             ?: icons.keys.first()
 
         val colors = ColorMapper.getAvailableColors(false)
-        val colorId = colors.indexOf(color).takeUnless { it == -1 }.orZero()
+        val colorId = colors.indexOf(color).takeUnless { it == -1 }
+            ?: (0..colors.size).random()
 
         val availableCategories = categoryInteractor.getAll()
 
