| Index: webrtc/examples/androidtests/src/org/appspot/apprtc/test/CallActivityStubbedInputOutputTest.java
|
| diff --git a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/ConnectActivityStubbedInputOutputTest.java b/webrtc/examples/androidtests/src/org/appspot/apprtc/test/CallActivityStubbedInputOutputTest.java
|
| similarity index 51%
|
| rename from webrtc/examples/androidtests/src/org/appspot/apprtc/test/ConnectActivityStubbedInputOutputTest.java
|
| rename to webrtc/examples/androidtests/src/org/appspot/apprtc/test/CallActivityStubbedInputOutputTest.java
|
| index ebb445bc793ec6b7332521b5914e8d32cd77d016..9e07505a8c522f8234606280d2a145e992a84584 100644
|
| --- a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/ConnectActivityStubbedInputOutputTest.java
|
| +++ b/webrtc/examples/androidtests/src/org/appspot/apprtc/test/CallActivityStubbedInputOutputTest.java
|
| @@ -18,7 +18,10 @@ import android.content.Context;
|
| import android.content.Intent;
|
| import android.net.Uri;
|
| import android.os.Environment;
|
| +import android.support.test.espresso.contrib.CountingIdlingResource;
|
| +import android.support.test.espresso.Espresso;
|
| import android.support.test.espresso.IdlingPolicies;
|
| +import android.support.test.espresso.IdlingResource;
|
| import android.support.test.filters.LargeTest;
|
| import android.support.test.rule.ActivityTestRule;
|
| import android.support.test.runner.AndroidJUnit4;
|
| @@ -38,39 +41,40 @@ import org.junit.runner.RunWith;
|
| */
|
| @RunWith(AndroidJUnit4.class)
|
| @LargeTest
|
| -public class ConnectActivityStubbedInputOutputTest {
|
| - private static final String TAG = "ConnectActivityStubbedInputOutputTest";
|
| +public class CallActivityStubbedInputOutputTest {
|
| + private static final String TAG = "CallActivityStubbedInputOutputTest";
|
|
|
| @Rule
|
| - public ActivityTestRule<ConnectActivity> rule =
|
| - new ActivityTestRule<ConnectActivity>(ConnectActivity.class) {
|
| - @Override
|
| - protected Intent getActivityIntent() {
|
| - Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
| - Intent intent = new Intent("android.intent.action.VIEW", Uri.parse("https://appr.tc"),
|
| - context, ConnectActivity.class);
|
| + public ActivityTestRule<CallActivity> rule = new ActivityTestRule<CallActivity>(
|
| + CallActivity.class) {
|
| + @Override
|
| + protected Intent getActivityIntent() {
|
| + Context context = InstrumentationRegistry.getContext();
|
| + Intent intent = new Intent("android.intent.action.VIEW", Uri.parse("http://localhost:9999"));
|
|
|
| - intent.putExtra(CallActivity.EXTRA_USE_VALUES_FROM_INTENT, true);
|
| + intent.putExtra(CallActivity.EXTRA_USE_VALUES_FROM_INTENT, true);
|
|
|
| - intent.putExtra(CallActivity.EXTRA_LOOPBACK, true);
|
| - intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, "OPUS");
|
| - intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, "VP8");
|
| - intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, false);
|
| - intent.putExtra(CallActivity.EXTRA_CAMERA2, false);
|
| - intent.putExtra(CallActivity.EXTRA_ROOMID, UUID.randomUUID().toString().substring(0, 8));
|
| + intent.putExtra(CallActivity.EXTRA_COLLIDERURL, "http://localhost:8089");
|
|
|
| - intent.putExtra(CallActivity.EXTRA_VIDEO_FILE_AS_CAMERA,
|
| - Environment.getExternalStorageDirectory().getAbsolutePath()
|
| - + "/chromium_tests_root/resources/reference_video_640x360_30fps.y4m");
|
| + intent.putExtra(CallActivity.EXTRA_LOOPBACK, true);
|
| + intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, "OPUS");
|
| + intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, "VP8");
|
| + intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, false);
|
| + intent.putExtra(CallActivity.EXTRA_CAMERA2, false);
|
| + intent.putExtra(CallActivity.EXTRA_ROOMID, UUID.randomUUID().toString().substring(0, 8));
|
|
|
| - intent.putExtra(CallActivity.EXTRA_SAVE_REMOTE_VIDEO_TO_FILE,
|
| - Environment.getExternalStorageDirectory().getAbsolutePath() + "/output.y4m");
|
| - intent.putExtra(CallActivity.EXTRA_SAVE_REMOTE_VIDEO_TO_FILE_WIDTH, 640);
|
| - intent.putExtra(CallActivity.EXTRA_SAVE_REMOTE_VIDEO_TO_FILE_HEIGHT, 360);
|
| + intent.putExtra(CallActivity.EXTRA_VIDEO_FILE_AS_CAMERA,
|
| + Environment.getExternalStorageDirectory().getAbsolutePath()
|
| + + "/chromium_tests_root/resources/reference_video_640x360_30fps.y4m");
|
|
|
| - return intent;
|
| - }
|
| - };
|
| + intent.putExtra(CallActivity.EXTRA_SAVE_REMOTE_VIDEO_TO_FILE,
|
| + Environment.getExternalStorageDirectory().getAbsolutePath() + "/output.y4m");
|
| + intent.putExtra(CallActivity.EXTRA_SAVE_REMOTE_VIDEO_TO_FILE_WIDTH, 640);
|
| + intent.putExtra(CallActivity.EXTRA_SAVE_REMOTE_VIDEO_TO_FILE_HEIGHT, 360);
|
| +
|
| + return intent;
|
| + }
|
| + };
|
|
|
| @Test
|
| public void testLoopback() throws InterruptedException {
|
| @@ -78,7 +82,7 @@ public class ConnectActivityStubbedInputOutputTest {
|
| IdlingPolicies.setMasterPolicyTimeout(240000, TimeUnit.MILLISECONDS);
|
|
|
| // During the time we sleep it will record video.
|
| - Thread.sleep(10000);
|
| + Thread.sleep(8000);
|
|
|
| // Click on hang-up button.
|
| onView(withId(R.id.button_call_disconnect)).perform(click());
|
|
|