loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-21 23:56:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change experimental method naming for blockUntilDelivered.

Browse Source 
PiperOrigin-RevId: 325786522
This commit is contained in:
samrobinson 2020-08-10 13:40:32 +01:00 committed by kim-vde
parent eb9463454b
commit 9a0203e954
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
View File

@ -323,13 +323,13 @@ public final class PlayerMessage {
* @throws InterruptedException If the current thread is interrupted while waiting for the message
* to be delivered.
*/
public synchronized boolean experimental_blockUntilDelivered(long timeoutMs)
public synchronized boolean experimentalBlockUntilDelivered(long timeoutMs)
throws InterruptedException, TimeoutException {
return experimental_blockUntilDelivered(timeoutMs, Clock.DEFAULT);
return experimentalBlockUntilDelivered(timeoutMs, Clock.DEFAULT);
}
@VisibleForTesting()
/* package */ synchronized boolean experimental_blockUntilDelivered(long timeoutMs, Clock clock)
/* package */ synchronized boolean experimentalBlockUntilDelivered(long timeoutMs, Clock clock)
throws InterruptedException, TimeoutException {
Assertions.checkState(isSent);
Assertions.checkState(handler.getLooper().getThread() != Thread.currentThread());

16
library/core/src/test/java/com/google/android/exoplayer2/PlayerMessageTest.java
View File

@ -66,30 +66,30 @@ public class PlayerMessageTest {
}
@Test
public void experimental_blockUntilDelivered_timesOut() throws Exception {
public void experimentalBlockUntilDelivered_timesOut() throws Exception {
when(clock.elapsedRealtime()).thenReturn(0L).thenReturn(TIMEOUT_MS * 2);
try {
message.send().experimental_blockUntilDelivered(TIMEOUT_MS, clock);
message.send().experimentalBlockUntilDelivered(TIMEOUT_MS, clock);
fail();
} catch (TimeoutException expected) {
}
// Ensure experimental_blockUntilDelivered() entered the blocking loop
// Ensure experimentalBlockUntilDelivered() entered the blocking loop
verify(clock, Mockito.times(2)).elapsedRealtime();
}
@Test
public void experimental_blockUntilDelivered_onAlreadyProcessed_succeeds() throws Exception {
public void experimentalBlockUntilDelivered_onAlreadyProcessed_succeeds() throws Exception {
when(clock.elapsedRealtime()).thenReturn(0L);
message.send().markAsProcessed(/* isDelivered= */ true);
assertThat(message.experimental_blockUntilDelivered(TIMEOUT_MS, clock)).isTrue();
assertThat(message.experimentalBlockUntilDelivered(TIMEOUT_MS, clock)).isTrue();
}
@Test
public void experimental_blockUntilDelivered_markAsProcessedWhileBlocked_succeeds()
public void experimentalBlockUntilDelivered_markAsProcessedWhileBlocked_succeeds()
throws Exception {
message.send();
@ -114,8 +114,8 @@ public class PlayerMessageTest {
});
try {
assertThat(message.experimental_blockUntilDelivered(TIMEOUT_MS, clock)).isTrue();
// Ensure experimental_blockUntilDelivered() entered the blocking loop.
assertThat(message.experimentalBlockUntilDelivered(TIMEOUT_MS, clock)).isTrue();
// Ensure experimentalBlockUntilDelivered() entered the blocking loop.
verify(clock, Mockito.atLeast(2)).elapsedRealtime();
future.get(1, SECONDS);
} finally {