Skip to content

SDK / exoplayer

Go to a project
Commit f18e0f82 by Googler Committed by microkatz
Options

Remove times(1) from effect and transformer tests as it is the default. 

PiperOrigin-RevId: 466324322
(cherry picked from commit 95a7dcae)
parent c0bef3db
Inline Side-by-side
Showing with 18 additions and 21 deletions
google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/ChainingGlTextureProcessorListenerTest.java
...@@ -58,7 +58,7 @@ public final class ChainingGlTextureProcessorListenerTest { ...@@ -58,7 +58,7 @@ public final class ChainingGlTextureProcessorListenerTest {
chainingGlTextureProcessorListener.onInputFrameProcessed(texture); chainingGlTextureProcessorListener.onInputFrameProcessed(texture);
Thread.sleep(EXECUTOR_WAIT_TIME_MS); Thread.sleep(EXECUTOR_WAIT_TIME_MS);
verify(mockProducingGlTextureProcessor, times(1)).releaseOutputFrame(texture); verify(mockProducingGlTextureProcessor).releaseOutputFrame(texture);
} }
@Test @Test
...@@ -71,8 +71,7 @@ public final class ChainingGlTextureProcessorListenerTest { ...@@ -71,8 +71,7 @@ public final class ChainingGlTextureProcessorListenerTest {
chainingGlTextureProcessorListener.onOutputFrameAvailable(texture, presentationTimeUs); chainingGlTextureProcessorListener.onOutputFrameAvailable(texture, presentationTimeUs);
Thread.sleep(EXECUTOR_WAIT_TIME_MS); Thread.sleep(EXECUTOR_WAIT_TIME_MS);
verify(fakeConsumingGlTextureProcessor, times(1)) verify(fakeConsumingGlTextureProcessor).maybeQueueInputFrame(texture, presentationTimeUs);
.maybeQueueInputFrame(texture, presentationTimeUs);
} }
@Test @Test
...@@ -109,7 +108,7 @@ public final class ChainingGlTextureProcessorListenerTest { ...@@ -109,7 +108,7 @@ public final class ChainingGlTextureProcessorListenerTest {
verify(fakeConsumingGlTextureProcessor, times(2)) verify(fakeConsumingGlTextureProcessor, times(2))
.maybeQueueInputFrame(firstTexture, firstPresentationTimeUs); .maybeQueueInputFrame(firstTexture, firstPresentationTimeUs);
verify(fakeConsumingGlTextureProcessor, times(1)) verify(fakeConsumingGlTextureProcessor)
.maybeQueueInputFrame(secondTexture, secondPresentationTimeUs); .maybeQueueInputFrame(secondTexture, secondPresentationTimeUs);
} }
...@@ -119,7 +118,7 @@ public final class ChainingGlTextureProcessorListenerTest { ...@@ -119,7 +118,7 @@ public final class ChainingGlTextureProcessorListenerTest {
chainingGlTextureProcessorListener.onCurrentOutputStreamEnded(); chainingGlTextureProcessorListener.onCurrentOutputStreamEnded();
Thread.sleep(EXECUTOR_WAIT_TIME_MS); Thread.sleep(EXECUTOR_WAIT_TIME_MS);
verify(fakeConsumingGlTextureProcessor, times(1)).signalEndOfCurrentInputStream(); verify(fakeConsumingGlTextureProcessor).signalEndOfCurrentInputStream();
} }
private static class FakeGlTextureProcessor implements GlTextureProcessor { private static class FakeGlTextureProcessor implements GlTextureProcessor {
......
library/transformer/src/test/java/com/google/android/exoplayer2/transformer/FallbackListenerTest.java
...@@ -19,7 +19,6 @@ import static org.junit.Assert.assertThrows; ...@@ -19,7 +19,6 @@ import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import android.net.Uri; import android.net.Uri;
...@@ -89,7 +88,7 @@ public class FallbackListenerTest { ...@@ -89,7 +88,7 @@ public class FallbackListenerTest {
fallbackListener.registerTrack(); fallbackListener.registerTrack();
fallbackListener.onTransformationRequestFinalized(audioFallbackRequest); fallbackListener.onTransformationRequestFinalized(audioFallbackRequest);
verify(mockListener, times(1)) verify(mockListener)
.onFallbackApplied(PLACEHOLDER_MEDIA_ITEM, originalRequest, audioFallbackRequest); .onFallbackApplied(PLACEHOLDER_MEDIA_ITEM, originalRequest, audioFallbackRequest);
} }
...@@ -117,7 +116,7 @@ public class FallbackListenerTest { ...@@ -117,7 +116,7 @@ public class FallbackListenerTest {
fallbackListener.onTransformationRequestFinalized(audioFallbackRequest); fallbackListener.onTransformationRequestFinalized(audioFallbackRequest);
fallbackListener.onTransformationRequestFinalized(videoFallbackRequest); fallbackListener.onTransformationRequestFinalized(videoFallbackRequest);
verify(mockListener, times(1)) verify(mockListener)
.onFallbackApplied(PLACEHOLDER_MEDIA_ITEM, originalRequest, mergedFallbackRequest); .onFallbackApplied(PLACEHOLDER_MEDIA_ITEM, originalRequest, mergedFallbackRequest);
} }
......
library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerEndToEndTest.java
...@@ -26,7 +26,6 @@ import static org.mockito.ArgumentMatchers.any; ...@@ -26,7 +26,6 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import android.content.Context; import android.content.Context;
...@@ -271,9 +270,9 @@ public final class TransformerEndToEndTest { ...@@ -271,9 +270,9 @@ public final class TransformerEndToEndTest {
transformer.startTransformation(mediaItem, outputPath); transformer.startTransformation(mediaItem, outputPath);
TransformerTestRunner.runUntilCompleted(transformer); TransformerTestRunner.runUntilCompleted(transformer);
verify(mockListener1, times(1)).onTransformationCompleted(eq(mediaItem), any()); verify(mockListener1).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener2, times(1)).onTransformationCompleted(eq(mediaItem), any()); verify(mockListener2).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener3, times(1)).onTransformationCompleted(eq(mediaItem), any()); verify(mockListener3).onTransformationCompleted(eq(mediaItem), any());
} }
@Test @Test
...@@ -294,9 +293,9 @@ public final class TransformerEndToEndTest { ...@@ -294,9 +293,9 @@ public final class TransformerEndToEndTest {
transformer.startTransformation(mediaItem, outputPath); transformer.startTransformation(mediaItem, outputPath);
TransformationException exception = TransformerTestRunner.runUntilError(transformer); TransformationException exception = TransformerTestRunner.runUntilError(transformer);
verify(mockListener1, times(1)).onTransformationError(mediaItem, exception); verify(mockListener1).onTransformationError(mediaItem, exception);
verify(mockListener2, times(1)).onTransformationError(mediaItem, exception); verify(mockListener2).onTransformationError(mediaItem, exception);
verify(mockListener3, times(1)).onTransformationError(mediaItem, exception); verify(mockListener3).onTransformationError(mediaItem, exception);
} }
@Test @Test
...@@ -319,11 +318,11 @@ public final class TransformerEndToEndTest { ...@@ -319,11 +318,11 @@ public final class TransformerEndToEndTest {
transformer.startTransformation(mediaItem, outputPath); transformer.startTransformation(mediaItem, outputPath);
TransformerTestRunner.runUntilCompleted(transformer); TransformerTestRunner.runUntilCompleted(transformer);
verify(mockListener1, times(1)) verify(mockListener1)
.onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest); .onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest);
verify(mockListener2, times(1)) verify(mockListener2)
.onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest); .onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest);
verify(mockListener3, times(1)) verify(mockListener3)
.onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest); .onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest);
} }
...@@ -345,9 +344,9 @@ public final class TransformerEndToEndTest { ...@@ -345,9 +344,9 @@ public final class TransformerEndToEndTest {
transformer2.startTransformation(mediaItem, outputPath); transformer2.startTransformation(mediaItem, outputPath);
TransformerTestRunner.runUntilCompleted(transformer2); TransformerTestRunner.runUntilCompleted(transformer2);
verify(mockListener1, times(1)).onTransformationCompleted(eq(mediaItem), any()); verify(mockListener1).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener2, never()).onTransformationCompleted(eq(mediaItem), any()); verify(mockListener2, never()).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener3, times(1)).onTransformationCompleted(eq(mediaItem), any()); verify(mockListener3).onTransformationCompleted(eq(mediaItem), any());
} }
@Test @Test
...@@ -474,7 +473,7 @@ public final class TransformerEndToEndTest { ...@@ -474,7 +473,7 @@ public final class TransformerEndToEndTest {
DumpFileAsserts.assertOutput( DumpFileAsserts.assertOutput(
context, testMuxer, getDumpFileName(FILE_AUDIO_UNSUPPORTED_BY_MUXER + ".fallback")); context, testMuxer, getDumpFileName(FILE_AUDIO_UNSUPPORTED_BY_MUXER + ".fallback"));
verify(mockListener, times(1)) verify(mockListener)
.onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest); .onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest);
} }
......
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