Refactor LanguageActivityTest.

Remove deprecated code.
This commit is contained in:
Abdul Wadood 2018-07-17 17:21:56 +05:30 committed by Isaac Hutt
parent e35d4a90e8
commit b623967dcb
3 changed files with 10 additions and 10 deletions

View File

@ -122,7 +122,7 @@ public class LanguageActivityTest {
onView(withContentDescription("Search")).check(matches(notNullValue()));
// verify that the list of languages is present
onView(withId(R.id.activity_language_recycler_view)).check(withItemCount(greaterThan(0)));
onView(withId(R.id.recycler_view)).check(withItemCount(greaterThan(0)));
// languages used for testing
String language1 = "kongo";
@ -142,7 +142,7 @@ public class LanguageActivityTest {
allOf(withId(R.id.item_language_checkbox),
childAtPosition(
childAtPosition(
withId(R.id.activity_language_recycler_view),
withId(R.id.recycler_view),
0),
0),
isDisplayed()));
@ -163,7 +163,7 @@ public class LanguageActivityTest {
allOf(withId(R.id.item_language_checkbox),
childAtPosition(
childAtPosition(
withId(R.id.activity_language_recycler_view),
withId(R.id.recycler_view),
0),
0),
isDisplayed()));
@ -274,11 +274,11 @@ public class LanguageActivityTest {
onView(withContentDescription("Collapse")).perform(click());
onView(withContentDescription("Navigate up")).perform(click());
BaristaSleepInteractions.sleep(TEST_PAUSE_MS);
IdlingRegistry.getInstance().unregister(LibraryFragment.IDLING_RESOURCE);
}
@After
public void endTest() {
IdlingRegistry.getInstance().unregister(LibraryFragment.IDLING_RESOURCE);
Intents.release();
}
}

View File

@ -19,8 +19,8 @@
package org.kiwix.kiwixmobile.tests;
import android.Manifest;
import android.support.test.espresso.Espresso;
import android.support.test.espresso.IdlingPolicies;
import android.support.test.espresso.IdlingRegistry;
import android.support.test.espresso.ViewInteraction;
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
@ -76,7 +76,7 @@ public class DownloadTest {
public static void beforeClass() {
IdlingPolicies.setMasterPolicyTimeout(180, TimeUnit.SECONDS);
IdlingPolicies.setIdlingResourceTimeout(180, TimeUnit.SECONDS);
Espresso.registerIdlingResources(KiwixIdlingResource.getInstance());
IdlingRegistry.getInstance().register(KiwixIdlingResource.getInstance());
}
@Before
@ -145,7 +145,7 @@ this functionality in the tests.
@After
public void finish() {
Espresso.unregisterIdlingResources(KiwixIdlingResource.getInstance());
IdlingRegistry.getInstance().unregister(KiwixIdlingResource.getInstance());
}
}

View File

@ -19,8 +19,8 @@ package org.kiwix.kiwixmobile.tests;
import android.Manifest;
import android.support.test.espresso.DataInteraction;
import android.support.test.espresso.Espresso;
import android.support.test.espresso.IdlingPolicies;
import android.support.test.espresso.IdlingRegistry;
import android.support.test.rule.ActivityTestRule;
import android.support.test.rule.GrantPermissionRule;
import android.util.Log;
@ -89,7 +89,7 @@ public class NetworkTest {
public static void beforeClass() {
IdlingPolicies.setMasterPolicyTimeout(180, TimeUnit.SECONDS);
IdlingPolicies.setIdlingResourceTimeout(180, TimeUnit.SECONDS);
Espresso.registerIdlingResources(KiwixIdlingResource.getInstance());
IdlingRegistry.getInstance().register(KiwixIdlingResource.getInstance());
}
@Before
@ -179,6 +179,6 @@ public class NetworkTest {
@After
public void finish() {
Espresso.unregisterIdlingResources(KiwixIdlingResource.getInstance());
IdlingRegistry.getInstance().unregister(KiwixIdlingResource.getInstance());
}
}