From e8aca24446503e892e981890c8bf96b54ad937a6 Mon Sep 17 00:00:00 2001 From: sakal Date: Tue, 17 Jan 2017 03:32:06 -0800 Subject: [PATCH] Move file capturer/renderer tests to the correct location. Move file capturer/renderer tests from the AppRTCMobile tests directory to the WebRTC tests directory. These tests do not test AppRTCMobile but rather WebRTC functionality. Therefore, they belong in WebRTC tests directory. BUG=webrtc:6545 Review-Url: https://codereview.webrtc.org/2632233002 Cr-Commit-Position: refs/heads/master@{#16115} --- webrtc/examples/BUILD.gn | 10 +--------- webrtc/sdk/android/BUILD.gn | 6 ++++++ .../src/org/webrtc}/FileVideoCapturerTest.java | 6 ++---- .../src/org/webrtc}/VideoFileRendererTest.java | 0 .../src/org/webrtc}/capturetestvideo.y4m | 0 5 files changed, 9 insertions(+), 13 deletions(-) rename webrtc/{examples/androidtests/src/org/appspot/apprtc/test => sdk/android/instrumentationtests/src/org/webrtc}/FileVideoCapturerTest.java (94%) rename webrtc/{examples/androidtests/src/org/appspot/apprtc/test => sdk/android/instrumentationtests/src/org/webrtc}/VideoFileRendererTest.java (100%) rename webrtc/{examples/androidtests/src/org/appspot/apprtc/test => sdk/android/instrumentationtests/src/org/webrtc}/capturetestvideo.y4m (100%) diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn index 428498d1ed..3764b5c72c 100644 --- a/webrtc/examples/BUILD.gn +++ b/webrtc/examples/BUILD.gn @@ -107,11 +107,7 @@ if (is_android) { apk_name = "AppRTCMobileTest" android_manifest = "androidtests/AndroidManifest.xml" - java_files = [ - "androidtests/src/org/appspot/apprtc/test/FileVideoCapturerTest.java", - "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java", - "androidtests/src/org/appspot/apprtc/test/VideoFileRendererTest.java", - ] + java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java" ] apk_under_test = ":AppRTCMobile" @@ -122,10 +118,6 @@ if (is_android) { "//third_party/junit", "//webrtc/sdk/android:libjingle_peerconnection_java", ] - - data = [ - "//webrtc/examples/androidtests/src/org/appspot/apprtc/test/capturetestvideo.y4m", - ] } instrumentation_test_apk("AppRTCMobileTestStubbedVideoIO") { diff --git a/webrtc/sdk/android/BUILD.gn b/webrtc/sdk/android/BUILD.gn index edd33607b2..cff8c21457 100644 --- a/webrtc/sdk/android/BUILD.gn +++ b/webrtc/sdk/android/BUILD.gn @@ -195,6 +195,7 @@ if (rtc_include_tests) { "instrumentationtests/src/org/webrtc/Camera2CapturerTest.java", "instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java", "instrumentationtests/src/org/webrtc/EglRendererTest.java", + "instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java", "instrumentationtests/src/org/webrtc/GlRectDrawerTest.java", "instrumentationtests/src/org/webrtc/MediaCodecVideoEncoderTest.java", "instrumentationtests/src/org/webrtc/NetworkMonitorTest.java", @@ -202,9 +203,14 @@ if (rtc_include_tests) { "instrumentationtests/src/org/webrtc/RendererCommonTest.java", "instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java", "instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java", + "instrumentationtests/src/org/webrtc/VideoFileRendererTest.java", "instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java", ] + data = [ + "//webrtc/sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m", + ] + deps = [ "//base:base_java", "//base:base_java_test_support", diff --git a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/FileVideoCapturerTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java similarity index 94% rename from webrtc/examples/androidtests/src/org/appspot/apprtc/test/FileVideoCapturerTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java index cf2924b7a3..b11fd00a32 100644 --- a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/FileVideoCapturerTest.java +++ b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -package org.appspot.apprtc.test; +package org.webrtc; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -25,8 +25,6 @@ import java.util.Arrays; import org.chromium.base.test.BaseJUnit4ClassRunner; import org.junit.Test; import org.junit.runner.RunWith; -import org.webrtc.FileVideoCapturer; -import org.webrtc.VideoCapturer; @RunWith(BaseJUnit4ClassRunner.class) public class FileVideoCapturerTest { @@ -83,7 +81,7 @@ public class FileVideoCapturerTest { final int FRAME_HEIGHT = 4; final FileVideoCapturer fileVideoCapturer = new FileVideoCapturer(Environment.getExternalStorageDirectory().getPath() - + "/chromium_tests_root/webrtc/examples/androidtests/src/org/appspot/apprtc/test/" + + "/chromium_tests_root/webrtc/sdk/android/instrumentationtests/src/org/webrtc/" + "capturetestvideo.y4m"); final MockCapturerObserver capturerObserver = new MockCapturerObserver(); fileVideoCapturer.initialize(null, null, capturerObserver); diff --git a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/VideoFileRendererTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java similarity index 100% rename from webrtc/examples/androidtests/src/org/appspot/apprtc/test/VideoFileRendererTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/VideoFileRendererTest.java diff --git a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/capturetestvideo.y4m b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m similarity index 100% rename from webrtc/examples/androidtests/src/org/appspot/apprtc/test/capturetestvideo.y4m rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m