diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build')
12 files changed, 59 insertions, 53 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 4ffbadf13c..99f8d118ce 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -1670,7 +1670,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { } protected String getErrorMsgMandatoryProviderMissing(String offendingRule, String providerName) { - return String.format("'%s' does not have mandatory provider '%s'", offendingRule, providerName); + return String.format("'%s' does not have mandatory providers: '%s'", + offendingRule, providerName); } /** diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java index 741f4dec9d..b5935056a8 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigSettingTest.java @@ -1070,7 +1070,7 @@ public class ConfigSettingTest extends BuildViewTestCase { public void forbidsNonConfigFeatureFlagRulesForFlagValues() throws Exception { checkError("test", "invalid_flag", "in flag_values attribute of config_setting rule //test:invalid_flag: " - + "'//test:genrule' does not have mandatory provider 'FeatureFlagInfo'", + + "'//test:genrule' does not have mandatory providers: 'FeatureFlagInfo'", "config_setting(", " name = 'invalid_flag',", " flag_values = {", diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java index 4c562df429..a7b9e1e7ab 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java @@ -51,7 +51,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { public void testJ2ObjCInformationExportedFromJ2ObjcLibrary() throws Exception { ConfiguredTarget j2objcLibraryTarget = getConfiguredTarget( "//java/com/google/dummy/test:transpile"); - ObjcProvider provider = j2objcLibraryTarget.getProvider(ObjcProvider.class); + ObjcProvider provider = j2objcLibraryTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.LIBRARY))).containsExactly( "third_party/java/j2objc/libjre_core_lib.a", "java/com/google/dummy/test/libtest_j2objc.a"); @@ -85,7 +85,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { " deps = ['test'])"); ConfiguredTarget target = getConfiguredTarget("//java/com/google/test:transpile"); - ObjcProvider provider = target.getProvider(ObjcProvider.class); + ObjcProvider provider = target.get(ObjcProvider.SKYLARK_CONSTRUCTOR); String genfilesFragment = target.getConfiguration().getGenfilesFragment().toString(); assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.LIBRARY))).containsExactly( "third_party/java/j2objc/libjre_core_lib.a", @@ -124,7 +124,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { ConfiguredTarget j2objcLibraryTarget = getConfiguredTarget( "//java/com/google/dummy/test/proto:transpile"); - ObjcProvider provider = j2objcLibraryTarget.getProvider(ObjcProvider.class); + ObjcProvider provider = j2objcLibraryTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.LIBRARY))).containsExactly( "third_party/java/j2objc/libjre_core_lib.a", "third_party/java/j2objc/libproto_runtime.a", @@ -220,7 +220,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { Artifact classMappingFile = getGenfilesArtifact("test.clsmap.properties", test); assertThat(provider.getClassMappingFiles()).containsExactly(classMappingFile); - ObjcProvider objcProvider = target.getProvider(ObjcProvider.class); + ObjcProvider objcProvider = target.get(ObjcProvider.SKYLARK_CONSTRUCTOR); Artifact headerFile = getGenfilesArtifact("test.j2objc.pb.h", test); Artifact sourceFile = getGenfilesArtifact("test.j2objc.pb.m", test); assertThat(objcProvider.get(ObjcProvider.HEADER)).contains(headerFile); @@ -285,7 +285,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { public void testExplicitJreDeps() throws Exception { ConfiguredTarget j2objcLibraryTarget = getConfiguredTarget( "//java/com/google/dummy/test:transpile"); - ObjcProvider provider = j2objcLibraryTarget.getProvider(ObjcProvider.class); + ObjcProvider provider = j2objcLibraryTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); // jre_io_lib and jre_emul_lib should be excluded. assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.LIBRARY))).containsExactly( "third_party/java/j2objc/libjre_core_lib.a", @@ -306,7 +306,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { ")"); ConfiguredTarget target = getJ2ObjCAspectConfiguredTarget("//java/com/google/transpile:dummy"); - ObjcProvider provider = target.getProvider(ObjcProvider.class); + ObjcProvider provider = target.get(ObjcProvider.SKYLARK_CONSTRUCTOR); Artifact srcJarSources = getFirstArtifactEndingWith( provider.get(ObjcProvider.SOURCE), "source_files"); Artifact srcJarHeaders = getFirstArtifactEndingWith( @@ -325,7 +325,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { addSimpleJ2ObjcLibraryWithJavaPlugin(); ConfiguredTarget j2objcLibraryTarget = getConfiguredTarget("//java/com/google/app/test:transpile"); - ObjcProvider provider = j2objcLibraryTarget.getProvider(ObjcProvider.class); + ObjcProvider provider = j2objcLibraryTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); Artifact headers = getFirstArtifactEndingWith(provider.get(ObjcProvider.HEADER), "header_files"); Artifact sources = @@ -500,7 +500,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { protected Artifact j2objcArchive(String j2objcLibraryTarget, String javaTargetName) throws Exception { ConfiguredTarget target = getConfiguredTarget(j2objcLibraryTarget); - ObjcProvider provider = target.getProvider(ObjcProvider.class); + ObjcProvider provider = target.get(ObjcProvider.SKYLARK_CONSTRUCTOR); String archiveName = String.format("lib%s_j2objc.a", javaTargetName); return getFirstArtifactEndingWith(provider.get(ObjcProvider.LIBRARY), archiveName); } @@ -518,7 +518,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { ConfiguredTarget objcTarget = getConfiguredTarget("//app:lib"); - ObjcProvider provider = objcTarget.getProvider(ObjcProvider.class); + ObjcProvider provider = objcTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.LIBRARY))) .containsExactly( "third_party/java/j2objc/libjre_core_lib.a", @@ -559,7 +559,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { ConfiguredTarget objcTarget = getConfiguredTarget("//app:lib"); - ObjcProvider provider = objcTarget.getProvider(ObjcProvider.class); + ObjcProvider provider = objcTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.LIBRARY))) .containsExactly( "third_party/java/j2objc/libjre_core_lib.a", @@ -659,7 +659,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { ConfiguredTarget target = getJ2ObjCAspectConfiguredTarget("//java/com/google/transpile:dummy"); - ObjcProvider provider = target.getProvider(ObjcProvider.class); + ObjcProvider provider = target.get(ObjcProvider.SKYLARK_CONSTRUCTOR); Artifact moduleMap = getFirstArtifactEndingWith( provider.get(ObjcProvider.MODULE_MAP), "dummy.modulemaps/module.modulemap"); @@ -696,7 +696,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { addSimpleJ2ObjcLibraryWithJavaPlugin(); ConfiguredTarget j2objcLibraryTarget = getConfiguredTarget("//java/com/google/app/test:transpile"); - ObjcProvider provider = j2objcLibraryTarget.getProvider(ObjcProvider.class); + ObjcProvider provider = j2objcLibraryTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); Artifact moduleMap = getFirstArtifactEndingWith( provider.get(ObjcProvider.MODULE_MAP), "test.modulemaps/module.modulemap"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/IosApplicationTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/IosApplicationTest.java index 2f718f3116..01e54dddb0 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/IosApplicationTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/IosApplicationTest.java @@ -116,7 +116,8 @@ public class IosApplicationTest extends ObjcRuleTestCase { ")"); RuleContext ruleContext = getRuleContext(getConfiguredTarget("//x:x")); ImmutableListMultimap<BuildConfiguration, ObjcProvider> prereqByConfig = - ruleContext.getPrerequisitesByConfiguration("binary", Mode.SPLIT, ObjcProvider.class); + ruleContext.getPrerequisitesByConfiguration( + "binary", Mode.SPLIT, ObjcProvider.SKYLARK_CONSTRUCTOR); List<String> childCpus = Lists.transform(prereqByConfig.keySet().asList(), new Function<BuildConfiguration, String>() { @Override 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 8427e72fd8..f33a9e6636 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 @@ -1092,7 +1092,7 @@ public class IosTestTest extends ObjcRuleTestCase { ObjcProvider appProvider = getConfiguredTarget("//test:protos_app") - .getProvider(XcTestAppProvider.class) + .get(XcTestAppProvider.SKYLARK_CONSTRUCTOR) .getObjcProvider(); ConfiguredTarget binTarget = getConfiguredTarget("//test:protos_bin"); Artifact protoHeader = diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java index 40fa3569a7..abbae40ccf 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcLibraryTest.java @@ -108,7 +108,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest { .addAll(FASTBUILD_COPTS) .addAll( iquoteArgs( - getConfiguredTarget("//objc:lib").getProvider(ObjcProvider.class), + getConfiguredTarget("//objc:lib").get(ObjcProvider.SKYLARK_CONSTRUCTOR), getTargetConfiguration())) .build(); @@ -170,7 +170,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest { .addAll(FASTBUILD_COPTS) .addAll( iquoteArgs( - getConfiguredTarget("//objc:lib").getProvider(ObjcProvider.class), + getConfiguredTarget("//objc:lib").get(ObjcProvider.SKYLARK_CONSTRUCTOR), getTargetConfiguration())) .build(); @@ -249,7 +249,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest { .addAll(FASTBUILD_COPTS) .addAll( iquoteArgs( - getConfiguredTarget("//objc:lib").getProvider(ObjcProvider.class), + getConfiguredTarget("//objc:lib").get(ObjcProvider.SKYLARK_CONSTRUCTOR), getAppleCrosstoolConfiguration())) .add("-include", "objc/some.pch") .add("-fobjc-arc") @@ -295,7 +295,7 @@ public class LegacyObjcLibraryTest extends ObjcLibraryTest { .addAll(FASTBUILD_COPTS) .addAll( iquoteArgs( - getConfiguredTarget("//objc:lib").getProvider(ObjcProvider.class), + getConfiguredTarget("//objc:lib").get(ObjcProvider.SKYLARK_CONSTRUCTOR), getTargetConfiguration())) .add("-fobjc-arc") .add("-Ifoo") diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java index dc45294c3e..a7258a4f53 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java @@ -79,7 +79,7 @@ public class LegacyObjcProtoLibraryTest extends ObjcProtoLibraryTest { .addAll(FASTBUILD_COPTS) .addAll( LegacyObjcLibraryTest.iquoteArgs( - target.getProvider(ObjcProvider.class), getTargetConfiguration())) + target.get(ObjcProvider.SKYLARK_CONSTRUCTOR), getTargetConfiguration())) .add("-I") .add(sourceFile.getExecPath().getParentDirectory().getParentDirectory().toString()) .add("-fno-objc-arc") 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 5b7155528c..9e2d0c07d0 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 @@ -51,6 +51,7 @@ import com.google.devtools.build.lib.rules.apple.AppleToolchain; import com.google.devtools.build.lib.rules.cpp.CppCompileAction; import com.google.devtools.build.lib.rules.cpp.CppModuleMapAction; import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode; +import com.google.devtools.build.lib.rules.objc.ObjcProvider.Key; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.common.options.OptionsParsingException; import java.util.Collections; @@ -331,9 +332,9 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { .setAndCreateFiles("hdrs", "d.h", "e.m") .setList("deps", "//objc:lib") .write(); - assertThat(Artifact.toRootRelativePaths(target.getProvider(ObjcProvider.class).get(HEADER))) + assertThat(getArifactPaths(target, HEADER)) .containsExactly("objc/a.h", "objc/b.h", "objc/f.m"); - assertThat(Artifact.toRootRelativePaths(depender.getProvider(ObjcProvider.class).get(HEADER))) + assertThat(getArifactPaths(depender, HEADER)) .containsExactly("objc/a.h", "objc/b.h", "objc/f.m", "objc2/d.h", "objc2/e.m"); } @@ -356,11 +357,9 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { .setList("non_propagated_deps", "//objc2:lib") .write(); - assertThat(Artifact.toRootRelativePaths(target.getProvider(ObjcProvider.class).get(HEADER))) + assertThat(getArifactPaths(target, HEADER)) .containsExactly("objc/a.h", "objc/b.h"); - assertThat( - Artifact.toRootRelativePaths( - transitiveDepender.getProvider(ObjcProvider.class).get(HEADER))) + assertThat(getArifactPaths(transitiveDepender, HEADER)) .containsExactly("objc2/c.h", "objc2/d.h", "objc3/e.h", "objc3/f.h"); } @@ -1026,16 +1025,20 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { .setAndCreateFiles("hdrs", "c.h", "d.h") .setList("deps", "//objc:lib") .write(); - assertThat(Artifact.toRootRelativePaths(target.getProvider(ObjcProvider.class).get(LIBRARY))) - .containsExactly("objc/liblib.a"); - assertThat(Artifact.toRootRelativePaths(depender.getProvider(ObjcProvider.class).get(LIBRARY))) - .containsExactly("objc/liblib.a", "objc2/liblib.a"); - assertThat(Artifact.toRootRelativePaths(target.getProvider(ObjcProvider.class).get(HEADER))) + assertThat(getArifactPaths(target, LIBRARY)).containsExactly("objc/liblib.a"); + assertThat(getArifactPaths(depender, LIBRARY)).containsExactly( + "objc/liblib.a", "objc2/liblib.a"); + assertThat(getArifactPaths(target, HEADER)) .containsExactly("objc/a.h", "objc/b.h"); - assertThat(Artifact.toRootRelativePaths(depender.getProvider(ObjcProvider.class).get(HEADER))) + assertThat(getArifactPaths(depender, HEADER)) .containsExactly("objc/a.h", "objc/b.h", "objc2/c.h", "objc2/d.h"); } + private Iterable<String> getArifactPaths(ConfiguredTarget target, Key<Artifact> artifactKey) { + return Artifact.toRootRelativePaths( + target.get(ObjcProvider.SKYLARK_CONSTRUCTOR).get(artifactKey)); + } + @Test public void testWeakSdkFrameworks_objcProvider() throws Exception { createLibraryTargetWriter("//base_lib:lib") 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 9ae12ffe0f..8116e34c9b 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 @@ -1072,7 +1072,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { } protected ObjcProvider providerForTarget(String label) throws Exception { - return getConfiguredTarget(label).getProvider(ObjcProvider.class); + return getConfiguredTarget(label).get(ObjcProvider.SKYLARK_CONSTRUCTOR); } protected CommandAction archiveAction(String label) throws Exception { @@ -1171,7 +1171,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { "includes", "['incdir']"); ObjcProvider provider = getConfiguredTarget("//x:x", getAppleCrosstoolConfiguration()) - .getProvider(ObjcProvider.class); + .get(ObjcProvider.SKYLARK_CONSTRUCTOR); assertThat(provider.get(HEADER)).containsExactly(getSourceArtifact("x/a.h")); assertThat(provider.get(INCLUDE)) .containsExactly( 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 2cfdbad0a5..11d36332da 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 @@ -209,7 +209,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { ")"); ConfiguredTarget binaryTarget = getConfiguredTarget("//examples/apple_skylark:bin"); - ObjcProvider objcProvider = binaryTarget.getProvider(ObjcProvider.class); + ObjcProvider objcProvider = binaryTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); assertThat(Artifact.toRootRelativePaths(objcProvider.get(ObjcProvider.LIBRARY))) .contains("examples/apple_skylark/liblib.a"); @@ -246,7 +246,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { ")"); ConfiguredTarget binaryTarget = getConfiguredTarget("//examples/apple_skylark:bin"); - ObjcProvider objcProvider = binaryTarget.getProvider(ObjcProvider.class); + ObjcProvider objcProvider = binaryTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); assertThat(objcProvider.get(ObjcProvider.DEFINE)).contains("mock_define"); } @@ -689,11 +689,11 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { " return struct(objc=created_provider)"); Iterable<String> foundLinkopts = - skylarkTarget.getProvider(ObjcProvider.class).get(ObjcProvider.LINKOPT); + skylarkTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR).get(ObjcProvider.LINKOPT); Iterable<String> foundDefines = - skylarkTarget.getProvider(ObjcProvider.class).get(ObjcProvider.DEFINE); + skylarkTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR).get(ObjcProvider.DEFINE); boolean usesSwift = - skylarkTarget.getProvider(ObjcProvider.class).is(ObjcProvider.Flag.USES_SWIFT); + skylarkTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR).is(ObjcProvider.Flag.USES_SWIFT); assertThat(foundLinkopts).containsExactly("somelinkopt"); assertThat(foundDefines).containsExactly("define1", "define2"); @@ -712,7 +712,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { " return struct(objc=created_provider)"); Iterable<Artifact> foundLinkInputs = - skylarkTarget.getProvider(ObjcProvider.class).get(ObjcProvider.LINK_INPUTS); + skylarkTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR).get(ObjcProvider.LINK_INPUTS); assertThat(ActionsTestUtil.baseArtifactNames(foundLinkInputs)).contains("foo.ast"); } @@ -724,7 +724,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { " return struct(objc=created_provider)"); boolean usesSwift = - skylarkTarget.getProvider(ObjcProvider.class).is(ObjcProvider.Flag.USES_SWIFT); + skylarkTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR).is(ObjcProvider.Flag.USES_SWIFT); assertThat(usesSwift).isTrue(); } @@ -739,7 +739,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { " return struct(objc=created_provider)"); Iterable<PathFragment> foundIncludes = - skylarkTarget.getProvider(ObjcProvider.class).get(ObjcProvider.INCLUDE); + skylarkTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR).get(ObjcProvider.INCLUDE); assertThat(foundIncludes) .containsExactly( @@ -760,7 +760,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { "(include=propagated_includes, direct_dep_providers=[strict_provider])", " return struct(objc=created_provider)"); - ObjcProvider skylarkProvider = skylarkTarget.getProvider(ObjcProvider.class); + ObjcProvider skylarkProvider = skylarkTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR); ObjcProvider skylarkProviderDirectDepender = new ObjcProvider.Builder().addTransitiveAndPropagate(skylarkProvider).build(); ObjcProvider skylarkProviderIndirectDepender = @@ -785,7 +785,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { " return struct(objc=created_provider)"); Iterable<String> foundStrings = - skylarkTarget.getProvider(ObjcProvider.class).get(ObjcProvider.DEFINE); + skylarkTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR).get(ObjcProvider.DEFINE); assertThat(foundStrings).containsExactly("define_from_dep", "define_from_impl"); } @@ -1130,7 +1130,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { ConfiguredTarget skylarkTarget = getConfiguredTarget("//examples/apple_skylark:my_target"); - XcTestAppProvider xcTestAppProvider = skylarkTarget.getProvider(XcTestAppProvider.class); + XcTestAppProvider xcTestAppProvider = skylarkTarget.get(XcTestAppProvider.SKYLARK_CONSTRUCTOR); assertThat(xcTestAppProvider.getBundleLoader().getRootRelativePathString()) .isEqualTo("examples/rule/test_artifact"); @@ -1243,7 +1243,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { ")"); ConfiguredTarget skylarkTarget = getConfiguredTarget("//examples/apple_skylark:my_target"); - assertThat(skylarkTarget.getProvider(ObjcProvider.class)).isNotNull(); + assertThat(skylarkTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR)).isNotNull(); } private void checkSkylarkRunMemleaksWithExpectedValue(boolean expectedValue) throws Exception { diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java index 6e4a576671..08b9ccdf39 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java @@ -682,7 +682,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { "test", "b", "in dependencies attribute of main_rule rule //test:b: " - + "'//test:a' does not have mandatory provider 'some_provider'", + + "'//test:a' does not have mandatory providers: 'some_provider'", "load('/test/skylark/extension', 'dependent_rule')", "load('/test/skylark/extension', 'main_rule')", "", diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index 0431e99845..e8d3d5b5cd 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java @@ -150,7 +150,8 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { // about the macro. assertContainsEvent( "ERROR /workspace/test/BUILD:4:1: in deps attribute of skylark_rule rule " - + "//test:m_skylark: '//test:jlib' does not have mandatory provider 'some_provider'. " + + "//test:m_skylark: '//test:jlib' does not have mandatory providers:" + + " 'some_provider'. " + "Since this rule was created by the macro 'macro_skylark_rule', the error might " + "have been caused by the macro implementation in /workspace/test/macros.bzl:12:36"); } @@ -184,7 +185,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { // Skylark rule WITHOUT macro -> location points to the attribute and there is no mention of // 'macro' at all. assertContainsEvent("ERROR /workspace/test/BUILD:11:10: in deps attribute of " - + "skylark_rule rule //test:skyrule: '//test:jlib' does not have mandatory provider " + + "skylark_rule rule //test:skyrule: '//test:jlib' does not have mandatory providers: " + "'some_provider'"); } } @@ -228,7 +229,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { } catch (Exception ex) { assertContainsEvent("ERROR /workspace/test/BUILD:9:10: in deps attribute of " + "skylark_rule rule //test:skyrule2: '//test:my_other_lib' does not have " - + "mandatory provider 'a' or 'c'"); + + "mandatory providers: 'a' or 'c'"); } } @@ -262,7 +263,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { } catch (Exception ex) { assertContainsEvent("ERROR /workspace/test/BUILD:9:10: in deps attribute of " + "testing_rule_for_mandatory_providers rule //test:skyrule2: '//test:my_other_lib' " - + "does not have mandatory provider 'a' or 'c'"); + + "does not have mandatory providers: 'a' or 'c'"); } } @@ -1097,7 +1098,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { invalidatePackages(); getConfiguredTarget("//:r"); assertContainsEvent("in label_dict attribute of my_rule rule //:r: " - + "'//:dep' does not have mandatory provider 'my_provider'"); + + "'//:dep' does not have mandatory providers: 'my_provider'"); } @Test |