Decoupling test targets from Obj-C code

webrtc/test/BUILD.gn

 # Copyright (c) 2014 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("../webrtc.gni")
 import("//build/config/ui.gni")
@@ skipping 89 matching lines @@
     "field_trial.h",
   ]
 
   deps = [
     "..:webrtc_common",
     "../system_wrappers",
     "../system_wrappers:field_trial_default",
   ]
 }
 
+if (is_ios) {
+  rtc_source_set("objc_test_support") {

[kjellander_webrtc, 2017/08/14 06:56:45]

I realized for targets like this we probably want to have visibility = [ ":*" ]
to limit their visibility to the same BUILD.gn file. Applies to all the CLs
similar to this.

[kjellander_webrtc, 2017/08/14 06:56:46]

test_support_objc

[mbonadei, 2017/08/15 13:43:13]

Done.

[mbonadei, 2017/08/15 13:43:13]

Done.

+    sources = [
+      "ios/test_support.h",
+      "ios/test_support.mm",
+    ]
+  }
+}
+
 rtc_source_set("test_support") {
   testonly = true
 
   sources = [
     "gmock.h",
     "gtest.h",
     "testsupport/packet_reader.cc",
     "testsupport/packet_reader.h",
     "testsupport/perf_test.cc",
     "testsupport/perf_test.h",
     "testsupport/trace_to_stderr.cc",
     "testsupport/trace_to_stderr.h",
     "testsupport/unittest_utils.h",
   ]
 
-  if (is_ios) {
-    sources += [
-      "ios/test_support.h",
-      "ios/test_support.mm",
-    ]
-  }
-
   deps = [
     "..:webrtc_common",
     "../common_video",
     "../rtc_base:gtest_prod",
     "../rtc_base:rtc_base_approved",
     "../system_wrappers",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   public_deps = [
     ":fileutils",
   ]
+  if (is_ios) {
+    public_deps += [ ":objc_test_support" ]
+  }
 
   if (!build_with_chromium && is_clang) {
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
   if (is_android) {
     deps += [ "//base:base" ]
   }
 
@@ skipping 172 matching lines @@
       ":video_test_common",
       ":video_test_support",
       "../modules/video_capture",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 }
 
+if (is_ios) {
+  rtc_source_set("objc_fileutils") {
+    sources = [
+      "testsupport/iosfileutils.mm",
+    ]
+    deps = [
+      "..:webrtc_common",
+      "../rtc_base:rtc_base_approved",
+      "../sdk:objc_common",
+    ]
+  }
+}
+
 rtc_source_set("fileutils") {
   testonly = true
   sources = [
     "testsupport/fileutils.cc",
     "testsupport/fileutils.h",
   ]
   deps = [
     "..:webrtc_common",
     "../rtc_base:rtc_base_approved",
   ]
   if (is_ios) {
-    sources += [ "testsupport/iosfileutils.mm" ]
-    deps += [ "../sdk:objc_common" ]
+    deps += [ ":objc_fileutils" ]
   }
   if (is_win) {
     deps += [ "../rtc_base:rtc_base" ]
   }
   visibility = [ ":*" ]
 }
 
+if (is_mac) {
+  rtc_source_set("objc_run_test") {
+    check_includes = false
+    sources = [
+      "mac/run_test.mm",
+    ]
+  }
+}
+
 rtc_source_set("run_test") {
   testonly = true
   sources = [
     "run_test.h",
   ]
   if (is_mac) {
-    sources += [ "mac/run_test.mm" ]
+    deps = [
+      ":objc_run_test",
+    ]
   } else {
     sources += [ "run_test.cc" ]
   }
 }
 
 rtc_source_set("fileutils_unittests") {
   testonly = true
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "testsupport/fileutils_unittest.cc",
@@ skipping 135 matching lines @@
     # adds -Wall, and this flag have to be after -Wall -- so they need to
     # come from a config and cannot be on the target directly.
     cflags = [
       "-Wno-bool-conversion",
       "-Wno-comment",
       "-Wno-delete-non-virtual-dtor",
     ]
   }
 }
 
+if (is_mac) {
+  rtc_source_set("objc_test_renderer") {
+    check_includes = false
+    sources = [
+      "mac/video_renderer_mac.h",
+      "mac/video_renderer_mac.mm",
+    ]
+    deps = [
+      "../rtc_base:rtc_base_approved",
+    ]
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+  }
+}
+
 rtc_source_set("test_renderer") {
   testonly = true
   libs = []
   sources = [
     "linux/glx_renderer.cc",
     "linux/glx_renderer.h",
     "linux/video_renderer_linux.cc",
-    "mac/video_renderer_mac.h",
-    "mac/video_renderer_mac.mm",
     "video_renderer.cc",
     "video_renderer.h",
     "win/d3d_renderer.cc",
     "win/d3d_renderer.h",
   ]
+  deps = [
+    ":test_support",
+    "..:webrtc_common",
+    "../common_video",
+    "../modules/media_file",
+    "../rtc_base:rtc_base_approved",
+    "//testing/gtest",
+  ]
   if (!is_linux && !is_mac && !is_win) {
     sources += [ "null_platform_renderer.cc" ]
   }
   if (is_linux || is_mac) {
     sources += [
       "gl/gl_renderer.cc",
       "gl/gl_renderer.h",
     ]
   }
 
   if (is_linux) {
     libs += [
       "Xext",
       "X11",
       "GL",
     ]
   }
   if (is_android) {
     libs += [
       "GLESv2",
       "log",
     ]
   }
   if (is_mac) {
     libs = [
       "Cocoa.framework",
       "OpenGL.framework",
       "CoreVideo.framework",
     ]
+    deps += [ ":objc_test_renderer" ]
   }
 
   public_configs = [ ":test_renderer_exported_config" ]
 
   if (!build_with_chromium && is_clang) {
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
-
-  deps = [
-    ":test_support",
-    "..:webrtc_common",
-    "../common_video",
-    "../modules/media_file",
-    "../rtc_base:rtc_base_approved",
-    "//testing/gtest",
-  ]
 }
 
 rtc_source_set("audio_codec_mocks") {
   testonly = true
   sources = [
     "mock_audio_decoder.cc",
     "mock_audio_decoder.h",
     "mock_audio_decoder_factory.h",
     "mock_audio_encoder.cc",
     "mock_audio_encoder.h",
@@ skipping 15 matching lines @@
     java_files = [
       "android/org/webrtc/native_test/RTCNativeUnitTest.java",
       "android/org/webrtc/native_test/RTCNativeUnitTestActivity.java",
     ]
     deps = [
       "../rtc_base:base_java",
       "//testing/android/native_test:native_test_java",
     ]
   }
 }