diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
18 files changed, 171 insertions, 105 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java index e7cd803874..82b9455473 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.rules.android; import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.actions.Artifact; @@ -575,6 +576,8 @@ public class AarImportTest extends BuildViewTestCase { @Test public void testTransitiveExports() throws Exception { assertThat(getConfiguredTarget("//a:bar").get(JavaInfo.PROVIDER).getTransitiveExports()) - .containsExactly(Label.parseAbsolute("//a:foo"), Label.parseAbsolute("//java:baz")); + .containsExactly( + Label.parseAbsolute("//a:foo", ImmutableMap.of()), + Label.parseAbsolute("//java:baz", ImmutableMap.of())); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java index 4f44f850d1..9e6f5f865b 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java @@ -22,6 +22,7 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.truth.Truth; @@ -478,9 +479,11 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { ConfiguredTarget target = getConfiguredTarget("//java/com/google/exports:dummy"); List<Label> exports = ImmutableList.copyOf( target.getProvider(JavaExportsProvider.class).getTransitiveExports()); - assertThat(exports).containsExactly(Label.parseAbsolute("//java/com/google/exports:dummy2"), - Label.parseAbsolute("//java/com/google/exports:dummy3"), - Label.parseAbsolute("//java/com/google/exports:dummy4")); + assertThat(exports) + .containsExactly( + Label.parseAbsolute("//java/com/google/exports:dummy2", ImmutableMap.of()), + Label.parseAbsolute("//java/com/google/exports:dummy3", ImmutableMap.of()), + Label.parseAbsolute("//java/com/google/exports:dummy4", ImmutableMap.of())); assertNoEvents(); } @@ -943,22 +946,22 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { Iterables.transform( foo.get(AndroidResourcesInfo.PROVIDER).getTransitiveAndroidResources(), getLabel)) .containsExactly( - Label.parseAbsolute("//java/apps/android:lib"), - Label.parseAbsolute("//java/apps/android:bar")); + Label.parseAbsolute("//java/apps/android:lib", ImmutableMap.of()), + Label.parseAbsolute("//java/apps/android:bar", ImmutableMap.of())); assertThat( Iterables.transform( foo.get(AndroidResourcesInfo.PROVIDER).getDirectAndroidResources(), getLabel)) - .containsExactly(Label.parseAbsolute("//java/apps/android:foo")); + .containsExactly(Label.parseAbsolute("//java/apps/android:foo", ImmutableMap.of())); ConfiguredTarget lib = getConfiguredTarget("//java/apps/android:lib"); assertThat( Iterables.transform( lib.get(AndroidResourcesInfo.PROVIDER).getTransitiveAndroidResources(), getLabel)) - .containsExactly(Label.parseAbsolute("//java/apps/android:bar")); + .containsExactly(Label.parseAbsolute("//java/apps/android:bar", ImmutableMap.of())); assertThat( Iterables.transform( lib.get(AndroidResourcesInfo.PROVIDER).getDirectAndroidResources(), getLabel)) - .containsExactly(Label.parseAbsolute("//java/apps/android:lib")); + .containsExactly(Label.parseAbsolute("//java/apps/android:lib", ImmutableMap.of())); ConfiguredTarget libNeverlink = getConfiguredTarget("//java/apps/android:lib_neverlink"); assertThat(libNeverlink.get(AndroidResourcesInfo.PROVIDER).getTransitiveAndroidResources()) diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidMultidexBaseTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidMultidexBaseTest.java index 85a842f99b..ef53ebd340 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidMultidexBaseTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidMultidexBaseTest.java @@ -17,6 +17,7 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.getFirstArtifactEndingWith; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.actions.SpawnAction; @@ -65,7 +66,7 @@ public class AndroidMultidexBaseTest extends BuildViewTestCase { // Only created in legacy mode: Artifact strippedJar = getFirstArtifactEndingWith(artifacts, "main_dex_intermediate.jar"); Artifact mainDexList = getFirstArtifactEndingWith(artifacts, "main_dex_list.txt"); - String ruleName = Label.parseAbsolute(ruleLabel).getName(); + String ruleName = Label.parseAbsolute(ruleLabel, ImmutableMap.of()).getName(); Artifact mainDexProguardSpec = getFirstArtifactEndingWith( artifacts, "main_dex_" + ruleName + "_proguard.cfg"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagOptionsTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagOptionsTest.java index 2bc8b30f33..a744b6e38d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagOptionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagOptionsTest.java @@ -256,71 +256,88 @@ public final class ConfigFeatureFlagOptionsTest { // Empty with all flags trimmed getOptionsAndTrim(ImmutableMap.of(), ImmutableSet.of()), getOptionsAndTrim( - ImmutableMap.of(Label.parseAbsolute("//a:a"), "a"), ImmutableSet.of()), + ImmutableMap.of(Label.parseAbsolute("//a:a", ImmutableMap.of()), "a"), + ImmutableSet.of()), getOptionsAndTrim( ImmutableMap.of( - Label.parseAbsolute("//a:a"), "a", Label.parseAbsolute("//b:b"), "b"), + Label.parseAbsolute("//a:a", ImmutableMap.of()), + "a", + Label.parseAbsolute("//b:b", ImmutableMap.of()), + "b"), ImmutableSet.of())) .addEqualityGroup( // Only //a:a => a, others default - getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//a:a"), "a")), - getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//a:a"), "a"))) + getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//a:a", ImmutableMap.of()), "a")), + getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//a:a", ImmutableMap.of()), "a"))) .addEqualityGroup( // Error: //a:a is absent - getOptionsAndTrim(ImmutableMap.of(), ImmutableSet.of(Label.parseAbsolute("//a:a"))), getOptionsAndTrim( - ImmutableMap.of(Label.parseAbsolute("//b:b"), "b"), - ImmutableSet.of(Label.parseAbsolute("//a:a")))) + ImmutableMap.of(), + ImmutableSet.of(Label.parseAbsolute("//a:a", ImmutableMap.of()))), + getOptionsAndTrim( + ImmutableMap.of(Label.parseAbsolute("//b:b", ImmutableMap.of()), "b"), + ImmutableSet.of(Label.parseAbsolute("//a:a", ImmutableMap.of())))) .addEqualityGroup( // Only //a:a => a, others trimmed getOptionsAndTrim( - ImmutableMap.of(Label.parseAbsolute("//a:a"), "a"), - ImmutableSet.of(Label.parseAbsolute("//a:a"))), + ImmutableMap.of(Label.parseAbsolute("//a:a", ImmutableMap.of()), "a"), + ImmutableSet.of(Label.parseAbsolute("//a:a", ImmutableMap.of()))), getOptionsAndTrim( ImmutableMap.of( - Label.parseAbsolute("//a:a"), "a", Label.parseAbsolute("//b:b"), "b"), - ImmutableSet.of(Label.parseAbsolute("//a:a")))) + Label.parseAbsolute("//a:a", ImmutableMap.of()), + "a", + Label.parseAbsolute("//b:b", ImmutableMap.of()), + "b"), + ImmutableSet.of(Label.parseAbsolute("//a:a", ImmutableMap.of())))) .addEqualityGroup( // Only //b:b => a, others default - getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//b:b"), "a"))) + getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//b:b", ImmutableMap.of()), "a"))) .addEqualityGroup( // Only //a:a => b, others default - getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//a:a"), "b"))) + getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//a:a", ImmutableMap.of()), "b"))) .addEqualityGroup( // Only //b:b => b, others default - getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//b:b"), "b"))) + getOptionsWith(ImmutableMap.of(Label.parseAbsolute("//b:b", ImmutableMap.of()), "b"))) .addEqualityGroup( // //a:a => b and //b:b => a, others default (order doesn't matter) getOptionsWith( ImmutableMap.of( - Label.parseAbsolute("//a:a"), "b", - Label.parseAbsolute("//b:b"), "a")), + Label.parseAbsolute("//a:a", ImmutableMap.of()), "b", + Label.parseAbsolute("//b:b", ImmutableMap.of()), "a")), getOptionsWith( ImmutableMap.of( - Label.parseAbsolute("//b:b"), "a", - Label.parseAbsolute("//a:a"), "b"))) + Label.parseAbsolute("//b:b", ImmutableMap.of()), "a", + Label.parseAbsolute("//a:a", ImmutableMap.of()), "b"))) .addEqualityGroup( // //a:a => b and //b:b => a, others trimmed (order doesn't matter) getOptionsAndTrim( ImmutableMap.of( - Label.parseAbsolute("//a:a"), "b", - Label.parseAbsolute("//b:b"), "a"), - ImmutableSet.of(Label.parseAbsolute("//a:a"), Label.parseAbsolute("//b:b"))), + Label.parseAbsolute("//a:a", ImmutableMap.of()), "b", + Label.parseAbsolute("//b:b", ImmutableMap.of()), "a"), + ImmutableSet.of( + Label.parseAbsolute("//a:a", ImmutableMap.of()), + Label.parseAbsolute("//b:b", ImmutableMap.of()))), getOptionsAndTrim( ImmutableMap.of( - Label.parseAbsolute("//a:a"), "b", - Label.parseAbsolute("//b:b"), "a"), - ImmutableSet.of(Label.parseAbsolute("//b:b"), Label.parseAbsolute("//a:a"))), + Label.parseAbsolute("//a:a", ImmutableMap.of()), "b", + Label.parseAbsolute("//b:b", ImmutableMap.of()), "a"), + ImmutableSet.of( + Label.parseAbsolute("//b:b", ImmutableMap.of()), + Label.parseAbsolute("//a:a", ImmutableMap.of()))), getOptionsAndTrim( ImmutableMap.of( - Label.parseAbsolute("//b:b"), "a", - Label.parseAbsolute("//a:a"), "b"), - ImmutableSet.of(Label.parseAbsolute("//a:a"), Label.parseAbsolute("//b:b"))), + Label.parseAbsolute("//b:b", ImmutableMap.of()), "a", + Label.parseAbsolute("//a:a", ImmutableMap.of()), "b"), + ImmutableSet.of( + Label.parseAbsolute("//a:a", ImmutableMap.of()), + Label.parseAbsolute("//b:b", ImmutableMap.of()))), getOptionsAndTrim( ImmutableMap.of( - Label.parseAbsolute("//b:b"), "a", - Label.parseAbsolute("//a:a"), "b"), - ImmutableSet.of(Label.parseAbsolute("//b:b"), Label.parseAbsolute("//a:a")))) + Label.parseAbsolute("//b:b", ImmutableMap.of()), "a", + Label.parseAbsolute("//a:a", ImmutableMap.of()), "b"), + ImmutableSet.of( + Label.parseAbsolute("//b:b", ImmutableMap.of()), + Label.parseAbsolute("//a:a", ImmutableMap.of())))) .testEquals(); } @@ -341,7 +358,7 @@ public final class ConfigFeatureFlagOptionsTest { public void parser_doesNotAllowFlagValuesToBeParsed() throws Exception { ConfigFeatureFlagOptions options = Options.getDefaults(ConfigFeatureFlagOptions.class); ImmutableSortedMap<Label, String> testValue = - ImmutableSortedMap.of(Label.parseAbsolute("//what:heck"), "something"); + ImmutableSortedMap.of(Label.parseAbsolute("//what:heck", ImmutableMap.of()), "something"); options.flagValues = testValue; String flagValuesOption = options @@ -363,7 +380,8 @@ public final class ConfigFeatureFlagOptionsTest { @Test public void parser_doesNotAllowKnownDefaultValuesToBeParsed() throws Exception { ConfigFeatureFlagOptions options = Options.getDefaults(ConfigFeatureFlagOptions.class); - ImmutableSortedSet<Label> testValue = ImmutableSortedSet.of(Label.parseAbsolute("//what:heck")); + ImmutableSortedSet<Label> testValue = + ImmutableSortedSet.of(Label.parseAbsolute("//what:heck", ImmutableMap.of())); options.knownDefaultFlags = testValue; String defaultValuesOption = options @@ -385,7 +403,8 @@ public final class ConfigFeatureFlagOptionsTest { @Test public void parser_doesNotAllowUnknownValuesToBeParsed() throws Exception { ConfigFeatureFlagOptions options = Options.getDefaults(ConfigFeatureFlagOptions.class); - ImmutableSortedSet<Label> testValue = ImmutableSortedSet.of(Label.parseAbsolute("//what:heck")); + ImmutableSortedSet<Label> testValue = + ImmutableSortedSet.of(Label.parseAbsolute("//what:heck", ImmutableMap.of())); options.unknownFlags = testValue; String unknownFlagsOption = options diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactoryTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactoryTest.java index 1899d32dbb..362b898a8d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTransitionFactoryTest.java @@ -120,7 +120,8 @@ public final class ConfigFeatureFlagTransitionFactoryTest extends BuildViewTestC Rule rule = scratchRule("a", "empty", "feature_flag_setter(name = 'empty', flag_values = {})"); PatchTransition transition = new ConfigFeatureFlagTransitionFactory("flag_values").buildTransitionFor(rule); - Map<Label, String> originalFlagMap = ImmutableMap.of(Label.parseAbsolute("//a:flag"), "value"); + Map<Label, String> originalFlagMap = + ImmutableMap.of(Label.parseAbsolute("//a:flag", ImmutableMap.of()), "value"); BuildOptions original = getOptionsWithFlagFragment(originalFlagMap); BuildOptions converted = transition.patch(original); @@ -147,8 +148,10 @@ public final class ConfigFeatureFlagTransitionFactoryTest extends BuildViewTestC " default_value = 'a')"); PatchTransition transition = new ConfigFeatureFlagTransitionFactory("flag_values").buildTransitionFor(rule); - Map<Label, String> originalFlagMap = ImmutableMap.of(Label.parseAbsolute("//a:old"), "value"); - Map<Label, String> expectedFlagMap = ImmutableMap.of(Label.parseAbsolute("//a:flag"), "a"); + Map<Label, String> originalFlagMap = + ImmutableMap.of(Label.parseAbsolute("//a:old", ImmutableMap.of()), "value"); + Map<Label, String> expectedFlagMap = + ImmutableMap.of(Label.parseAbsolute("//a:flag", ImmutableMap.of()), "a"); BuildOptions original = getOptionsWithFlagFragment(originalFlagMap); BuildOptions converted = transition.patch(original); 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 46042fdce3..00737cb31b 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 @@ -177,7 +177,7 @@ public class ConfigSettingTest extends BuildViewTestCase { public void labelGetter() throws Exception { writeSimpleExample(); assertThat(getConfigMatchingProvider("//pkg:foo").label()) - .isEqualTo(Label.parseAbsolute("//pkg:foo")); + .isEqualTo(Label.parseAbsolute("//pkg:foo", ImmutableMap.of())); } /** diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagManualTrimmingTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagManualTrimmingTest.java index a89c44e5dd..d03118c5e1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagManualTrimmingTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/FeatureFlagManualTrimmingTest.java @@ -18,6 +18,7 @@ import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap; import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Splitter; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; @@ -184,7 +185,7 @@ public final class FeatureFlagManualTrimmingTest extends SkylarkTestCase { Artifact targetFlags = Iterables.getOnlyElement(getFilesToBuild(getConfiguredTarget("//test:target")).toList()); - Label usedFlag = Label.parseAbsolute("//test:used_flag"); + Label usedFlag = Label.parseAbsolute("//test:used_flag", ImmutableMap.of()); assertThat(getFlagValuesFromOutputFile(targetFlags)).containsEntry(usedFlag, "configured"); } @@ -269,7 +270,7 @@ public final class FeatureFlagManualTrimmingTest extends SkylarkTestCase { Artifact targetFlags = Iterables.getOnlyElement(getFilesToBuild(getConfiguredTarget("//test:target")).toList()); - Label usedFlag = Label.parseAbsolute("//test:used_flag"); + Label usedFlag = Label.parseAbsolute("//test:used_flag", ImmutableMap.of()); assertThat(getFlagValuesFromOutputFile(targetFlags)).containsEntry(usedFlag, "default"); } @@ -642,7 +643,7 @@ public final class FeatureFlagManualTrimmingTest extends SkylarkTestCase { Artifact targetFlags = Iterables.getOnlyElement(getFilesToBuild(getConfiguredTarget("//test:target")).toList()); - Label usedFlag = Label.parseAbsolute("//test:used_flag"); + Label usedFlag = Label.parseAbsolute("//test:used_flag", ImmutableMap.of()); assertThat(getFlagValuesFromOutputFile(targetFlags)).containsEntry(usedFlag, "default"); } @@ -714,7 +715,7 @@ public final class FeatureFlagManualTrimmingTest extends SkylarkTestCase { Artifact targetFlags = Iterables.getOnlyElement(getFilesToBuild(getConfiguredTarget("//test:reader")).toList()); - Label usedFlag = Label.parseAbsolute("//test:used_flag"); + Label usedFlag = Label.parseAbsolute("//test:used_flag", ImmutableMap.of()); assertThat(getFlagValuesFromOutputFile(targetFlags)).containsEntry(usedFlag, "default"); } @@ -764,7 +765,7 @@ public final class FeatureFlagManualTrimmingTest extends SkylarkTestCase { Artifact targetFlags = Iterables.getOnlyElement(getFilesToBuild(getConfiguredTarget("//test:toplevel")).toList()); - Label usedFlag = Label.parseAbsolute("//test:used_flag"); + Label usedFlag = Label.parseAbsolute("//test:used_flag", ImmutableMap.of()); assertThat(getFlagValuesFromOutputFile(targetFlags)).containsEntry(usedFlag, "configured"); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index 18f661b953..49b14ea565 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -574,7 +574,7 @@ public class CcCommonTest extends BuildViewTestCase { "cc_library(name = 'lib',", " srcs = ['foo.cc'],", " includes = ['./'])"); - Label label = Label.parseAbsolute("@pkg//bar:lib"); + Label label = Label.parseAbsolute("@pkg//bar:lib", ImmutableMap.of()); ConfiguredTarget target = view.getConfiguredTargetForTesting(reporter, label, targetConfig); assertThat(view.hasErrors(target)).isFalse(); assertNoEvents(); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java index 2f72860c2b..75071f359b 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.rules.cpp; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; @@ -67,7 +68,7 @@ public class CcToolchainSelectionTest extends BuildViewTestCase { (CcToolchainProvider) getRuleContext(target) .getToolchainContext() - .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE)); + .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE, ImmutableMap.of())); assertThat(Iterables.getOnlyElement(toolchain.getCompile()).getExecPathString()) .endsWith("piii"); } @@ -103,7 +104,7 @@ public class CcToolchainSelectionTest extends BuildViewTestCase { (CcToolchainProvider) getRuleContext(target) .getToolchainContext() - .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE)); + .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE, ImmutableMap.of())); assertThat(toolchain.getToolchainIdentifier()).endsWith("piii"); } @@ -164,7 +165,7 @@ public class CcToolchainSelectionTest extends BuildViewTestCase { (CcToolchainProvider) getRuleContext(target) .getToolchainContext() - .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE)); + .forToolchainType(Label.parseAbsolute(CPP_TOOLCHAIN_TYPE, ImmutableMap.of())); assertThat(toolchain.getToolPathFragment(CppConfiguration.Tool.LD).toString()) .contains("piii-ld"); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java index 6fcd099d7d..55229e8f0a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java @@ -17,6 +17,7 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyArtifactNames; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Streams; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; @@ -506,9 +507,8 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase { JavaExportsProvider exportsProvider = javaInfo.getProvider(JavaExportsProvider.class); - assertThat( - exportsProvider.getTransitiveExports()) - .containsExactly(Label.parseAbsolute("//foo:my_java_lib_b")); + assertThat(exportsProvider.getTransitiveExports()) + .containsExactly(Label.parseAbsolute("//foo:my_java_lib_b", ImmutableMap.of())); JavaCompilationArgsProvider javaCompilationArgsProvider = javaInfo.getProvider(JavaCompilationArgsProvider.class); @@ -577,9 +577,8 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase { JavaExportsProvider exportsProvider = javaInfo.getProvider(JavaExportsProvider.class); - assertThat( - exportsProvider.getTransitiveExports()) - .containsExactly(Label.parseAbsolute("//foo:my_java_lib_b")); + assertThat(exportsProvider.getTransitiveExports()) + .containsExactly(Label.parseAbsolute("//foo:my_java_lib_b", ImmutableMap.of())); JavaCompilationArgsProvider javaCompilationArgsProvider = javaInfo.getProvider(JavaCompilationArgsProvider.class); @@ -879,7 +878,9 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase { private JavaInfo fetchJavaInfo() throws Exception { ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule"); Info info = - myRuleTarget.get(new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "result")); + myRuleTarget.get( + new SkylarkKey( + Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result")); @SuppressWarnings("unchecked") JavaInfo javaInfo = (JavaInfo) info.getValue("property"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoTest.java index 58cbf5f7cd..c1c44d7567 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoTest.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.rules.java; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.collect.nestedset.NestedSet; @@ -73,11 +74,11 @@ public class JavaInfoTest { assertThat(labels) .containsExactly( - Label.parseAbsolute("//foo:foo0.bzl"), - Label.parseAbsolute("//foo:foo1.bzl"), - Label.parseAbsolute("//bar:bar0.bzl"), - Label.parseAbsolute("//bar:bar1.bzl"), - Label.parseAbsolute("//bar:bar2.bzl")) + Label.parseAbsolute("//foo:foo0.bzl", ImmutableMap.of()), + Label.parseAbsolute("//foo:foo1.bzl", ImmutableMap.of()), + Label.parseAbsolute("//bar:bar0.bzl", ImmutableMap.of()), + Label.parseAbsolute("//bar:bar1.bzl", ImmutableMap.of()), + Label.parseAbsolute("//bar:bar2.bzl", ImmutableMap.of())) .inOrder(); } @@ -86,7 +87,7 @@ public class JavaInfoTest { NestedSetBuilder<Label> builder = NestedSetBuilder.stableOrder(); for (int i = 0; i < count; i++) { String absName = String.format("//%s:%s%d.bzl", prefix, prefix, i); - Label label = Label.parseAbsolute(absName); + Label label = Label.parseAbsolute(absName, ImmutableMap.of()); builder.add(label); } // TODO(dbabkin): refactor to use NestedSetCollector whe it will be ready. return new JavaExportsProvider(builder.build()); diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java index 47036d774c..c5956c0021 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.rules.java; import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyArtifactNames; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; @@ -198,7 +199,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { ConfiguredTarget configuredTarget = getConfiguredTarget("//java/test:my"); Info info = configuredTarget.get( - new SkylarkKey(Label.parseAbsolute("//java/test:extension.bzl"), "result")); + new SkylarkKey( + Label.parseAbsolute("//java/test:extension.bzl", ImmutableMap.of()), "result")); SkylarkNestedSet transitiveRuntimeJars = ((SkylarkNestedSet) info.getValue("transitive_runtime_jars")); @@ -295,7 +297,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { ConfiguredTarget configuredTarget = getConfiguredTarget("//java/test:my"); Info info = configuredTarget.get( - new SkylarkKey(Label.parseAbsolute("//java/test:extension.bzl"), "result")); + new SkylarkKey( + Label.parseAbsolute("//java/test:extension.bzl", ImmutableMap.of()), "result")); JavaRuleOutputJarsProvider outputs = ((JavaRuleOutputJarsProvider) info.getValue("outputs")); assertThat(outputs.getOutputJars()).hasSize(1); @@ -717,7 +720,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { ConfiguredTarget configuredTarget = getConfiguredTarget("//java/test:my"); Info info = configuredTarget.get( - new SkylarkKey(Label.parseAbsolute("//java/test:extension.bzl"), "result")); + new SkylarkKey( + Label.parseAbsolute("//java/test:extension.bzl", ImmutableMap.of()), "result")); SkylarkNestedSet sourceJars = ((SkylarkNestedSet) info.getValue("source_jars")); SkylarkNestedSet transitiveDeps = ((SkylarkNestedSet) info.getValue("transitive_deps")); @@ -815,7 +819,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { ConfiguredTarget configuredTarget = getConfiguredTarget("//java/test:my"); Info info = configuredTarget.get( - new SkylarkKey(Label.parseAbsolute("//java/test:extension.bzl"), "result")); + new SkylarkKey( + Label.parseAbsolute("//java/test:extension.bzl", ImmutableMap.of()), "result")); assertThat(info.getValue("enabled")).isEqualTo(Boolean.TRUE); assertThat(info.getValue("class_jar")).isNotNull(); @@ -874,7 +879,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { // Extract out the information from skylark rule Info info = myConfiguredTarget.get( - new SkylarkKey(Label.parseAbsolute("//java/test:extension.bzl"), "result")); + new SkylarkKey( + Label.parseAbsolute("//java/test:extension.bzl", ImmutableMap.of()), "result")); SkylarkNestedSet rawMyCompileJars = (SkylarkNestedSet) (info.getValue("compile_jars")); SkylarkNestedSet rawMyTransitiveRuntimeJars = @@ -1164,7 +1170,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:r"); ConfiguredTarget javaLibraryTarget = getConfiguredTarget("//foo:jl"); SkylarkKey myProviderKey = - new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "my_provider"); + new SkylarkKey( + Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "my_provider"); Info declaredProvider = myRuleTarget.get(myProviderKey); Object javaProvider = declaredProvider.getValue("p"); assertThat(javaProvider).isInstanceOf(JavaInfo.class); @@ -1314,8 +1321,10 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')"); assertNoEvents(); ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule"); - Info info = myRuleTarget.get( - new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "result")); + Info info = + myRuleTarget.get( + new SkylarkKey( + Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result")); @SuppressWarnings("unchecked") SkylarkList<Artifact> sourceJars = (SkylarkList<Artifact>) (info.getValue("source_jars")); assertThat(prettyArtifactNames(sourceJars)).containsExactly("foo/libmy_java_lib_a-src.jar"); @@ -1342,7 +1351,9 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { assertNoEvents(); ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule"); Info info = - myRuleTarget.get(new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "result")); + myRuleTarget.get( + new SkylarkKey( + Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result")); @SuppressWarnings("unchecked") SkylarkNestedSet sourceJars = (SkylarkNestedSet) info.getValue("property"); @@ -1373,7 +1384,9 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { assertNoEvents(); ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule"); Info info = - myRuleTarget.get(new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "result")); + myRuleTarget.get( + new SkylarkKey( + Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result")); @SuppressWarnings("unchecked") SkylarkNestedSet sourceJars = (SkylarkNestedSet) info.getValue("property"); @@ -1404,7 +1417,9 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { assertNoEvents(); ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule"); Info info = - myRuleTarget.get(new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "result")); + myRuleTarget.get( + new SkylarkKey( + Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result")); @SuppressWarnings("unchecked") SkylarkNestedSet sourceJars = (SkylarkNestedSet) info.getValue("property"); @@ -1435,14 +1450,16 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')"); assertNoEvents(); ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule"); - Info info = myRuleTarget.get( - new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "result")); + Info info = + myRuleTarget.get( + new SkylarkKey( + Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result")); @SuppressWarnings("unchecked") SkylarkNestedSet exports = (SkylarkNestedSet) (info.getValue("property")); assertThat(exports.getSet(Label.class)) - .containsExactly(Label.parseAbsolute("//foo:my_java_lib_b")); + .containsExactly(Label.parseAbsolute("//foo:my_java_lib_b", ImmutableMap.of())); } @@ -1463,8 +1480,10 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')"); assertNoEvents(); ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule"); - Info info = myRuleTarget.get( - new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "result")); + Info info = + myRuleTarget.get( + new SkylarkKey( + Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result")); JavaGenJarsProvider javaGenJarsProvider = (JavaGenJarsProvider) info.getValue("property"); @@ -1491,8 +1510,10 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { "my_rule(name = 'my_skylark_rule', dep = ':my_java_lib_a')"); assertNoEvents(); ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:my_skylark_rule"); - Info info = myRuleTarget.get( - new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "result")); + Info info = + myRuleTarget.get( + new SkylarkKey( + Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result")); JavaCompilationInfoProvider javaCompilationInfoProvider = (JavaCompilationInfoProvider) info.getValue("property"); @@ -1649,7 +1670,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { ); ConfiguredTarget configuredTarget = getConfiguredTarget("//foo:myrule"); Info info = - configuredTarget.get(new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl"), "result")); + configuredTarget.get( + new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result")); assertThat(((String) info.getValue("strict_java_deps"))).isEqualTo("default"); } @@ -1673,7 +1695,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { useConfiguration("--strict_java_deps=ERROR"); ConfiguredTarget configuredTarget = getConfiguredTarget("//foo:myrule"); Info info = - configuredTarget.get(new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl"), "result")); + configuredTarget.get( + new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result")); assertThat(((String) info.getValue("strict_java_deps"))).isEqualTo("error"); } @@ -1699,7 +1722,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { ); ConfiguredTarget configuredTarget = getConfiguredTarget("//foo:myrule"); Info info = - configuredTarget.get(new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl"), "result")); + configuredTarget.get( + new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result")); Label javaToolchainLabel = ((Label) info.getValue("java_toolchain_label")); assertThat(javaToolchainLabel.toString()).endsWith("jdk:toolchain"); } @@ -1727,7 +1751,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { useConfiguration("--java_toolchain=//java/com/google/test:toolchain"); ConfiguredTarget configuredTarget = getConfiguredTarget("//foo:myrule"); Info info = - configuredTarget.get(new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl"), "result")); + configuredTarget.get( + new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result")); Label javaToolchainLabel = ((Label) info.getValue("java_toolchain_label")); assertThat(javaToolchainLabel.toString()).isEqualTo("//java/com/google/test:toolchain"); } 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 8983ccaa56..f617673885 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 @@ -380,7 +380,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { String objFileName, Iterable<String> compilationInputExecPaths) throws Exception { - String labelName = Label.parseAbsolute(targetLabel).getName(); + String labelName = Label.parseAbsolute(targetLabel, ImmutableMap.of()).getName(); CommandAction linkAction = (CommandAction) getGeneratingAction( diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java index 0486cd309f..1304d647ba 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcSourceTest.java @@ -15,6 +15,7 @@ package com.google.devtools.build.lib.rules.objc; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.testing.EqualsTester; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactRoot; @@ -61,7 +62,7 @@ public class J2ObjcSourceTest { private J2ObjcSource getJ2ObjcSource(String label, String fileName, J2ObjcSource.SourceType sourceType) throws Exception { - Label ruleLabel = Label.parseAbsolute(label); + Label ruleLabel = Label.parseAbsolute(label, ImmutableMap.of()); PathFragment path = ruleLabel.toPathFragment(); return new J2ObjcSource( ruleLabel, diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java index 5d2eed5d9c..689bbb5ad9 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.rules.objc; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.CommandAction; @@ -118,7 +119,8 @@ public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase { // actions, follow the chain of actions starting at the lipobin // creation. Artifact lipoBin = - getBinArtifact(Label.parseAbsolute("//x:bin").getName() + "_lipobin", target); + getBinArtifact( + Label.parseAbsolute("//x:bin", ImmutableMap.of()).getName() + "_lipobin", target); Action lipoAction = getGeneratingAction(lipoBin); Artifact bin = ActionsTestUtil.getFirstArtifactEndingWith(lipoAction.getInputs(), "_bin"); CommandAction appleBinLinkAction = (CommandAction) getGeneratingAction(bin); @@ -166,7 +168,8 @@ public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase { // In order to get the set of variables that apply to the c++ actions, follow the chain of // actions starting at the lipobin creation. Artifact lipoBin = - getBinArtifact(Label.parseAbsolute("//x:bin").getName() + "_lipobin", target); + getBinArtifact( + Label.parseAbsolute("//x:bin", ImmutableMap.of()).getName() + "_lipobin", target); Action lipoAction = getGeneratingAction(lipoBin); Artifact bin = ActionsTestUtil.getFirstArtifactEndingWith(lipoAction.getInputs(), "_bin"); CommandAction appleBinLinkAction = (CommandAction) getGeneratingAction(bin); @@ -231,7 +234,8 @@ public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase { // In order to get the set of variables that apply to the c++ actions, follow the chain of // actions starting at the lipobin creation. Artifact lipoBin = - getBinArtifact(Label.parseAbsolute("//x:bin").getName() + "_lipobin", target); + getBinArtifact( + Label.parseAbsolute("//x:bin", ImmutableMap.of()).getName() + "_lipobin", target); Action lipoAction = getGeneratingAction(lipoBin); Artifact bin = ActionsTestUtil.getFirstArtifactEndingWith(lipoAction.getInputs(), "_bin"); CommandAction appleBinLinkAction = (CommandAction) getGeneratingAction(bin); 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 68e3b0ae58..4227116991 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 @@ -31,6 +31,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Action; @@ -910,7 +911,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { protected Action actionProducingArtifact(String targetLabel, String artifactSuffix) throws Exception { ConfiguredTarget libraryTarget = getConfiguredTarget(targetLabel); - Label parsedLabel = Label.parseAbsolute(targetLabel); + Label parsedLabel = Label.parseAbsolute(targetLabel, ImmutableMap.of()); Artifact linkedLibrary = getBinArtifact( parsedLabel.getName() + artifactSuffix, libraryTarget); @@ -1398,7 +1399,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { } private BinaryFileWriteAction plMergeAction(String binaryLabelString) throws Exception { - Label binaryLabel = Label.parseAbsolute(binaryLabelString); + Label binaryLabel = Label.parseAbsolute(binaryLabelString, ImmutableMap.of()); ConfiguredTarget binary = getConfiguredTarget(binaryLabelString); return (BinaryFileWriteAction) getGeneratingAction(getBinArtifact(binaryLabel.getName() diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java b/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java index 200d9f7ebf..a6f0cda13e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.rules.platform; import static com.google.common.truth.Truth.assertThat; +import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.platform.PlatformProviderUtils; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; @@ -49,19 +50,19 @@ public class ConstraintTest extends BuildViewTestCase { assertThat(PlatformProviderUtils.constraintSetting(setting)).isNotNull(); assertThat(PlatformProviderUtils.constraintSetting(setting)).isNotNull(); assertThat(PlatformProviderUtils.constraintSetting(setting).label()) - .isEqualTo(Label.parseAbsolute("//constraint:basic")); + .isEqualTo(Label.parseAbsolute("//constraint:basic", ImmutableMap.of())); ConfiguredTarget fooValue = getConfiguredTarget("//constraint:foo"); assertThat(fooValue).isNotNull(); assertThat(PlatformProviderUtils.constraintValue(fooValue)).isNotNull(); assertThat(PlatformProviderUtils.constraintValue(fooValue).constraint().label()) - .isEqualTo(Label.parseAbsolute("//constraint:basic")); + .isEqualTo(Label.parseAbsolute("//constraint:basic", ImmutableMap.of())); assertThat(PlatformProviderUtils.constraintValue(fooValue).label()) - .isEqualTo(Label.parseAbsolute("//constraint:foo")); + .isEqualTo(Label.parseAbsolute("//constraint:foo", ImmutableMap.of())); ConfiguredTarget barValue = getConfiguredTarget("//constraint:bar"); assertThat(barValue).isNotNull(); assertThat(PlatformProviderUtils.constraintValue(barValue).constraint().label()) - .isEqualTo(Label.parseAbsolute("//constraint:basic")); + .isEqualTo(Label.parseAbsolute("//constraint:basic", ImmutableMap.of())); assertThat(PlatformProviderUtils.constraintValue(barValue).label()) - .isEqualTo(Label.parseAbsolute("//constraint:bar")); + .isEqualTo(Label.parseAbsolute("//constraint:bar", ImmutableMap.of())); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java index 262cb7de5d..e11d2d6b54 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java @@ -18,11 +18,11 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyArtifactNames; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -58,7 +58,8 @@ public class ProtoLangToolchainTest extends BuildViewTestCase { .isEqualTo("x/plugin"); TransitiveInfoCollection runtimes = toolchain.runtime(); - assertThat(runtimes.getLabel()).isEqualTo(Label.parseAbsolute("//x:runtime")); + assertThat(runtimes.getLabel()) + .isEqualTo(Label.parseAbsolute("//x:runtime", ImmutableMap.of())); assertThat(prettyArtifactNames(toolchain.blacklistedProtos())) .containsExactly("x/metadata.proto", "x/descriptor.proto", "x/any.proto"); |