Skip to content

Commit e4b677e

Browse files
RazeemanRazeeman
committed
add more tests
1 parent 283b7a7 commit e4b677e

File tree

14 files changed

+309
-92
lines changed

14 files changed

+309
-92
lines changed

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

Lines changed: 72 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ class AddRecordTagTest : BaseUiTest() {
5454

5555
// View is set up
5656
checkViewIsNotDisplayed(withId(R.id.btnChangeRecordTagDelete))
57+
checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTagColor))
5758
checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTagType))
59+
checkViewIsNotDisplayed(withId(R.id.fieldChangeRecordTagColor))
5860
checkViewIsDisplayed(allOf(withId(R.id.fieldChangeRecordTagType), withCardColor(R.color.colorBackground)))
5961

6062
// Name is not selected
@@ -91,7 +93,61 @@ class AddRecordTagTest : BaseUiTest() {
9193
checkPreviewUpdated(withCardColor(firstColor))
9294
checkPreviewUpdated(hasDescendant(withTag(firstIcon)))
9395
checkViewIsDisplayed(allOf(withId(R.id.etChangeRecordTagName), withText(name)))
94-
checkViewIsNotDisplayed(withText(R.string.change_record_type_field))
96+
}
97+
98+
@Test
99+
fun addRecordGeneralTag() {
100+
val name = "Test"
101+
val typeName = "Type"
102+
103+
// Add activities
104+
testUtils.addActivity(typeName, firstColor, firstIcon)
105+
106+
NavUtils.openSettingsScreen()
107+
NavUtils.openCategoriesScreen()
108+
checkViewIsDisplayed(withText(R.string.categories_record_type_hint))
109+
clickOnViewWithText(R.string.categories_add_record_tag)
110+
closeSoftKeyboard()
111+
112+
// View is set up
113+
checkViewIsNotDisplayed(withId(R.id.btnChangeRecordTagDelete))
114+
checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTagColor))
115+
checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTagType))
116+
checkViewIsNotDisplayed(withId(R.id.fieldChangeRecordTagType))
117+
checkViewIsDisplayed(allOf(withId(R.id.fieldChangeRecordTagColor), withCardColor(R.color.colorBackground)))
118+
119+
// Name is not selected
120+
clickOnViewWithText(R.string.change_category_save)
121+
122+
// Typing name
123+
typeTextIntoView(R.id.etChangeRecordTagName, name)
124+
tryAction { checkPreviewUpdated(hasDescendant(withText(name))) }
125+
126+
// Open color chooser
127+
clickOnViewWithId(R.id.fieldChangeRecordTagColor)
128+
checkViewIsDisplayed(withId(R.id.rvChangeRecordTagColor))
129+
checkViewIsDisplayed(allOf(withId(R.id.fieldChangeRecordTagColor), withCardColor(R.color.inputFieldBorder)))
130+
131+
// Selecting color
132+
clickOnRecyclerItem(R.id.rvChangeRecordTagColor, withCardColor(lastColor))
133+
checkPreviewUpdated(hasDescendant(withText(name)))
134+
checkPreviewUpdated(withCardColor(lastColor))
135+
clickOnViewWithId(R.id.fieldChangeRecordTagColor)
136+
checkViewIsDisplayed(
137+
allOf(withId(R.id.fieldChangeRecordTagColor), withCardColor(R.color.colorBackground))
138+
)
139+
140+
clickOnViewWithText(R.string.change_record_type_save)
141+
142+
// Tag added
143+
checkViewIsDisplayed(withText(name))
144+
checkViewIsDisplayed(withCardColor(lastColor))
145+
146+
// Check tag saved
147+
longClickOnView(withText(name))
148+
checkPreviewUpdated(hasDescendant(withText(name)))
149+
checkPreviewUpdated(withCardColor(lastColor))
150+
checkViewIsDisplayed(allOf(withId(R.id.etChangeRecordTagName), withText(name)))
95151
}
96152

97153
@Test
@@ -114,20 +170,22 @@ class AddRecordTagTest : BaseUiTest() {
114170
@Test
115171
fun addRecordTagSameName() {
116172
val typeName = "typeName"
117-
val tagName = "tagName"
173+
val tagNameActivity = "tagNameActivity"
174+
val tagNameGeneral = "tagNameGeneral"
118175

119176
// Add activities
120177
testUtils.addActivity(typeName, firstColor, firstIcon)
121-
testUtils.addRecordTag(typeName, tagName)
178+
testUtils.addRecordTag(tagNameActivity, typeName)
179+
testUtils.addRecordTag(tagNameGeneral)
122180

123181
// Check items
124182
NavUtils.openSettingsScreen()
125183
NavUtils.openCategoriesScreen()
126-
onView(withId(R.id.rvCategoriesList)).check(recyclerItemCount(6))
184+
onView(withId(R.id.rvCategoriesList)).check(recyclerItemCount(7))
127185

128-
// Add another tag
186+
// Add another activity tag
129187
clickOnViewWithText(R.string.categories_add_record_tag)
130-
typeTextIntoView(R.id.etChangeRecordTagName, tagName)
188+
typeTextIntoView(R.id.etChangeRecordTagName, tagNameActivity)
131189
clickOnView(
132190
allOf(
133191
isDescendantOfA(withId(R.id.buttonsChangeRecordTagType)),
@@ -138,7 +196,14 @@ class AddRecordTagTest : BaseUiTest() {
138196
clickOnRecyclerItem(R.id.rvChangeRecordTagType, withText(typeName))
139197
clickOnViewWithText(R.string.change_record_type_save)
140198

141-
onView(withId(R.id.rvCategoriesList)).check(recyclerItemCount(6))
199+
onView(withId(R.id.rvCategoriesList)).check(recyclerItemCount(7))
200+
201+
// Add another general tag
202+
clickOnViewWithText(R.string.categories_add_record_tag)
203+
typeTextIntoView(R.id.etChangeRecordTagName, tagNameGeneral)
204+
clickOnViewWithText(R.string.change_record_type_save)
205+
206+
onView(withId(R.id.rvCategoriesList)).check(recyclerItemCount(7))
142207
}
143208

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

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ class AddRecordTest : BaseUiTest() {
4040
val color = firstColor
4141
val icon = firstIcon
4242
val comment = "Comment"
43-
val tag = "Tag"
43+
val tag1 = "Tag1"
44+
val tag2 = "Tag2"
4445

4546
// Add activity
4647
testUtils.addActivity(name, color, icon)
47-
testUtils.addRecordTag(name, tag)
48+
testUtils.addRecordTag(tag1, name)
49+
testUtils.addRecordTag(tag2)
4850

4951
// Add record
5052
NavUtils.openRecordsScreen()
@@ -122,9 +124,21 @@ class AddRecordTest : BaseUiTest() {
122124
clickOnViewWithId(R.id.fieldChangeRecordCategory)
123125
checkViewIsDisplayed(withId(R.id.rvChangeRecordCategories))
124126

125-
// Selecting tag
126-
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag))
127-
checkPreviewUpdated(hasDescendant(withText("$name - $tag")))
127+
// Selecting tags
128+
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag1))
129+
checkPreviewUpdated(hasDescendant(withText("$name - $tag1")))
130+
131+
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag2))
132+
checkPreviewUpdated(hasDescendant(withText("$name - $tag1, $tag2")))
133+
134+
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag1))
135+
checkPreviewUpdated(hasDescendant(withText("$name - $tag2")))
136+
137+
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag2))
138+
checkPreviewUpdated(hasDescendant(withText(name)))
139+
140+
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag1))
141+
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag2))
128142
clickOnViewWithId(R.id.fieldChangeRecordCategory)
129143

130144
clickOnViewWithText(R.string.change_record_save)
@@ -134,7 +148,7 @@ class AddRecordTest : BaseUiTest() {
134148
allOf(
135149
withId(R.id.viewRecordItem),
136150
withCardColor(color),
137-
hasDescendant(withText("$name - $tag")),
151+
hasDescendant(withText("$name - $tag1, $tag2")),
138152
hasDescendant(withTag(icon)),
139153
hasDescendant(withText(timeStartedPreview)),
140154
hasDescendant(withText(timeEndedPreview)),

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ class ArchiveTest : BaseUiTest() {
140140

141141
testUtils.addActivity(name1)
142142
testUtils.addRecord(name1)
143-
testUtils.addRecordTag(name1, tag1)
144-
testUtils.addRecordTag(name1, tag2)
143+
testUtils.addRecordTag(tag1, name1)
144+
testUtils.addRecordTag(tag2, name1)
145145

146146
NavUtils.openSettingsScreen()
147147
onView(withId(R.id.checkboxSettingsShowRecordTagSelection)).perform(nestedScrollTo())
@@ -206,6 +206,7 @@ class ArchiveTest : BaseUiTest() {
206206
clickOnView(allOf(withText(name1), isCompletelyDisplayed()))
207207
checkTagVisible(tag1)
208208
checkTagVisible(tag2)
209+
pressBack()
209210
}
210211

211212
@Test
@@ -218,12 +219,12 @@ class ArchiveTest : BaseUiTest() {
218219
testUtils.addActivity(name1)
219220
testUtils.addActivity(name2)
220221

221-
testUtils.addRecordTag(name1, tag1)
222-
testUtils.addRecordTag(name1, tag2)
222+
testUtils.addRecordTag(tag1, name1)
223+
testUtils.addRecordTag(tag2, name1)
223224

224-
testUtils.addRecord(name1, tagName = tag1)
225-
testUtils.addRecord(name1, tagName = tag1)
226-
testUtils.addRecord(name1, tagName = tag1)
225+
testUtils.addRecord(name1, tagNames = listOf(tag1))
226+
testUtils.addRecord(name1, tagNames = listOf(tag1))
227+
testUtils.addRecord(name1, tagNames = listOf(tag1))
227228
testUtils.addRecord(name1)
228229

229230
// Delete

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

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import com.example.util.simpletimetracker.utils.BaseUiTest
99
import com.example.util.simpletimetracker.utils.NavUtils
1010
import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
1111
import com.example.util.simpletimetracker.utils.checkViewIsNotDisplayed
12+
import com.example.util.simpletimetracker.utils.clickOnRecyclerItem
13+
import com.example.util.simpletimetracker.utils.clickOnViewWithId
1214
import com.example.util.simpletimetracker.utils.clickOnViewWithText
15+
import com.example.util.simpletimetracker.utils.scrollRecyclerToView
1316
import com.example.util.simpletimetracker.utils.tryAction
1417
import com.example.util.simpletimetracker.utils.typeTextIntoView
1518
import com.example.util.simpletimetracker.utils.withCardColor
@@ -35,14 +38,17 @@ class ChangeRecordTagTest : BaseUiTest() {
3538
// Add category
3639
NavUtils.openSettingsScreen()
3740
NavUtils.openCategoriesScreen()
38-
NavUtils.addRecordTag(name, typeName)
41+
NavUtils.addRecordTag(name, activity = typeName)
3942

4043
clickOnViewWithText(name)
4144

4245
// View is set up
4346
checkViewIsDisplayed(withId(R.id.btnChangeRecordTagDelete))
47+
checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTagColor))
4448
checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTagType))
45-
checkViewIsNotDisplayed(withText(R.string.change_record_type_field))
49+
checkViewIsNotDisplayed(withId(R.id.buttonsChangeRecordTagType))
50+
checkViewIsNotDisplayed(withId(R.id.fieldChangeRecordTagColor))
51+
checkViewIsNotDisplayed(withId(R.id.fieldChangeRecordTagType))
4652
checkViewIsDisplayed(allOf(withId(R.id.etChangeRecordTagName), withText(name)))
4753

4854
// Preview is updated
@@ -59,6 +65,52 @@ class ChangeRecordTagTest : BaseUiTest() {
5965
checkViewIsDisplayed(withText(newName))
6066
}
6167

68+
@Test
69+
fun changeRecordGeneralTag() {
70+
val name = "Test"
71+
val newName = "Updated"
72+
val typeName = "Type"
73+
74+
// Add activities
75+
testUtils.addActivity(typeName, firstColor, firstIcon)
76+
77+
// Add category
78+
NavUtils.openSettingsScreen()
79+
NavUtils.openCategoriesScreen()
80+
NavUtils.addRecordTag(name, color = firstColor)
81+
82+
clickOnViewWithText(name)
83+
84+
// View is set up
85+
checkViewIsDisplayed(withId(R.id.btnChangeRecordTagDelete))
86+
checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTagColor))
87+
checkViewIsNotDisplayed(withId(R.id.rvChangeRecordTagType))
88+
checkViewIsNotDisplayed(withId(R.id.buttonsChangeRecordTagType))
89+
checkViewIsDisplayed(withId(R.id.fieldChangeRecordTagColor))
90+
checkViewIsNotDisplayed(withId(R.id.fieldChangeRecordTagType))
91+
checkViewIsDisplayed(allOf(withId(R.id.etChangeRecordTagName), withText(name)))
92+
93+
// Preview is updated
94+
checkPreviewUpdated(hasDescendant(withText(name)))
95+
checkPreviewUpdated(withCardColor(firstColor))
96+
97+
// Change item name
98+
typeTextIntoView(R.id.etChangeRecordTagName, newName)
99+
tryAction { checkPreviewUpdated(hasDescendant(withText(newName))) }
100+
101+
// Change item color
102+
clickOnViewWithId(R.id.fieldChangeRecordTagColor)
103+
scrollRecyclerToView(R.id.rvChangeRecordTagColor, withCardColor(lastColor))
104+
clickOnRecyclerItem(R.id.rvChangeRecordTagColor, withCardColor(lastColor))
105+
tryAction { checkPreviewUpdated(withCardColor(lastColor)) }
106+
107+
clickOnViewWithText(R.string.change_record_type_save)
108+
109+
// Record tag updated
110+
checkViewIsDisplayed(withText(newName))
111+
checkViewIsDisplayed(withCardColor(lastColor))
112+
}
113+
62114
private fun checkPreviewUpdated(matcher: Matcher<View>) =
63115
checkViewIsDisplayed(allOf(withId(R.id.previewChangeRecordTag), matcher))
64116
}

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class ChangeRecordTest : BaseUiTest() {
5050
// Add activities
5151
testUtils.addActivity(name, firstColor, firstIcon)
5252
testUtils.addActivity(newName, lastColor, emoji = lastEmoji)
53-
testUtils.addRecordTag(name, tag1)
54-
testUtils.addRecordTag(newName, tag2)
53+
testUtils.addRecordTag(tag1, name)
54+
testUtils.addRecordTag(tag2, newName)
5555

5656
// Add record
5757
NavUtils.openRecordsScreen()
@@ -198,12 +198,14 @@ class ChangeRecordTest : BaseUiTest() {
198198
@Test
199199
fun changeRecordUntagged() {
200200
val name = "TypeName"
201-
val tag = "TagName"
202-
val fullName = "$name - $tag"
201+
val tag1 = "Tag1"
202+
val tag2 = "Tag2"
203+
val fullName = "$name - $tag1, $tag2"
203204

204205
// Add activities
205206
testUtils.addActivity(name, firstColor, firstIcon)
206-
testUtils.addRecordTag(name, tag)
207+
testUtils.addRecordTag(tag1, name)
208+
testUtils.addRecordTag(tag2)
207209

208210
// Add record
209211
NavUtils.openRecordsScreen()
@@ -219,7 +221,8 @@ class ChangeRecordTest : BaseUiTest() {
219221
clickOnView(allOf(withText(name), isCompletelyDisplayed()))
220222
checkPreviewUpdated(hasDescendant(withText(name)))
221223
clickOnViewWithText(R.string.change_record_category_field)
222-
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag))
224+
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag1))
225+
clickOnRecyclerItem(R.id.rvChangeRecordCategories, withText(tag2))
223226
clickOnViewWithText(R.string.change_record_category_field)
224227
checkPreviewUpdated(hasDescendant(withText(fullName)))
225228
clickOnViewWithText(R.string.change_record_type_save)

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ChangeRunningRecordTest : BaseUiTest() {
4848
// Add activities
4949
testUtils.addActivity(name1, firstColor, firstIcon, goalTime = firstGoalTime)
5050
testUtils.addActivity(name2, lastColor, emoji = lastEmoji)
51-
testUtils.addRecordTag(name2, tag2)
51+
testUtils.addRecordTag(tag2, name2)
5252

5353
// Start timer
5454
tryAction { clickOnViewWithText(name1) }
@@ -160,16 +160,18 @@ class ChangeRunningRecordTest : BaseUiTest() {
160160
fun changeRecordUntagged() {
161161
val name1 = "TypeName1"
162162
val name2 = "TypeName2"
163-
val tag1 = "TagName1"
164-
val tag2 = "TagName2"
163+
val tag1 = "Tag1"
164+
val tag2 = "Tag2"
165+
val tag3 = "Tag3"
165166
val fullName1 = "$name1 - $tag1"
166-
val fullName2 = "$name2 - $tag2"
167+
val fullName2 = "$name2 - $tag2, $tag3"
167168

168169
// Add activities
169170
testUtils.addActivity(name1)
170171
testUtils.addActivity(name2)
171-
testUtils.addRecordTag(name1, tag1)
172-
testUtils.addRecordTag(name2, tag2)
172+
testUtils.addRecordTag(tag1, name1)
173+
testUtils.addRecordTag(tag2, name2)
174+
testUtils.addRecordTag(tag3)
173175

174176
// Add running record
175177
tryAction { clickOnViewWithText(name1) }
@@ -198,6 +200,7 @@ class ChangeRunningRecordTest : BaseUiTest() {
198200
clickOnViewWithText(R.string.change_record_type_field)
199201
clickOnViewWithText(R.string.change_record_category_field)
200202
clickOnRecyclerItem(R.id.rvChangeRunningRecordCategories, withText(tag2))
203+
clickOnRecyclerItem(R.id.rvChangeRunningRecordCategories, withText(tag3))
201204
checkPreviewUpdated(hasDescendant(withText(fullName2)))
202205
clickOnViewWithText(R.string.change_record_category_field)
203206
clickOnViewWithText(R.string.change_record_save)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class RecordsAllTest : BaseUiTest() {
4242

4343
// Add activity
4444
testUtils.addActivity(name)
45-
testUtils.addRecordTag(name, tag)
45+
testUtils.addRecordTag(tag, name)
4646

4747
// Add records
4848
NavUtils.openRecordsScreen()

0 commit comments

Comments
 (0)