Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated tests

Browse Source
This commit is contained in:
ByteHamster 2020-03-18 20:21:47 +01:00
parent 2026b3dd22
commit 260bb8f5cc
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java
View File

@ -20,6 +20,7 @@ import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.service.playback.PlaybackService;
import de.danoeh.antennapod.core.storage.PodDBAdapter; import de.danoeh.antennapod.core.storage.PodDBAdapter;
import de.danoeh.antennapod.dialog.RatingDialog; import de.danoeh.antennapod.dialog.RatingDialog;
import de.danoeh.antennapod.fragment.NavDrawerFragment;
import org.awaitility.Awaitility; import org.awaitility.Awaitility;
import org.awaitility.core.ConditionTimeoutException; import org.awaitility.core.ConditionTimeoutException;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;
@ -132,9 +133,10 @@ public class EspressoTestUtils {
} }
public static void setLastNavFragment(String tag) { public static void setLastNavFragment(String tag) {
InstrumentationRegistry.getTargetContext().getSharedPreferences(MainActivity.PREF_NAME, Context.MODE_PRIVATE) InstrumentationRegistry.getTargetContext().getSharedPreferences(
NavDrawerFragment.PREF_NAME, Context.MODE_PRIVATE)
.edit() .edit()
.putString(MainActivity.PREF_LAST_FRAGMENT_TAG, tag) .putString(NavDrawerFragment.PREF_LAST_FRAGMENT_TAG, tag)
.commit(); .commit();
} }

5
app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
View File

@ -99,6 +99,7 @@ public class MainActivityTest {
solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBackToActivity(MainActivity.class.getSimpleName());
solo.goBack(); solo.goBack();
solo.goBack();
assertEquals(solo.getString(R.string.subscriptions_label), getActionbarTitle()); assertEquals(solo.getString(R.string.subscriptions_label), getActionbarTitle());
} }
@ -111,6 +112,7 @@ public class MainActivityTest {
onView(withText(R.string.back_button_open_drawer)).perform(click()); onView(withText(R.string.back_button_open_drawer)).perform(click());
solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBackToActivity(MainActivity.class.getSimpleName());
solo.goBack(); solo.goBack();
solo.goBack();
assertTrue(((MainActivity)solo.getCurrentActivity()).isDrawerOpen()); assertTrue(((MainActivity)solo.getCurrentActivity()).isDrawerOpen());
} }
@ -124,6 +126,7 @@ public class MainActivityTest {
solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBackToActivity(MainActivity.class.getSimpleName());
solo.goBack(); solo.goBack();
solo.goBack(); solo.goBack();
solo.goBack();
assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED)); assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED));
} }
@ -136,6 +139,7 @@ public class MainActivityTest {
onView(withText(R.string.back_button_show_prompt)).perform(click()); onView(withText(R.string.back_button_show_prompt)).perform(click());
solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBackToActivity(MainActivity.class.getSimpleName());
solo.goBack(); solo.goBack();
solo.goBack();
onView(withText(R.string.yes)).perform(click()); onView(withText(R.string.yes)).perform(click());
Thread.sleep(100); Thread.sleep(100);
assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED)); assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED));
@ -150,6 +154,7 @@ public class MainActivityTest {
onView(withText(R.string.back_button_default)).perform(click()); onView(withText(R.string.back_button_default)).perform(click());
solo.goBackToActivity(MainActivity.class.getSimpleName()); solo.goBackToActivity(MainActivity.class.getSimpleName());
solo.goBack(); solo.goBack();
solo.goBack();
assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED)); assertThat(mActivityRule.getActivityResult(), hasResultCode(Activity.RESULT_CANCELED));
} }
} }

4
app/src/androidTest/java/de/test/antennapod/ui/NavigationDrawerTest.java
View File

@ -12,6 +12,7 @@ import de.danoeh.antennapod.core.feed.Feed;
import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.fragment.DownloadsFragment; import de.danoeh.antennapod.fragment.DownloadsFragment;
import de.danoeh.antennapod.fragment.EpisodesFragment; import de.danoeh.antennapod.fragment.EpisodesFragment;
import de.danoeh.antennapod.fragment.NavDrawerFragment;
import de.danoeh.antennapod.fragment.PlaybackHistoryFragment; import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
import de.danoeh.antennapod.fragment.QueueFragment; import de.danoeh.antennapod.fragment.QueueFragment;
import de.test.antennapod.EspressoTestUtils; import de.test.antennapod.EspressoTestUtils;
@ -26,7 +27,6 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.action.ViewActions.longClick; import static androidx.test.espresso.action.ViewActions.longClick;
@ -194,7 +194,7 @@ public class NavigationDrawerTest {
List<String> hidden = UserPreferences.getHiddenDrawerItems(); List<String> hidden = UserPreferences.getHiddenDrawerItems();
assertEquals(titles.length, hidden.size()); assertEquals(titles.length, hidden.size());
for (String tag : MainActivity.NAV_DRAWER_TAGS) { for (String tag : NavDrawerFragment.NAV_DRAWER_TAGS) {
assertTrue(hidden.contains(tag)); assertTrue(hidden.contains(tag));
} }
} }

7
app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
View File

@ -16,6 +16,7 @@ import android.widget.AdapterView;
import android.widget.ListView; import android.widget.ListView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import de.danoeh.antennapod.R; import de.danoeh.antennapod.R;
@ -48,8 +49,10 @@ import java.util.List;
public class NavDrawerFragment extends Fragment implements AdapterView.OnItemClickListener, public class NavDrawerFragment extends Fragment implements AdapterView.OnItemClickListener,
AdapterView.OnItemLongClickListener { AdapterView.OnItemLongClickListener {
private static final String PREF_LAST_FRAGMENT_TAG = "prefLastFragmentTag"; @VisibleForTesting
private static final String PREF_NAME = "NavDrawerPrefs"; public static final String PREF_LAST_FRAGMENT_TAG = "prefLastFragmentTag";
@VisibleForTesting
public static final String PREF_NAME = "NavDrawerPrefs";
public static final String TAG = "NavDrawerFragment"; public static final String TAG = "NavDrawerFragment";
public static final String[] NAV_DRAWER_TAGS = { public static final String[] NAV_DRAWER_TAGS = {