aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar Florian Weikert <fwe@google.com>2015-12-02 17:53:24 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2015-12-02 22:27:15 +0000
commita42c02b57a8c5a47b77d9e06e016f44e53452dcd (patch)
tree01be4d2c4d9b42238dc8e4d38b57db866853d39b /src/test
parentb679d9e8f366f934e8206dbf2e2c950f4dcf1d95 (diff)
Migrated tests in devtools/build/lib/events to JUnit 4.
-- MOS_MIGRATED_REVID=109208102
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/google/devtools/build/lib/events/EventTestTemplate.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/events/ReporterStreamTest.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/events/ReporterTest.java4
3 files changed, 3 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/events/EventTestTemplate.java b/src/test/java/com/google/devtools/build/lib/events/EventTestTemplate.java
index 5d7ae46a1b..8ef996a6c8 100644
--- a/src/test/java/com/google/devtools/build/lib/events/EventTestTemplate.java
+++ b/src/test/java/com/google/devtools/build/lib/events/EventTestTemplate.java
@@ -27,7 +27,7 @@ public abstract class EventTestTemplate {
protected Location locationNoLineInfo;
@Before
- public void setUp() throws Exception {
+ public final void createLocations() throws Exception {
String message = "This is not an error message.";
path = new PathFragment("/path/to/workspace/my/sample/path.txt");
diff --git a/src/test/java/com/google/devtools/build/lib/events/ReporterStreamTest.java b/src/test/java/com/google/devtools/build/lib/events/ReporterStreamTest.java
index c8a320551d..786a4deb98 100644
--- a/src/test/java/com/google/devtools/build/lib/events/ReporterStreamTest.java
+++ b/src/test/java/com/google/devtools/build/lib/events/ReporterStreamTest.java
@@ -32,7 +32,7 @@ public class ReporterStreamTest {
private EventHandler outAppender;
@Before
- public void setUp() throws Exception {
+ public final void createOutputAppender() throws Exception {
reporter = new Reporter();
out = new StringBuilder();
outAppender = new EventHandler() {
diff --git a/src/test/java/com/google/devtools/build/lib/events/ReporterTest.java b/src/test/java/com/google/devtools/build/lib/events/ReporterTest.java
index e14fc6c6df..3393fde39f 100644
--- a/src/test/java/com/google/devtools/build/lib/events/ReporterTest.java
+++ b/src/test/java/com/google/devtools/build/lib/events/ReporterTest.java
@@ -33,10 +33,8 @@ public class ReporterTest extends EventTestTemplate {
private StringBuilder out;
private AbstractEventHandler outAppender;
- @Override
@Before
- public void setUp() throws Exception {
- super.setUp();
+ public final void initializeOutput() throws Exception {
reporter = new Reporter();
out = new StringBuilder();
outAppender = new AbstractEventHandler(EventKind.ERRORS) {