Skip to content

Commit f9f0e66

Browse files
grzesiek2010grzesiek2010
committed
Moved sortByDialog_ShouldBeTranslatedAndDisplayProperIcons to a separate class
1 parent 90d41ae commit f9f0e66

File tree

2 files changed

+68
-61
lines changed

2 files changed

+68
-61
lines changed

‎collect_app/src/androidTest/java/org/odk/collect/android/feature/formmanagement/BlankFormListTest.kt‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
package org.odk.collect.android.feature.formmanagement
2+
3+
import androidx.test.espresso.Espresso.onView
4+
import androidx.test.espresso.assertion.ViewAssertions.matches
5+
import androidx.test.espresso.matcher.ViewMatchers.withText
6+
import androidx.test.ext.junit.runners.AndroidJUnit4
7+
import org.junit.Rule
8+
import org.junit.Test
9+
import org.junit.rules.RuleChain
10+
import org.junit.runner.RunWith
11+
import org.odk.collect.android.R
12+
import org.odk.collect.android.support.rules.CollectTestRule
13+
import org.odk.collect.android.support.rules.TestRuleChain
14+
import org.odk.collect.androidtest.DrawableMatcher.withImageDrawable
15+
import org.odk.collect.testshared.RecyclerViewMatcher.Companion.withRecyclerView
16+
17+
@RunWith(AndroidJUnit4::class)
18+
class BlankFormListTest {
19+
private val rule = CollectTestRule()
20+
21+
@get:Rule
22+
val chain: RuleChain = TestRuleChain.chain().around(rule)
23+
24+
@Test
25+
fun sortByDialog_ShouldBeTranslatedAndDisplayProperIcons() {
26+
rule.startAtMainMenu()
27+
.openProjectSettingsDialog()
28+
.clickSettings()
29+
.clickOnUserInterface()
30+
.clickOnLanguage()
31+
.clickOnSelectedLanguage("Deutsch")
32+
.clickFillBlankForm()
33+
.clickOnSortByButton()
34+
.assertText("Sortieren nach")
35+
36+
onView(
37+
withRecyclerView(R.id.recyclerView).atPositionOnView(0, R.id.title)
38+
).check(matches(withText("Name, A-Z")))
39+
40+
onView(
41+
withRecyclerView(R.id.recyclerView).atPositionOnView(0, R.id.icon)
42+
).check(matches(withImageDrawable(R.drawable.ic_sort_by_alpha)))
43+
44+
onView(
45+
withRecyclerView(R.id.recyclerView).atPositionOnView(1, R.id.title)
46+
).check(matches(withText("Name, Z-A")))
47+
48+
onView(
49+
withRecyclerView(R.id.recyclerView).atPositionOnView(1, R.id.icon)
50+
).check(matches(withImageDrawable(R.drawable.ic_sort_by_alpha)))
51+
52+
onView(
53+
withRecyclerView(R.id.recyclerView).atPositionOnView(2, R.id.title)
54+
).check(matches(withText("Datum, neuestes zuerst")))
55+
56+
onView(
57+
withRecyclerView(R.id.recyclerView).atPositionOnView(2, R.id.icon)
58+
).check(matches(withImageDrawable(R.drawable.ic_access_time)))
59+
60+
onView(
61+
withRecyclerView(R.id.recyclerView).atPositionOnView(3, R.id.title)
62+
).check(matches(withText("Datum, ältestes zuerst")))
63+
64+
onView(
65+
withRecyclerView(R.id.recyclerView).atPositionOnView(3, R.id.icon)
66+
).check(matches(withImageDrawable(R.drawable.ic_access_time)))
67+
}
68+
}

‎collect_app/src/androidTest/java/org/odk/collect/android/regression/FillBlankFormTest.java‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
package org.odk.collect.android.regression;
22

3-
import static androidx.test.espresso.Espresso.onView;
4-
import static androidx.test.espresso.Espresso.pressBack;
5-
import static androidx.test.espresso.assertion.ViewAssertions.matches;
6-
import static androidx.test.espresso.matcher.ViewMatchers.withText;
73
import static junit.framework.TestCase.assertNotSame;
8-
import static org.odk.collect.androidtest.DrawableMatcher.withImageDrawable;
9-
import static org.odk.collect.testshared.RecyclerViewMatcher.withRecyclerView;
104
import static java.util.Collections.singletonList;
115

126
import android.widget.FrameLayout;
@@ -59,61 +53,6 @@ public void answers_ShouldBeSuggestedInComplianceWithSelectedLetters() {
5953
.assertText("Abrotanum alpestre");
6054
}
6155

62-
@Test
63-
public void sortByDialog_ShouldBeTranslatedAndDisplayProperIcons() {
64-
//TestCase37
65-
rule.startAtMainMenu()
66-
.openProjectSettingsDialog()
67-
.clickSettings()
68-
.clickOnUserInterface()
69-
.clickOnLanguage()
70-
.clickOnSelectedLanguage("Deutsch")
71-
.clickFillBlankForm()
72-
.clickOnSortByButton()
73-
.assertText("Sortieren nach");
74-
75-
onView(withRecyclerView(R.id.recyclerView)
76-
.atPositionOnView(0, R.id.title))
77-
.check(matches(withText("Name, A-Z")));
78-
79-
onView(withRecyclerView(R.id.recyclerView)
80-
.atPositionOnView(0, R.id.icon))
81-
.check(matches(withImageDrawable(R.drawable.ic_sort_by_alpha)));
82-
83-
onView(withRecyclerView(R.id.recyclerView)
84-
.atPositionOnView(1, R.id.title))
85-
.check(matches(withText("Name, Z-A")));
86-
onView(withRecyclerView(R.id.recyclerView)
87-
.atPositionOnView(1, R.id.icon))
88-
.check(matches(withImageDrawable(R.drawable.ic_sort_by_alpha)));
89-
90-
onView(withRecyclerView(R.id.recyclerView)
91-
.atPositionOnView(2, R.id.title))
92-
.check(matches(withText("Datum, neuestes zuerst")));
93-
94-
onView(withRecyclerView(R.id.recyclerView)
95-
.atPositionOnView(2, R.id.icon))
96-
.check(matches(withImageDrawable(R.drawable.ic_access_time)));
97-
98-
onView(withRecyclerView(R.id.recyclerView)
99-
.atPositionOnView(3, R.id.title))
100-
.check(matches(withText("Datum, ältestes zuerst")));
101-
102-
onView(withRecyclerView(R.id.recyclerView)
103-
.atPositionOnView(3, R.id.icon))
104-
.check(matches(withImageDrawable(R.drawable.ic_access_time)));
105-
106-
pressBack();
107-
pressBack();
108-
109-
new MainMenuPage()
110-
.openProjectSettingsDialog()
111-
.clickSettings()
112-
.clickOnUserInterface()
113-
.clickOnLanguage()
114-
.clickOnSelectedLanguage("English");
115-
}
116-
11756
@Test
11857
public void searchExpression_ShouldDisplayWhenItContainsOtherAppearanceName() {
11958
//TestCase26

0 commit comments

Comments
 (0)