admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix testReturnBufferLate incorrectly calling end to end test.

Browse Source 
Review-Url: https://codereview.webrtc.org/2202183002
Cr-Commit-Position: refs/heads/master@{#13604}
This commit is contained in:
sakal 2016-08-02 03:32:11 -07:00 committed by Commit bot
parent b4ad456ba0
commit 8626eb5dd2
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
View File

@ -14,9 +14,9 @@ import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
import android.content.Context;
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
public class Camera1CapturerUsingByteBufferTest extends InstrumentationTestCase {
static final String TAG = "Camera1CapturerUsingByteBufferTest";
@ -141,7 +141,7 @@ public class Camera1CapturerUsingByteBufferTest extends InstrumentationTestCase
// been stopped and restarted. It does not test or use the C++ layer.
@LargeTest
public void testReturnBufferLate() throws InterruptedException {
fixtures.returnBufferLateEndToEnd();
fixtures.returnBufferLate();
}
// This test that we can capture frames, keep the frames in a local renderer, stop capturing,

6
webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java
View File

@ -14,9 +14,9 @@ import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
import android.content.Context;
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
public class Camera1CapturerUsingTextureTest extends InstrumentationTestCase {
static final String TAG = "Camera1CapturerUsingTextureTest";
@ -129,7 +129,7 @@ public class Camera1CapturerUsingTextureTest extends InstrumentationTestCase {
// been stopped and restarted. It does not test or use the C++ layer.
@LargeTest
public void testReturnBufferLate() throws InterruptedException {
fixtures.returnBufferLateEndToEnd();
fixtures.returnBufferLate();
}
// This test that we can capture frames, keep the frames in a local renderer, stop capturing,

8
webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java
View File

@ -13,15 +13,15 @@ package org.webrtc;
import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
import android.content.Context;
import android.hardware.camera2.CameraAccessException;
import android.hardware.camera2.CameraDevice;
import android.hardware.camera2.CameraManager;
import android.hardware.camera2.CameraAccessException;
import android.os.Handler;
import android.os.Looper;
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
import java.util.concurrent.CountDownLatch;
@ -253,7 +253,7 @@ public class Camera2CapturerTest extends InstrumentationTestCase {
// been stopped and restarted. It does not test or use the C++ layer.
@LargeTest
public void testReturnBufferLate() throws InterruptedException {
fixtures.returnBufferLateEndToEnd();
fixtures.returnBufferLate();
}
// This test that we can capture frames, keep the frames in a local renderer, stop capturing,