diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe')
9 files changed, 30 insertions, 18 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java index df0320f16d..fafe4b7717 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java @@ -215,7 +215,7 @@ public final class FilesetEntryFunctionTest extends FoundationTestCase { } private static Label label(String label) throws Exception { - return Label.parseAbsolute(label); + return Label.parseAbsolute(label, ImmutableMap.of()); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java index b6681d023f..3d9971d15d 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java @@ -448,8 +448,10 @@ public class PackageFunctionTest extends BuildViewTestCase { SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//foo")); PackageValue value = validPackage(skyKey); - assertThat(value.getPackage().getSkylarkFileDependencies()).containsExactly( - Label.parseAbsolute("//bar:ext.bzl"), Label.parseAbsolute("//baz:ext.bzl")); + assertThat(value.getPackage().getSkylarkFileDependencies()) + .containsExactly( + Label.parseAbsolute("//bar:ext.bzl", ImmutableMap.of()), + Label.parseAbsolute("//baz:ext.bzl", ImmutableMap.of())); scratch.overwriteFile("bar/ext.bzl", "load('//qux:ext.bzl', 'c')", @@ -461,8 +463,10 @@ public class PackageFunctionTest extends BuildViewTestCase { Root.fromPath(rootDirectory)); value = validPackage(skyKey); - assertThat(value.getPackage().getSkylarkFileDependencies()).containsExactly( - Label.parseAbsolute("//bar:ext.bzl"), Label.parseAbsolute("//qux:ext.bzl")); + assertThat(value.getPackage().getSkylarkFileDependencies()) + .containsExactly( + Label.parseAbsolute("//bar:ext.bzl", ImmutableMap.of()), + Label.parseAbsolute("//qux:ext.bzl", ImmutableMap.of())); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java index 7423652698..985cb9cb96 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.skyframe; import static com.google.common.truth.Truth.assertThat; +import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; import com.google.devtools.build.lib.cmdline.Label; @@ -36,12 +37,12 @@ public class RuleContextTest extends ToolchainTestCase { "--platforms=//platforms:mac"); RuleContext ruleContext = getRuleContext(getConfiguredTarget("//x")); assertThat(ruleContext.getToolchainContext().resolvedToolchainLabels()) - .contains(Label.parseAbsolute("//toolchain:toolchain_1_impl")); + .contains(Label.parseAbsolute("//toolchain:toolchain_1_impl", ImmutableMap.of())); ToolchainInfo toolchain = ruleContext .getToolchainContext() - .forToolchainType(Label.parseAbsolute("//toolchain:test_toolchain")); + .forToolchainType(Label.parseAbsolute("//toolchain:test_toolchain", ImmutableMap.of())); assertThat(toolchain.getValue("data")).isEqualTo("foo"); } } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java index b13b87910b..eb43635135 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java @@ -492,7 +492,7 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { } }; fs.stubStat(bazDir, inconsistentParentFileStatus); - Set<Label> labels = ImmutableSet.of(Label.parseAbsolute("//foo:foo")); + Set<Label> labels = ImmutableSet.of(Label.parseAbsolute("//foo:foo", ImmutableMap.of())); getSkyframeExecutor() .getPackageManager() .newTransitiveLoader() diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java index 90843718d7..fae9d22012 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java @@ -19,6 +19,7 @@ import static com.google.devtools.build.skyframe.WalkableGraphUtils.exists; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -228,7 +229,7 @@ abstract public class SkyframeLabelVisitorTestCase extends PackageLoadingTestCas throws LabelSyntaxException, NoSuchThingException, InterruptedException { Set<Target> targets = new HashSet<>(); for (String strLabel : strLabels) { - Label label = Label.parseAbsolute(strLabel); + Label label = Label.parseAbsolute(strLabel, ImmutableMap.of()); targets.add(getSkyframeExecutor().getPackageManager().getTarget(reporter, label)); } return targets; diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TargetMarkerFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TargetMarkerFunctionTest.java index 75a4888cc1..6778dc8862 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TargetMarkerFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TargetMarkerFunctionTest.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.skyframe; import static com.google.common.truth.Truth.assertThat; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.clock.BlazeClock; @@ -63,12 +64,12 @@ public class TargetMarkerFunctionTest extends BuildViewTestCase { } private SkyKey skyKey(String labelName) throws Exception { - return TargetMarkerValue.key(Label.parseAbsolute(labelName)); + return TargetMarkerValue.key(Label.parseAbsolute(labelName, ImmutableMap.of())); } private Throwable getErrorFromTargetValue(String labelName) throws Exception { reporter.removeHandler(failFastHandler); - SkyKey targetKey = TargetMarkerValue.key(Label.parseAbsolute(labelName)); + SkyKey targetKey = TargetMarkerValue.key(Label.parseAbsolute(labelName, ImmutableMap.of())); EvaluationResult<TargetMarkerValue> evaluationResult = SkyframeExecutorTestUtils.evaluate( skyframeExecutor, targetKey, /*keepGoing=*/ false, reporter); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java index 7749f9e9ff..f3389712eb 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java @@ -43,7 +43,7 @@ public class TransitiveTraversalFunctionTest extends BuildViewTestCase { @Test public void noRepeatedLabelVisitationForTransitiveTraversalFunction() throws Exception { // Create a basic package with a target //foo:foo. - Label label = Label.parseAbsolute("//foo:foo"); + Label label = Label.parseAbsolute("//foo:foo", ImmutableMap.of()); Package pkg = scratchPackage( "workspace", @@ -64,8 +64,8 @@ public class TransitiveTraversalFunctionTest extends BuildViewTestCase { // Create the GroupedList saying we had already requested two targets the last time we called // #compute. GroupedListHelper<SkyKey> helper = new GroupedListHelper<>(); - SkyKey fakeDep1 = function.getKey(Label.parseAbsolute("//foo:bar")); - SkyKey fakeDep2 = function.getKey(Label.parseAbsolute("//foo:baz")); + SkyKey fakeDep1 = function.getKey(Label.parseAbsolute("//foo:bar", ImmutableMap.of())); + SkyKey fakeDep2 = function.getKey(Label.parseAbsolute("//foo:baz", ImmutableMap.of())); helper.add(TargetMarkerValue.key(label)); helper.add(PackageValue.key(label.getPackageIdentifier())); helper.startGroup(); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java index 4e633e4632..9a502988ea 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.skyframe; 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.FileStateValue; import com.google.devtools.build.lib.actions.FileValue; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; @@ -206,7 +207,8 @@ public class WorkspaceFileFunctionTest extends BuildViewTestCase { SkyKey key = ExternalPackageFunction.key(workspacePath); PackageValue value = (PackageValue) externalSkyFunc.compute(key, getEnv()); Package pkg = value.getPackage(); - assertThat(getLabelMapping(pkg, "foo/bar")).isEqualTo(Label.parseAbsolute("//foo:bar")); + assertThat(getLabelMapping(pkg, "foo/bar")) + .isEqualTo(Label.parseAbsolute("//foo:bar", ImmutableMap.of())); MoreAsserts.assertNoEvents(pkg.getEvents()); } @@ -218,7 +220,8 @@ public class WorkspaceFileFunctionTest extends BuildViewTestCase { SkyKey key = ExternalPackageFunction.key(workspacePath); PackageValue value = (PackageValue) externalSkyFunc.compute(key, getEnv()); Package pkg = value.getPackage(); - assertThat(getLabelMapping(pkg, "foo/bar")).isEqualTo(Label.parseAbsolute("//foo:bar")); + assertThat(getLabelMapping(pkg, "foo/bar")) + .isEqualTo(Label.parseAbsolute("//foo:bar", ImmutableMap.of())); MoreAsserts.assertNoEvents(pkg.getEvents()); } @@ -274,7 +277,8 @@ public class WorkspaceFileFunctionTest extends BuildViewTestCase { SkyKey key = ExternalPackageFunction.key(workspacePath); PackageValue value = (PackageValue) externalSkyFunc.compute(key, getEnv()); Package pkg = value.getPackage(); - assertThat(getLabelMapping(pkg, "foo/bar")).isEqualTo(Label.parseAbsolute("//foo:bar")); + assertThat(getLabelMapping(pkg, "foo/bar")) + .isEqualTo(Label.parseAbsolute("//foo:bar", ImmutableMap.of())); MoreAsserts.assertNoEvents(pkg.getEvents()); } } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java index 745ad95edc..08ea24e51e 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/LabelCodecTest.java @@ -14,6 +14,7 @@ package com.google.devtools.build.lib.skyframe.serialization; +import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester; import org.junit.Test; @@ -26,6 +27,6 @@ public class LabelCodecTest { @Test public void testCodec() throws Exception { - new SerializationTester(Label.parseAbsolute("//foo/bar:baz")).runTests(); + new SerializationTester(Label.parseAbsolute("//foo/bar:baz", ImmutableMap.of())).runTests(); } } |