Move iOS tests to XCTest from gtest.

webrtc/examples/BUILD.gn

Index: webrtc/examples/BUILD.gn
diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn
index 59842fc524532742cb85c3bd98b9e89ae45f90e3..3be9381505a110fb151dfc8df35f6122992659a5 100644
--- a/webrtc/examples/BUILD.gn
+++ b/webrtc/examples/BUILD.gn
@@ -433,32 +433,37 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
   }
 
   if (rtc_include_tests) {
-    config("rtc_apprtcmobile_config") {
-      defines = [ "GTEST_RELATIVE_PATH" ]
-    }
-
-    rtc_test("apprtcmobile_tests") {
-      include_dirs = [ "objc/AppRTCMobile/ios" ]
-      deps = [
-        ":AppRTCMobile_lib",
-        ":apprtc_signaling",
-        "//testing/gtest",
-        "//third_party/ocmock",
-      ]
-
-      sources = [
-        "objc/AppRTCMobile/tests/ARDAppClientTest.mm",
-        "objc/AppRTCMobile/tests/ARDSettingsModelTests.mm",
-      ]
+    if (is_ios) {

[daniela-webrtc, 2017/02/13 16:08:21]

This means that we'll no longer have Mac test target. Perhaps add a TODO with
bug tracking the target on that one?

[kthelgason, 2017/02/14 09:48:46]

Good call, thanks. Done.

+      rtc_source_set("apprtcmobile_test_sources") {
+        include_dirs = [
+          "objc/AppRTCMobile",
+          "objc/AppRTCMobile/ios",
+        ]
+        testonly = true
+        sources = [
+          "objc/AppRTCMobile/tests/ARDAppClient_xctest.mm",
+          "objc/AppRTCMobile/tests/ARDSDPUtils_xctest.mm",
+          "objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm",
+        ]
+        public_deps = [
+          ":AppRTCMobile_ios_frameworks",
+          ":AppRTCMobile_lib",
+          "//build/config/ios:xctest",
+          "//third_party/ocmock",
+        ]
+        configs += [ "//build/config/compiler:enable_arc" ]
+      }
 
-      if (is_ios) {
+      ios_xctest_test("apprtcmobile_tests") {

[kjellander_webrtc, 2017/02/14 09:04:10]

The rtc_test template in
https://chromium.googlesource.com/external/webrtc/+/master/webrtc/webrtc.gni#232
gets the global configurations //webrtc:common_config and
//webrtc:common_inherited_config added to it, while this doesn't. I suspect that
could affect behavior depending on if code in this target actually uses any of
those defines etc, but going forward I think it's safest if we either:
* create our own rtc_ios_xctest_test template
* add those configurations to each instance of ios_xctest_test.

[kthelgason, 2017/02/14 09:48:46]

Done.

         info_plist = "objc/AppRTCMobile/ios/Info.plist"
+        sources = [
+          "objc/AppRTCMobile/ios/main.m",
+        ]
+        deps = [
+          ":apprtcmobile_test_sources",
+        ]
+        ldflags = [ "-all_load" ]
       }
-
-      configs += [
-        ":rtc_apprtcmobile_config",
-        "//build/config/compiler:enable_arc",
-      ]
     }
   }
 }