mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix compilation errors while trying to run instrumentation tests. (#3850)

Browse source
This commit is contained in:
Mike Hurtado 2020-06-29 09:42:47 -07:00 • committed by GitHub
parent dea629c2c4
commit 7caf73fb4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt
View file

@ -14,7 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.rule.ActivityTestRule import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4
import fr.free.nrw.commons.utils.ConfigUtils import fr.free.nrw.commons.utils.ConfigUtils.getVersionNameWithSha
import org.hamcrest.CoreMatchers import org.hamcrest.CoreMatchers
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule
@ -36,7 +36,9 @@ class AboutActivityTest {
@Test @Test
fun testBuildNumber() { fun testBuildNumber() {
Espresso.onView(ViewMatchers.withId(R.id.about_version)) Espresso.onView(ViewMatchers.withId(R.id.about_version))
.check(ViewAssertions.matches(withText(ConfigUtils.getVersionNameWithSha(getApplicationContext())))) .check(ViewAssertions.matches(
withText(getApplicationContext<CommonsApplication>().getVersionNameWithSha())
))
} }
@Test @Test

20
app/src/androidTest/java/fr/free/nrw/commons/UploadTest.kt
View file

@ -26,7 +26,7 @@ import androidx.test.rule.ActivityTestRule
import androidx.test.rule.GrantPermissionRule import androidx.test.rule.GrantPermissionRule
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4
import fr.free.nrw.commons.auth.LoginActivity import fr.free.nrw.commons.auth.LoginActivity
import fr.free.nrw.commons.upload.DescriptionsAdapter import fr.free.nrw.commons.upload.UploadMediaDetailAdapter
import fr.free.nrw.commons.util.MyViewAction import fr.free.nrw.commons.util.MyViewAction
import fr.free.nrw.commons.utils.ConfigUtils import fr.free.nrw.commons.utils.ConfigUtils
import org.hamcrest.core.AllOf.allOf import org.hamcrest.core.AllOf.allOf
@ -78,7 +78,7 @@ class UploadTest {
@Test @Test
fun testUploadWithDescription() { fun testUploadWithDescription() {
if (!ConfigUtils.isBetaFlavour()) { if (!ConfigUtils.isBetaFlavour) {
throw Error("This test should only be run in Beta!") throw Error("This test should only be run in Beta!")
} }
@ -96,7 +96,7 @@ class UploadTest {
// Try to dismiss the error, if there is one (probably about duplicate files on Commons) // Try to dismiss the error, if there is one (probably about duplicate files on Commons)
dismissWarning("Yes") dismissWarning("Yes")
onView(allOf<View>(isDisplayed(), withId(R.id.et_title))) onView(allOf<View>(isDisplayed(), withId(R.id.tv_title)))
.perform(replaceText(commonsFileName)) .perform(replaceText(commonsFileName))
onView(allOf<View>(isDisplayed(), withId(R.id.description_item_edit_text))) onView(allOf<View>(isDisplayed(), withId(R.id.description_item_edit_text)))
@ -150,7 +150,7 @@ class UploadTest {
@Test @Test
fun testUploadWithoutDescription() { fun testUploadWithoutDescription() {
if (!ConfigUtils.isBetaFlavour()) { if (!ConfigUtils.isBetaFlavour) {
throw Error("This test should only be run in Beta!") throw Error("This test should only be run in Beta!")
} }
@ -168,7 +168,7 @@ class UploadTest {
// Try to dismiss the error, if there is one (probably about duplicate files on Commons) // Try to dismiss the error, if there is one (probably about duplicate files on Commons)
dismissWarning("Yes") dismissWarning("Yes")
onView(allOf<View>(isDisplayed(), withId(R.id.et_title))) onView(allOf<View>(isDisplayed(), withId(R.id.tv_title)))
.perform(replaceText(commonsFileName)) .perform(replaceText(commonsFileName))
onView(allOf(isDisplayed(), withId(R.id.btn_next))) onView(allOf(isDisplayed(), withId(R.id.btn_next)))
@ -209,7 +209,7 @@ class UploadTest {
@Test @Test
fun testUploadWithMultilingualDescription() { fun testUploadWithMultilingualDescription() {
if (!ConfigUtils.isBetaFlavour()) { if (!ConfigUtils.isBetaFlavour) {
throw Error("This test should only be run in Beta!") throw Error("This test should only be run in Beta!")
} }
@ -227,12 +227,12 @@ class UploadTest {
// Try to dismiss the error, if there is one (probably about duplicate files on Commons) // Try to dismiss the error, if there is one (probably about duplicate files on Commons)
dismissWarningDialog() dismissWarningDialog()
onView(allOf<View>(isDisplayed(), withId(R.id.et_title))) onView(allOf<View>(isDisplayed(), withId(R.id.tv_title)))
.perform(replaceText(commonsFileName)) .perform(replaceText(commonsFileName))
onView(withId(R.id.rv_descriptions)).perform( onView(withId(R.id.rv_descriptions)).perform(
RecyclerViewActions RecyclerViewActions
.actionOnItemAtPosition<DescriptionsAdapter.ViewHolder>(0, .actionOnItemAtPosition<UploadMediaDetailAdapter.ViewHolder>(0,
MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, "Test description"))) MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, "Test description")))
onView(withId(R.id.btn_add_description)) onView(withId(R.id.btn_add_description))
@ -240,12 +240,12 @@ class UploadTest {
onView(withId(R.id.rv_descriptions)).perform( onView(withId(R.id.rv_descriptions)).perform(
RecyclerViewActions RecyclerViewActions
.actionOnItemAtPosition<DescriptionsAdapter.ViewHolder>(1, .actionOnItemAtPosition<UploadMediaDetailAdapter.ViewHolder>(1,
MyViewAction.selectSpinnerItemInChildViewWithId(R.id.spinner_description_languages, 2))) MyViewAction.selectSpinnerItemInChildViewWithId(R.id.spinner_description_languages, 2)))
onView(withId(R.id.rv_descriptions)).perform( onView(withId(R.id.rv_descriptions)).perform(
RecyclerViewActions RecyclerViewActions
.actionOnItemAtPosition<DescriptionsAdapter.ViewHolder>(1, .actionOnItemAtPosition<UploadMediaDetailAdapter.ViewHolder>(1,
MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, "Description"))) MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, "Description")))
onView(allOf(isDisplayed(), withId(R.id.btn_next))) onView(allOf(isDisplayed(), withId(R.id.btn_next)))

6
app/src/androidTest/java/fr/free/nrw/commons/WelcomeActivityTest.kt
View file

@ -23,7 +23,7 @@ class WelcomeActivityTest {
@Test @Test
fun ifBetaShowsSkipButton() { fun ifBetaShowsSkipButton() {
if (ConfigUtils.isBetaFlavour()) { if (ConfigUtils.isBetaFlavour) {
onView(withId(R.id.finishTutorialButton)) onView(withId(R.id.finishTutorialButton))
.check(matches(isDisplayed())) .check(matches(isDisplayed()))
} }
@ -31,7 +31,7 @@ class WelcomeActivityTest {
@Test @Test
fun ifProdHidesSkipButton() { fun ifProdHidesSkipButton() {
if (!ConfigUtils.isBetaFlavour()) { if (!ConfigUtils.isBetaFlavour) {
onView(withId(R.id.finishTutorialButton)) onView(withId(R.id.finishTutorialButton))
.check(matches(not(isDisplayed()))) .check(matches(not(isDisplayed())))
} }
@ -39,7 +39,7 @@ class WelcomeActivityTest {
@Test @Test
fun testBetaSkipButton() { fun testBetaSkipButton() {
if (ConfigUtils.isBetaFlavour()) { if (ConfigUtils.isBetaFlavour) {
onView(withId(R.id.finishTutorialButton)) onView(withId(R.id.finishTutorialButton))
.perform(ViewActions.click()) .perform(ViewActions.click())
assert(activityRule.activity.isDestroyed) assert(activityRule.activity.isDestroyed)