Polish ThreadsTest

Author: marcphilipp

src/test/java/org/junit/tests/running/classes/ThreadsTest.java

@@ -2,21 +2,25 @@
 
 import org.junit.AfterClass;
 import org.junit.Test;
-import org.junit.internal.runners.ErrorReportingRunner;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
 import org.junit.runner.Result;
 import org.junit.runner.RunWith;
-import org.junit.runner.Runner;
 import org.junit.runner.notification.RunListener;
 import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.InitializationError;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 
 public class ThreadsTest {
-    private String log = "";
+
+    private List<Boolean> interruptedFlags = new ArrayList<Boolean>();
+    private JUnitCore core = new JUnitCore();
 
     public static class TestWithInterrupt {
 
@@ -34,18 +38,17 @@ public void otherTestCaseInterruptingCurrentThread() {
 
     @Test
     public void currentThreadInterruptedStatusIsClearedAfterEachTestExecution() {
-        log = "";
-        JUnitCore jUnitCore = new JUnitCore();
-        jUnitCore.addListener(new RunListener() {
+        core.addListener(new RunListener() {
             @Override
             public void testFinished(Description description) {
-                log += Thread.currentThread().isInterrupted() + " ";
+                interruptedFlags.add(Thread.currentThread().isInterrupted());
             }
         });
 
-        Result result = jUnitCore.run(TestWithInterrupt.class);
+        Result result = core.run(TestWithInterrupt.class);
+
         assertEquals(0, result.getFailureCount());
-        assertEquals("false false ", log);
+        assertEquals(asList(false, false), interruptedFlags);
     }
 
     @RunWith(BlockJUnit4ClassRunner.class)
@@ -63,29 +66,18 @@ public void test() {
 
     @Test
     public void currentThreadInterruptStatusIsClearedAfterSuiteExecution() {
-        log = "";
-        JUnitCore jUnitCore = new JUnitCore();
-        jUnitCore.addListener(new RunListener() {
+        core.addListener(new RunListener() {
             @Override
-            public void testSuiteFinished(Description description) throws Exception {
-                log += Thread.currentThread().isInterrupted();
+            public void testSuiteFinished(Description description) {
+                interruptedFlags.add(Thread.currentThread().isInterrupted());
             }
         });
 
-        Request request = new Request() {
-            @Override
-            public Runner getRunner() {
-                try {
-                    return new BlockJUnit4ClassRunner(TestWithInterruptFromAfterClass.class) {
-                    };
-                } catch (InitializationError e) {
-                    return new ErrorReportingRunner(TestWithInterruptFromAfterClass.class, e);
-                }
-            }
-        };
+        Request request = Request.aClass(TestWithInterruptFromAfterClass.class);
+
+        Result result = core.run(request);
 
-        Result result = jUnitCore.run(request);
         assertEquals(0, result.getFailureCount());
-        assertEquals("false", log);
+        assertEquals(singletonList(false), interruptedFlags);
     }
 }