diff options
Diffstat (limited to 'src/test')
19 files changed, 62 insertions, 44 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 3b92f212de..302276a94f 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -272,6 +272,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", "//third_party:guava-testlib", @@ -365,6 +366,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/rules/genquery", "//src/main/java/com/google/devtools/build/lib/rules/objc", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:extra_actions_base_java_proto", "//src/test/java/com/google/devtools/build/lib/skyframe:testutil", @@ -536,6 +538,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/test/java/com/google/devtools/build/lib/skyframe:testutil", "//third_party:auto_value", "//third_party:guava", @@ -593,6 +596,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:build_java_proto", "//src/main/protobuf:crosstool_config_java_proto", @@ -634,6 +638,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/protobuf:build_java_proto", "//third_party:guava", "//third_party:guava-testlib", @@ -663,6 +668,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:io", "//src/main/java/com/google/devtools/build/lib:packages", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/test/java/com/google/devtools/build/lib:testutil", "//third_party:guava", "//third_party:jsr305", diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD index d3c387dbec..da28b50f64 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD +++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD @@ -29,6 +29,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", "//src/test/java/com/google/devtools/build/lib:foundations_testutil", diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD index 8d94ddba6c..7750bb23a5 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD @@ -30,6 +30,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", "//src/test/java/com/google/devtools/build/lib:packages_testutil", diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java index 36320171b9..491ecc14d1 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java @@ -34,6 +34,7 @@ import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; import com.google.devtools.build.skyframe.InMemoryMemoizingEvaluator; +import com.google.devtools.build.skyframe.LegacySkyKey; import com.google.devtools.build.skyframe.MemoizingEvaluator; import com.google.devtools.build.skyframe.RecordingDifferencer; import com.google.devtools.build.skyframe.SequentialBuildDriver; @@ -51,7 +52,7 @@ import org.junit.Before; abstract class ArtifactFunctionTestCase { static final ActionLookupKey ALL_OWNER = new SingletonActionLookupKey(); - static final SkyKey OWNER_KEY = SkyKey.create(SkyFunctions.ACTION_LOOKUP, ALL_OWNER); + static final SkyKey OWNER_KEY = LegacySkyKey.create(SkyFunctions.ACTION_LOOKUP, ALL_OWNER); protected Predicate<PathFragment> allowedMissingInputsPredicate = Predicates.alwaysFalse(); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD index 022d46ef00..8c5e58559e 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD @@ -26,6 +26,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:foundations_testutil", "//src/test/java/com/google/devtools/build/lib:packages_testutil", @@ -70,6 +71,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", "//src/test/java/com/google/devtools/build/lib:foundations_testutil", diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java index 0f7a4c69dd..fa102db528 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsTest.java @@ -46,6 +46,7 @@ import com.google.devtools.build.lib.testutil.Suite; import com.google.devtools.build.lib.testutil.TestSpec; import com.google.devtools.build.lib.util.OrderedSetMultimap; import com.google.devtools.build.skyframe.EvaluationResult; +import com.google.devtools.build.skyframe.LegacySkyKey; import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionException; import com.google.devtools.build.skyframe.SkyFunctionName; @@ -98,7 +99,7 @@ public class ConfigurationsForTargetsTest extends AnalysisTestCase { * Returns a {@link SkyKey} for a given <Target, BuildConfiguration> pair. */ static SkyKey key(Target target, BuildConfiguration config) { - return SkyKey.create(SKYFUNCTION_NAME, new TargetAndConfiguration(target, config)); + return LegacySkyKey.create(SKYFUNCTION_NAME, new TargetAndConfiguration(target, config)); } /** diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java index f8253903d4..830b91c786 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java @@ -54,7 +54,6 @@ import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor; import com.google.devtools.build.lib.vfs.FileStatus; import com.google.devtools.build.lib.vfs.FileSystem; -import com.google.devtools.build.lib.vfs.FileSystem.HashFunction; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; @@ -761,7 +760,12 @@ public class FileFunctionTest { Iterables.filter( graph.getValues().keySet(), SkyFunctionName.functionIs(SkyFunctions.FILE_STATE)), - SkyKey.NODE_NAME)); + new Function<SkyKey, Object>() { + @Override + public Object apply(SkyKey skyKey) { + return skyKey.argument(); + } + })); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 4b6b7002f5..901fa9ffe9 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -76,6 +76,7 @@ import com.google.devtools.build.skyframe.ErrorInfo; import com.google.devtools.build.skyframe.EvaluationProgressReceiver; import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.InMemoryMemoizingEvaluator; +import com.google.devtools.build.skyframe.LegacySkyKey; import com.google.devtools.build.skyframe.RecordingDifferencer; import com.google.devtools.build.skyframe.SequentialBuildDriver; import com.google.devtools.build.skyframe.SkyFunction; @@ -104,7 +105,8 @@ import org.junit.Before; public abstract class TimestampBuilderTestCase extends FoundationTestCase { protected static final ActionLookupValue.ActionLookupKey ALL_OWNER = new SingletonActionLookupKey(); - protected static final SkyKey OWNER_KEY = SkyKey.create(SkyFunctions.ACTION_LOOKUP, ALL_OWNER); + protected static final SkyKey OWNER_KEY = + LegacySkyKey.create(SkyFunctions.ACTION_LOOKUP, ALL_OWNER); protected static final Predicate<Action> ALWAYS_EXECUTE_FILTER = Predicates.alwaysTrue(); protected static final String CYCLE_MSG = "Yarrrr, there be a cycle up in here"; diff --git a/src/test/java/com/google/devtools/build/lib/skylark/BUILD b/src/test/java/com/google/devtools/build/lib/skylark/BUILD index 85c00a305c..0cd4824961 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skylark/BUILD @@ -56,6 +56,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", "//src/test/java/com/google/devtools/build/lib:foundations_testutil", diff --git a/src/test/java/com/google/devtools/build/skyframe/BUILD b/src/test/java/com/google/devtools/build/skyframe/BUILD index 496678ae8b..6d65934f7b 100644 --- a/src/test/java/com/google/devtools/build/skyframe/BUILD +++ b/src/test/java/com/google/devtools/build/skyframe/BUILD @@ -26,6 +26,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/test/java/com/google/devtools/build/lib:testutil", "//third_party:guava", "//third_party:guava-testlib", @@ -48,6 +49,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/test/java/com/google/devtools/build/lib:testutil", "//third_party:guava", "//third_party:guava-testlib", diff --git a/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java b/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java index e009493a57..06dd49b97c 100644 --- a/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/CyclesReporterTest.java @@ -27,7 +27,8 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class CyclesReporterTest { - private static final SkyKey DUMMY_KEY = SkyKey.create(SkyFunctionName.create("func"), "key"); + private static final SkyKey DUMMY_KEY = + LegacySkyKey.create(SkyFunctionName.create("func"), "key"); @Test public void nullEventHandler() { diff --git a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java index 4b04614e12..e88d73ebee 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ErrorInfoTest.java @@ -20,13 +20,11 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.skyframe.SkyFunctionException.ReifiedSkyFunctionException; - +import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.IOException; - /** Tests for the non-trivial creation logic of {@link ErrorInfo}. */ @RunWith(JUnit4.class) public class ErrorInfoTest { @@ -49,7 +47,7 @@ public class ErrorInfoTest { private void runTestFromException(boolean isDirectlyTransient, boolean isTransitivelyTransient) { Exception exception = new IOException("ehhhhh"); - SkyKey causeOfException = SkyKey.create(SkyFunctionName.create("CAUSE"), 1234); + SkyKey causeOfException = LegacySkyKey.create(SkyFunctionName.create("CAUSE"), 1234); DummySkyFunctionException dummyException = new DummySkyFunctionException(exception, isDirectlyTransient, /*isCatastrophic=*/ false); @@ -89,8 +87,8 @@ public class ErrorInfoTest { public void testFromCycle() { CycleInfo cycle = new CycleInfo( - ImmutableList.of(SkyKey.create(SkyFunctionName.create("PATH"), 1234)), - ImmutableList.of(SkyKey.create(SkyFunctionName.create("CYCLE"), 4321))); + ImmutableList.of(LegacySkyKey.create(SkyFunctionName.create("PATH"), 1234)), + ImmutableList.of(LegacySkyKey.create(SkyFunctionName.create("CYCLE"), 4321))); ErrorInfo errorInfo = ErrorInfo.fromCycle(cycle); @@ -105,12 +103,12 @@ public class ErrorInfoTest { public void testFromChildErrors() { CycleInfo cycle = new CycleInfo( - ImmutableList.of(SkyKey.create(SkyFunctionName.create("PATH"), 1234)), - ImmutableList.of(SkyKey.create(SkyFunctionName.create("CYCLE"), 4321))); + ImmutableList.of(LegacySkyKey.create(SkyFunctionName.create("PATH"), 1234)), + ImmutableList.of(LegacySkyKey.create(SkyFunctionName.create("CYCLE"), 4321))); ErrorInfo cycleErrorInfo = ErrorInfo.fromCycle(cycle); Exception exception1 = new IOException("ehhhhh"); - SkyKey causeOfException1 = SkyKey.create(SkyFunctionName.create("CAUSE1"), 1234); + SkyKey causeOfException1 = LegacySkyKey.create(SkyFunctionName.create("CAUSE1"), 1234); DummySkyFunctionException dummyException1 = new DummySkyFunctionException(exception1, /*isTransient=*/ true, /*isCatastrophic=*/ false); ErrorInfo exceptionErrorInfo1 = ErrorInfo.fromException( @@ -119,14 +117,14 @@ public class ErrorInfoTest { // N.B this ErrorInfo will be catastrophic. Exception exception2 = new IOException("blahhhhh"); - SkyKey causeOfException2 = SkyKey.create(SkyFunctionName.create("CAUSE2"), 5678); + SkyKey causeOfException2 = LegacySkyKey.create(SkyFunctionName.create("CAUSE2"), 5678); DummySkyFunctionException dummyException2 = new DummySkyFunctionException(exception2, /*isTransient=*/ false, /*isCatastrophic=*/ true); ErrorInfo exceptionErrorInfo2 = ErrorInfo.fromException( new ReifiedSkyFunctionException(dummyException2, causeOfException2), /*isTransitivelyTransient=*/ false); - SkyKey currentKey = SkyKey.create(SkyFunctionName.create("CURRENT"), 9876); + SkyKey currentKey = LegacySkyKey.create(SkyFunctionName.create("CURRENT"), 9876); ErrorInfo errorInfo = ErrorInfo.fromChildErrors( currentKey, ImmutableList.of(cycleErrorInfo, exceptionErrorInfo1, exceptionErrorInfo2)); diff --git a/src/test/java/com/google/devtools/build/skyframe/GraphTest.java b/src/test/java/com/google/devtools/build/skyframe/GraphTest.java index 932878fbe2..84016d7953 100644 --- a/src/test/java/com/google/devtools/build/skyframe/GraphTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/GraphTest.java @@ -71,7 +71,7 @@ public abstract class GraphTest { } protected SkyKey key(String name) { - return SkyKey.create(SKY_FUNCTION_NAME, name); + return LegacySkyKey.create(SKY_FUNCTION_NAME, name); } @Test diff --git a/src/test/java/com/google/devtools/build/skyframe/GraphTester.java b/src/test/java/com/google/devtools/build/skyframe/GraphTester.java index a5eb7177b9..f643783b29 100644 --- a/src/test/java/com/google/devtools/build/skyframe/GraphTester.java +++ b/src/test/java/com/google/devtools/build/skyframe/GraphTester.java @@ -23,13 +23,11 @@ import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.skyframe.SkyFunction.Environment; import com.google.devtools.build.skyframe.SkyFunctionException.Transience; - import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; - import javax.annotation.Nullable; /** @@ -158,7 +156,7 @@ public class GraphTester { } public static SkyKey skyKey(String key) { - return SkyKey.create(NODE_TYPE, key); + return LegacySkyKey.create(NODE_TYPE, key); } /** @@ -266,7 +264,7 @@ public class GraphTester { public static SkyKey[] toSkyKeys(String... names) { SkyKey[] result = new SkyKey[names.length]; for (int i = 0; i < names.length; i++) { - result[i] = SkyKey.create(GraphTester.NODE_TYPE, names[i]); + result[i] = LegacySkyKey.create(GraphTester.NODE_TYPE, names[i]); } return result; } diff --git a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java index 5829329452..37f3ba9f5f 100644 --- a/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/InMemoryNodeEntryTest.java @@ -51,7 +51,7 @@ public class InMemoryNodeEntryTest { NestedSetBuilder.<TaggedEvents>emptySet(Order.STABLE_ORDER); private static SkyKey key(String name) { - return SkyKey.create(NODE_TYPE, name); + return LegacySkyKey.create(NODE_TYPE, name); } @Test diff --git a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java index 461047d6d5..c8d121b4c0 100644 --- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java @@ -143,7 +143,7 @@ public class MemoizingEvaluatorTest { } private static SkyKey toSkyKey(String name) { - return SkyKey.create(NODE_TYPE, name); + return LegacySkyKey.create(NODE_TYPE, name); } @Test diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java index 2097852053..0db63baa6a 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java @@ -1485,7 +1485,7 @@ public class ParallelEvaluatorTest { class ParentFunction implements SkyFunction { @Override public SkyValue compute(SkyKey skyKey, Environment env) throws InterruptedException { - SkyValue dep = env.getValue(SkyKey.create(childType, "billy the kid")); + SkyValue dep = env.getValue(LegacySkyKey.create(childType, "billy the kid")); if (dep == null) { return null; } @@ -1501,7 +1501,7 @@ public class ParallelEvaluatorTest { ParallelEvaluator evaluator = makeEvaluator(new InMemoryGraphImpl(), skyFunctions, false); try { - evaluator.eval(ImmutableList.of(SkyKey.create(parentType, "octodad"))); + evaluator.eval(ImmutableList.of(LegacySkyKey.create(parentType, "octodad"))); fail(); } catch (RuntimeException e) { assertEquals("I WANT A PONY!!!", e.getCause().getMessage()); diff --git a/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java b/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java index 3001c2a43f..e61aef104d 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ReverseDepsUtilityTest.java @@ -51,13 +51,13 @@ public class ReverseDepsUtilityTest { InMemoryNodeEntry example = new InMemoryNodeEntry(); for (int j = 0; j < numElements; j++) { ReverseDepsUtility.addReverseDeps( - example, Collections.singleton(SkyKey.create(NODE_TYPE, j))); + example, Collections.singleton(LegacySkyKey.create(NODE_TYPE, j))); } // Not a big test but at least check that it does not blow up. assertThat(ReverseDepsUtility.toString(example)).isNotEmpty(); assertThat(ReverseDepsUtility.getReverseDeps(example)).hasSize(numElements); for (int i = 0; i < numRemovals; i++) { - ReverseDepsUtility.removeReverseDep(example, SkyKey.create(NODE_TYPE, i)); + ReverseDepsUtility.removeReverseDep(example, LegacySkyKey.create(NODE_TYPE, i)); } assertThat(ReverseDepsUtility.getReverseDeps(example)).hasSize(numElements - numRemovals); assertThat(example.getReverseDepsDataToConsolidateForReverseDepsUtil()).isNull(); @@ -71,12 +71,12 @@ public class ReverseDepsUtilityTest { InMemoryNodeEntry example = new InMemoryNodeEntry(); List<SkyKey> toAdd = new ArrayList<>(); for (int j = 0; j < numElements; j++) { - toAdd.add(SkyKey.create(NODE_TYPE, j)); + toAdd.add(LegacySkyKey.create(NODE_TYPE, j)); } ReverseDepsUtility.addReverseDeps(example, toAdd); assertThat(ReverseDepsUtility.getReverseDeps(example)).hasSize(numElements); for (int i = 0; i < numRemovals; i++) { - ReverseDepsUtility.removeReverseDep(example, SkyKey.create(NODE_TYPE, i)); + ReverseDepsUtility.removeReverseDep(example, LegacySkyKey.create(NODE_TYPE, i)); } assertThat(ReverseDepsUtility.getReverseDeps(example)).hasSize(numElements - numRemovals); assertThat(example.getReverseDepsDataToConsolidateForReverseDepsUtil()).isNull(); @@ -88,10 +88,11 @@ public class ReverseDepsUtilityTest { InMemoryNodeEntry example = new InMemoryNodeEntry(); for (int i = 0; i < numElements; i++) { ReverseDepsUtility.addReverseDeps( - example, Collections.singleton(SkyKey.create(NODE_TYPE, i))); + example, Collections.singleton(LegacySkyKey.create(NODE_TYPE, i))); } // Should only fail when we call getReverseDeps(). - ReverseDepsUtility.addReverseDeps(example, Collections.singleton(SkyKey.create(NODE_TYPE, 0))); + ReverseDepsUtility.addReverseDeps( + example, Collections.singleton(LegacySkyKey.create(NODE_TYPE, 0))); try { ReverseDepsUtility.getReverseDeps(example); assertThat(numElements).isEqualTo(0); @@ -102,7 +103,7 @@ public class ReverseDepsUtilityTest { @Test public void doubleAddThenRemove() { InMemoryNodeEntry example = new InMemoryNodeEntry(); - SkyKey key = SkyKey.create(NODE_TYPE, 0); + SkyKey key = LegacySkyKey.create(NODE_TYPE, 0); ReverseDepsUtility.addReverseDeps(example, Collections.singleton(key)); // Should only fail when we call getReverseDeps(). ReverseDepsUtility.addReverseDeps(example, Collections.singleton(key)); @@ -117,8 +118,8 @@ public class ReverseDepsUtilityTest { @Test public void doubleAddThenRemoveCheckedOnSize() { InMemoryNodeEntry example = new InMemoryNodeEntry(); - SkyKey fixedKey = SkyKey.create(NODE_TYPE, 0); - SkyKey key = SkyKey.create(NODE_TYPE, 1); + SkyKey fixedKey = LegacySkyKey.create(NODE_TYPE, 0); + SkyKey key = LegacySkyKey.create(NODE_TYPE, 1); ReverseDepsUtility.addReverseDeps(example, ImmutableList.of(fixedKey, key)); // Should only fail when we reach the limit. ReverseDepsUtility.addReverseDeps(example, Collections.singleton(key)); @@ -134,8 +135,8 @@ public class ReverseDepsUtilityTest { @Test public void addRemoveAdd() { InMemoryNodeEntry example = new InMemoryNodeEntry(); - SkyKey fixedKey = SkyKey.create(NODE_TYPE, 0); - SkyKey key = SkyKey.create(NODE_TYPE, 1); + SkyKey fixedKey = LegacySkyKey.create(NODE_TYPE, 0); + SkyKey key = LegacySkyKey.create(NODE_TYPE, 1); ReverseDepsUtility.addReverseDeps(example, ImmutableList.of(fixedKey, key)); ReverseDepsUtility.removeReverseDep(example, key); ReverseDepsUtility.addReverseDeps(example, Collections.singleton(key)); @@ -147,12 +148,13 @@ public class ReverseDepsUtilityTest { InMemoryNodeEntry example = new InMemoryNodeEntry(); for (int i = 0; i < numElements; i++) { ReverseDepsUtility.addReverseDeps( - example, Collections.singleton(SkyKey.create(NODE_TYPE, i))); + example, Collections.singleton(LegacySkyKey.create(NODE_TYPE, i))); // This should always succeed, since the next element is still not present. - ReverseDepsUtility.maybeCheckReverseDepNotPresent(example, SkyKey.create(NODE_TYPE, i + 1)); + ReverseDepsUtility.maybeCheckReverseDepNotPresent( + example, LegacySkyKey.create(NODE_TYPE, i + 1)); } try { - ReverseDepsUtility.maybeCheckReverseDepNotPresent(example, SkyKey.create(NODE_TYPE, 0)); + ReverseDepsUtility.maybeCheckReverseDepNotPresent(example, LegacySkyKey.create(NODE_TYPE, 0)); // Should only fail if empty or above the checking threshold. assertThat(numElements == 0 || numElements >= ReverseDepsUtility.MAYBE_CHECK_THRESHOLD) .isTrue(); diff --git a/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java b/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java index 0e22db30ca..fc3cb3faa4 100644 --- a/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/SkyKeyTest.java @@ -16,13 +16,11 @@ package com.google.devtools.build.skyframe; import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.testutil.TestUtils; - +import java.io.Serializable; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.Serializable; - /** * Unit test for the SkyKey class, checking hash code transience logic. */ @@ -36,7 +34,7 @@ public class SkyKeyTest { assertThat(hashCodeSpy.getNumberOfTimesHashCodeCalled()).isEqualTo(0); // When a SkyKey is constructed with that HashCodeSpy as its argument, - SkyKey originalKey = SkyKey.create(SkyFunctionName.create("TEMP"), hashCodeSpy); + SkyKey originalKey = LegacySkyKey.create(SkyFunctionName.create("TEMP"), hashCodeSpy); // Then the HashCodeSpy reports that its hashcode method was called once. assertThat(hashCodeSpy.getNumberOfTimesHashCodeCalled()).isEqualTo(1); |