Merge JunitTestUtils into MoreAsserts; update all callers.
--
MOS_MIGRATED_REVID=98914195
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 e13da02..3ee896e 100644
--- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
@@ -15,6 +15,9 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertContainsEvent;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertEventCount;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertNoEvents;
import static com.google.devtools.build.skyframe.GraphTester.CONCATENATE;
import static com.google.devtools.build.skyframe.GraphTester.COPY;
import static com.google.devtools.build.skyframe.GraphTester.NODE_TYPE;
@@ -41,7 +44,6 @@
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.JunitTestUtils;
import com.google.devtools.build.lib.testutil.TestThread;
import com.google.devtools.build.lib.testutil.TestUtils;
import com.google.devtools.build.lib.util.Pair;
@@ -126,15 +128,15 @@
tester.set("x", new StringValue("y")).setWarning("fizzlepop");
StringValue value = (StringValue) tester.evalAndGet("x");
assertEquals("y", value.getValue());
- JunitTestUtils.assertContainsEvent(eventCollector, "fizzlepop");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "fizzlepop");
+ assertEventCount(1, eventCollector);
initializeReporter();
tester.invalidate();
value = (StringValue) tester.evalAndGet("x");
assertEquals("y", value.getValue());
- JunitTestUtils.assertContainsEvent(eventCollector, "fizzlepop");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "fizzlepop");
+ assertEventCount(1, eventCollector);
}
private abstract static class NoExtractorFunction implements SkyFunction {
@@ -275,9 +277,9 @@
for (int i = 0; i < 2; i++) {
initializeReporter();
tester.evalAndGet("top");
- JunitTestUtils.assertContainsEvent(eventCollector, "warn-d1");
- JunitTestUtils.assertContainsEvent(eventCollector, "warn-d2");
- JunitTestUtils.assertEventCount(2, eventCollector);
+ assertContainsEvent(eventCollector, "warn-d1");
+ assertContainsEvent(eventCollector, "warn-d2");
+ assertEventCount(2, eventCollector);
}
}
@@ -293,8 +295,8 @@
assertThat(result.getError(topKey).getRootCauses()).containsExactly(topKey);
assertEquals(topKey.toString(), result.getError(topKey).getException().getMessage());
assertTrue(result.getError(topKey).getException() instanceof SomeErrorException);
- JunitTestUtils.assertContainsEvent(eventCollector, "warn-dep");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "warn-dep");
+ assertEventCount(1, eventCollector);
}
}
@@ -309,8 +311,8 @@
assertThat(result.getError(topKey).getRootCauses()).containsExactly(topKey);
assertEquals(topKey.toString(), result.getError(topKey).getException().getMessage());
assertTrue(result.getError(topKey).getException() instanceof SomeErrorException);
- JunitTestUtils.assertContainsEvent(eventCollector, "warning msg");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "warning msg");
+ assertEventCount(1, eventCollector);
}
}
@@ -325,8 +327,8 @@
assertThat(result.getError(topKey).getRootCauses()).containsExactly(topKey);
assertEquals(topKey.toString(), result.getError(topKey).getException().getMessage());
assertTrue(result.getError(topKey).getException() instanceof SomeErrorException);
- JunitTestUtils.assertContainsEvent(eventCollector, "warning msg");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "warning msg");
+ assertEventCount(1, eventCollector);
}
}
@@ -339,8 +341,8 @@
// Make sure we see the warning exactly once.
initializeReporter();
tester.eval(/*keepGoing=*/false, "t1", "t2");
- JunitTestUtils.assertContainsEvent(eventCollector, "look both ways before crossing");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "look both ways before crossing");
+ assertEventCount(1, eventCollector);
}
}
@@ -353,14 +355,14 @@
for (int i = 0; i < 2; i++) {
initializeReporter();
tester.evalAndGetError("error-value");
- JunitTestUtils.assertContainsEvent(eventCollector, "don't chew with your mouth open");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "don't chew with your mouth open");
+ assertEventCount(1, eventCollector);
}
initializeReporter();
tester.evalAndGet("warning-value");
- JunitTestUtils.assertContainsEvent(eventCollector, "don't chew with your mouth open");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "don't chew with your mouth open");
+ assertEventCount(1, eventCollector);
}
@Test
@@ -373,16 +375,16 @@
StringValue value = (StringValue) tester.evalAndGet("x");
assertEquals("y", value.getValue());
- JunitTestUtils.assertContainsEvent(eventCollector, "fizzlepop");
- JunitTestUtils.assertContainsEvent(eventCollector, "just letting you know");
- JunitTestUtils.assertEventCount(2, eventCollector);
+ assertContainsEvent(eventCollector, "fizzlepop");
+ assertContainsEvent(eventCollector, "just letting you know");
+ assertEventCount(2, eventCollector);
// On the rebuild, we only replay warning messages.
initializeReporter();
value = (StringValue) tester.evalAndGet("x");
assertEquals("y", value.getValue());
- JunitTestUtils.assertContainsEvent(eventCollector, "fizzlepop");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "fizzlepop");
+ assertEventCount(1, eventCollector);
}
@Test
@@ -409,8 +411,8 @@
"just letting you know");
tester.evalAndGetError("error-value");
- JunitTestUtils.assertContainsEvent(eventCollector, "just letting you know");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "just letting you know");
+ assertEventCount(1, eventCollector);
// Change the progress message.
tester.getOrCreate("error-value").setHasTransientError(true).setProgress(
@@ -420,15 +422,15 @@
for (int i = 0; i < 2; i++) {
initializeReporter();
tester.evalAndGetError("error-value");
- JunitTestUtils.assertNoEvents(eventCollector);
+ assertNoEvents(eventCollector);
}
// When invalidating errors, we should show the new progress message.
initializeReporter();
tester.invalidateTransientErrors();
tester.evalAndGetError("error-value");
- JunitTestUtils.assertContainsEvent(eventCollector, "letting you know more");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "letting you know more");
+ assertEventCount(1, eventCollector);
}
@Test
@@ -1337,14 +1339,14 @@
tester.set("x", new StringValue("y")).setWarning("fizzlepop");
StringValue value = (StringValue) tester.evalAndGet("x");
assertEquals("y", value.getValue());
- JunitTestUtils.assertContainsEvent(eventCollector, "fizzlepop");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "fizzlepop");
+ assertEventCount(1, eventCollector);
tester.invalidate();
value = (StringValue) tester.evalAndGet("x");
assertEquals("y", value.getValue());
// No new events emitted.
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertEventCount(1, eventCollector);
}
/**
@@ -1452,7 +1454,7 @@
assertEquals("on the incremental build, top's builder should have only been executed once in "
+ "normal evaluation", 3, numTopInvocations.get());
}
- JunitTestUtils.assertContainsEvent(eventCollector, warningText);
+ assertContainsEvent(eventCollector, warningText);
assertEquals(0, topSignaled.getCount());
assertEquals(0, topRestartedBuild.getCount());
}
@@ -2435,12 +2437,12 @@
parentEvaluated, null, null, false, parentVal, ImmutableList.of(child)));
assertThat(tester.evalAndGet( /*keepGoing=*/false, parent)).isEqualTo(parentVal);
assertThat(parentEvaluated.getCount()).isEqualTo(1);
- JunitTestUtils.assertContainsEvent(eventCollector, "bloop");
+ assertContainsEvent(eventCollector, "bloop");
tester.resetPlayedEvents();
tester.getOrCreate(child, /*markAsModified=*/ true);
tester.invalidate();
assertThat(tester.evalAndGet( /*keepGoing=*/false, parent)).isEqualTo(parentVal);
- JunitTestUtils.assertContainsEvent(eventCollector, "bloop");
+ assertContainsEvent(eventCollector, "bloop");
assertThat(parentEvaluated.getCount()).isEqualTo(1);
}
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 dfd14d4..af2c4e0 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
@@ -16,6 +16,11 @@
import static com.google.common.collect.Iterables.getOnlyElement;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertContainsEvent;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertEventCount;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertGreaterThan;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertLessThan;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertNoEvents;
import static com.google.devtools.build.skyframe.GraphTester.CONCATENATE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -39,8 +44,6 @@
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.JunitTestUtils;
-import com.google.devtools.build.lib.testutil.MoreAsserts;
import com.google.devtools.build.lib.testutil.TestThread;
import com.google.devtools.build.lib.testutil.TestUtils;
import com.google.devtools.build.skyframe.GraphTester.StringValue;
@@ -139,7 +142,7 @@
tester.getOrCreate("ab").addDependency("a").addDependency("b").setComputedValue(CONCATENATE);
StringValue value = (StringValue) eval(false, GraphTester.toSkyKey("ab"));
assertEquals("ab", value.getValue());
- JunitTestUtils.assertNoEvents(eventCollector);
+ assertNoEvents(eventCollector);
}
/**
@@ -403,8 +406,8 @@
set("a", "a").setWarning("warning on 'a'");
StringValue value = (StringValue) eval(false, GraphTester.toSkyKey("a"));
assertEquals("a", value.getValue());
- JunitTestUtils.assertContainsEvent(eventCollector, "warning on 'a'");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "warning on 'a'");
+ assertEventCount(1, eventCollector);
}
@Test
@@ -416,8 +419,8 @@
tester.getOrCreate(a).setTag("a");
StringValue value = (StringValue) eval(false, a);
assertEquals("a value", value.getValue());
- JunitTestUtils.assertContainsEvent(eventCollector, "warning message");
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "warning message");
+ assertEventCount(1, eventCollector);
}
@Test
@@ -429,7 +432,7 @@
tester.getOrCreate(a).setTag("b");
StringValue value = (StringValue) eval(false, a);
assertEquals("a value", value.getValue());
- JunitTestUtils.assertEventCount(0, eventCollector); }
+ assertEventCount(0, eventCollector); }
@Test
public void warningDoesNotMatchRegex() throws Exception {
@@ -440,7 +443,7 @@
tester.getOrCreate(a).setTag("a");
StringValue value = (StringValue) eval(false, a);
assertEquals("a", value.getValue());
- JunitTestUtils.assertEventCount(0, eventCollector);
+ assertEventCount(0, eventCollector);
}
/** Regression test: events from already-done value not replayed. */
@@ -453,15 +456,15 @@
tester.getOrCreate(top).addDependency(a).setComputedValue(CONCATENATE);
// Build a so that it is already in the graph.
eval(false, a);
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertEventCount(1, eventCollector);
eventCollector.clear();
// Build top. The warning from a should be reprinted.
eval(false, top);
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertEventCount(1, eventCollector);
eventCollector.clear();
// Build top again. The warning should have been stored in the value.
eval(false, top);
- JunitTestUtils.assertEventCount(1, eventCollector);
+ assertEventCount(1, eventCollector);
}
@Test
@@ -495,9 +498,9 @@
});
evaluator.eval(ImmutableList.of(a));
assertTrue(evaluated.get());
- JunitTestUtils.assertEventCount(2, eventCollector);
- JunitTestUtils.assertContainsEvent(eventCollector, "boop");
- JunitTestUtils.assertContainsEvent(eventCollector, "beep");
+ assertEventCount(2, eventCollector);
+ assertContainsEvent(eventCollector, "boop");
+ assertContainsEvent(eventCollector, "beep");
eventCollector.clear();
evaluator = makeEvaluator(graph,
ImmutableMap.of(GraphTester.NODE_TYPE, tester.createDelegatingFunction()),
@@ -505,8 +508,8 @@
evaluated.set(false);
evaluator.eval(ImmutableList.of(a));
assertFalse(evaluated.get());
- JunitTestUtils.assertEventCount(1, eventCollector);
- JunitTestUtils.assertContainsEvent(eventCollector, "boop");
+ assertEventCount(1, eventCollector);
+ assertContainsEvent(eventCollector, "boop");
}
@Test
@@ -1150,8 +1153,8 @@
* topKey, if {@code selfEdge} is true.
*/
private static void assertManyCycles(ErrorInfo errorInfo, SkyKey topKey, boolean selfEdge) {
- MoreAsserts.assertGreaterThan(1, Iterables.size(errorInfo.getCycleInfo()));
- MoreAsserts.assertLessThan(50, Iterables.size(errorInfo.getCycleInfo()));
+ assertGreaterThan(1, Iterables.size(errorInfo.getCycleInfo()));
+ assertLessThan(50, Iterables.size(errorInfo.getCycleInfo()));
boolean foundSelfEdge = false;
for (CycleInfo cycle : errorInfo.getCycleInfo()) {
assertEquals(1, cycle.getCycle().size()); // Self-edge.
