diff options
author | 2017-07-07 11:19:45 -0400 | |
---|---|---|
committer | 2017-07-07 13:37:48 -0400 | |
commit | 51f76dbb931b025c6066af91e8c53a9715014b8a (patch) | |
tree | fffe127f1dfc1d9bca4663ae95bae7421af0f0b1 /src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java | |
parent | 38f74a23738f8f1e0e0e3bc49d41a479f311dbe9 (diff) |
Platform -> ApplePlatform, to avoid ambiguity with the newly introduced
Platform rule.
PiperOrigin-RevId: 161203491
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java index 40a2c83edc..9840d460a6 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java @@ -46,8 +46,8 @@ import com.google.devtools.build.lib.analysis.config.CompilationMode; import com.google.devtools.build.lib.analysis.util.ScratchAttributeWriter; import com.google.devtools.build.lib.packages.NoSuchTargetException; import com.google.devtools.build.lib.packages.util.MockObjcSupport; +import com.google.devtools.build.lib.rules.apple.ApplePlatform; import com.google.devtools.build.lib.rules.apple.AppleToolchain; -import com.google.devtools.build.lib.rules.apple.Platform; import com.google.devtools.build.lib.rules.cpp.CppCompileAction; import com.google.devtools.build.lib.rules.cpp.CppModuleMapAction; import com.google.devtools.build.lib.vfs.PathFragment; @@ -412,8 +412,10 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { .containsAllOf("-isysroot", AppleToolchain.sdkDir()).inOrder(); assertThat(Collections.frequency(compileActionA.getArguments(), "-F" + AppleToolchain.sdkDir() + "/Developer/Library/Frameworks")).isEqualTo(1); - assertThat(Collections.frequency(compileActionA.getArguments(), - "-F" + frameworkDir(Platform.IOS_SIMULATOR))).isEqualTo(1); + assertThat( + Collections.frequency( + compileActionA.getArguments(), "-F" + frameworkDir(ApplePlatform.IOS_SIMULATOR))) + .isEqualTo(1); assertThat(compileActionA.getArguments()) .containsAllIn(AppleToolchain.DEFAULT_WARNINGS.values()); assertThat(compileActionA.getArguments()) @@ -463,8 +465,10 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { .containsAllOf("-isysroot", AppleToolchain.sdkDir()).inOrder(); assertThat(Collections.frequency(compileActionA.getArguments(), "-F" + AppleToolchain.sdkDir() + "/Developer/Library/Frameworks")).isEqualTo(1); - assertThat(Collections.frequency(compileActionA.getArguments(), - "-F" + frameworkDir(Platform.IOS_DEVICE))).isEqualTo(1); + assertThat( + Collections.frequency( + compileActionA.getArguments(), "-F" + frameworkDir(ApplePlatform.IOS_DEVICE))) + .isEqualTo(1); assertThat(compileActionA.getArguments()) .containsAllIn(AppleToolchain.DEFAULT_WARNINGS.values()); assertThat(compileActionA.getArguments()) |