From 665bc3c7ada5341f5461780486e9117d45aa6947 Mon Sep 17 00:00:00 2001 From: magjed Date: Thu, 1 Dec 2016 01:45:31 -0800 Subject: [PATCH] Move webrtc/api/androidtests to webrtc/sdk/android/instrumentationtests BUG=webrtc:5882 NOPRESUBMIT=True Review-Url: https://codereview.webrtc.org/2541823002 Cr-Commit-Position: refs/heads/master@{#15352} --- webrtc/BUILD.gn | 2 +- webrtc/api/BUILD.gn | 32 ------------ webrtc/api/androidtests/OWNERS | 1 - webrtc/build/gn_isolate_map.pyl | 2 +- .../instrumentationtests}/AndroidManifest.xml | 0 .../sdk/android/instrumentationtests/BUILD.gn | 51 +++++++++++++++++++ .../instrumentationtests}/ant.properties | 0 .../android/instrumentationtests}/build.xml | 0 .../instrumentationtests}/project.properties | 0 .../Camera1CapturerUsingByteBufferTest.java | 0 .../Camera1CapturerUsingTextureTest.java | 0 .../src/org/webrtc/Camera2CapturerTest.java | 0 .../CameraVideoCapturerTestFixtures.java | 0 .../src/org/webrtc/EglRendererTest.java | 0 .../src/org/webrtc/GlRectDrawerTest.java | 0 .../webrtc/MediaCodecVideoEncoderTest.java | 0 .../src/org/webrtc/NetworkMonitorTest.java | 0 .../src/org/webrtc/PeerConnectionTest.java | 0 .../src/org/webrtc/RendererCommonTest.java | 0 .../org/webrtc/SurfaceTextureHelperTest.java | 0 .../SurfaceViewRendererOnMeasureTest.java | 0 .../src/org/webrtc/WebRtcJniBootTest.java | 0 22 files changed, 53 insertions(+), 35 deletions(-) delete mode 100644 webrtc/api/androidtests/OWNERS rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/AndroidManifest.xml (100%) create mode 100644 webrtc/sdk/android/instrumentationtests/BUILD.gn rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/ant.properties (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/build.xml (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/project.properties (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/Camera1CapturerUsingTextureTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/Camera2CapturerTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/CameraVideoCapturerTestFixtures.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/EglRendererTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/GlRectDrawerTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/MediaCodecVideoEncoderTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/NetworkMonitorTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/PeerConnectionTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/RendererCommonTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/SurfaceTextureHelperTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java (100%) rename webrtc/{api/androidtests => sdk/android/instrumentationtests}/src/org/webrtc/WebRtcJniBootTest.java (100%) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 9318166379..e29fb11193 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -309,7 +309,7 @@ if (!build_with_chromium) { if (is_android) { deps += [ ":android_junit_tests", - "api:libjingle_peerconnection_android_unittest", + "//webrtc/sdk/android/instrumentationtests", ] } else { deps += [ "modules/video_capture:video_capture_tests" ] diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index fe1ade26d6..dabfb4b2f9 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn @@ -505,36 +505,4 @@ if (rtc_include_tests) { "//testing/gmock", ] } - - if (is_android) { - instrumentation_test_apk("libjingle_peerconnection_android_unittest") { - apk_name = "libjingle_peerconnection_android_unittest" - android_manifest = "androidtests/AndroidManifest.xml" - - java_files = [ - "androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java", - "androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java", - "androidtests/src/org/webrtc/Camera2CapturerTest.java", - "androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java", - "androidtests/src/org/webrtc/EglRendererTest.java", - "androidtests/src/org/webrtc/GlRectDrawerTest.java", - "androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java", - "androidtests/src/org/webrtc/NetworkMonitorTest.java", - "androidtests/src/org/webrtc/PeerConnectionTest.java", - "androidtests/src/org/webrtc/RendererCommonTest.java", - "androidtests/src/org/webrtc/SurfaceTextureHelperTest.java", - "androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java", - "androidtests/src/org/webrtc/WebRtcJniBootTest.java", - ] - - deps = [ - ":libjingle_peerconnection_java", - ":libjingle_peerconnection_metrics_default_java", - "../base:base_java", - "//base:base_java", - ] - - shared_libraries = [ ":libjingle_peerconnection_so" ] - } - } } diff --git a/webrtc/api/androidtests/OWNERS b/webrtc/api/androidtests/OWNERS deleted file mode 100644 index 4d31ffb663..0000000000 --- a/webrtc/api/androidtests/OWNERS +++ /dev/null @@ -1 +0,0 @@ -magjed@webrtc.org diff --git a/webrtc/build/gn_isolate_map.pyl b/webrtc/build/gn_isolate_map.pyl index 13f62a15b7..84005040ab 100644 --- a/webrtc/build/gn_isolate_map.pyl +++ b/webrtc/build/gn_isolate_map.pyl @@ -40,7 +40,7 @@ "type": "console_test_launcher", }, "libjingle_peerconnection_android_unittest": { - "label": "//webrtc/api:libjingle_peerconnection_android_unittest", + "label": "//webrtc/sdk/android/instrumentationtests:libjingle_peerconnection_android_unittest", "type": "additional_compile_target", }, "modules_tests": { diff --git a/webrtc/api/androidtests/AndroidManifest.xml b/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml similarity index 100% rename from webrtc/api/androidtests/AndroidManifest.xml rename to webrtc/sdk/android/instrumentationtests/AndroidManifest.xml diff --git a/webrtc/sdk/android/instrumentationtests/BUILD.gn b/webrtc/sdk/android/instrumentationtests/BUILD.gn new file mode 100644 index 0000000000..ab193b462e --- /dev/null +++ b/webrtc/sdk/android/instrumentationtests/BUILD.gn @@ -0,0 +1,51 @@ +# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +import("//build/config/android/config.gni") +import("//build/config/android/rules.gni") +import("//webrtc/build/webrtc.gni") + +group("instrumentationtests") { + # This target shall build all targets in instrumentationtests. + testonly = true + public_deps = [] + + public_deps += [ ":libjingle_peerconnection_android_unittest" ] +} + +if (rtc_include_tests) { + instrumentation_test_apk("libjingle_peerconnection_android_unittest") { + apk_name = "libjingle_peerconnection_android_unittest" + android_manifest = "AndroidManifest.xml" + + java_files = [ + "src/org/webrtc/Camera1CapturerUsingByteBufferTest.java", + "src/org/webrtc/Camera1CapturerUsingTextureTest.java", + "src/org/webrtc/Camera2CapturerTest.java", + "src/org/webrtc/CameraVideoCapturerTestFixtures.java", + "src/org/webrtc/EglRendererTest.java", + "src/org/webrtc/GlRectDrawerTest.java", + "src/org/webrtc/MediaCodecVideoEncoderTest.java", + "src/org/webrtc/NetworkMonitorTest.java", + "src/org/webrtc/PeerConnectionTest.java", + "src/org/webrtc/RendererCommonTest.java", + "src/org/webrtc/SurfaceTextureHelperTest.java", + "src/org/webrtc/SurfaceViewRendererOnMeasureTest.java", + "src/org/webrtc/WebRtcJniBootTest.java", + ] + + deps = [ + "../../../api:libjingle_peerconnection_java", + "../../../api:libjingle_peerconnection_metrics_default_java", + "../../../base:base_java", + "//base:base_java", + ] + + shared_libraries = [ "../../../api:libjingle_peerconnection_so" ] + } +} diff --git a/webrtc/api/androidtests/ant.properties b/webrtc/sdk/android/instrumentationtests/ant.properties similarity index 100% rename from webrtc/api/androidtests/ant.properties rename to webrtc/sdk/android/instrumentationtests/ant.properties diff --git a/webrtc/api/androidtests/build.xml b/webrtc/sdk/android/instrumentationtests/build.xml similarity index 100% rename from webrtc/api/androidtests/build.xml rename to webrtc/sdk/android/instrumentationtests/build.xml diff --git a/webrtc/api/androidtests/project.properties b/webrtc/sdk/android/instrumentationtests/project.properties similarity index 100% rename from webrtc/api/androidtests/project.properties rename to webrtc/sdk/android/instrumentationtests/project.properties diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java diff --git a/webrtc/api/androidtests/src/org/webrtc/EglRendererTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/EglRendererTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/GlRectDrawerTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/GlRectDrawerTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/MediaCodecVideoEncoderTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/MediaCodecVideoEncoderTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/NetworkMonitorTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/NetworkMonitorTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/RendererCommonTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java diff --git a/webrtc/api/androidtests/src/org/webrtc/WebRtcJniBootTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java similarity index 100% rename from webrtc/api/androidtests/src/org/webrtc/WebRtcJniBootTest.java rename to webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java