From 3073c728acf181aa8cce92a45ecb2433a172a899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Mon, 18 Feb 2019 13:24:05 +0100 Subject: [PATCH] Fix AndroidVideoDecoderTest for new Robolectric version. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New Robolectric version doesn't allow Surface to be constructed with a null SurfaceTexture. Bug: webrtc:10323 Change-Id: Ib6991d40b12b81d16ecb04787945cc4045e99b40 Reviewed-on: https://webrtc-review.googlesource.com/c/123236 Reviewed-by: Mirko Bonadei Reviewed-by: Magnus Jedvert Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#26734} --- sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java b/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java index 8f96214ad1..693dc6491f 100644 --- a/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java +++ b/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java @@ -20,9 +20,11 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; import android.graphics.Matrix; +import android.graphics.SurfaceTexture; import android.media.MediaCodecInfo.CodecCapabilities; import android.media.MediaFormat; import android.os.Handler; @@ -176,6 +178,8 @@ public class AndroidVideoDecoderTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); + when(mockSurfaceTextureHelper.getSurfaceTexture()) + .thenReturn(new SurfaceTexture(/*texName=*/0)); MediaFormat outputFormat = new MediaFormat(); // TODO(sakal): Add more details to output format as needed. fakeMediaCodecWrapper = spy(new FakeMediaCodecWrapper(outputFormat));