Fix tests

This commit is contained in:
Abdul Wadood 2018-09-12 02:41:54 +05:30 committed by Isaac Hutt
parent 357f512fc7
commit 82cdac44dd
7 changed files with 55 additions and 65 deletions

View File

@ -21,30 +21,25 @@ package org.kiwix.kiwixmobile.help;
import android.Manifest;
import android.content.Context;
import android.support.test.espresso.intent.Intents;
import android.support.test.filters.LargeTest;
import android.support.test.rule.GrantPermissionRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
import com.schibsted.spain.barista.rule.BaristaRule;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.kiwix.kiwixmobile.R;
import org.kiwix.kiwixmobile.intro.IntroActivity;
import static android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
import static org.kiwix.kiwixmobile.testutils.Matcher.childAtPosition;
import static android.support.test.InstrumentationRegistry.getInstrumentation;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.core.IsNull.notNullValue;
import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
@ -52,14 +47,13 @@ import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
@RunWith(AndroidJUnit4.class)
public class HelpActivityTest {
private Context context;
@Rule
public BaristaRule<HelpActivity> activityTestRule = BaristaRule.create(HelpActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
private Context context;
@Before
public void setUp() {

View File

@ -21,9 +21,9 @@ package org.kiwix.kiwixmobile.intro;
import android.Manifest;
import android.support.test.espresso.ViewInteraction;
import android.support.test.espresso.intent.Intents;
import android.support.test.filters.LargeTest;
import android.support.test.rule.GrantPermissionRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
import com.schibsted.spain.barista.rule.BaristaRule;

View File

@ -23,12 +23,13 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.test.espresso.intent.Intents;
import android.support.test.filters.LargeTest;
import android.support.test.rule.GrantPermissionRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions;
import com.schibsted.spain.barista.rule.BaristaRule;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@ -37,28 +38,27 @@ import org.junit.runner.RunWith;
import org.kiwix.kiwixmobile.intro.IntroActivity;
import org.kiwix.kiwixmobile.main.MainActivity;
import static org.junit.Assert.assertEquals;
import static org.kiwix.kiwixmobile.utils.Constants.PREF_SHOW_INTRO;
import static android.support.test.InstrumentationRegistry.getInstrumentation;
import static android.support.test.espresso.intent.Intents.intended;
import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent;
import static org.junit.Assert.assertEquals;
import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS;
import static org.kiwix.kiwixmobile.utils.Constants.PREF_SHOW_INTRO;
@LargeTest
@RunWith(AndroidJUnit4.class)
public class SplashActivityTest {
private Context context;
@Rule
public BaristaRule<SplashActivity> activityTestRule = BaristaRule.create(SplashActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
private Context context;
@Before
public void setUp(){
public void setUp() {
Intents.init();
context = getInstrumentation().getTargetContext();
}

View File

@ -1,10 +1,10 @@
package org.kiwix.kiwixmobile.tests.activities;
import android.Manifest;
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.rule.GrantPermissionRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import org.junit.Rule;
import org.junit.Test;
@ -15,17 +15,16 @@ import org.kiwix.kiwixmobile.bookmark.BookmarksActivity;
@RunWith(AndroidJUnit4.class)
public class BookmarksActivityTest {
@Rule
public ActivityTestRule<BookmarksActivity> mActivityTestRule = new ActivityTestRule<>(
BookmarksActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@Rule
public ActivityTestRule<BookmarksActivity> mActivityTestRule = new ActivityTestRule<>(
BookmarksActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@Test
public void BookmarksActivitySimple() {
}
@Test
public void BookmarksActivitySimple() {
}
}

View File

@ -1,10 +1,10 @@
package org.kiwix.kiwixmobile.tests.activities;
import android.Manifest;
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.rule.GrantPermissionRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import org.junit.Rule;
import org.junit.Test;
@ -15,17 +15,16 @@ import org.kiwix.kiwixmobile.search.SearchActivity;
@RunWith(AndroidJUnit4.class)
public class SearchActivityTest {
@Rule
public ActivityTestRule<SearchActivity> mActivityTestRule = new ActivityTestRule<>(
SearchActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@Rule
public ActivityTestRule<SearchActivity> mActivityTestRule = new ActivityTestRule<>(
SearchActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@Test
public void SearchActivitySimple() {
}
@Test
public void SearchActivitySimple() {
}
}

View File

@ -1,10 +1,10 @@
package org.kiwix.kiwixmobile.tests.activities;
import android.Manifest;
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.rule.GrantPermissionRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import org.junit.Rule;
import org.junit.Test;
@ -15,17 +15,16 @@ import org.kiwix.kiwixmobile.settings.KiwixSettingsActivity;
@RunWith(AndroidJUnit4.class)
public class SettingsActivityTest {
@Rule
public ActivityTestRule<KiwixSettingsActivity> mActivityTestRule = new ActivityTestRule<>(
KiwixSettingsActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@Rule
public ActivityTestRule<KiwixSettingsActivity> mActivityTestRule = new ActivityTestRule<>(
KiwixSettingsActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@Test
public void SettingsActivitySimple() {
}
@Test
public void SettingsActivitySimple() {
}
}

View File

@ -1,10 +1,10 @@
package org.kiwix.kiwixmobile.tests.activities;
import android.Manifest;
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.rule.GrantPermissionRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
import org.junit.Rule;
import org.junit.Test;
@ -15,17 +15,16 @@ import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity;
@RunWith(AndroidJUnit4.class)
public class ZimManageActivityTest {
@Rule
public ActivityTestRule<ZimManageActivity> mActivityTestRule = new ActivityTestRule<>(
ZimManageActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@Rule
public ActivityTestRule<ZimManageActivity> mActivityTestRule = new ActivityTestRule<>(
ZimManageActivity.class);
@Rule
public GrantPermissionRule readPermissionRule = GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule writePermissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@Test
public void ZimManageActivitySimple() {
}
@Test
public void ZimManageActivitySimple() {
}
}