diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java | 20 |
1 files changed, 10 insertions, 10 deletions
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 0b3d8fc22a..56dcfb51f8 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java @@ -43,9 +43,9 @@ import com.google.devtools.build.lib.events.EventKind; import com.google.devtools.build.lib.testutil.TestThread; import com.google.devtools.build.lib.testutil.TestUtils; import com.google.devtools.build.skyframe.GraphTester.StringValue; -import com.google.devtools.build.skyframe.NotifyingGraph.EventType; -import com.google.devtools.build.skyframe.NotifyingGraph.Listener; -import com.google.devtools.build.skyframe.NotifyingGraph.Order; +import com.google.devtools.build.skyframe.NotifyingHelper.EventType; +import com.google.devtools.build.skyframe.NotifyingHelper.Listener; +import com.google.devtools.build.skyframe.NotifyingHelper.Order; import com.google.devtools.build.skyframe.ParallelEvaluator.EventFilter; import com.google.devtools.build.skyframe.SkyFunctionException.Transience; @@ -1276,7 +1276,7 @@ public class ParallelEvaluatorTest { * we should detect cycle. */ private void cycleAndErrorInBubbleUp(boolean keepGoing) throws Exception { - graph = new DeterministicGraph<>(new InMemoryGraphImpl()); + graph = new DeterministicHelper.DeterministicProcessableGraph(new InMemoryGraphImpl()); tester = new GraphTester(); SkyKey errorKey = GraphTester.toSkyKey("error"); SkyKey cycleKey = GraphTester.toSkyKey("cycle"); @@ -1323,7 +1323,7 @@ public class ParallelEvaluatorTest { */ @Test public void cycleAndErrorAndOtherInBubbleUp() throws Exception { - graph = new DeterministicGraph<>(new InMemoryGraphImpl()); + graph = new DeterministicHelper.DeterministicProcessableGraph(new InMemoryGraphImpl()); tester = new GraphTester(); SkyKey errorKey = GraphTester.toSkyKey("error"); SkyKey cycleKey = GraphTester.toSkyKey("cycle"); @@ -1366,7 +1366,7 @@ public class ParallelEvaluatorTest { * Here, we add an additional top-level key in error, just to mix it up. */ private void cycleAndErrorAndError(boolean keepGoing) throws Exception { - graph = new DeterministicGraph<>(new InMemoryGraphImpl()); + graph = new DeterministicHelper.DeterministicProcessableGraph(new InMemoryGraphImpl()); tester = new GraphTester(); SkyKey errorKey = GraphTester.toSkyKey("error"); SkyKey cycleKey = GraphTester.toSkyKey("cycle"); @@ -1999,7 +1999,7 @@ public class ParallelEvaluatorTest { } }); graph = - new NotifyingGraph<>( + new NotifyingHelper.NotifyingProcessableGraph( new InMemoryGraphImpl(), new Listener() { @Override @@ -2032,7 +2032,7 @@ public class ParallelEvaluatorTest { @Test public void cachedErrorsFromKeepGoingUsedOnNoKeepGoing() throws Exception { - graph = new DeterministicGraph<>(new InMemoryGraphImpl()); + graph = new DeterministicHelper.DeterministicProcessableGraph(new InMemoryGraphImpl()); tester = new GraphTester(); SkyKey errorKey = GraphTester.toSkyKey("error"); SkyKey parent1Key = GraphTester.toSkyKey("parent1"); @@ -2052,7 +2052,7 @@ public class ParallelEvaluatorTest { @Test public void cachedTopLevelErrorsShouldHaltNoKeepGoingBuildEarly() throws Exception { - graph = new DeterministicGraph<>(new InMemoryGraphImpl()); + graph = new DeterministicHelper.DeterministicProcessableGraph(new InMemoryGraphImpl()); tester = new GraphTester(); SkyKey errorKey = GraphTester.toSkyKey("error"); tester.getOrCreate(errorKey).setHasError(true); @@ -2082,7 +2082,7 @@ public class ParallelEvaluatorTest { private void runUnhandledTransitiveErrors(boolean keepGoing, final boolean explicitlyPropagateError) throws Exception { - graph = new DeterministicGraph<>(new InMemoryGraphImpl()); + graph = new DeterministicHelper.DeterministicProcessableGraph(new InMemoryGraphImpl()); tester = new GraphTester(); SkyKey grandparentKey = GraphTester.toSkyKey("grandparent"); final SkyKey parentKey = GraphTester.toSkyKey("parent"); |