Merge branch 'Tibor17-junit.issues' into concurrent-run-listeners

Conflicts:
	build.xml
	src/main/java/org/junit/runner/notification/RunNotifier.java
	src/main/java/org/junit/runner/notification/SynchronizedRunListener.java
	src/test/java/org/junit/tests/AllTests.java

Author: kcooney

Diff for: NOTICE.txt

@@ -2,4 +2,6 @@
    ==  Notices and attributions required by libraries that the project depends on   ==
    ===================================================================================
 
- The JUnit depends on Java Hamcrest (http://hamcrest.org/JavaHamcrest/).
+ The JUnit depends on Java Hamcrest (http://hamcrest.org/JavaHamcrest).
+
+ The JUnit depends on net.jcip:jcip-annotations:1.0 (http://jcip.net).

Diff for: build.xml

@@ -33,6 +33,8 @@
   <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
   <property name="jciplib" location="lib/jcip-annotations-1.0.jar" />
   <property name="jciplibsources" location="lib/jcip-annotations-1.0-sources.jar" />
+  <property name="jciplib" location="lib/jcip-annotations-1.0.jar" />
+  <property name="jciplibsources" location="lib/jcip-annotations-1.0-sources.jar" />
 
   <property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
 

Diff for: pom.xml

@@ -261,6 +261,7 @@
                     <includeDependencySources>true</includeDependencySources>
                     <dependencySourceIncludes>
                         <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude>
+                        <dependencySourceInclude>net.jcip:jcip-annotations:*</dependencySourceInclude>
                     </dependencySourceIncludes>
                 </configuration>
             </plugin>

Diff for: src/main/java/org/junit/runner/Result.java

@@ -1,5 +1,6 @@
 package org.junit.runner;
 
+import net.jcip.annotations.ThreadSafe;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
 
@@ -65,6 +66,7 @@ public boolean wasSuccessful() {
         return getFailureCount() == 0;
     }
 
+    @ThreadSafe
     private class Listener extends RunListener {
         @Override
         public void testRunStarted(Description description) throws Exception {

Diff for: src/main/java/org/junit/runner/notification/RunNotifier.java

@@ -77,7 +77,7 @@ void run() {
      * Do not invoke.
      */
     public void fireTestRunStarted(final Description description) {
-        new SafeNotifier(fListeners) {
+        new SafeNotifier() {
             @Override
             protected void notifyListener(RunListener each) throws Exception {
                 each.testRunStarted(description);

Diff for: src/main/java/org/junit/runner/notification/SynchronizedRunListener.java

@@ -2,6 +2,8 @@
 
 import java.lang.annotation.Annotation;
 
+import net.jcip.annotations.ThreadSafe;
+
 import org.junit.runner.Description;
 import org.junit.runner.Result;
 
@@ -13,8 +15,9 @@
  * @version 4.12
  * @since 4.12
  */
+@ThreadSafe
 final class SynchronizedRunListener extends RunListener {
-    private static final Object fMonitor = new Object();
+    private static final Object sMonitor = new Object();
     private final RunListener fListener;
 
     public static RunListener wrapIfNotThreadSafe(RunListener listener) {
@@ -32,49 +35,49 @@ public static RunListener wrapIfNotThreadSafe(RunListener listener) {
 
     @Override
     public void testRunStarted(Description description) throws Exception {
-        synchronized (fMonitor) {
+        synchronized (sMonitor) {
             fListener.testRunStarted(description);
         }
     }
 
     @Override
     public void testRunFinished(Result result) throws Exception {
-        synchronized (fMonitor) {
+        synchronized (sMonitor) {
             fListener.testRunFinished(result);
         }
     }
 
     @Override
     public void testStarted(Description description) throws Exception {
-        synchronized (fMonitor) {
+        synchronized (sMonitor) {
             fListener.testStarted(description);
         }
     }
 
     @Override
     public void testFinished(Description description) throws Exception {
-        synchronized (fMonitor) {
+        synchronized (sMonitor) {
             fListener.testFinished(description);
         }
     }
 
     @Override
     public void testFailure(Failure failure) throws Exception {
-        synchronized (fMonitor) {
+        synchronized (sMonitor) {
             fListener.testFailure(failure);
         }
     }
 
     @Override
     public void testAssumptionFailure(Failure failure) {
-        synchronized (fMonitor) {
+        synchronized (sMonitor) {
             fListener.testAssumptionFailure(failure);
         }
     }
 
     @Override
     public void testIgnored(Description description) throws Exception {
-        synchronized (fMonitor) {
+        synchronized (sMonitor) {
             fListener.testIgnored(description);
         }
     }

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

@@ -6,8 +6,8 @@
 import org.junit.internal.matchers.StacktracePrintingMatcherTest;
 import org.junit.runner.RunWith;
 import org.junit.runner.notification.AddRemoveListenerTest;
-import org.junit.runner.notification.RunNotifierTest;
 import org.junit.runner.notification.ConcurrentRunNotifierTest;
+import org.junit.runner.notification.RunNotifierTest;
 import org.junit.runner.notification.SynchronizedRunListenerTest;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;