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

Making sure to not click the wrong list

Browse Source 
We might have multiple lists with the same ID in the hierarchy
This commit is contained in:
ByteHamster 2019-12-02 13:29:06 +01:00
parent 44aa0a3239
commit 51442cb047
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/androidTest/java/de/test/antennapod/playback/PlaybackTest.java
View File

@ -5,6 +5,7 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View;
import androidx.test.filters.LargeTest; import androidx.test.filters.LargeTest;
import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.rule.ActivityTestRule; import androidx.test.rule.ActivityTestRule;
@ -22,6 +23,7 @@ import de.danoeh.antennapod.core.util.LongList;
import de.test.antennapod.EspressoTestUtils; import de.test.antennapod.EspressoTestUtils;
import de.test.antennapod.ui.UITestUtils; import de.test.antennapod.ui.UITestUtils;
import org.awaitility.Awaitility; import org.awaitility.Awaitility;
import org.hamcrest.Matcher;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@ -37,6 +39,7 @@ import java.util.concurrent.TimeUnit;
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.contrib.RecyclerViewActions.actionOnItemAtPosition; import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
import static androidx.test.espresso.matcher.ViewMatchers.hasMinimumChildCount;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.isRoot; import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
@ -233,8 +236,9 @@ public class PlaybackTest {
onView(withText(R.string.all_episodes_short_label)).perform(click()); onView(withText(R.string.all_episodes_short_label)).perform(click());
final List<FeedItem> episodes = DBReader.getRecentlyPublishedEpisodes(0, 10); final List<FeedItem> episodes = DBReader.getRecentlyPublishedEpisodes(0, 10);
onView(allOf(withId(android.R.id.list), isDisplayed())).perform( Matcher<View> allEpisodesMatcher = allOf(withId(android.R.id.list), isDisplayed(), hasMinimumChildCount(2));
actionOnItemAtPosition(0, clickChildViewWithId(R.id.butSecondaryAction))); onView(isRoot()).perform(waitForView(allEpisodesMatcher, 1000));
onView(allEpisodesMatcher).perform(actionOnItemAtPosition(0, clickChildViewWithId(R.id.butSecondaryAction)));
long mediaId = episodes.get(0).getMedia().getId(); long mediaId = episodes.get(0).getMedia().getId();
Awaitility.await().atMost(1, TimeUnit.SECONDS).until(() -> { Awaitility.await().atMost(1, TimeUnit.SECONDS).until(() -> {
@ -253,8 +257,9 @@ public class PlaybackTest {
protected void playFromQueue(int itemIdx) { protected void playFromQueue(int itemIdx) {
final List<FeedItem> queue = DBReader.getQueue(); final List<FeedItem> queue = DBReader.getQueue();
onView(withId(R.id.recyclerView)).perform( Matcher<View> queueMatcher = allOf(withId(R.id.recyclerView), isDisplayed(), hasMinimumChildCount(2));
actionOnItemAtPosition(itemIdx, clickChildViewWithId(R.id.butSecondaryAction))); onView(isRoot()).perform(waitForView(queueMatcher, 1000));
onView(queueMatcher).perform(actionOnItemAtPosition(itemIdx, clickChildViewWithId(R.id.butSecondaryAction)));
onView(isRoot()).perform(waitForView(withId(R.id.butPlay), 1000)); onView(isRoot()).perform(waitForView(withId(R.id.butPlay), 1000));
long mediaId = queue.get(itemIdx).getMedia().getId(); long mediaId = queue.get(itemIdx).getMedia().getId();

2
core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
View File

@ -219,7 +219,7 @@ public class DownloadService extends Service {
downloadCompletionThread.interrupt(); downloadCompletionThread.interrupt();
try { try {
downloadCompletionThread.join(); downloadCompletionThread.join(1000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }