Skip to content

Commit

Permalink
Remove times(1) from effect and transformer tests as it is the default.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 466324322
  • Loading branch information
Googler authored and marcbaechinger committed Oct 19, 2022
1 parent 7075f78 commit 95a7dca
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void onInputFrameProcessed_surrendersFrameToPreviousGlTextureProcessor()
chainingGlTextureProcessorListener.onInputFrameProcessed(texture);
Thread.sleep(EXECUTOR_WAIT_TIME_MS);

verify(mockProducingGlTextureProcessor, times(1)).releaseOutputFrame(texture);
verify(mockProducingGlTextureProcessor).releaseOutputFrame(texture);
}

@Test
Expand All @@ -71,8 +71,7 @@ public void onOutputFrameAvailable_passesFrameToNextGlTextureProcessor()
chainingGlTextureProcessorListener.onOutputFrameAvailable(texture, presentationTimeUs);
Thread.sleep(EXECUTOR_WAIT_TIME_MS);

verify(fakeConsumingGlTextureProcessor, times(1))
.maybeQueueInputFrame(texture, presentationTimeUs);
verify(fakeConsumingGlTextureProcessor).maybeQueueInputFrame(texture, presentationTimeUs);
}

@Test
Expand Down Expand Up @@ -109,7 +108,7 @@ public void onOutputFrameAvailable_twoFramesWithFirstRejected_retriesFirstBefore

verify(fakeConsumingGlTextureProcessor, times(2))
.maybeQueueInputFrame(firstTexture, firstPresentationTimeUs);
verify(fakeConsumingGlTextureProcessor, times(1))
verify(fakeConsumingGlTextureProcessor)
.maybeQueueInputFrame(secondTexture, secondPresentationTimeUs);
}

Expand All @@ -119,7 +118,7 @@ public void onOutputStreamEnded_signalsInputStreamEndedToNextGlTextureProcessor(
chainingGlTextureProcessorListener.onCurrentOutputStreamEnded();
Thread.sleep(EXECUTOR_WAIT_TIME_MS);

verify(fakeConsumingGlTextureProcessor, times(1)).signalEndOfCurrentInputStream();
verify(fakeConsumingGlTextureProcessor).signalEndOfCurrentInputStream();
}

private static class FakeGlTextureProcessor implements GlTextureProcessor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

import android.net.Uri;
Expand Down Expand Up @@ -89,7 +88,7 @@ public void onTransformationRequestFinalized_withDifferentRequest_callsCallback(
fallbackListener.registerTrack();
fallbackListener.onTransformationRequestFinalized(audioFallbackRequest);

verify(mockListener, times(1))
verify(mockListener)
.onFallbackApplied(PLACEHOLDER_MEDIA_ITEM, originalRequest, audioFallbackRequest);
}

Expand Down Expand Up @@ -117,7 +116,7 @@ public void onTransformationRequestFinalized_withDifferentRequest_callsCallback(
fallbackListener.onTransformationRequestFinalized(audioFallbackRequest);
fallbackListener.onTransformationRequestFinalized(videoFallbackRequest);

verify(mockListener, times(1))
verify(mockListener)
.onFallbackApplied(PLACEHOLDER_MEDIA_ITEM, originalRequest, mergedFallbackRequest);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

import android.content.Context;
Expand Down Expand Up @@ -271,9 +270,9 @@ public void startTransformation_withMultipleListeners_callsEachOnCompletion() th
transformer.startTransformation(mediaItem, outputPath);
TransformerTestRunner.runUntilCompleted(transformer);

verify(mockListener1, times(1)).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener2, times(1)).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener3, times(1)).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener1).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener2).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener3).onTransformationCompleted(eq(mediaItem), any());
}

@Test
Expand All @@ -294,9 +293,9 @@ public void startTransformation_withMultipleListeners_callsEachOnError() throws
transformer.startTransformation(mediaItem, outputPath);
TransformationException exception = TransformerTestRunner.runUntilError(transformer);

verify(mockListener1, times(1)).onTransformationError(mediaItem, exception);
verify(mockListener2, times(1)).onTransformationError(mediaItem, exception);
verify(mockListener3, times(1)).onTransformationError(mediaItem, exception);
verify(mockListener1).onTransformationError(mediaItem, exception);
verify(mockListener2).onTransformationError(mediaItem, exception);
verify(mockListener3).onTransformationError(mediaItem, exception);
}

@Test
Expand All @@ -319,11 +318,11 @@ public void startTransformation_withMultipleListeners_callsEachOnFallback() thro
transformer.startTransformation(mediaItem, outputPath);
TransformerTestRunner.runUntilCompleted(transformer);

verify(mockListener1, times(1))
verify(mockListener1)
.onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest);
verify(mockListener2, times(1))
verify(mockListener2)
.onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest);
verify(mockListener3, times(1))
verify(mockListener3)
.onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest);
}

Expand All @@ -345,9 +344,9 @@ public void startTransformation_afterBuildUponWithListenerRemoved_onlyCallsRemai
transformer2.startTransformation(mediaItem, outputPath);
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(mockListener3, times(1)).onTransformationCompleted(eq(mediaItem), any());
verify(mockListener3).onTransformationCompleted(eq(mediaItem), any());
}

@Test
Expand Down Expand Up @@ -474,7 +473,7 @@ public void startTransformation_withAudioMuxerFormatFallback_completesSuccessful

DumpFileAsserts.assertOutput(
context, testMuxer, getDumpFileName(FILE_AUDIO_UNSUPPORTED_BY_MUXER + ".fallback"));
verify(mockListener, times(1))
verify(mockListener)
.onFallbackApplied(mediaItem, originalTransformationRequest, fallbackTransformationRequest);
}

Expand Down

0 comments on commit 95a7dca

Please sign in to comment.