diff options
author | 2015-10-27 17:25:30 +0000 | |
---|---|---|
committer | 2015-10-27 19:44:34 +0000 | |
commit | 011652cb7f4b90a0f23e39130fafde8e60349a40 (patch) | |
tree | ed8d3f99c510cda6f6a32caee19dd3ecc6287d65 /src/test/java/com/google/devtools/build/skyframe | |
parent | cc8954aab4431cd5c6fc73ecf6c08241724b59e5 (diff) |
Remove unnecessary use of Reporter.
--
MOS_MIGRATED_REVID=106410378
Diffstat (limited to 'src/test/java/com/google/devtools/build/skyframe')
-rw-r--r-- | src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java | 3 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java | 42 |
2 files changed, 2 insertions, 43 deletions
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 aea1db5f50..9aded52880 100644 --- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java @@ -43,7 +43,6 @@ import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventCollector; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.events.EventKind; -import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.testutil.TestThread; import com.google.devtools.build.lib.testutil.TestUtils; import com.google.devtools.build.skyframe.GraphTester.StringValue; @@ -137,7 +136,7 @@ public class MemoizingEvaluatorTest { @Before public void initializeReporter() { eventCollector = new EventCollector(); - reporter = new Reporter(eventCollector); + reporter = eventCollector; tester.resetPlayedEvents(); } 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 4a2f8ed317..5fe22a278d 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java @@ -41,8 +41,6 @@ import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventCollector; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.events.EventKind; -import com.google.devtools.build.lib.events.OutputFilter.RegexOutputFilter; -import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.testutil.TestThread; import com.google.devtools.build.lib.testutil.TestUtils; import com.google.devtools.build.skyframe.GraphTester.StringValue; @@ -83,14 +81,12 @@ public class ParallelEvaluatorTest { protected GraphTester tester = new GraphTester(); private EventCollector eventCollector; - private EventHandler reporter; private EvaluationProgressReceiver revalidationReceiver; @Before public void initializeReporter() { eventCollector = new EventCollector(); - reporter = new Reporter(eventCollector); } @After @@ -111,7 +107,7 @@ public class ParallelEvaluatorTest { return new ParallelEvaluator(graph, oldGraphVersion, builders, - reporter, + eventCollector, new MemoizingEvaluator.EmittedEventState(), storedEventFilter, keepGoing, @@ -436,42 +432,6 @@ public class ParallelEvaluatorTest { assertEventCount(1, eventCollector); } - @Test - public void warningMatchesRegex() throws Exception { - graph = new InMemoryGraph(); - ((Reporter) reporter).setOutputFilter(RegexOutputFilter.forRegex("a")); - set("example", "a value").setWarning("warning message"); - SkyKey a = GraphTester.toSkyKey("example"); - tester.getOrCreate(a).setTag("a"); - StringValue value = (StringValue) eval(false, a); - assertEquals("a value", value.getValue()); - assertContainsEvent(eventCollector, "warning message"); - assertEventCount(1, eventCollector); - } - - @Test - public void warningMatchesRegexOnlyTag() throws Exception { - graph = new InMemoryGraph(); - ((Reporter) reporter).setOutputFilter(RegexOutputFilter.forRegex("a")); - set("a", "a value").setWarning("warning on 'a'"); - SkyKey a = GraphTester.toSkyKey("a"); - tester.getOrCreate(a).setTag("b"); - StringValue value = (StringValue) eval(false, a); - assertEquals("a value", value.getValue()); - assertEventCount(0, eventCollector); } - - @Test - public void warningDoesNotMatchRegex() throws Exception { - graph = new InMemoryGraph(); - ((Reporter) reporter).setOutputFilter(RegexOutputFilter.forRegex("b")); - set("a", "a").setWarning("warning on 'a'"); - SkyKey a = GraphTester.toSkyKey("a"); - tester.getOrCreate(a).setTag("a"); - StringValue value = (StringValue) eval(false, a); - assertEquals("a", value.getValue()); - assertEventCount(0, eventCollector); - } - /** Regression test: events from already-done value not replayed. */ @Test public void eventFromDoneChildRecorded() throws Exception { |