diff options
author | nharmata <nharmata@google.com> | 2017-05-09 13:53:19 -0400 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2017-05-10 13:35:26 -0400 |
commit | 8040b0b7690420be2f92071e635cd1d7f18a38e9 (patch) | |
tree | 65e69733d7f18757399bf2ce535dbf00eaf3643b /src/test | |
parent | 370b4846dc530c9cbb270e4fd15150ec164f7a74 (diff) |
Introduce an EvaluationProgressReceiver implementation that does nothing.
This is useful for dealing with all the existing implementations in the face of
interface changes that are irrelevant.
RELNOTES: None
PiperOrigin-RevId: 155525021
Diffstat (limited to 'src/test')
5 files changed, 18 insertions, 141 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java index 229cbcfb48..d2ddae08a4 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java @@ -285,7 +285,7 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe } private static final class RecordingEvaluationProgressReceiver - implements EvaluationProgressReceiver { + extends EvaluationProgressReceiver.NullEvaluationProgressReceiver { Set<SkyKey> invalidations; Set<SkyValue> evaluations; @@ -304,12 +304,6 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe } @Override - public void enqueueing(SkyKey skyKey) {} - - @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) {} - - @Override public void evaluated( SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, EvaluationState state) { SkyValue value = skyValueSupplier.get(); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java index 9c73d2f26f..940c8946cb 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java @@ -71,7 +71,7 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase { } private static final class TrackingEvaluationProgressReceiver - implements EvaluationProgressReceiver { + extends EvaluationProgressReceiver.NullEvaluationProgressReceiver { public static final class InvalidatedKey { public final SkyKey skyKey; @@ -159,9 +159,6 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase { } @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) {} - - @Override public void evaluated( SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, EvaluationState state) { evaluated.add(new EvaluatedEntry(skyKey, skyValueSupplier.get(), state)); diff --git a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java index 2ab03467ba..5c99c94420 100644 --- a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; @@ -182,28 +181,12 @@ public class EagerInvalidatorTest { public void receiverWorks() throws Exception { final Set<SkyKey> invalidated = Sets.newConcurrentHashSet(); DirtyTrackingProgressReceiver receiver = new DirtyTrackingProgressReceiver( - new EvaluationProgressReceiver() { + new EvaluationProgressReceiver.NullEvaluationProgressReceiver() { @Override public void invalidated(SkyKey skyKey, InvalidationState state) { Preconditions.checkState(state == expectedState()); invalidated.add(skyKey); } - - @Override - public void enqueueing(SkyKey skyKey) { - throw new UnsupportedOperationException(); - } - - @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) { - throw new UnsupportedOperationException(); - } - - @Override - public void evaluated(SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, - EvaluationState state) { - throw new UnsupportedOperationException(); - } }); graph = new InMemoryGraphImpl(); set("a", "a"); @@ -225,28 +208,12 @@ public class EagerInvalidatorTest { public void receiverIsNotifiedAboutNodesInError() throws Exception { final Set<SkyKey> invalidated = Sets.newConcurrentHashSet(); DirtyTrackingProgressReceiver receiver = new DirtyTrackingProgressReceiver( - new EvaluationProgressReceiver() { + new EvaluationProgressReceiver.NullEvaluationProgressReceiver() { @Override public void invalidated(SkyKey skyKey, InvalidationState state) { Preconditions.checkState(state == expectedState()); invalidated.add(skyKey); } - - @Override - public void enqueueing(SkyKey skyKey) { - throw new UnsupportedOperationException(); - } - - @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) { - throw new UnsupportedOperationException(); - } - - @Override - public void evaluated(SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, - EvaluationState state) { - throw new UnsupportedOperationException(); - } }); // Given a graph consisting of two nodes, "a" and "ab" such that "ab" depends on "a", @@ -270,28 +237,12 @@ public class EagerInvalidatorTest { public void invalidateValuesNotInGraph() throws Exception { final Set<SkyKey> invalidated = Sets.newConcurrentHashSet(); DirtyTrackingProgressReceiver receiver = new DirtyTrackingProgressReceiver( - new EvaluationProgressReceiver() { + new EvaluationProgressReceiver.NullEvaluationProgressReceiver() { @Override public void invalidated(SkyKey skyKey, InvalidationState state) { Preconditions.checkState(state == InvalidationState.DIRTY); invalidated.add(skyKey); } - - @Override - public void enqueueing(SkyKey skyKey) { - throw new UnsupportedOperationException(); - } - - @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) { - throw new UnsupportedOperationException(); - } - - @Override - public void evaluated(SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, - EvaluationState state) { - throw new UnsupportedOperationException(); - } }); graph = new InMemoryGraphImpl(); invalidateWithoutError(receiver, skyKey("a")); @@ -390,7 +341,7 @@ public class EagerInvalidatorTest { final Thread mainThread = Thread.currentThread(); final AtomicReference<SkyKey> badKey = new AtomicReference<>(); DirtyTrackingProgressReceiver receiver = new DirtyTrackingProgressReceiver( - new EvaluationProgressReceiver() { + new EvaluationProgressReceiver.NullEvaluationProgressReceiver() { @Override public void invalidated(SkyKey skyKey, InvalidationState state) { if (skyKey.equals(child)) { @@ -409,22 +360,6 @@ public class EagerInvalidatorTest { // thread is already interrupted. } } - - @Override - public void enqueueing(SkyKey skyKey) { - throw new UnsupportedOperationException(); - } - - @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) { - throw new UnsupportedOperationException(); - } - - @Override - public void evaluated( - SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, EvaluationState state) { - throw new UnsupportedOperationException(); - } }); try { invalidateWithoutError(receiver, child); @@ -438,27 +373,11 @@ public class EagerInvalidatorTest { assertFalse(isInvalidated(parent)); assertNotNull(graph.get(null, Reason.OTHER, parent).getValue()); receiver = new DirtyTrackingProgressReceiver( - new EvaluationProgressReceiver() { + new EvaluationProgressReceiver.NullEvaluationProgressReceiver() { @Override public void invalidated(SkyKey skyKey, InvalidationState state) { invalidated.add(skyKey); } - - @Override - public void enqueueing(SkyKey skyKey) { - throw new UnsupportedOperationException(); - } - - @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) { - throw new UnsupportedOperationException(); - } - - @Override - public void evaluated(SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, - EvaluationState state) { - throw new UnsupportedOperationException(); - } }); invalidateWithoutError(receiver); assertTrue(invalidated.contains(parent)); @@ -529,7 +448,8 @@ public class EagerInvalidatorTest { int countDownStart = validValuesToDo > 0 ? random.nextInt(validValuesToDo) : 0; final CountDownLatch countDownToInterrupt = new CountDownLatch(countDownStart); final DirtyTrackingProgressReceiver receiver = - new DirtyTrackingProgressReceiver(new EvaluationProgressReceiver() { + new DirtyTrackingProgressReceiver( + new EvaluationProgressReceiver.NullEvaluationProgressReceiver() { @Override public void invalidated(SkyKey skyKey, InvalidationState state) { countDownToInterrupt.countDown(); @@ -544,22 +464,6 @@ public class EagerInvalidatorTest { "Main thread was not interrupted"); } } - - @Override - public void enqueueing(SkyKey skyKey) { - throw new UnsupportedOperationException(); - } - - @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) { - throw new UnsupportedOperationException(); - } - - @Override - public void evaluated( - SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, EvaluationState state) { - throw new UnsupportedOperationException(); - } }); try { invalidate(graph, receiver, @@ -639,7 +543,7 @@ public class EagerInvalidatorTest { public void dirtyTrackingProgressReceiverWorksWithDeletingInvalidator() throws Exception { setupInvalidatableGraph(); DirtyTrackingProgressReceiver receiver = new DirtyTrackingProgressReceiver( - new TrackingProgressReceiver()); + new EvaluationProgressReceiver.NullEvaluationProgressReceiver()); // Dirty the node, and ensure that the tracker is aware of it: Iterable<SkyKey> diff1 = ImmutableList.of(skyKey("a")); @@ -713,8 +617,8 @@ public class EagerInvalidatorTest { @Test public void dirtyTrackingProgressReceiverWorksWithDirtyingInvalidator() throws Exception { setupInvalidatableGraph(); - DirtyTrackingProgressReceiver receiver = - new DirtyTrackingProgressReceiver(new TrackingProgressReceiver()); + DirtyTrackingProgressReceiver receiver = new DirtyTrackingProgressReceiver( + new EvaluationProgressReceiver.NullEvaluationProgressReceiver()); // Dirty the node, and ensure that the tracker is aware of it: invalidate(graph, receiver, skyKey("a")); 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 0db63baa6a..cfeab4edf0 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java @@ -256,16 +256,8 @@ public class ParallelEvaluatorTest { eval(/*keepGoing=*/false, fastKey); } final Set<SkyKey> receivedValues = Sets.newConcurrentHashSet(); - revalidationReceiver = new DirtyTrackingProgressReceiver(new EvaluationProgressReceiver() { - @Override - public void invalidated(SkyKey skyKey, InvalidationState state) {} - - @Override - public void enqueueing(SkyKey key) {} - - @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) {} - + revalidationReceiver = new DirtyTrackingProgressReceiver( + new EvaluationProgressReceiver.NullEvaluationProgressReceiver() { @Override public void evaluated(SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, EvaluationState state) { @@ -1821,21 +1813,14 @@ public class ParallelEvaluatorTest { public void signalValueEnqueuedAndEvaluated() throws Exception { final Set<SkyKey> enqueuedValues = Sets.newConcurrentHashSet(); final Set<SkyKey> evaluatedValues = Sets.newConcurrentHashSet(); - EvaluationProgressReceiver progressReceiver = new EvaluationProgressReceiver() { - @Override - public void invalidated(SkyKey skyKey, InvalidationState state) { - throw new IllegalStateException(); - } - + EvaluationProgressReceiver progressReceiver = + new EvaluationProgressReceiver.NullEvaluationProgressReceiver() { @Override public void enqueueing(SkyKey skyKey) { enqueuedValues.add(skyKey); } @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) {} - - @Override public void evaluated(SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, EvaluationState state) { evaluatedValues.add(skyKey); diff --git a/src/test/java/com/google/devtools/build/skyframe/TrackingProgressReceiver.java b/src/test/java/com/google/devtools/build/skyframe/TrackingProgressReceiver.java index ba922f745d..0a73eaf45e 100644 --- a/src/test/java/com/google/devtools/build/skyframe/TrackingProgressReceiver.java +++ b/src/test/java/com/google/devtools/build/skyframe/TrackingProgressReceiver.java @@ -16,13 +16,13 @@ package com.google.devtools.build.skyframe; import com.google.common.base.Supplier; import com.google.common.collect.Sets; import com.google.devtools.build.lib.util.Preconditions; - import java.util.Set; /** * A testing utility to keep track of evaluation. */ -public class TrackingProgressReceiver implements EvaluationProgressReceiver { +public class TrackingProgressReceiver + extends EvaluationProgressReceiver.NullEvaluationProgressReceiver { public final Set<SkyKey> dirty = Sets.newConcurrentHashSet(); public final Set<SkyKey> deleted = Sets.newConcurrentHashSet(); public final Set<SkyKey> enqueued = Sets.newConcurrentHashSet(); @@ -50,9 +50,6 @@ public class TrackingProgressReceiver implements EvaluationProgressReceiver { } @Override - public void computed(SkyKey skyKey, long elapsedTimeNanos) {} - - @Override public void evaluated(SkyKey skyKey, Supplier<SkyValue> skyValueSupplier, EvaluationState state) { evaluated.add(skyKey); if (skyValueSupplier.get() != null) { |