Move some tests from legacy to crosstool case.

PiperOrigin-RevId: 169087881

2 files changed, 85 insertions, 85 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java
index 3ae1bc14b5..f789de4ef1 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java
@@ -35,6 +35,7 @@ import com.google.devtools.build.lib.analysis.test.TestRunnerAction;
 import com.google.devtools.build.lib.packages.util.MockObjcSupport;
 import com.google.devtools.build.lib.packages.util.MockProtoSupport;
 import com.google.devtools.build.lib.rules.apple.AppleConfiguration.ConfigurationDistinguisher;
+import com.google.devtools.build.lib.rules.apple.AppleToolchain;
 import com.google.devtools.build.lib.rules.apple.XcodeVersionProperties;
 import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -1270,4 +1271,88 @@ public class IosTestTest extends ObjcRuleTestCase {
   public void testSdkIncludesUsedInCompileAction() throws Exception {
     checkSdkIncludesUsedInCompileAction(RULE_TYPE);
   }
+
+  @Test
+  public void testGetsIncludesFromTestRig() throws Exception {
+    scratch.file("x/BUILD",
+        "objc_library(",
+        "    name = 'lib',",
+        "    srcs = ['lib.m'],",
+        "    includes = ['libinc'],",
+        "    sdk_includes = ['libinc_sdk'],",
+        ")",
+        "objc_binary(",
+        "    name = 'bin',",
+        "    srcs = ['bin.m'],",
+        "    includes = ['bininc'],",
+        "    sdk_includes = ['bininc_sdk'],",
+        "    deps = [':lib'],",
+        ")",
+        "ios_application(",
+        "    name = 'testApp',",
+        "    binary = ':bin',",
+        ")",
+        "ios_test(",
+        "    name = 'test',",
+        "    srcs = ['test.m'],",
+        "    includes = ['testinc'],",
+        "    sdk_includes = ['testinc_sdk'],",
+        "    xctest = 1,",
+        "    xctest_app = ':testApp',",
+        ")");
+    // We remove spaces because the crosstool case does not use spaces for include paths.
+    String compileArgs = Joiner.on("")
+        .join(compileAction("//x:test", "test.o").getArguments())
+        .replace(" ", "");
+    assertThat(compileArgs).contains("-Ix/libinc");
+    assertThat(compileArgs).contains("-Ix/bininc");
+    assertThat(compileArgs).contains("-Ix/testinc");
+
+    String sdkIncludeDir = AppleToolchain.sdkDir() + "/usr/include/";
+    assertThat(compileArgs).contains("-I" + sdkIncludeDir + "libinc_sdk");
+    assertThat(compileArgs).contains("-I" + sdkIncludeDir + "bininc_sdk");
+    assertThat(compileArgs).contains("-I" + sdkIncludeDir + "testinc_sdk");
+  }
+
+  @Test
+  public void testGetsFrameworksFromTestRig() throws Exception {
+    scratch.file("x/BUILD",
+        "objc_framework(",
+        "    name = 'fx',",
+        "    framework_imports = ['fx.framework/1'],",
+        ")",
+        "objc_library(",
+        "    name = 'lib',",
+        "    srcs = ['lib.m'],",
+        "    deps = [':fx'],",
+        ")",
+        "objc_binary(",
+        "    name = 'bin',",
+        "    srcs = ['bin.m'],",
+        "    deps = [':lib'],",
+        ")",
+        "ios_application(",
+        "    name = 'testApp',",
+        "    binary = ':bin',",
+        ")",
+        "ios_test(",
+        "    name = 'test',",
+        "    srcs = ['test.m'],",
+        "    xctest = 1,",
+        "    xctest_app = ':testApp',",
+        ")");
+    CommandAction compileAction = compileAction("//x:test", "test.o");
+
+    assertThat(Artifact.toExecPaths(compileAction.getInputs()))
+        .contains("x/fx.framework/1");
+    // We remove spaces since the crosstool case does not use spaces for '-F'.
+    String compileActionArgs = Joiner.on("")
+        .join(compileAction.getArguments())
+        .replace(" ", "");
+
+    assertThat(compileActionArgs).contains("-Fx");
+
+    CommandAction linkAction = linkAction("//x:test");
+    assertThat(Joiner.on(" ").join(linkAction.getArguments())).doesNotContain("-framework fx");
+  }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyIosTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyIosTestTest.java
index ee6e89f9f9..25c7d2d7ed 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyIosTestTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyIosTestTest.java
@@ -14,16 +14,7 @@
 
 package com.google.devtools.build.lib.rules.objc;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.CommandAction;
-import com.google.devtools.build.lib.rules.apple.AppleToolchain;
 import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode;
-import java.util.List;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -38,80 +29,4 @@ public class LegacyIosTestTest extends IosTestTest {
     return ObjcCrosstoolMode.OFF;
   }
 
-  @Test
-  public void testGetsIncludesFromTestRig() throws Exception {
-    scratch.file("x/BUILD",
-        "objc_library(",
-        "    name = 'lib',",
-        "    srcs = ['lib.m'],",
-        "    includes = ['libinc'],",
-        "    sdk_includes = ['libinc_sdk'],",
-        ")",
-        "objc_binary(",
-        "    name = 'bin',",
-        "    srcs = ['bin.m'],",
-        "    includes = ['bininc'],",
-        "    sdk_includes = ['bininc_sdk'],",
-        "    deps = [':lib'],",
-        ")",
-        "ios_application(",
-        "    name = 'testApp',",
-        "    binary = ':bin',",
-        ")",
-        "ios_test(",
-        "    name = 'test',",
-        "    srcs = ['test.m'],",
-        "    includes = ['testinc'],",
-        "    sdk_includes = ['testinc_sdk'],",
-        "    xctest = 1,",
-        "    xctest_app = ':testApp',",
-        ")");
-    List<String> compileArgs = compileAction("//x:test", "test.o").getArguments();
-    assertContainsSublist(compileArgs, ImmutableList.of("-I", "x/libinc"));
-    assertContainsSublist(compileArgs, ImmutableList.of("-I", "x/bininc"));
-    assertContainsSublist(compileArgs, ImmutableList.of("-I", "x/testinc"));
-
-    String sdkIncludeDir = AppleToolchain.sdkDir() + "/usr/include/";
-    assertContainsSublist(compileArgs, ImmutableList.of("-I", sdkIncludeDir + "libinc_sdk"));
-    assertContainsSublist(compileArgs, ImmutableList.of("-I", sdkIncludeDir + "bininc_sdk"));
-    assertContainsSublist(compileArgs, ImmutableList.of("-I", sdkIncludeDir + "testinc_sdk"));
-  }
-
-  @Test
-  public void testGetsFrameworksFromTestRig() throws Exception {
-    scratch.file("x/BUILD",
-        "objc_framework(",
-        "    name = 'fx',",
-        "    framework_imports = ['fx.framework/1'],",
-        ")",
-        "objc_library(",
-        "    name = 'lib',",
-        "    srcs = ['lib.m'],",
-        "    deps = [':fx'],",
-        ")",
-        "objc_binary(",
-        "    name = 'bin',",
-        "    srcs = ['bin.m'],",
-        "    deps = [':lib'],",
-        ")",
-        "ios_application(",
-        "    name = 'testApp',",
-        "    binary = ':bin',",
-        ")",
-        "ios_test(",
-        "    name = 'test',",
-        "    srcs = ['test.m'],",
-        "    xctest = 1,",
-        "    xctest_app = ':testApp',",
-        ")");
-    CommandAction compileAction = compileAction("//x:test", "test.o");
-
-    assertThat(Artifact.toExecPaths(compileAction.getInputs()))
-        .contains("x/fx.framework/1");
-    assertContainsSublist(compileAction.getArguments(), ImmutableList.of("-F", "x"));
-
-    CommandAction linkAction = linkAction("//x:test");
-    assertThat(Joiner.on(" ").join(linkAction.getArguments())).doesNotContain("-framework fx");
-  }
-
 }