Skip to content

Commit 2d2d3ac

Browse files
RazeemanRazeeman
committed
add ui tests for statistics
1 parent 3f3bdd2 commit 2d2d3ac

File tree

15 files changed

+248
-27
lines changed

15 files changed

+248
-27
lines changed

‎app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
99
import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
1010
import androidx.test.espresso.matcher.ViewMatchers.withClassName
1111
import androidx.test.espresso.matcher.ViewMatchers.withId
12-
import androidx.test.espresso.matcher.ViewMatchers.withTagValue
1312
import androidx.test.espresso.matcher.ViewMatchers.withText
1413
import androidx.test.ext.junit.rules.ActivityScenarioRule
1514
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -27,6 +26,7 @@ import com.example.util.simpletimetracker.utils.clickOnRecyclerItem
2726
import com.example.util.simpletimetracker.utils.clickOnViewWithId
2827
import com.example.util.simpletimetracker.utils.clickOnViewWithText
2928
import com.example.util.simpletimetracker.utils.withCardColor
29+
import com.example.util.simpletimetracker.utils.withTag
3030
import org.hamcrest.CoreMatchers.allOf
3131
import org.hamcrest.CoreMatchers.equalTo
3232
import org.hamcrest.Matcher
@@ -135,14 +135,14 @@ class AddRecordTest {
135135
clickOnRecyclerItem(R.id.rvChangeRecordType, withText(name))
136136
checkPreviewUpdated(withText(name))
137137
checkPreviewUpdated(withCardColor(color))
138-
checkPreviewUpdated(withTagValue(equalTo(icon)))
138+
checkPreviewUpdated(withTag(icon))
139139

140140
clickOnViewWithText(R.string.change_record_save)
141141

142142
// Record added
143143
checkViewIsDisplayed(allOf(withText(name), isCompletelyDisplayed()))
144144
checkViewIsDisplayed(allOf(withCardColor(color), isCompletelyDisplayed()))
145-
checkViewIsDisplayed(allOf(withTagValue(equalTo(icon)), isCompletelyDisplayed()))
145+
checkViewIsDisplayed(allOf(withTag(icon), isCompletelyDisplayed()))
146146
checkViewIsDisplayed(allOf(withText(timeStartedPreview), isCompletelyDisplayed()))
147147
checkViewIsDisplayed(allOf(withText(timeEndedPreview), isCompletelyDisplayed()))
148148
checkViewIsDisplayed(allOf(withText("2h 3m"), isCompletelyDisplayed()))

‎app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.test.core.app.ApplicationProvider
55
import androidx.test.espresso.Espresso.pressBack
66
import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
77
import androidx.test.espresso.matcher.ViewMatchers.withId
8-
import androidx.test.espresso.matcher.ViewMatchers.withTagValue
98
import androidx.test.espresso.matcher.ViewMatchers.withText
109
import androidx.test.ext.junit.rules.ActivityScenarioRule
1110
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -23,8 +22,8 @@ import com.example.util.simpletimetracker.utils.clickOnViewWithText
2322
import com.example.util.simpletimetracker.utils.scrollRecyclerToPosition
2423
import com.example.util.simpletimetracker.utils.typeTextIntoView
2524
import com.example.util.simpletimetracker.utils.withCardColor
25+
import com.example.util.simpletimetracker.utils.withTag
2626
import org.hamcrest.CoreMatchers.allOf
27-
import org.hamcrest.CoreMatchers.equalTo
2827
import org.hamcrest.Matcher
2928
import org.junit.Before
3029
import org.junit.Rule
@@ -101,20 +100,20 @@ class AddRecordTypeTest {
101100
checkViewIsDisplayed(withId(R.id.rvChangeRecordTypeIcon))
102101

103102
// Selecting icon
104-
clickOnRecyclerItem(R.id.rvChangeRecordTypeIcon, withTagValue(equalTo(firstIcon)))
105-
checkPreviewUpdated(withTagValue(equalTo(firstIcon)))
103+
clickOnRecyclerItem(R.id.rvChangeRecordTypeIcon, withTag(firstIcon))
104+
checkPreviewUpdated(withTag(firstIcon))
106105

107106
// Selecting icon
108107
scrollRecyclerToPosition(R.id.rvChangeRecordTypeIcon, lastIconPosition)
109-
clickOnRecyclerItem(R.id.rvChangeRecordTypeIcon, withTagValue(equalTo(lastIcon)))
110-
checkPreviewUpdated(withTagValue(equalTo(lastIcon)))
108+
clickOnRecyclerItem(R.id.rvChangeRecordTypeIcon, withTag(lastIcon))
109+
checkPreviewUpdated(withTag(lastIcon))
111110

112111
clickOnViewWithText(R.string.change_record_type_save)
113112

114113
// Record type added
115114
checkViewIsDisplayed(withText(name))
116115
checkViewIsDisplayed(withCardColor(lastColor))
117-
checkViewIsDisplayed(withTagValue(equalTo(lastIcon)))
116+
checkViewIsDisplayed(withTag(lastIcon))
118117
}
119118

120119
private fun checkPreviewUpdated(matcher: Matcher<View>) =

‎app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRecordTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
1010
import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
1111
import androidx.test.espresso.matcher.ViewMatchers.withClassName
1212
import androidx.test.espresso.matcher.ViewMatchers.withId
13-
import androidx.test.espresso.matcher.ViewMatchers.withTagValue
1413
import androidx.test.espresso.matcher.ViewMatchers.withText
1514
import androidx.test.ext.junit.rules.ActivityScenarioRule
1615
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -30,6 +29,7 @@ import com.example.util.simpletimetracker.utils.clickOnViewWithId
3029
import com.example.util.simpletimetracker.utils.clickOnViewWithText
3130
import com.example.util.simpletimetracker.utils.longClickOnView
3231
import com.example.util.simpletimetracker.utils.withCardColor
32+
import com.example.util.simpletimetracker.utils.withTag
3333
import org.hamcrest.CoreMatchers.allOf
3434
import org.hamcrest.CoreMatchers.equalTo
3535
import org.hamcrest.Matcher
@@ -113,7 +113,7 @@ class ChangeRecordTest {
113113
// Preview is updated
114114
checkPreviewUpdated(withText(name))
115115
checkPreviewUpdated(withCardColor(firstColor))
116-
checkPreviewUpdated(withTagValue(equalTo(firstIcon)))
116+
checkPreviewUpdated(withTag(firstIcon))
117117
checkPreviewUpdated(withText(timeStartedPreview))
118118
checkPreviewUpdated(withText(timeEndedPreview))
119119
checkPreviewUpdated(withText(timeRangePreview))
@@ -180,7 +180,7 @@ class ChangeRecordTest {
180180
// Preview is updated
181181
checkPreviewUpdated(withText(newName))
182182
checkPreviewUpdated(withCardColor(lastColor))
183-
checkPreviewUpdated(withTagValue(equalTo(lastIcon)))
183+
checkPreviewUpdated(withTag(lastIcon))
184184
checkPreviewUpdated(withText(timeStartedPreview))
185185
checkPreviewUpdated(withText(timeEndedPreview))
186186
checkPreviewUpdated(withText(timeRangePreview))
@@ -192,7 +192,7 @@ class ChangeRecordTest {
192192
clickOnViewWithId(R.id.btnRecordsContainerPrevious)
193193
checkViewIsDisplayed(allOf(withText(newName), isCompletelyDisplayed()))
194194
checkViewIsDisplayed(allOf(withCardColor(lastColor), isCompletelyDisplayed()))
195-
checkViewIsDisplayed(allOf(withTagValue(equalTo(lastIcon)), isCompletelyDisplayed()))
195+
checkViewIsDisplayed(allOf(withTag(lastIcon), isCompletelyDisplayed()))
196196
checkViewIsDisplayed(allOf(withText(timeStartedPreview), isCompletelyDisplayed()))
197197
checkViewIsDisplayed(allOf(withText(timeEndedPreview), isCompletelyDisplayed()))
198198
checkViewIsDisplayed(allOf(withText(timeRangePreview), isCompletelyDisplayed()))

‎app/src/androidTest/java/com/example/util/simpletimetracker/DeleteRecordTest.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.example.util.simpletimetracker
33
import androidx.test.core.app.ApplicationProvider
44
import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
55
import androidx.test.espresso.matcher.ViewMatchers.withId
6-
import androidx.test.espresso.matcher.ViewMatchers.withTagValue
76
import androidx.test.espresso.matcher.ViewMatchers.withText
87
import androidx.test.ext.junit.rules.ActivityScenarioRule
98
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,7 +18,7 @@ import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
1918
import com.example.util.simpletimetracker.utils.clickOnViewWithId
2019
import com.example.util.simpletimetracker.utils.longClickOnView
2120
import com.example.util.simpletimetracker.utils.withCardColor
22-
import org.hamcrest.CoreMatchers.equalTo
21+
import com.example.util.simpletimetracker.utils.withTag
2322
import org.hamcrest.Matchers.allOf
2423
import org.junit.Before
2524
import org.junit.Rule
@@ -75,7 +74,7 @@ class DeleteRecordTest {
7574
// Record is deleted
7675
checkViewDoesNotExist(allOf(withText(name), isCompletelyDisplayed()))
7776
checkViewDoesNotExist(allOf(withCardColor(color), isCompletelyDisplayed()))
78-
checkViewDoesNotExist(allOf(withTagValue(equalTo(icon)), isCompletelyDisplayed()))
77+
checkViewDoesNotExist(allOf(withTag(icon), isCompletelyDisplayed()))
7978

8079
// TODO check undo
8180
}

‎app/src/androidTest/java/com/example/util/simpletimetracker/DeleteRecordTypeTest.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.example.util.simpletimetracker
33
import androidx.test.core.app.ApplicationProvider
44
import androidx.test.espresso.Espresso.pressBack
55
import androidx.test.espresso.matcher.ViewMatchers.withId
6-
import androidx.test.espresso.matcher.ViewMatchers.withTagValue
76
import androidx.test.espresso.matcher.ViewMatchers.withText
87
import androidx.test.ext.junit.rules.ActivityScenarioRule
98
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -21,7 +20,7 @@ import com.example.util.simpletimetracker.utils.clickOnViewWithId
2120
import com.example.util.simpletimetracker.utils.clickOnViewWithText
2221
import com.example.util.simpletimetracker.utils.longClickOnView
2322
import com.example.util.simpletimetracker.utils.withCardColor
24-
import org.hamcrest.CoreMatchers.equalTo
23+
import com.example.util.simpletimetracker.utils.withTag
2524
import org.junit.Before
2625
import org.junit.Rule
2726
import org.junit.Test
@@ -77,6 +76,6 @@ class DeleteRecordTypeTest {
7776
// Record type is deleted
7877
checkViewDoesNotExist(withText(name))
7978
checkViewDoesNotExist(withCardColor(color))
80-
checkViewDoesNotExist(withTagValue(equalTo(icon)))
79+
checkViewDoesNotExist(withTag(icon))
8180
}
8281
}

‎app/src/androidTest/java/com/example/util/simpletimetracker/StartRecordTest.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
55
import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
66
import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
77
import androidx.test.espresso.matcher.ViewMatchers.withId
8-
import androidx.test.espresso.matcher.ViewMatchers.withTagValue
98
import androidx.test.espresso.matcher.ViewMatchers.withText
109
import androidx.test.ext.junit.rules.ActivityScenarioRule
1110
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -22,8 +21,8 @@ import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
2221
import com.example.util.simpletimetracker.utils.clickOnView
2322
import com.example.util.simpletimetracker.utils.clickOnViewWithText
2423
import com.example.util.simpletimetracker.utils.withCardColor
24+
import com.example.util.simpletimetracker.utils.withTag
2525
import org.hamcrest.CoreMatchers.allOf
26-
import org.hamcrest.CoreMatchers.equalTo
2726
import org.junit.Before
2827
import org.junit.Rule
2928
import org.junit.Test
@@ -79,7 +78,7 @@ class StartRecordTest {
7978
withId(R.id.layoutRunningRecordItem),
8079
withCardColor(firstColor),
8180
hasDescendant(withText(name)),
82-
hasDescendant(withTagValue(equalTo(firstIcon))),
81+
hasDescendant(withTag(firstIcon)),
8382
hasDescendant(withText(timeStarted))
8483
)
8584
)
@@ -93,7 +92,7 @@ class StartRecordTest {
9392
withId(R.id.layoutRunningRecordItem),
9493
withCardColor(lastColor),
9594
hasDescendant(withText(newName)),
96-
hasDescendant(withTagValue(equalTo(lastIcon))),
95+
hasDescendant(withTag(lastIcon)),
9796
hasDescendant(withText(timeStarted))
9897
)
9998
)

0 commit comments

Comments
 (0)