Skip to content

Convert instrumentation tests to Kotlin #2689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 21, 2019
Merged

Convert instrumentation tests to Kotlin #2689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5073d09
Convert SettingsActivityTest to Kotlin
domdomegg Mar 20, 2019
f8f3ce2
Convert NavigationBaseActivityTest to Kotlin
domdomegg Mar 20, 2019
a01a2bf
Convert UploadTest to Kotlin
domdomegg Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 0 additions & 67 deletions app/src/androidTest/java/fr/free/nrw/commons/NavigationBaseActivityTest.java
View file
Open in desktop

This file was deleted.

65 changes: 65 additions & 0 deletions app/src/androidTest/java/fr/free/nrw/commons/NavigationBaseActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package fr.free.nrw.commons

import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.contrib.DrawerActions
import androidx.test.espresso.contrib.NavigationViewActions
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.filters.LargeTest
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith

@LargeTest
@RunWith(AndroidJUnit4::class)
class NavigationBaseActivityTest {
@get:Rule
var activityRule: ActivityTestRule<*> = ActivityTestRule(AboutActivity::class.java)

/**
* Goes through all the activities in the app and checks we don't crash
* NB: This is not realistic if we're not logged in; we can access 'home', 'notifications', 'settings' and 'achievements' which we wouldn't otherwise be able to.
*/
@Test
fun goThroughNavigationBaseActivityActivities() {
// Home
openNavigationDrawerAndNavigateTo(R.id.action_home)

// Explore
openNavigationDrawerAndNavigateTo(R.id.action_explore)

// Bookmarks
openNavigationDrawerAndNavigateTo(R.id.action_bookmarks)

// About
openNavigationDrawerAndNavigateTo(R.id.action_about)

// Settings
openNavigationDrawerAndNavigateTo(R.id.action_settings)

// Achievements
openNavigationDrawerAndNavigateTo(R.id.action_login)
}

/**
* Clicks 'Explore' in the navigation drawer twice, then clicks 'home'
* Testing to avoid regression of #2200
*/
@Test
fun doubleNavigateToExploreThenReturnHome() {
// Explore
openNavigationDrawerAndNavigateTo(R.id.action_explore)

// Explore
openNavigationDrawerAndNavigateTo(R.id.action_explore)

// Home
openNavigationDrawerAndNavigateTo(R.id.action_home)
}

private fun openNavigationDrawerAndNavigateTo(menuItemId: Int) {
onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
onView(withId(R.id.navigation_view)).perform(NavigationViewActions.navigateTo(menuItemId))
}
}
125 changes: 59 additions & 66 deletions ...ree/nrw/commons/SettingsActivityTest.java → .../free/nrw/commons/SettingsActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,160 +1,153 @@
package fr.free.nrw.commons;

import android.content.Context;

import com.google.gson.Gson;

import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;

import androidx.test.InstrumentationRegistry;
import androidx.test.espresso.Espresso;
import androidx.test.espresso.matcher.PreferenceMatchers;
import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.settings.Prefs;
import fr.free.nrw.commons.settings.SettingsActivity;

import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.action.ViewActions.replaceText;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.assertEquals;
package fr.free.nrw.commons

import androidx.test.espresso.Espresso
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.replaceText
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.PreferenceMatchers
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.filters.LargeTest
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import com.google.gson.Gson
import fr.free.nrw.commons.kvstore.JsonKvStore
import fr.free.nrw.commons.settings.Prefs
import fr.free.nrw.commons.settings.SettingsActivity
import org.hamcrest.Matchers.allOf
import org.hamcrest.core.IsNot.not
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith

@LargeTest
@RunWith(AndroidJUnit4.class)
public class SettingsActivityTest {
JsonKvStore defaultKvStore;
@RunWith(AndroidJUnit4::class)
class SettingsActivityTest {
private lateinit var defaultKvStore: JsonKvStore

@Rule
public ActivityTestRule activityRule = new ActivityTestRule<>(SettingsActivity.class);
@get:Rule
var activityRule: ActivityTestRule<*> = ActivityTestRule(SettingsActivity::class.java)

@Before
public void setup() {
Context context = InstrumentationRegistry.getTargetContext();
String storeName = context.getPackageName() + "_preferences";
defaultKvStore = new JsonKvStore(context, storeName, new Gson());
fun setup() {
val context = InstrumentationRegistry.getInstrumentation().targetContext
val storeName = context.packageName + "_preferences"
defaultKvStore = JsonKvStore(context, storeName, Gson())
}

@Test
public void setRecentUploadLimitTo123() {
fun setRecentUploadLimitTo123() {
// Open "Use external storage" preference
Espresso.onData(PreferenceMatchers.withKey("uploads"))
.inAdapterView(withId(android.R.id.list))
.perform(click());
.perform(click())

// Try setting it to 123
Espresso.onView(withId(android.R.id.edit))
.perform(replaceText("123"));
.perform(replaceText("123"))

// Click "OK"
Espresso.onView(allOf(withId(android.R.id.button1), withText("OK")))
.perform(click());
.perform(click())

// Check setting set to 123 in SharedPreferences
assertEquals(
123,
defaultKvStore.getInt(Prefs.UPLOADS_SHOWING, 0)
);
defaultKvStore.getInt(Prefs.UPLOADS_SHOWING, 0).toLong()
)

// Check displaying 123 in summary text
Espresso.onData(PreferenceMatchers.withKey("uploads"))
.inAdapterView(withId(android.R.id.list))
.onChildView(withId(android.R.id.summary))
.check(matches(withText("123")));
.check(matches(withText("123")))
}

@Test
public void setRecentUploadLimitTo0() {
fun setRecentUploadLimitTo0() {
// Open "Use external storage" preference
Espresso.onData(PreferenceMatchers.withKey("uploads"))
.inAdapterView(withId(android.R.id.list))
.perform(click());
.perform(click())

// Try setting it to 0
Espresso.onView(withId(android.R.id.edit))
.perform(replaceText("0"));
.perform(replaceText("0"))

// Click "OK"
Espresso.onView(allOf(withId(android.R.id.button1), withText("OK")))
.perform(click());
.perform(click())

// Check setting set to 100 in SharedPreferences
assertEquals(
100,
defaultKvStore.getInt(Prefs.UPLOADS_SHOWING, 0)
);
defaultKvStore.getInt(Prefs.UPLOADS_SHOWING, 0).toLong()
)

// Check displaying 100 in summary text
Espresso.onData(PreferenceMatchers.withKey("uploads"))
.inAdapterView(withId(android.R.id.list))
.onChildView(withId(android.R.id.summary))
.check(matches(withText("100")));
.check(matches(withText("100")))
}

@Test
public void setRecentUploadLimitTo700() {
fun setRecentUploadLimitTo700() {
// Open "Use external storage" preference
Espresso.onData(PreferenceMatchers.withKey("uploads"))
.inAdapterView(withId(android.R.id.list))
.perform(click());
.perform(click())

// Try setting it to 700
Espresso.onView(withId(android.R.id.edit))
.perform(replaceText("700"));
.perform(replaceText("700"))

// Click "OK"
Espresso.onView(allOf(withId(android.R.id.button1), withText("OK")))
.perform(click());
.perform(click())

// Check setting set to 500 in SharedPreferences
assertEquals(
500,
defaultKvStore.getInt(Prefs.UPLOADS_SHOWING, 0)
);
defaultKvStore.getInt(Prefs.UPLOADS_SHOWING, 0).toLong()
)

// Check displaying 100 in summary text
Espresso.onData(PreferenceMatchers.withKey("uploads"))
.inAdapterView(withId(android.R.id.list))
.onChildView(withId(android.R.id.summary))
.check(matches(withText("500")));
.check(matches(withText("500")))
}

@Test
public void useAuthorNameTogglesOn() {
fun useAuthorNameTogglesOn() {
// Turn on "Use external storage" preference if currently off
if (!defaultKvStore.getBoolean("useAuthorName", true)) {
Espresso.onData(PreferenceMatchers.withKey("useAuthorName"))
.inAdapterView(withId(android.R.id.list))
.perform(click());
.perform(click())
}

// Check authorName preference is enabled
Espresso.onData(PreferenceMatchers.withKey("authorName"))
.inAdapterView(withId(android.R.id.list))
.check(matches(isEnabled()));
.check(matches(isEnabled()))
}

@Test
public void useAuthorNameTogglesOff() {
fun useAuthorNameTogglesOff() {
// Turn off "Use external storage" preference if currently on
if (defaultKvStore.getBoolean("useAuthorName", false)) {
Espresso.onData(PreferenceMatchers.withKey("useAuthorName"))
.inAdapterView(withId(android.R.id.list))
.perform(click());
.perform(click())
}

// Check authorName preference is enabled
Espresso.onData(PreferenceMatchers.withKey("authorName"))
.inAdapterView(withId(android.R.id.list))
.check(matches(not(isEnabled())));
.check(matches(not(isEnabled())))
}
}
Loading