aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google
diff options
context:
space:
mode:
authorGravatar vladmos <vladmos@google.com>2017-08-10 20:30:17 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-08-11 12:56:15 +0200
commita664a5118e552504ba7962e1cccfea43b51ef28e (patch)
tree0f0926df29537fc48208721818a24bc2817e1ee3 /src/test/java/com/google
parent4435515d156dbb0cc40869de686d326b175f61b8 (diff)
Make the print function output debug messages
RELNOTES: The `print` function now prints debug messages instead of warnings. PiperOrigin-RevId: 164880003
Diffstat (limited to 'src/test/java/com/google')
-rw-r--r--src/test/java/com/google/devtools/build/lib/events/util/EventCollectionApparatus.java8
-rw-r--r--src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java6
-rw-r--r--src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java4
-rw-r--r--src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java2
4 files changed, 16 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/events/util/EventCollectionApparatus.java b/src/test/java/com/google/devtools/build/lib/events/util/EventCollectionApparatus.java
index 8d104525fc..aaf3569686 100644
--- a/src/test/java/com/google/devtools/build/lib/events/util/EventCollectionApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/events/util/EventCollectionApparatus.java
@@ -158,6 +158,14 @@ public final class EventCollectionApparatus {
}
/**
+ * Utility method: Assert that the {@link #collector()} has received a
+ * debug message with the {@code expectedMessage}.
+ */
+ public Event assertContainsDebug(String expectedMessage) {
+ return MoreAsserts.assertContainsEvent(eventCollector, expectedMessage, EventKind.DEBUG);
+ }
+
+ /**
* Utility method: Assert that the {@link #collector()} has received an event of the given type
* and with the {@code expectedMessage}.
*/
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index 983c7a29ff..86e7964041 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -1318,11 +1318,11 @@ public class SkylarkEvaluationTest extends EvaluationTest {
// TODO(fwe): cannot be handled by current testing suite
setFailFast(false);
eval("print('hello')");
- assertContainsWarning("hello");
+ assertContainsDebug("hello");
eval("print('a', 'b')");
- assertContainsWarning("a b");
+ assertContainsDebug("a b");
eval("print('a', 'b', sep='x')");
- assertContainsWarning("axb");
+ assertContainsDebug("axb");
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
index 0fa14bcec0..ceeffe74eb 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
@@ -242,6 +242,10 @@ public class EvaluationTestCase {
return eventCollectionApparatus.assertContainsWarning(expectedMessage);
}
+ public Event assertContainsDebug(String expectedMessage) {
+ return eventCollectionApparatus.assertContainsDebug(expectedMessage);
+ }
+
public EvaluationTestCase clearEvents() {
eventCollectionApparatus.clear();
return this;
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
index fd140600b0..118eed2538 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
@@ -77,7 +77,7 @@ public abstract class FoundationTestCase {
@Before
public final void initializeLogging() throws Exception {
- eventCollector = new EventCollector(EventKind.ERRORS_AND_WARNINGS);
+ eventCollector = new EventCollector(EventKind.ERRORS_WARNINGS_AND_INFO);
eventBus = new EventBus();
reporter = new Reporter(eventBus, eventCollector);
reporter.addHandler(failFastHandler);