Commit 6473d46c by Oliver Woodman

Fix tests

parent b4b82f5b
...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.offline.DownloadManager; ...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.offline.DownloadManager;
import com.google.android.exoplayer2.offline.DownloadRequest; import com.google.android.exoplayer2.offline.DownloadRequest;
import com.google.android.exoplayer2.offline.DownloaderConstructorHelper; import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
import com.google.android.exoplayer2.offline.StreamKey; import com.google.android.exoplayer2.offline.StreamKey;
import com.google.android.exoplayer2.scheduler.Requirements;
import com.google.android.exoplayer2.testutil.DummyMainThread; import com.google.android.exoplayer2.testutil.DummyMainThread;
import com.google.android.exoplayer2.testutil.DummyMainThread.TestRunnable; import com.google.android.exoplayer2.testutil.DummyMainThread.TestRunnable;
import com.google.android.exoplayer2.testutil.FakeDataSet; import com.google.android.exoplayer2.testutil.FakeDataSet;
...@@ -192,7 +193,6 @@ public class DownloadManagerDashTest { ...@@ -192,7 +193,6 @@ public class DownloadManagerDashTest {
} }
// Disabled due to flakiness. // Disabled due to flakiness.
@Ignore
@Test @Test
public void testHandleRemoveActionBeforeDownloadFinish() throws Throwable { public void testHandleRemoveActionBeforeDownloadFinish() throws Throwable {
handleDownloadRequest(fakeStreamKey1); handleDownloadRequest(fakeStreamKey1);
...@@ -204,7 +204,6 @@ public class DownloadManagerDashTest { ...@@ -204,7 +204,6 @@ public class DownloadManagerDashTest {
} }
// Disabled due to flakiness [Internal: b/122290449]. // Disabled due to flakiness [Internal: b/122290449].
@Ignore
@Test @Test
public void testHandleInterferingRemoveAction() throws Throwable { public void testHandleInterferingRemoveAction() throws Throwable {
final ConditionVariable downloadInProgressCondition = new ConditionVariable(); final ConditionVariable downloadInProgressCondition = new ConditionVariable();
...@@ -260,6 +259,7 @@ public class DownloadManagerDashTest { ...@@ -260,6 +259,7 @@ public class DownloadManagerDashTest {
downloadIndex, downloadIndex,
new DefaultDownloaderFactory( new DefaultDownloaderFactory(
new DownloaderConstructorHelper(cache, fakeDataSourceFactory))); new DownloaderConstructorHelper(cache, fakeDataSourceFactory)));
downloadManager.setRequirements(new Requirements(0));
downloadManagerListener = downloadManagerListener =
new TestDownloadManagerListener( new TestDownloadManagerListener(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment