Make RunNotifierTest a JUnit4-style test again

Author: kcooney

Diff for: src/test/java/junit/tests/AllTests.java

@@ -17,7 +17,6 @@ public static Test suite() {
         suite.addTest(junit.tests.framework.AllTests.suite());
         suite.addTest(junit.tests.runner.AllTests.suite());
         suite.addTest(junit.tests.extensions.AllTests.suite());
-        suite.addTest(org.junit.tests.SmokeTests.suite());
         return suite;
     }
 }

Diff for: src/test/java/org/junit/runner/notification/RunNotifierTest.java

@@ -1,29 +1,20 @@
 package org.junit.runner.notification;
 
 import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 import org.junit.runner.Description;
 import org.junit.runner.Result;
 
-/**
- * Tests for {@link RunNotifier}. These tests are written in JUnit3-style
- * because bugs in {@code RunNotifier} can cause incorrect results when running
- * other tests (including causing failed tests to appear to be passing).
- */
-public class RunNotifierTest extends TestCase {
-    private RunNotifier notifier;
+public class RunNotifierTest {
+    private final RunNotifier notifier = new RunNotifier();
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        notifier = new RunNotifier();
-    }
-
-    public void testNotifiesSecondListenerIfFirstThrowsException() {
+    @Test
+    public void notifiesSecondListenerIfFirstThrowsException() {
         FailureListener failureListener = new FailureListener();
         notifier.addListener(new CorruptListener());
         notifier.addListener(failureListener);
@@ -32,7 +23,8 @@ public void testNotifiesSecondListenerIfFirstThrowsException() {
                 failureListener.failure);
     }
 
-    public void testHasNoProblemsWithFailingListeners() { // see issues 209 and 395
+    @Test
+    public void hasNoProblemsWithFailingListeners() { // see issues 209 and 395
         notifier.addListener(new CorruptListener());
         notifier.addListener(new FailureListener());
         notifier.addListener(new CorruptListener());
@@ -51,7 +43,8 @@ public void testFailure(Failure failure) throws Exception {
         }
     }
 
-    public void testAddAndRemoveWithNonThreadSafeListener() {
+    @Test
+    public void addAndRemoveWithNonThreadSafeListener() {
         CountingListener listener = new CountingListener();
         assertThat(listener.testStarted.get(), is(0));
         notifier.addListener(listener);
@@ -61,8 +54,9 @@ public void testAddAndRemoveWithNonThreadSafeListener() {
         notifier.fireTestStarted(null);
         assertThat(listener.testStarted.get(), is(1));
     }
-    
-    public void testAddFirstAndRemoveWithNonThreadSafeListener() {
+
+    @Test
+    public void addFirstAndRemoveWithNonThreadSafeListener() {
         CountingListener listener = new CountingListener();
         assertThat(listener.testStarted.get(), is(0));
         notifier.addFirstListener(listener);
@@ -73,7 +67,8 @@ public void testAddFirstAndRemoveWithNonThreadSafeListener() {
         assertThat(listener.testStarted.get(), is(1));
     }
 
-    public void testAddAndRemoveWithThreadSafeListener() {
+    @Test
+    public void addAndRemoveWithThreadSafeListener() {
         ThreadSafeListener listener = new ThreadSafeListener();
         assertThat(listener.testStarted.get(), is(0));
         notifier.addListener(listener);
@@ -84,7 +79,8 @@ public void testAddAndRemoveWithThreadSafeListener() {
         assertThat(listener.testStarted.get(), is(1));
     }
 
-    public void testAddFirstAndRemoveWithThreadSafeListener() {
+    @Test
+    public void addFirstAndRemoveWithThreadSafeListener() {
         ThreadSafeListener listener = new ThreadSafeListener();
         assertThat(listener.testStarted.get(), is(0));
         notifier.addFirstListener(listener);