Skip to content

Commit a3f94fb

Browse files
committed
fix some ui test
1 parent 70cb73d commit a3f94fb

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

app/src/androidTest/java/com/example/util/simpletimetracker/CustomColorTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import android.view.View
44
import androidx.annotation.ColorInt
55
import androidx.test.espresso.Espresso.onView
66
import androidx.test.espresso.Espresso.pressBack
7-
import androidx.test.espresso.action.ViewActions.swipeLeft
8-
import androidx.test.espresso.action.ViewActions.swipeRight
7+
import androidx.test.espresso.action.GeneralLocation
98
import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
109
import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
1110
import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -18,6 +17,7 @@ import com.example.util.simpletimetracker.utils.NavUtils
1817
import com.example.util.simpletimetracker.utils.checkSliderValue
1918
import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
2019
import com.example.util.simpletimetracker.utils.checkViewIsNotDisplayed
20+
import com.example.util.simpletimetracker.utils.clickLocation
2121
import com.example.util.simpletimetracker.utils.clickOnRecyclerItem
2222
import com.example.util.simpletimetracker.utils.clickOnViewWithIdOnPager
2323
import com.example.util.simpletimetracker.utils.clickOnViewWithText
@@ -50,11 +50,11 @@ class CustomColorTest : BaseUiTest() {
5050
checkViewIsDisplayed(withText(R.string.color_selection_final_color_hint))
5151

5252
// Change slider hue
53-
onView(withId(R.id.sliderColorSelectionHue)).perform(swipeLeft())
53+
onView(withId(R.id.sliderColorSelectionHue)).perform(clickLocation(GeneralLocation.CENTER_LEFT))
5454
checkSliderValue(R.id.sliderColorSelectionHue, 0)
5555
checkViewIsDisplayed(allOf(withId(R.id.etColorSelectionHue), withText("0")))
5656

57-
onView(withId(R.id.sliderColorSelectionHue)).perform(swipeRight())
57+
onView(withId(R.id.sliderColorSelectionHue)).perform(clickLocation(GeneralLocation.CENTER_RIGHT))
5858
checkSliderValue(R.id.sliderColorSelectionHue, 360)
5959
checkViewIsDisplayed(allOf(withId(R.id.etColorSelectionHue), withText("360")))
6060

app/src/androidTest/java/com/example/util/simpletimetracker/utils/ViewActions.kt

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.example.util.simpletimetracker.utils
22

3+
import android.view.InputDevice
4+
import android.view.MotionEvent
35
import android.view.View
46
import android.view.ViewConfiguration
57
import android.widget.HorizontalScrollView
@@ -10,12 +12,15 @@ import androidx.test.espresso.PerformException
1012
import androidx.test.espresso.UiController
1113
import androidx.test.espresso.ViewAction
1214
import androidx.test.espresso.action.CoordinatesProvider
15+
import androidx.test.espresso.action.GeneralClickAction
1316
import androidx.test.espresso.action.GeneralLocation
1417
import androidx.test.espresso.action.GeneralSwipeAction
1518
import androidx.test.espresso.action.MotionEvents
1619
import androidx.test.espresso.action.Press
1720
import androidx.test.espresso.action.ScrollToAction
1821
import androidx.test.espresso.action.Swipe
22+
import androidx.test.espresso.action.Tap
23+
import androidx.test.espresso.action.ViewActions
1924
import androidx.test.espresso.matcher.ViewMatchers
2025
import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
2126
import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
@@ -79,6 +84,20 @@ fun unconstrainedClick(): ViewAction = object : ViewAction {
7984
}
8085
}
8186

87+
fun clickLocation(
88+
location: GeneralLocation,
89+
): ViewAction {
90+
return ViewActions.actionWithAssertions(
91+
GeneralClickAction(
92+
Tap.SINGLE,
93+
location,
94+
Press.FINGER,
95+
InputDevice.SOURCE_UNKNOWN,
96+
MotionEvent.BUTTON_PRIMARY
97+
)
98+
)
99+
}
100+
82101
fun nestedScrollTo(): ViewAction = object : ViewAction {
83102
override fun getDescription(): String =
84103
"nested scroll to"
@@ -102,7 +121,7 @@ fun nestedScrollTo(): ViewAction = object : ViewAction {
102121
fun drag(
103122
direction: Direction = Direction.COORDINATES,
104123
offset: Int = 0,
105-
coordinates: FloatArray = FloatArray(2) { 0.0f }
124+
coordinates: FloatArray = FloatArray(2) { 0.0f },
106125
): ViewAction = object : ViewAction {
107126
private val SWIPE_EVENT_COUNT = 50
108127

0 commit comments

Comments
 (0)