diff options
author | cparsons <cparsons@google.com> | 2018-01-17 08:53:48 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-17 08:55:38 -0800 |
commit | 8134b9fc140c810d00a91ca9a0313a1e4322ee00 (patch) | |
tree | a6aa39f0bd26ff1420e7b29335cf70121ec74538 /src/test/java/com/google/devtools/build/lib/rules/objc | |
parent | ed90b554d05db038ff0eab5463af9ab51c2c72a7 (diff) |
Migrate Apple providers to abide by Native Declared Provider best practices.
This has the effect of documenting exposed struct fields on these providers.
RELNOTES: None.
PiperOrigin-RevId: 182221042
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc')
4 files changed, 15 insertions, 15 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java index 01cc1e9b4a..b940580870 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java @@ -1397,8 +1397,8 @@ public class AppleBinaryTest extends ObjcRuleTestCase { " srcs = ['a.m'],", ")"); ConfiguredTarget binTarget = getConfiguredTarget("//bin:bin"); - AppleExecutableBinaryProvider executableBinaryProvider = - binTarget.get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR); + AppleExecutableBinaryInfo executableBinaryProvider = + binTarget.get(AppleExecutableBinaryInfo.SKYLARK_CONSTRUCTOR); assertThat(executableBinaryProvider).isNotNull(); CommandAction testLinkAction = linkAction("//test:test"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java index 389e34a96d..0086a3f89d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java @@ -122,7 +122,7 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase { ")"); ObjcProvider provider = getConfiguredTarget("//package:test") - .get(AppleStaticLibraryProvider.SKYLARK_CONSTRUCTOR).getDepsObjcProvider(); + .get(AppleStaticLibraryInfo.SKYLARK_CONSTRUCTOR).getDepsObjcProvider(); // Do not remove SDK_FRAMEWORK values in avoid_deps. assertThat(provider.get(ObjcProvider.SDK_FRAMEWORK)) .containsAllOf(new SdkFramework("AvoidSDK"), new SdkFramework("BaseSDK")); @@ -485,8 +485,8 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase { public void testAppleStaticLibraryProvider() throws Exception { RULE_TYPE.scratchTarget(scratch, "platform_type", "'ios'"); ConfiguredTarget binTarget = getConfiguredTarget("//x:x"); - AppleStaticLibraryProvider provider = - binTarget.get(AppleStaticLibraryProvider.SKYLARK_CONSTRUCTOR); + AppleStaticLibraryInfo provider = + binTarget.get(AppleStaticLibraryInfo.SKYLARK_CONSTRUCTOR); assertThat(provider).isNotNull(); assertThat(provider.getMultiArchArchive()).isNotNull(); assertThat(provider.getDepsObjcProvider()).isNotNull(); diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index 0baa442cf7..e3573a46fa 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java @@ -1046,18 +1046,18 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { if (objcProvider != null) { return objcProvider; } - AppleExecutableBinaryProvider executableProvider = - getConfiguredTarget(label).get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR); + AppleExecutableBinaryInfo executableProvider = + getConfiguredTarget(label).get(AppleExecutableBinaryInfo.SKYLARK_CONSTRUCTOR); if (executableProvider != null) { return executableProvider.getDepsObjcProvider(); } - AppleDylibBinaryProvider dylibProvider = - getConfiguredTarget(label).get(AppleDylibBinaryProvider.SKYLARK_CONSTRUCTOR); + AppleDylibBinaryInfo dylibProvider = + getConfiguredTarget(label).get(AppleDylibBinaryInfo.SKYLARK_CONSTRUCTOR); if (dylibProvider != null) { return dylibProvider.getDepsObjcProvider(); } - AppleLoadableBundleBinaryProvider loadableBundleProvider = - getConfiguredTarget(label).get(AppleLoadableBundleBinaryProvider.SKYLARK_CONSTRUCTOR); + AppleLoadableBundleBinaryInfo loadableBundleProvider = + getConfiguredTarget(label).get(AppleLoadableBundleBinaryInfo.SKYLARK_CONSTRUCTOR); if (loadableBundleProvider != null) { return loadableBundleProvider.getDepsObjcProvider(); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java index 257c2217f6..aa8e02356c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java @@ -204,8 +204,8 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { ")"); ConfiguredTarget binaryTarget = getConfiguredTarget("//examples/apple_skylark:bin"); - AppleExecutableBinaryProvider executableProvider = - binaryTarget.get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR); + AppleExecutableBinaryInfo executableProvider = + binaryTarget.get(AppleExecutableBinaryInfo.SKYLARK_CONSTRUCTOR); ObjcProvider objcProvider = executableProvider.getDepsObjcProvider(); assertThat(Artifact.toRootRelativePaths(objcProvider.get(ObjcProvider.LIBRARY))) @@ -244,8 +244,8 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { ")"); ConfiguredTarget binaryTarget = getConfiguredTarget("//examples/apple_skylark:bin"); - AppleExecutableBinaryProvider executableProvider = - binaryTarget.get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR); + AppleExecutableBinaryInfo executableProvider = + binaryTarget.get(AppleExecutableBinaryInfo.SKYLARK_CONSTRUCTOR); ObjcProvider objcProvider = executableProvider.getDepsObjcProvider(); assertThat(objcProvider.get(ObjcProvider.DEFINE)).contains("mock_define"); |