loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix flaky unit tests

Browse Source 
PiperOrigin-RevId: 290910992
This commit is contained in:
christosts 2020-01-22 09:47:22 +00:00 committed by Ian Baker
parent d64388a075
commit 78fe1afa85
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java
View File

@ -290,11 +290,14 @@ public class DedicatedThreadAsyncMediaCodecAdapterTest {
AtomicInteger onCodecStartCount = new AtomicInteger(0); AtomicInteger onCodecStartCount = new AtomicInteger(0);
adapter.setCodecStartRunnable(() -> onCodecStartCount.incrementAndGet()); adapter.setCodecStartRunnable(() -> onCodecStartCount.incrementAndGet());
adapter.start(); adapter.start();
// Grab reference to Looper before shutting down the adapter otherwise handlerThread.getLooper()
// might return null.
Looper looper = handlerThread.getLooper();
adapter.flush(); adapter.flush();
adapter.shutdown(); adapter.shutdown();
// Wait until all tasks have been handled. // Wait until all tasks have been handled.
Shadows.shadowOf(handlerThread.getLooper()).idle(); Shadows.shadowOf(looper).idle();
// Only adapter.start() calls onCodecStart. // Only adapter.start() calls onCodecStart.
assertThat(onCodecStartCount.get()).isEqualTo(1); assertThat(onCodecStartCount.get()).isEqualTo(1);
} }

5
library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java
View File

@ -290,10 +290,13 @@ public class MultiLockAsyncMediaCodecAdapterTest {
AtomicInteger codecStartCalls = new AtomicInteger(0); AtomicInteger codecStartCalls = new AtomicInteger(0);
adapter.setCodecStartRunnable(() -> codecStartCalls.incrementAndGet()); adapter.setCodecStartRunnable(() -> codecStartCalls.incrementAndGet());
adapter.start(); adapter.start();
// Grab reference to Looper before shutting down the adapter otherwise handlerThread.getLooper()
// might return null.
Looper looper = handlerThread.getLooper();
adapter.flush(); adapter.flush();
adapter.shutdown(); adapter.shutdown();
Shadows.shadowOf(handlerThread.getLooper()).idle(); Shadows.shadowOf(looper).idle();
// Only adapter.start() called codec#start() // Only adapter.start() called codec#start()
assertThat(codecStartCalls.get()).isEqualTo(1); assertThat(codecStartCalls.get()).isEqualTo(1);
} }