开源软件构建与测试

Changes of Revision 3

_service:tar_scm:junit.spec Changed

@@ -1,18 +1,19 @@
 Name:           junit
 Epoch:          1
-Version:        4.12
-Release:        13
+Version:        4.13.2
+Release:        2
 Summary:        A Java package for unit testing frameworks
 License:        EPL-1.0
 URL:            http://www.junit.org/
 Source0:        https://github.com/%{name}-team/%{name}/archive/r%{version}.tar.gz
-Patch0000:      CVE-2020-15250-pre.patch
-Patch0001:      CVE-2020-15250.patch
+Patch0000:      0001-Port-to-hamcrest-2.2.patch
 
 BuildArch:      noarch
 BuildRequires:  maven-local mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
+BuildRequires:  java-11-openjdk-devel
+Requires:       java-11-openjdk
 
 Obsoletes:      %{name}-demo < 4.12
 
@@ -37,6 +38,9 @@
 find . -name "*.jar" -delete
 find . -name "*.class" -delete
 
+# InaccessibleBaseClassTest fails with Java 8
+sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
+
 %pom_remove_plugin :replacer
 sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java
 
@@ -60,9 +64,12 @@
     </plugin>"
 
 %mvn_file : junit
+%mvn_alias junit:junit junit:junit-dep
 
 %build
-%mvn_build
+#set openjdk11 for build
+export JAVA_HOME=%{_jvmdir}/java-11-openjdk
+%mvn_build -- -DjdkVersion=1.7 -P\!restrict-doclint
 
 %install
 %mvn_install
@@ -74,6 +81,12 @@
 %doc doc/*
 
 %changelog
+* Mon Sep 25 2023 wangkai <13474090681@163.com> - 1:4.13.2-2
+- Enable test for build
+
+* Mon Sep 25 2023 wangkai <13474090681@163.com> - 1:4.13.2-1
+- Update to 4.13.2
+
 * Fri Feb 19 2021 wangxiao <wangxiao65@huawei.com> - 1:4.12-13
 - Fix CVE-2020-15250

_service:tar_scm:0001-Port-to-hamcrest-2.2.patch Added

@@ -0,0 +1,108 @@
+From 85c780b61cd35b4544d2926393805e1699641f38 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Fri, 6 Mar 2020 14:28:05 +0100
+Subject: PATCH Port to hamcrest 2.2
+
+---
+ .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 ---
+ .../org/junit/internal/matchers/ThrowableCauseMatcher.java     | 2 --
+ .../org/junit/internal/matchers/ThrowableMessageMatcher.java   | 2 --
+ src/main/java/org/junit/matchers/JUnitMatchers.java            | 2 +-
+ .../experimental/theories/runner/WithDataPointMethod.java      | 2 +-
+ 5 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java
+index 93a6827..3ea4a81 100644
+--- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java
++++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java
+@@ -1,7 +1,6 @@
+ package org.junit.internal.matchers;
+ 
+ import org.hamcrest.Description;
+-import org.hamcrest.Factory;
+ import org.hamcrest.Matcher;
+ 
+ import org.junit.internal.Throwables;
+@@ -39,13 +38,11 @@ public class StacktracePrintingMatcher<T extends Throwable> extends
+         return Throwables.getStacktrace(throwable);
+     }
+ 
+-    @Factory
+     public static <T extends Throwable> Matcher<T> isThrowable(
+             Matcher<T> throwableMatcher) {
+         return new StacktracePrintingMatcher<T>(throwableMatcher);
+     }
+ 
+-    @Factory
+     public static <T extends Exception> Matcher<T> isException(
+             Matcher<T> exceptionMatcher) {
+         return new StacktracePrintingMatcher<T>(exceptionMatcher);
+diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
+index 6e2ff5e..1f0a0a0 100644
+--- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
++++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
+@@ -1,7 +1,6 @@
+ package org.junit.internal.matchers;
+ 
+ import org.hamcrest.Description;
+-import org.hamcrest.Factory;
+ import org.hamcrest.Matcher;
+ import org.hamcrest.TypeSafeMatcher;
+ 
+@@ -43,7 +42,6 @@ public class ThrowableCauseMatcher<T extends Throwable> extends
+      * @param matcher to apply to the cause of the outer exception
+      * @param <T> type of the outer exception
+      */
+-    @Factory
+     public static <T extends Throwable> Matcher<T> hasCause(final Matcher<?> matcher) {
+         return new ThrowableCauseMatcher<T>(matcher);
+     }
+diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java
+index 74386a8..7d16b11 100644
+--- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java
++++ b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java
+@@ -1,7 +1,6 @@
+ package org.junit.internal.matchers;
+ 
+ import org.hamcrest.Description;
+-import org.hamcrest.Factory;
+ import org.hamcrest.Matcher;
+ import org.hamcrest.TypeSafeMatcher;
+ 
+@@ -30,7 +29,6 @@ public class ThrowableMessageMatcher<T extends Throwable> extends
+         matcher.describeMismatch(item.getMessage(), description);
+     }
+ 
+-    @Factory
+     public static <T extends Throwable> Matcher<T> hasMessage(final Matcher<String> matcher) {
+         return new ThrowableMessageMatcher<T>(matcher);
+     }
+diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java
+index 13407cc..8889266 100644
+--- a/src/main/java/org/junit/matchers/JUnitMatchers.java
++++ b/src/main/java/org/junit/matchers/JUnitMatchers.java
+@@ -56,7 +56,7 @@ public class JUnitMatchers {
+      * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead.
+      */
+     @Deprecated
+-    public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) {
++    public static <T> Matcher<Iterable<? extends T>> everyItem(final Matcher<T> elementMatcher) {
+         return CoreMatchers.everyItem(elementMatcher);
+     }
+ 
+diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java
+index f2b2753..e5759ed 100644
+--- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java
++++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java
+@@ -108,7 +108,7 @@ public class WithDataPointMethod {
+         return JUnitCore.runClasses(type).getFailures();
+     }
+ 
+-    private Matcher<Iterable<Failure>> empty() {
++    private Matcher<Iterable<? extends Failure>> empty() {
+         return everyItem(nullValue(Failure.class));
+     }
+ }
+-- 
+2.25.2
+

_service:tar_scm:CVE-2020-15250-pre.patch Deleted

@@ -1,63 +0,0 @@
-From 24b8ee0bec2f2761b479bdd989275f19597955a3 Mon Sep 17 00:00:00 2001
-From: Carsten Varming <cvarming@twitter.com>
-Date: Sat, 21 May 2016 22:43:07 -0400
-Subject: PATCH Retry TemporaryFolder.newFolder's call to mkdir if the call
- does not create a new directory.
-
-Closes #1304
----
- .../java/org/junit/rules/TemporaryFolder.java | 27 +++++++++++++++----
- 1 file changed, 22 insertions(+), 5 deletions(-)
-
-diff --git a/src/main/java/org/junit/rules/TemporaryFolder.java b/src/main/java/org/junit/rules/TemporaryFolder.java
-index 8fc9d5b370..0b3e874528 100644
---- a/src/main/java/org/junit/rules/TemporaryFolder.java
-+++ b/src/main/java/org/junit/rules/TemporaryFolder.java
-@@ -32,6 +32,9 @@ public class TemporaryFolder extends Ext
-     private final File parentFolder;
-     private File folder;
- 
-+    private static final int TEMP_DIR_ATTEMPTS = 10000;
-+    private static final String TMP_PREFIX = "junit";
-+
-     public TemporaryFolder() {
-         this(null);
-     }
-@@ -75,7 +78,7 @@ public class TemporaryFolder extends Ext
-      * Returns a new fresh file with a random name under the temporary folder.
-      */
-     public File newFile() throws IOException {
--        return File.createTempFile("junit", null, getRoot());
-+        return File.createTempFile(TMP_PREFIX, null, getRoot());
-     }
- 
-     /**
-@@ -131,10 +134,24 @@ public class TemporaryFolder extends Ext
-     }
- 
-     private File createTemporaryFolderIn(File parentFolder) throws IOException {
--        File createdFolder = File.createTempFile("junit", "", parentFolder);
--        createdFolder.delete();
--        createdFolder.mkdir();
--        return createdFolder;
-+        File createdFolder = null;
-+        for (int i = 0; i < TEMP_DIR_ATTEMPTS; ++i) {
-+            // Use createTempFile to get a suitable folder name.
-+            String suffix = ".tmp";
-+            File tmpFile = File.createTempFile(TMP_PREFIX, suffix, parentFolder);
-+            String tmpName = tmpFile.getName();
-+            // Discard suffix of tmpName.
-+            String folderName = tmpName.substring(0, tmpName.length() - suffix.length());
-+            createdFolder = new File(parentFolder, folderName);
-+            if (createdFolder.mkdir()) {
-+                tmpFile.delete();
-+                return createdFolder;
-+            }
-+            tmpFile.delete();
-+        }
-+        throw new IOException("Unable to create temporary directory in: "
-+            + parentFolder.toString() + ". Tried " + TEMP_DIR_ATTEMPTS + " times. "
-+            + "Last attempted to create: " + createdFolder.toString());
-     }
- 
-     /**

_service:tar_scm:CVE-2020-15250.patch Deleted

@@ -1,77 +0,0 @@
-From 610155b8c22138329f0723eec22521627dbc52ae Mon Sep 17 00:00:00 2001
-From: Marc Philipp <mail@marcphilipp.de>
-Date: Sun, 11 Oct 2020 16:56:21 +0200
-Subject: PATCH Merge pull request from GHSA-269g-pwp5-87pp
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When running on Java 7 or later, temporary directories are now created
-Using Java’s NIO API which restricts permissions to owner-only by
-default.
----
- .../java/org/junit/rules/TemporaryFolder.java | 43 ++++++++++++++++++-
- .../org/junit/rules/TempFolderRuleTest.java   | 37 +++++++++++++++-
- 2 files changed, 78 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/java/org/junit/rules/TemporaryFolder.java b/src/main/java/org/junit/rules/TemporaryFolder.java
-index 1a6a770608..a726c66e36 100644
---- a/src/main/java/org/junit/rules/TemporaryFolder.java
-+++ b/src/main/java/org/junit/rules/TemporaryFolder.java
-@@ -2,6 +2,9 @@
- 
- import java.io.File;
- import java.io.IOException;
-+import java.lang.reflect.Array;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
- 
- import org.junit.Rule;
- 
-@@ -133,7 +136,45 @@ public File newFolder() throws IOException {
-         return createTemporaryFolderIn(getRoot());
-     }
- 
--    private File createTemporaryFolderIn(File parentFolder) throws IOException {
-+    private static File createTemporaryFolderIn(File parentFolder) throws IOException {
-+        try {
-+            return createTemporaryFolderWithNioApi(parentFolder);
-+        } catch (ClassNotFoundException ignore) {
-+            // Fallback for Java 5 and 6
-+            return createTemporaryFolderWithFileApi(parentFolder);
-+        } catch (InvocationTargetException e) {
-+            Throwable cause = e.getCause();
-+            if (cause instanceof IOException) {
-+                throw (IOException) cause;
-+            }
-+            if (cause instanceof RuntimeException) {
-+                throw (RuntimeException) cause;
-+            }
-+            IOException exception = new IOException("Failed to create temporary folder in " + parentFolder);
-+            exception.initCause(cause);
-+            throw exception;
-+        } catch (Exception e) {
-+            throw new RuntimeException("Failed to create temporary folder in " + parentFolder, e);
-+        }
-+    }
-+
-+    private static File createTemporaryFolderWithNioApi(File parentFolder) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-+        Class<?> filesClass = Class.forName("java.nio.file.Files");
-+        Object fileAttributeArray = Array.newInstance(Class.forName("java.nio.file.attribute.FileAttribute"), 0);
-+        Class<?> pathClass = Class.forName("java.nio.file.Path");
-+        Object tempDir;
-+        if (parentFolder != null) {
-+            Method createTempDirectoryMethod = filesClass.getDeclaredMethod("createTempDirectory", pathClass, String.class, fileAttributeArray.getClass());
-+            Object parentPath = File.class.getDeclaredMethod("toPath").invoke(parentFolder);
-+            tempDir = createTempDirectoryMethod.invoke(null, parentPath, TMP_PREFIX, fileAttributeArray);
-+        } else {
-+            Method createTempDirectoryMethod = filesClass.getDeclaredMethod("createTempDirectory", String.class, fileAttributeArray.getClass());
-+            tempDir = createTempDirectoryMethod.invoke(null, TMP_PREFIX, fileAttributeArray);
-+        }
-+        return (File) pathClass.getDeclaredMethod("toFile").invoke(tempDir);
-+    }
-+
-+    private static File createTemporaryFolderWithFileApi(File parentFolder) throws IOException {
-         File createdFolder = null;
-         for (int i = 0; i < TEMP_DIR_ATTEMPTS; ++i) {
-             // Use createTempFile to get a suitable folder name.

_service Changed

_service:tar_scm:junit.yaml Changed

_service:tar_scm:r4.12.tar.gz/.travis.yml Deleted

_service:tar_scm:r4.12.tar.gz/doc/homepage.html Deleted

@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<HTML><HEAD><TITLE>JUnit</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2712.300" name=GENERATOR>
-<META content="Erich Gamma" name=Author></HEAD>
-<BODY>
-<H1><B><FONT color=#00cc00>J</FONT><FONT color=#ff0000>U</FONT><FONT
-color=#000000>nit </FONT></B></H1>
-<P>JUnit is a simple framework to write repeatable tests. It is an instance of
-the xUnit architecture for unit testing frameworks.
-<UL>
-  <LI><A href="http://junit.sourceforge.net/#Getting">Getting Started</A>
-
-  <LI><A href="http://junit.sourceforge.net/#Documentation">Documentation</A>
-  <LI><A href="http://junit.sourceforge.net/#Related">JUnit related
-  sites/projects</A> </LI>
-  <LI><A href="http://junit.sourceforge.net/#Mail">Mailing Lists</A></LI>
-  <LI><A href="http://junit.sourceforge.net/#Developer">Get Involved</A></LI>
-</UL>
-
-<h2>
-<a NAME="Getting"></a>Getting Started</h2>
-
-To get started with unit testing and JUnit read the article:
-<a href="doc/cookbook/cookbook.htm">JUnit Cookbook</a>.
-<br>This article describes basic test writing using JUnit 4.
-<p>You find additional samples in the org.junit.samples package:
-<ul>
-<li>
-SimpleTest.java - some simple test cases</li>
-
-<li>
-VectorTest.java - test cases for java.util.Vector</li>
-</ul>
-<P>JUnit 4.x only comes with a textual TestRunner.  For graphical feedback,
-most major IDE's support
-JUnit 4. If necessary, you can run JUnit 4 tests in a JUnit 3
-environment by adding the following method to each test class:
-<pre>
-public static Test suite() {
-   return new JUnit4TestAdapter(ThisClass.class);
-} 
-
-</pre>
-
-<h2>
-<a NAME="Documentation"></a>Documentation</h2>
-
-<blockquote><a href="doc/cookbook/cookbook.htm">JUnit Cookbook</a>
-<br>&nbsp;&nbsp;&nbsp; A cookbook for implementing tests with JUnit.
-<br><a href="javadoc_40/index.html">Javadoc</a>
-<br>&nbsp;&nbsp;&nbsp; API documentation generated with javadoc.
-<br><a href="doc/faq/faq.htm">Frequently asked questions</a>
-<br>&nbsp;&nbsp;&nbsp; Some frequently asked questions about using JUnit.
-
-<br><a href="README.html">Release notes</a>
-<br>&nbsp;&nbsp;&nbsp; Latest JUnit release notes
-<br><a href="epl-v10.html">License</a>
-<br>&nbsp;&nbsp;&nbsp; The terms of the common public license used for JUnit.<br>
-</blockquote>
-The following documents still describe JUnit 3.8.
-<blockquote>
-<br><a href="junit3.8.1/index.html">The JUnit 3.8 version of this homepage</a>
-<br><a href="doc/testinfected/testing.htm">Test Infected - Programmers
-Love Writing Tests</a>
-<br>&nbsp;&nbsp;&nbsp; An article demonstrating the development process
-with JUnit.
-
-<br><a href="doc/cookstour/cookstour.htm">JUnit - A cooks tour</a>
-</blockquote>
-
-<H2><A name=Related></A>JUnit Related Projects/Sites</H2>
-<UL>
-  <LI><A href="http://www.junit.org/">junit.org</A> - a site for software
-  developers using JUnit. It provides instructions for how to integrate JUnit
-  with development tools like JBuilder and VisualAge/Java.  As well as articles
-  about and extensions to JUnit.</LI>
-  <LI><A href="http://www.xprogramming.com/software.htm">XProgramming.com</A> -
-  various implementations of the xUnit testing framework architecture.&nbsp;</LI>
-
-</UL>
-<H2><A name=Mail></A>Mailing Lists</H2>
-There are three junit mailing lists:
-<UL>
-  <LI>JUnit announce: junit-announce@lists.sourceforge.net <A
-  href="http://lists.sourceforge.net/lists/listinfo/junit-announce">Archives/Subscribe/Unsubscribe</A></LI>
-    <LI>JUnit users list: junit@yahoogroups.com <A
-    href="http://groups.yahoo.com/group/junit/">Archives/Subscribe/Unsubscribe</A></LI>
-      <LI>JUnit developer list: junit-devel@lists.sourceforge.net <A
-      href="http://lists.sourceforge.net/lists/listinfo/junit-devel">Archives/Subscribe/Unsubscribe</A></LI>
-
-      </UL>
-
-      <H2><A name=Developer></A>Get Involved</H2>
-      JUnit celebrates programmers testing their own software.  As a result
-      bugs, patches, and feature requests which include JUnit TestCases have a
-      better
-      chance of being addressed than those without.  
-      
-      <br/>
-      JUnit is forged on
-      Sourceforge please use the tools <A
-      href="http://sf.net/projects/junit">provided</A> for your submissions.
-
-      <br/>
-      JUnit source code is now hosted on <a href="http://github.com/junit-team/junit">GitHub</a>.
-
-<hr WIDTH="100%">
-<font size="1">
-hosted by </font> <A href="http://sourceforge.net"><IMG src="http://sourceforge.net/sflogo.php?group_id=15278" width="88" height="31"
-border="0" alt="SourceForge Logo"></A>
-</font>
-
-</BODY></HTML>

_service:tar_scm:r4.12.tar.gz/doc/index.htm Deleted

_service:tar_scm:r4.12.tar.gz/src/changes Deleted

_service:tar_scm:r4.12.tar.gz/src/changes/changes.xml Deleted

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/ExperimentalTests.java Deleted

@@ -1,37 +0,0 @@
-package org.junit.tests.experimental;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.junit.tests.experimental.results.PrintableResultTest;
-import org.junit.tests.experimental.results.ResultMatchersTest;
-import org.junit.tests.experimental.theories.ParameterSignatureTest;
-import org.junit.tests.experimental.theories.extendingwithstubs.StubbedTheoriesTest;
-import org.junit.tests.experimental.theories.internal.AllMembersSupplierTest;
-import org.junit.tests.experimental.theories.internal.ParameterizedAssertionErrorTest;
-import org.junit.tests.experimental.theories.internal.SpecificDataPointsSupplierTest;
-import org.junit.tests.experimental.theories.runner.SuccessfulWithDataPointFields;
-import org.junit.tests.experimental.theories.runner.UnsuccessfulWithDataPointFields;
-import org.junit.tests.experimental.theories.runner.WhenNoParametersMatch;
-import org.junit.tests.experimental.theories.runner.WithAutoGeneratedDataPoints;
-import org.junit.tests.experimental.theories.runner.WithDataPointMethod;
-import org.junit.tests.experimental.theories.runner.WithExtendedParameterSources;
-import org.junit.tests.experimental.theories.runner.WithNamedDataPoints;
-import org.junit.tests.experimental.theories.runner.WithOnlyTestAnnotations;
-import org.junit.tests.experimental.theories.runner.WithUnresolvedGenericTypeVariablesOnTheoryParms;
-
-@RunWith(Suite.class)
-@SuiteClasses({ParameterizedAssertionErrorTest.class,
-        AllMembersSupplierTest.class,
-        SpecificDataPointsSupplierTest.class,
-        UnsuccessfulWithDataPointFields.class,
-        SuccessfulWithDataPointFields.class, PrintableResultTest.class,
-        ResultMatchersTest.class, WithDataPointMethod.class,
-        ParameterSignatureTest.class, WhenNoParametersMatch.class,
-        WithExtendedParameterSources.class, StubbedTheoriesTest.class,
-        WithOnlyTestAnnotations.class, WithNamedDataPoints.class,
-        WithUnresolvedGenericTypeVariablesOnTheoryParms.class, 
-        WithAutoGeneratedDataPoints.class})
-public class ExperimentalTests {
-
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/categories Deleted

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/categories/CategoriesAndParameterizedTest.java Deleted

@@ -1,123 +0,0 @@
-package org.junit.tests.experimental.categories;
-
-import static org.junit.Assert.assertThat;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.hasFailureContaining;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Categories;
-import org.junit.experimental.categories.Categories.IncludeCategory;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Suite.SuiteClasses;
-
-public class CategoriesAndParameterizedTest {
-    public static class Token {
-
-    }
-
-    @RunWith(Parameterized.class)
-    public static class WellBehavedParameterizedTest {
-        public WellBehavedParameterizedTest(String a) {
-        }
-
-        @Parameters
-        public static Collection<Object> getParameters() {
-            return Collections.singletonList(new Object{"a"});
-        }
-
-        @Test
-        public void testSomething() {
-            Assert.assertTrue(true);
-        }
-    }
-
-    @RunWith(Parameterized.class)
-    public static class ParameterizedTestWithAttemptedMethodCategory {
-        public ParameterizedTestWithAttemptedMethodCategory(String a) {
-        }
-
-        @Parameters
-        public static Collection<Object> getParameters() {
-            return Collections.singletonList(new Object{"a"});
-        }
-
-        @Test
-        @Category(Token.class)
-        public void testSomething() {
-            Assert.assertTrue(true);
-        }
-    }
-
-    @RunWith(Parameterized.class)
-    @Category(Token.class)
-    public static class ParameterizedTestWithClassCategory {
-        public ParameterizedTestWithClassCategory(String a) {
-        }
-
-        @Parameters
-        public static Collection<Object> getParameters() {
-            return Collections.singletonList(new Object{"a"});
-        }
-
-        @Test
-        public void testSomething() {
-            Assert.assertTrue(true);
-        }
-    }
-
-    @Category(Token.class)
-    public static class VanillaCategorizedJUnitTest {
-        @Test
-        public void testSomething() {
-            Assert.assertTrue(true);
-        }
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(Token.class)
-    @SuiteClasses({VanillaCategorizedJUnitTest.class,
-            WellBehavedParameterizedTest.class,
-            ParameterizedTestWithClassCategory.class})
-    public static class ParameterTokenSuiteWellFormed {
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(Token.class)
-    @SuiteClasses({ParameterizedTestWithAttemptedMethodCategory.class, VanillaCategorizedJUnitTest.class})
-    public static class ParameterTokenSuiteMalformed {
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(Token.class)
-    @SuiteClasses({VanillaCategorizedJUnitTest.class, ParameterizedTestWithAttemptedMethodCategory.class})
-    public static class ParameterTokenSuiteMalformedAndSwapped {
-    }
-
-    @Test
-    public void shouldSucceedWithAParameterizedClassSomewhere() {
-        assertThat(testResult(ParameterTokenSuiteWellFormed.class),
-                isSuccessful());
-    }
-
-    @Test
-    public void shouldFailWithMethodLevelCategoryAnnotation() {
-        assertThat(
-                testResult(ParameterTokenSuiteMalformed.class),
-                hasFailureContaining("Category annotations on Parameterized classes are not supported on individual methods."));
-    }
-
-    @Test
-    public void shouldFailWithMethodLevelCategoryAnnotationSwapped() {
-        assertThat(
-                testResult(ParameterTokenSuiteMalformedAndSwapped.class),
-                hasFailureContaining("Category annotations on Parameterized classes are not supported on individual methods."));
-    }
-}
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/categories/CategoryTest.java Deleted

@@ -1,548 +0,0 @@
-package org.junit.tests.experimental.categories;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
-import static org.junit.experimental.results.ResultMatchers.failureCountIs;
-import static org.hamcrest.core.AnyOf.anyOf;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static java.lang.String.format;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Categories;
-import org.junit.experimental.categories.Categories.CategoryFilter;
-import org.junit.experimental.categories.Categories.ExcludeCategory;
-import org.junit.experimental.categories.Categories.IncludeCategory;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Request;
-import org.junit.runner.Result;
-import org.junit.runner.RunWith;
-import org.junit.runner.manipulation.NoTestsRemainException;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.junit.runners.model.InitializationError;
-
-public class CategoryTest {
-    public interface FastTests {
-        // category marker
-    }
-
-    public interface SlowTests {
-        // category marker
-    }
-
-    public interface ReallySlowTests {
-        // category marker
-    }
-
-    public static class OneOfEach {
-
-        @Category(FastTests.class)
-        @Test
-        public void a() {
-        }
-
-        @Category(SlowTests.class)
-        @Test
-        public void b() {
-        }
-
-        @Category(ReallySlowTests.class)
-        @Test
-        public void c() {
-        }
-    }
-
-    public static class A {
-        @Test
-        public void a() {
-            fail();
-        }
-
-        @Category(SlowTests.class)
-        @Test
-        public void b() {
-        }
-    }
-
-    @Category(SlowTests.class)
-    public static class B {
-        @Test
-        public void c() {
-
-        }
-    }
-
-    public static class C {
-        @Test
-        public void d() {
-            fail();
-        }
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(SlowTests.class)
-    @SuiteClasses({A.class, B.class, C.class})
-    public static class SlowTestSuite {
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(SlowTests.class)
-    @SuiteClasses({A.class})
-    public static class JustA {
-    }
-
-    @Test
-    public void testCountOnJustA() {
-        assertThat(testResult(JustA.class), isSuccessful());
-    }
-
-    @Test
-    public void testCount() {
-        assertThat(testResult(SlowTestSuite.class), isSuccessful());
-    }
-
-    public static class Category1 {
-    }
-
-    public static class Category2 {
-    }
-
-    public static class SomeAreSlow {
-        @Test
-        public void noCategory() {
-        }
-
-        @Category(Category1.class)
-        @Test
-        public void justCategory1() {
-        }
-
-        @Category(Category2.class)
-        @Test
-        public void justCategory2() {
-        }
-
-        @Category({Category1.class, Category2.class})
-        @Test
-        public void both() {
-        }
-
-        @Category({Category2.class, Category1.class})
-        @Test
-        public void bothReversed() {
-        }
-    }
-
-    @RunWith(Categories.class)
-    @ExcludeCategory(Category1.class)
-    @SuiteClasses({SomeAreSlow.class})
-    public static class SomeAreSlowSuite {
-    }
-
-    @Test
-    public void testCountOnAWithoutSlowTests() {
-        Result result = JUnitCore.runClasses(SomeAreSlowSuite.class);
-        assertThat(testResult(SomeAreSlowSuite.class), isSuccessful());
-        assertEquals(2, result.getRunCount());
-        assertTrue(result.wasSuccessful());
-    }
-
-    @RunWith(Categories.class)
-    @ExcludeCategory(Category1.class)
-    @IncludeCategory(Category2.class)
-    @SuiteClasses({SomeAreSlow.class})
-    public static class IncludeAndExcludeSuite {
-    }
-
-    @Test
-    public void testsThatAreBothIncludedAndExcludedAreExcluded() {
-        Result result = JUnitCore.runClasses(IncludeAndExcludeSuite.class);
-        assertEquals(1, result.getRunCount());
-        assertTrue(result.wasSuccessful());
-    }
-
-    @RunWith(Suite.class)
-    @SuiteClasses({A.class, B.class, C.class})
-    public static class TestSuiteWithNoCategories {
-    }
-
-    @Test
-    public void testCountWithExplicitFilter() throws Throwable {
-        CategoryFilter include = CategoryFilter.include(SlowTests.class);
-        Request baseRequest = Request.aClass(TestSuiteWithNoCategories.class);
-        Result result = new JUnitCore().run(baseRequest.filterWith(include));
-        assertTrue(result.wasSuccessful());
-        assertEquals(2, result.getRunCount());
-    }
-
-    @Test
-    public void categoryFilterLeavesOnlyMatchingMethods()
-            throws InitializationError, NoTestsRemainException {
-        CategoryFilter filter = CategoryFilter.include(SlowTests.class);
-        BlockJUnit4ClassRunner runner = new BlockJUnit4ClassRunner(A.class);
-        filter.apply(runner);
-        assertEquals(1, runner.testCount());
-    }
-
-    public static class OneFastOneSlow {
-        @Category(FastTests.class)
-        @Test
-        public void a() {
-
-        }
-
-        @Category(SlowTests.class)
-        @Test
-        public void b() {
-
-        }
-    }
-
-    @Test
-    public void categoryFilterRejectsIncompatibleCategory()
-            throws InitializationError, NoTestsRemainException {
-        CategoryFilter filter = CategoryFilter.include(SlowTests.class);
-        BlockJUnit4ClassRunner runner = new BlockJUnit4ClassRunner(
-                OneFastOneSlow.class);
-        filter.apply(runner);
-        assertEquals(1, runner.testCount());
-    }
-
-    public static class OneFast {
-        @Category(FastTests.class)
-        @Test
-        public void a() {
-
-        }
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(SlowTests.class)
-    @SuiteClasses({OneFast.class})
-    public static class OneFastSuite {
-    }
-
-    @Test
-    public void ifNoTestsToRunUseErrorRunner() {
-        Result result = JUnitCore.runClasses(OneFastSuite.class);
-        assertEquals(1, result.getRunCount());
-        assertEquals(1, result.getFailureCount());
-        assertFalse(result.wasSuccessful());
-    }
-
-    @Test
-    public void describeACategoryFilter() {
-        CategoryFilter filter = CategoryFilter.include(SlowTests.class);
-        assertEquals("categories " + SlowTests.class + "", filter.describe());
-    }
-
-    @Test
-    public void describeMultipleCategoryFilter() {
-        CategoryFilter filter= CategoryFilter.include(FastTests.class, SlowTests.class);
-        String d1= format("categories %s, %s", FastTests.class, SlowTests.class);
-        String d2= format("categories %s, %s", SlowTests.class, FastTests.class);
-        assertThat(filter.describe(), is(anyOf(equalTo(d1), equalTo(d2))));
-    }
-
-
-    public static class OneThatIsBothFastAndSlow {
-        @Category({FastTests.class, SlowTests.class})
-        @Test
-        public void a() {
-
-        }
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(SlowTests.class)
-    @SuiteClasses({OneThatIsBothFastAndSlow.class})
-    public static class ChooseSlowFromBoth {
-    }
-
-    @Test
-    public void runMethodWithTwoCategories() {
-        assertThat(testResult(ChooseSlowFromBoth.class), isSuccessful());
-    }
-
-    public interface VerySlowTests extends SlowTests {
-
-    }
-
-    public static class OneVerySlowTest {
-        @Category(VerySlowTests.class)
-        @Test
-        public void a() {
-
-        }
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(SlowTests.class)
-    @SuiteClasses({OneVerySlowTest.class})
-    public static class RunSlowFromVerySlow {
-    }
-
-    @Test
-    public void subclassesOfIncludedCategoriesAreRun() {
-        assertThat(testResult(RunSlowFromVerySlow.class), isSuccessful());
-    }
-
-    public interface MultiA {
-    }
-
-    public interface MultiB {
-    }
-
-    public interface MultiC {
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(value= {MultiA.class, MultiB.class}, matchAny= false)
-    @SuiteClasses(AllIncludedMustMatched.class)
-    public static class AllIncludedMustBeMatchedSuite {
-    }
-
-    public static class AllIncludedMustMatched {
-        @Test
-        @Category({MultiA.class, MultiB.class})
-        public void a() {
-        }
-
-        @Test
-        @Category(MultiB.class)
-        public void b() {
-            fail("When multiple categories are included in a Suite, " +
-                    "@Test method must match all include categories");
-        }
-    }
-
-    @Test
-    public void allIncludedSuiteCategoriesMustBeMatched() {
-        Result result= JUnitCore.runClasses(AllIncludedMustBeMatchedSuite.class);
-        assertEquals(1, result.getRunCount());
-        assertEquals(0, result.getFailureCount());
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory({MultiA.class, MultiB.class})
-    @ExcludeCategory(MultiC.class)
-    @SuiteClasses(MultipleIncludesAndExcludeOnMethod.class)
-    public static class MultiIncludeWithExcludeCategorySuite {
-    }
-
-    public static class MultipleIncludesAndExcludeOnMethod {
-        @Test
-        @Category({MultiA.class, MultiB.class})
-        public void a() {
-        }
-
-        @Test
-        @Category({ MultiA.class, MultiB.class, MultiC.class })
-        public void b() {
-            fail("When multiple categories are included and excluded in a Suite, " +
-                    "@Test method must match all include categories and contain non of the excluded");
-        }
-    }
-
-    @Test
-    public void anyMethodWithExcludedCategoryWillBeExcluded() {
-        Result result= JUnitCore.runClasses(MultiIncludeWithExcludeCategorySuite.class);
-        assertEquals(1, result.getRunCount());
-        assertEquals(0, result.getFailureCount());
-    }
-
-    public static class ClassAsCategory {
-    }
-
-    public static class OneMoreTest {
-        @Category(ClassAsCategory.class)
-        @Test
-        public void a() {
-        }
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(ClassAsCategory.class)
-    @SuiteClasses({OneMoreTest.class})
-    public static class RunClassAsCategory {
-    }
-
-    @Test
-    public void classesCanBeCategories() {
-        assertThat(testResult(RunClassAsCategory.class), isSuccessful());
-    }
-
-    @Category(SlowTests.class)
-    public static abstract class Ancestor{}
-
-    public static class Inherited extends Ancestor {
-        @Test
-        public void a(){
-        }
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(SlowTests.class)
-    @SuiteClasses(Inherited.class)
-    public interface InheritanceSuite {}
-
-    @Test
-    public void testInheritance() {
-        Result result = JUnitCore.runClasses(InheritanceSuite.class);
-        assertEquals(1, result.getRunCount());
-        assertTrue(result.wasSuccessful());
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(Runnable.class)
-    @ExcludeCategory(Runnable.class)
-    @SuiteClasses({})
-    public static class EmptyCategoriesSuite {
-    }
-
-    @Test public void emptyCategoriesSuite() {
-        assertThat(testResult(EmptyCategoriesSuite.class), failureCountIs(1));
-    }
-
-    @Category(Runnable.class)
-    public static class NoTest {
-    }
-
-    @Category(Runnable.class)
-    public static class IgnoredTest {
-
-        @Ignore
-        @Test
-        public void test() {
-            fail();
-        }
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory(Runnable.class)
-    @SuiteClasses({NoTest.class, IgnoredTest.class})
-    public static class IgnoredTestCategoriesSuite {
-    }
-
-    @Test
-    public void ignoredTest() {// behaves same as Suite
-        Result result= JUnitCore.runClasses(IgnoredTestCategoriesSuite.class);
-        assertFalse(result.wasSuccessful());
-        assertThat(result.getRunCount(), is(1));
-        assertThat(result.getFailureCount(), is(1));
-        assertThat(result.getIgnoreCount(), is(1));
-    }
-
-    @Category(Runnable.class)
-    public static class ExcludedTest1 {
-
-        @Test
-        public void test() {
-            fail();
-        }
-    }
-
-    @Category(Runnable.class)
-    public static class ExcludedTest2 {
-
-        @Test
-        @Category(Runnable.class)
-        public void test() {
-            fail();
-        }
-    }
-
-    public static class IncludedTest {
-
-        @Test
-        @Category(Object.class)
-        public void test() {
-        }
-    }
-
-    @RunWith(Categories.class)
-    @IncludeCategory({Runnable.class, Object.class})
-    @ExcludeCategory(Runnable.class)
-    @SuiteClasses({ExcludedTest1.class, ExcludedTest2.class, IncludedTest.class})
-    public static class IncludedExcludedSameSuite {
-    }
-
-    @Test
-    public void oneRunnableOthersAvoided() {
-        Result result= JUnitCore.runClasses(IncludedExcludedSameSuite.class);
-        assertEquals(1, result.getRunCount());
-        assertTrue(result.wasSuccessful());
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void testCountWithMultipleExcludeFilter() throws Throwable {
-        Set<Class<?>> exclusions= new HashSet<Class<?>>(2);
-        Collections.addAll(exclusions, SlowTests.class, FastTests.class);
-        CategoryFilter exclude = CategoryFilter.categoryFilter(true, null, true, exclusions);
-        Request baseRequest= Request.aClass(OneOfEach.class);
-        Result result= new JUnitCore().run(baseRequest.filterWith(exclude));
-        assertTrue(result.wasSuccessful());
-        assertEquals(1, result.getRunCount());
-    }
-
-    @Test
-    public void testCountWithMultipleIncludeFilter() throws Throwable {
-        CategoryFilter exclude = CategoryFilter.include(true, SlowTests.class, FastTests.class);
-        Request baseRequest= Request.aClass(OneOfEach.class);
-        Result result= new JUnitCore().run(baseRequest.filterWith(exclude));
-        assertTrue(result.wasSuccessful());
-        assertEquals(2, result.getRunCount());
-    }
-
-    @RunWith(Categories.class)
-    @Categories.ExcludeCategory(String.class)
-    @Suite.SuiteClasses(NoIncludeCategoryAnnotationTest.class)
-    public static class NoIncludeCategoryAnnotationSuite {
-    }
-
-    @Category(CharSequence.class)
-    public static class NoIncludeCategoryAnnotationTest {
-
-        @Test
-        public void test2() {
-        }
-
-        @Test
-        @Category(String.class) public void test1() {
-        }
-    }
-
-    @Test
-    public void noIncludeCategoryAnnotation() {
-        Result testResult= JUnitCore.runClasses(NoIncludeCategoryAnnotationSuite.class);
-        assertTrue(testResult.wasSuccessful());
-        assertEquals(1, testResult.getRunCount());
-    }
-
-    @RunWith(Categories.class)
-    @Categories.IncludeCategory(CharSequence.class)
-    @Categories.ExcludeCategory(String.class)
-    @Suite.SuiteClasses(NoIncludeCategoryAnnotationTest.class)
-    public static class SameAsNoIncludeCategoryAnnotationSuite {
-    }
-
-    @Test
-    public void sameAsNoIncludeCategoryAnnotation() {
-        Result testResult= JUnitCore.runClasses(SameAsNoIncludeCategoryAnnotationSuite.class);
-        assertTrue(testResult.wasSuccessful());
-        assertEquals(1, testResult.getRunCount());
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/categories/CategoryValidatorTest.java Deleted

@@ -1,88 +0,0 @@
-package org.junit.tests.experimental.categories;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.experimental.categories.CategoryValidator;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.TestClass;
-
-public class CategoryValidatorTest {
-
-    public static class SampleCategory {
-    }
-
-    public static class CategoryTest {
-        @BeforeClass
-        @Category(value = SampleCategory.class)
-        public static void methodWithCategoryAndBeforeClass() {
-        }
-
-        @AfterClass
-        @Category(value = SampleCategory.class)
-        public static void methodWithCategoryAndAfterClass() {
-        }
-
-        @Before
-        @Category(value = SampleCategory.class)
-        public static void methodWithCategoryAndBefore() {
-        }
-
-        @After
-        @Category(value = SampleCategory.class)
-        public static void methodWithCategoryAndAfter() {
-        }
-
-        @Category(value = SampleCategory.class)
-        public static void methodWithCategory() {
-        }
-    }
-
-    @Test
-    public void errorIsAddedWhenCategoryIsUsedWithBeforeClass() {
-        FrameworkMethod method = new TestClass(CategoryTest.class).getAnnotatedMethods(BeforeClass.class).get(0);
-        testAndAssertErrorMessage(method, "@BeforeClass can not be combined with @Category");
-    }
-
-    @Test
-    public void errorIsAddedWhenCategoryIsUsedWithAfterClass() {
-        FrameworkMethod method = new TestClass(CategoryTest.class).getAnnotatedMethods(AfterClass.class).get(0);
-        testAndAssertErrorMessage(method, "@AfterClass can not be combined with @Category");
-    }
-
-    @Test
-    public void errorIsAddedWhenCategoryIsUsedWithBefore() {
-        FrameworkMethod method = new TestClass(CategoryTest.class).getAnnotatedMethods(Before.class).get(0);
-        testAndAssertErrorMessage(method, "@Before can not be combined with @Category");
-    }
-
-    @Test
-    public void errorIsAddedWhenCategoryIsUsedWithAfter() {
-        FrameworkMethod method = new TestClass(CategoryTest.class).getAnnotatedMethods(After.class).get(0);
-        testAndAssertErrorMessage(method, "@After can not be combined with @Category");
-    }
-
-    private void testAndAssertErrorMessage(FrameworkMethod method, String expectedErrorMessage) {
-        List<Exception> errors = new CategoryValidator().validateAnnotatedMethod(method);
-
-        assertThat(errors.size(), is(1));
-        Exception exception = errors.get(0);
-        assertThat(exception.getMessage(), is(expectedErrorMessage));
-    }
-
-    @Test
-    public void errorIsNotAddedWhenCategoryIsNotCombinedWithIllegalCombination() throws NoSuchMethodException {
-        FrameworkMethod method = new FrameworkMethod(CategoryTest.class.getMethod("methodWithCategory"));
-        List<Exception> errors = new CategoryValidator().validateAnnotatedMethod(method);
-
-        assertThat(errors.size(), is(0));
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/categories/JavadocTest.java Deleted

@@ -1,78 +0,0 @@
-package org.junit.tests.experimental.categories;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Categories;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * @author tibor17
- * @version 4.12
- * @since 4.12
- */
-public class JavadocTest {
-    public static interface FastTests {}
-    public static interface SlowTests {}
-    public static interface SmokeTests {}
-
-    public static class A {
-        public void a() {
-            fail();
-        }
-
-        @Category(SlowTests.class)
-        @Test
-        public void b() {
-        }
-
-        @Category({FastTests.class, SmokeTests.class})
-        @Test
-        public void c() {
-        }
-    }
-
-    @Category({SlowTests.class, FastTests.class})
-    public static class B {
-        @Test
-        public void d() {
-        }
-    }
-
-    @RunWith(Categories.class)
-    @Categories.IncludeCategory(SlowTests.class)
-    @Suite.SuiteClasses({A.class, B.class})
-    public static class SlowTestSuite {
-        // Will run A.b and B.d, but not A.a and A.c
-    }
-
-    @RunWith(Categories.class)
-    @Categories.IncludeCategory({FastTests.class, SmokeTests.class})
-    @Suite.SuiteClasses({A.class, B.class})
-    public static class FastOrSmokeTestSuite {
-        // Will run A.c and B.d, but not A.b because it is not any of FastTests or SmokeTests
-    }
-
-    @Test
-    public void slowTests() {
-        Result testResult= JUnitCore.runClasses(SlowTestSuite.class);
-        assertTrue(testResult.wasSuccessful());
-        assertThat("unexpected run count", testResult.getRunCount(), is(2));
-        assertThat("unexpected failure count", testResult.getFailureCount(), is(0));
-    }
-
-    @Test
-    public void fastSmokeTests() {
-        Result testResult= JUnitCore.runClasses(FastOrSmokeTestSuite.class);
-        assertTrue(testResult.wasSuccessful());
-        assertThat("unexpected run count", testResult.getRunCount(), is(2));
-        assertThat("unexpected failure count", testResult.getFailureCount(), is(0));
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/categories/MultiCategoryTest.java Deleted

@@ -1,171 +0,0 @@
-package org.junit.tests.experimental.categories;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Categories;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-/**
- * @author tibor17
- * @version 4.12
- * @since 4.12
- */
-public final class MultiCategoryTest {
-    public interface A {}
-    public interface B {}
-    public interface C {}
-
-    /**
-     * This test is mentioned in {@code Categories} and any changes
-     * must be reflected.
-     */
-    @Test
-    public void runSuite() {
-        // Targeting Test:
-        Result testResult= JUnitCore.runClasses(MultiCategorySuite.class);
-
-        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(2)));
-        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(0)));
-        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
-    }
-
-    @RunWith(Categories.class)
-    @Categories.IncludeCategory({A.class, B.class})
-    @Categories.ExcludeCategory(C.class)
-    @Suite.SuiteClasses({CategoriesTest.class})
-    public static final class MultiCategorySuite {}
-
-    public static final class CategoriesTest {
-
-        @Test
-        @Category(A.class)
-        public void a() {}
-
-        @Test
-        @Category(B.class)
-        public void b() {}
-
-        @Test
-        @Category(C.class)
-        public void c() {
-            fail();
-        }
-
-        @Test
-        public void anything() {
-            fail();
-        }
-    }
-
-    @Test
-    public void inheritanceAnyIncluded() {
-        Result testResult= JUnitCore.runClasses(InheritanceAny.class);
-        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(3)));
-        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(0)));
-        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
-    }
-
-    @Test
-    public void inheritanceAllIncluded() {
-        Result testResult= JUnitCore.runClasses(InheritanceAll.class);
-        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(1)));
-        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(0)));
-        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
-    }
-
-    @Test
-    public void inheritanceAnyAll() {//any included, all excluded
-        Result testResult= JUnitCore.runClasses(InheritanceAnyAll.class);
-        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(3)));
-        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(0)));
-        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
-    }
-
-    @Test
-    public void inheritanceAllAny() {//all included, any excluded
-        Result testResult= JUnitCore.runClasses(InheritanceAllAny.class);
-        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(1)));
-        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(1)));
-        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
-        assertFalse(testResult.wasSuccessful());
-    }
-
-    public static class X implements A {}
-    public static class Y implements B {}
-    public static class Z implements A, B {}
-    public static class W implements A, B, C {}
-    public static class Q implements A, C {}
-
-    @RunWith(Categories.class)
-    @Categories.IncludeCategory({A.class, B.class})
-    @Categories.ExcludeCategory(C.class)
-    @Suite.SuiteClasses({InheritanceAnyTest.class})
-    public static final class InheritanceAny {}
-
-    @RunWith(Categories.class)
-    @Categories.IncludeCategory(value= {A.class, B.class}, matchAny= false)
-    @Categories.ExcludeCategory(C.class)
-    @Suite.SuiteClasses({InheritanceAllTest.class})
-    public static final class InheritanceAll {}
-
-    @RunWith(Categories.class)
-    @Categories.IncludeCategory({A.class, B.class})
-    @Categories.ExcludeCategory(value= {A.class, C.class}, matchAny= false)
-    @Suite.SuiteClasses({InheritanceAnyAllTest.class})
-    public static final class InheritanceAnyAll {}
-
-    @RunWith(Categories.class)
-    @Categories.IncludeCategory(value= {A.class, B.class}, matchAny= false)
-    @Categories.ExcludeCategory({A.class, C.class})
-    @Suite.SuiteClasses({InheritanceAllAnyTest.class})
-    public static final class InheritanceAllAny {}
-
-    public static final class InheritanceAnyTest {
-        @Test @Category(X.class) public void x() {}
-        @Test @Category(Y.class) public void y() {}
-        @Test @Category(Z.class) public void z() {}
-        @Test @Category(W.class) public void w() { fail(); }
-        @Test @Category(Q.class) public void q() { fail(); }
-        @Test @Category(Runnable.class) public void runnable() { fail(); }
-        @Test public void t() { fail(); }
-    }
-
-    public static final class InheritanceAllTest {
-        @Test @Category(X.class) public void x() { fail(); }
-        @Test @Category(Y.class) public void y() { fail(); }
-        @Test @Category(Z.class) public void z() {}
-        @Test @Category(W.class) public void w() { fail(); }
-        @Test @Category(Q.class) public void q() { fail(); }
-        @Test @Category(Runnable.class) public void runnable() { fail(); }
-        @Test public void t() { fail(); }
-    }
-
-    public static final class InheritanceAnyAllTest {
-        @Test @Category(X.class) public void x() {}
-        @Test @Category(Y.class) public void y() {}
-        @Test @Category(Z.class) public void z() {}
-        @Test @Category(W.class) public void w() { fail(); }
-        @Test @Category(Q.class) public void q() { fail(); }
-        @Test @Category(Runnable.class) public void runnable() { fail(); }
-        @Test public void t() { fail(); }
-    }
-
-    public static final class InheritanceAllAnyTest {
-        @Test @Category(X.class) public void x() { fail(); }
-        @Test @Category(Y.class) public void y() { fail(); }
-        @Test @Category(Z.class) public void z() { fail(); }
-        @Test @Category(W.class) public void w() { fail(); }
-        @Test @Category(Q.class) public void q() { fail(); }
-        @Test @Category(Runnable.class) public void runnable() { fail(); }
-        @Test public void t() { fail(); }
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules Deleted

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/BlockJUnit4ClassRunnerOverrideTest.java Deleted

@@ -1,92 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runner.RunWith;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
-
-public class BlockJUnit4ClassRunnerOverrideTest {
-    public static class FlipBitRule implements MethodRule {
-        public Statement apply(final Statement base, FrameworkMethod method,
-                final Object target) {
-            return new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    target.getClass().getField("flipBit").set(target, true);
-                    base.evaluate();
-                }
-            };
-        }
-
-    }
-
-    public static class OverrideRulesRunner extends BlockJUnit4ClassRunner {
-        public OverrideRulesRunner(Class<?> klass) throws InitializationError {
-            super(klass);
-        }
-
-        @Override
-        protected List<MethodRule> rules(Object test) {
-            final LinkedList<MethodRule> methodRules = new LinkedList<MethodRule>(
-                    super.rules(test));
-            methodRules.add(new FlipBitRule());
-            return methodRules;
-        }
-    }
-
-    @RunWith(OverrideRulesRunner.class)
-    public static class OverrideRulesTest {
-        public boolean flipBit = false;
-
-        @Test
-        public void testFlipBit() {
-            assertTrue(flipBit);
-        }
-    }
-
-    @Test
-    public void overrideRulesMethod() {
-        assertThat(testResult(OverrideTestRulesTest.class), isSuccessful());
-    }
-
-    public static class OverrideTestRulesRunner extends BlockJUnit4ClassRunner {
-        public OverrideTestRulesRunner(Class<?> klass)
-                throws InitializationError {
-            super(klass);
-        }
-
-        @Override
-        protected List<TestRule> getTestRules(final Object test) {
-            final LinkedList<TestRule> methodRules = new LinkedList<TestRule>(
-                    super.getTestRules(test));
-            methodRules.add(new TestRule() {
-                public Statement apply(Statement base, Description description) {
-                    return new FlipBitRule().apply(base, null, test);
-                }
-            });
-            return methodRules;
-        }
-    }
-
-    @RunWith(OverrideTestRulesRunner.class)
-    public static class OverrideTestRulesTest extends OverrideRulesTest {
-    }
-
-    @Test
-    public void overrideTestRulesMethod() {
-        assertThat(testResult(OverrideRulesTest.class), isSuccessful());
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/ClassRulesTest.java Deleted

@@ -1,253 +0,0 @@
-/**
- * Created Oct 19, 2009
- */
-package org.junit.tests.experimental.rules;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.ExternalResource;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runners.model.Statement;
-
-/**
- * Tests to exercise class-level rules.
- */
-public class ClassRulesTest {
-    public static class Counter extends ExternalResource {
-        public int count = 0;
-
-        @Override
-        protected void before() throws Throwable {
-            count++;
-        }
-    }
-
-    public static class ExampleTestWithClassRule {
-        @ClassRule
-        public static Counter counter = new Counter();
-
-        @Test
-        public void firstTest() {
-            assertEquals(1, counter.count);
-        }
-
-        @Test
-        public void secondTest() {
-            assertEquals(1, counter.count);
-        }
-    }
-
-    @Test
-    public void ruleIsAppliedOnce() {
-        ExampleTestWithClassRule.counter.count = 0;
-        JUnitCore.runClasses(ExampleTestWithClassRule.class);
-        assertEquals(1, ExampleTestWithClassRule.counter.count);
-    }
-
-    public static class SubclassOfTestWithClassRule extends
-            ExampleTestWithClassRule {
-
-    }
-
-    @Test
-    public void ruleIsIntroducedAndEvaluatedOnSubclass() {
-        ExampleTestWithClassRule.counter.count = 0;
-        JUnitCore.runClasses(SubclassOfTestWithClassRule.class);
-        assertEquals(1, ExampleTestWithClassRule.counter.count);
-    }
-
-    public static class CustomCounter implements TestRule {
-        public int count = 0;
-
-        public Statement apply(final Statement base, Description description) {
-            return new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    count++;
-                    base.evaluate();
-                }
-            };
-        }
-    }
-
-    public static class ExampleTestWithCustomClassRule {
-        @ClassRule
-        public static CustomCounter counter = new CustomCounter();
-
-        @Test
-        public void firstTest() {
-            assertEquals(1, counter.count);
-        }
-
-        @Test
-        public void secondTest() {
-            assertEquals(1, counter.count);
-        }
-    }
-
-
-    @Test
-    public void customRuleIsAppliedOnce() {
-        ExampleTestWithCustomClassRule.counter.count = 0;
-        Result result = JUnitCore.runClasses(ExampleTestWithCustomClassRule.class);
-        assertTrue(result.wasSuccessful());
-        assertEquals(1, ExampleTestWithCustomClassRule.counter.count);
-    }
-
-    private static final List<String> orderList = new LinkedList<String>();
-
-    private static class OrderTestRule implements TestRule {
-        private String name;
-
-        public OrderTestRule(String name) {
-            this.name = name;
-        }
-
-        public Statement apply(final Statement base, final Description description) {
-            return new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    orderList.add(name);
-                    base.evaluate();
-                }
-            };
-        }
-    }
-
-    ;
-
-    public static class UsesFieldAndMethodRule {
-        @ClassRule
-        public static OrderTestRule orderMethod() {
-            return new OrderTestRule("orderMethod");
-        }
-
-        @ClassRule
-        public static OrderTestRule orderField = new OrderTestRule("orderField");
-
-        @Test
-        public void foo() {
-            assertEquals("orderField", orderList.get(0));
-            assertEquals("orderMethod", orderList.get(1));
-        }
-    }
-
-    @Test
-    public void usesFieldAndMethodRule() {
-        orderList.clear();
-        assertThat(testResult(UsesFieldAndMethodRule.class), isSuccessful());
-    }
-
-
-    public static class MethodExampleTestWithClassRule {
-        private static Counter counter = new Counter();
-
-        @ClassRule
-        public static Counter getCounter() {
-            return counter;
-        }
-
-        @Test
-        public void firstTest() {
-            assertEquals(1, counter.count);
-        }
-
-        @Test
-        public void secondTest() {
-            assertEquals(1, counter.count);
-        }
-    }
-
-    @Test
-    public void methodRuleIsAppliedOnce() {
-        MethodExampleTestWithClassRule.counter.count = 0;
-        JUnitCore.runClasses(MethodExampleTestWithClassRule.class);
-        assertEquals(1, MethodExampleTestWithClassRule.counter.count);
-    }
-
-    public static class MethodSubclassOfTestWithClassRule extends
-            MethodExampleTestWithClassRule {
-
-    }
-
-    @Test
-    public void methodRuleIsIntroducedAndEvaluatedOnSubclass() {
-        MethodExampleTestWithClassRule.counter.count = 0;
-        JUnitCore.runClasses(MethodSubclassOfTestWithClassRule.class);
-        assertEquals(1, MethodExampleTestWithClassRule.counter.count);
-    }
-
-    public static class MethodExampleTestWithCustomClassRule {
-        private static CustomCounter counter = new CustomCounter();
-
-        @ClassRule
-        public static CustomCounter getCounter() {
-            return counter;
-        }
-
-        @Test
-        public void firstTest() {
-            assertEquals(1, counter.count);
-        }
-
-        @Test
-        public void secondTest() {
-            assertEquals(1, counter.count);
-        }
-    }
-
-
-    @Test
-    public void methodCustomRuleIsAppliedOnce() {
-        MethodExampleTestWithCustomClassRule.counter.count = 0;
-        Result result = JUnitCore.runClasses(MethodExampleTestWithCustomClassRule.class);
-        assertTrue(result.wasSuccessful());
-        assertEquals(1, MethodExampleTestWithCustomClassRule.counter.count);
-    }
-
-    public static class CallMethodOnlyOnceRule {
-        static int countOfMethodCalls = 0;
-
-        private static class Dummy implements TestRule {
-            public Statement apply(final Statement base, Description description) {
-                return new Statement() {
-                    @Override
-                    public void evaluate() throws Throwable {
-                        base.evaluate();
-                    }
-
-                    ;
-                };
-            }
-        }
-
-        @ClassRule
-        public static Dummy both() {
-            countOfMethodCalls++;
-            return new Dummy();
-        }
-
-        @Test
-        public void onlyOnce() {
-            assertEquals(1, countOfMethodCalls);
-        }
-    }
-
-    @Test
-    public void testCallMethodOnlyOnceRule() {
-        CallMethodOnlyOnceRule.countOfMethodCalls = 0;
-        assertTrue(JUnitCore.runClasses(CallMethodOnlyOnceRule.class).wasSuccessful());
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/EventCollector.java Deleted

@@ -1,191 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.core.IsEqual.equalTo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-
-class EventCollector extends RunListener {
-    static Matcher<EventCollector> everyTestRunSuccessful() {
-        return allOf(hasNoFailure(), hasNoAssumptionFailure());
-    }
-
-    private static Matcher<EventCollector> hasNumberOfFailures(
-            final int numberOfFailures) {
-        return new TypeSafeMatcher<EventCollector>() {
-            @Override
-            public boolean matchesSafely(EventCollector item) {
-                return item.fFailures.size() == numberOfFailures;
-            }
-
-            public void describeTo(org.hamcrest.Description description) {
-                description.appendText("has ");
-                description.appendValue(numberOfFailures);
-                description.appendText(" failures");
-            }
-
-            @Override
-            protected void describeMismatchSafely(EventCollector item,
-                    org.hamcrest.Description description) {
-                description.appendValue(item.fFailures.size());
-                description.appendText(" failures");
-            }
-        };
-    }
-
-    static Matcher<EventCollector> hasSingleFailure() {
-        return hasNumberOfFailures(1);
-    }
-
-    static Matcher<EventCollector> hasNoFailure() {
-        return hasNumberOfFailures(0);
-    }
-
-    private static Matcher<EventCollector> hasNumberOfAssumptionFailures(
-            final int numberOfFailures) {
-        return new TypeSafeMatcher<EventCollector>() {
-            @Override
-            public boolean matchesSafely(EventCollector item) {
-                return item.fAssumptionFailures.size() == numberOfFailures;
-            }
-
-            public void describeTo(org.hamcrest.Description description) {
-                description.appendText("has ");
-                description.appendValue(numberOfFailures);
-                description.appendText(" assumption failures");
-            }
-        };
-    }
-
-    static Matcher<EventCollector> hasSingleAssumptionFailure() {
-        return hasNumberOfAssumptionFailures(1);
-    }
-
-    static Matcher<EventCollector> hasNoAssumptionFailure() {
-        return hasNumberOfAssumptionFailures(0);
-    }
-
-    static Matcher<EventCollector> hasSingleFailureWithMessage(String message) {
-        return hasSingleFailureWithMessage(equalTo(message));
-    }
-
-    static Matcher<EventCollector> hasSingleFailureWithMessage(
-            final Matcher<String> messageMatcher) {
-        return new TypeSafeMatcher<EventCollector>() {
-            @Override
-            public boolean matchesSafely(EventCollector item) {
-                return hasSingleFailure().matches(item)
-                        && messageMatcher.matches(item.fFailures.get(0)
-                        .getMessage());
-            }
-
-            public void describeTo(org.hamcrest.Description description) {
-                description.appendText("has single failure with message ");
-                messageMatcher.describeTo(description);
-            }
-
-            @Override
-            protected void describeMismatchSafely(EventCollector item,
-                    org.hamcrest.Description description) {
-                description.appendText("was ");
-                hasSingleFailure().describeMismatch(item, description);
-                description.appendText(": ");
-                boolean first= true;
-                for (Failure f : item.fFailures) {
-                    if (!first) {
-                        description.appendText(" ,");
-                    }
-                    description.appendText("'");
-                    description.appendText(f.getMessage());
-                    description.appendText("'");
-                    first= false;
-                }
-            }
-        };
-    }
-
-    static Matcher<EventCollector> failureIs(final Matcher<? super Throwable> exceptionMatcher) {
-        return new TypeSafeMatcher<EventCollector>() {
-            @Override
-            public boolean matchesSafely(EventCollector item) {
-                for (Failure f : item.fFailures) {
-                    return exceptionMatcher.matches(f.getException());
-                }
-                return false;
-            }
-
-            public void describeTo(org.hamcrest.Description description) {
-                description.appendText("failure is ");
-                exceptionMatcher.describeTo(description);
-            }
-        };
-    }
-
-    private final List<Description> fTestRunsStarted = new ArrayList<Description>();
-
-    private final List<Result> fTestRunsFinished = new ArrayList<Result>();
-
-    private final List<Description> fTestsStarted = new ArrayList<Description>();
-
-    private final List<Description> fTestsFinished = new ArrayList<Description>();
-
-    private final List<Failure> fFailures = new ArrayList<Failure>();
-
-    private final List<Failure> fAssumptionFailures = new ArrayList<Failure>();
-
-    private final List<Description> fTestsIgnored = new ArrayList<Description>();
-
-    @Override
-    public void testRunStarted(Description description) throws Exception {
-        fTestRunsStarted.add(description);
-    }
-
-    @Override
-    public void testRunFinished(Result result) throws Exception {
-        fTestRunsFinished.add(result);
-    }
-
-    @Override
-    public void testStarted(Description description) throws Exception {
-        fTestsStarted.add(description);
-    }
-
-    @Override
-    public void testFinished(Description description) throws Exception {
-        fTestsFinished.add(description);
-    }
-
-    @Override
-    public void testFailure(Failure failure) throws Exception {
-        fFailures.add(failure);
-    }
-
-    @Override
-    public void testAssumptionFailure(Failure failure) {
-        fAssumptionFailures.add(failure);
-    }
-
-    @Override
-    public void testIgnored(Description description) throws Exception {
-        fTestsIgnored.add(description);
-    }
-
-    @Override
-    public String toString() {
-        return fTestRunsStarted.size() + " test runs started, "
-            + fTestRunsFinished.size() + " test runs finished, "
-            + fTestsStarted.size() + " tests started, "
-            + fTestsFinished.size() + " tests finished, "
-            + fFailures.size() + " failures, "
-            + fAssumptionFailures.size() + " assumption failures, "
-            + fTestsIgnored.size() + " tests ignored";
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/ExpectedExceptionTest.java Deleted

@@ -1,368 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.any;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-import static org.junit.rules.ExpectedException.none;
-import static org.junit.tests.experimental.rules.EventCollector.everyTestRunSuccessful;
-import static org.junit.tests.experimental.rules.EventCollector.hasSingleAssumptionFailure;
-import static org.junit.tests.experimental.rules.EventCollector.hasSingleFailure;
-import static org.junit.tests.experimental.rules.EventCollector.hasSingleFailureWithMessage;
-
-import java.util.Collection;
-
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.Matcher;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ExpectedExceptionTest {
-    private static final String ARBITRARY_MESSAGE = "arbitrary message";
-
-    @Parameters(name= "{0}")
-    public static Collection<Object> testsWithEventMatcher() {
-        return asList(new Object{
-                {EmptyTestExpectingNoException.class, everyTestRunSuccessful()},
-                {ThrowExceptionWithExpectedType.class,
-                        everyTestRunSuccessful()},
-                {ThrowExceptionWithExpectedPartOfMessage.class,
-                        everyTestRunSuccessful()},
-                {
-                        ThrowExceptionWithWrongType.class,
-                        hasSingleFailureWithMessage(startsWith("\nExpected: an instance of java.lang.NullPointerException"))},
-                {
-                        HasWrongMessage.class,
-                        hasSingleFailureWithMessage(startsWith("\nExpected: exception with message a string containing \"expectedMessage\"\n"
-                                + "     but: message was \"actualMessage\""))},
-                {
-                        ThrowNoExceptionButExpectExceptionWithType.class,
-                        hasSingleFailureWithMessage("Expected test to throw an instance of java.lang.NullPointerException")},
-                {WronglyExpectsExceptionMessage.class, hasSingleFailure()},
-                {ExpectsSubstring.class, everyTestRunSuccessful()},
-                {
-                        ExpectsSubstringNullMessage.class,
-                        hasSingleFailureWithMessage(startsWith("\nExpected: exception with message a string containing \"anything!\""))},
-                {ExpectsMessageMatcher.class, everyTestRunSuccessful()},
-                {
-                        ExpectedMessageMatcherFails.class,
-                        hasSingleFailureWithMessage(startsWith("\nExpected: exception with message \"Wrong start\""))},
-                {ExpectsMatcher.class, everyTestRunSuccessful()},
-                {ExpectAssertionErrorWhichIsNotThrown.class, hasSingleFailure()},
-                {FailedAssumptionAndExpectException.class,
-                        hasSingleAssumptionFailure()},
-                {FailBeforeExpectingException.class,
-                        hasSingleFailureWithMessage(ARBITRARY_MESSAGE)},
-                {
-                        ExpectsMultipleMatchers.class,
-                        hasSingleFailureWithMessage(startsWith("\nExpected: (an instance of java.lang.IllegalArgumentException and exception with message a string containing \"Ack!\")"))},
-                {ThrowExceptionWithMatchingCause.class, everyTestRunSuccessful()},
-                {ThrowExpectedNullCause.class, everyTestRunSuccessful()},
-                {
-                        ThrowUnexpectedCause.class,
-                        hasSingleFailureWithMessage(CoreMatchers.<String>allOf(
-                                startsWith("\nExpected: ("),
-                                containsString("exception with cause is <java.lang.NullPointerException: expected cause>"),
-                                containsString("cause was <java.lang.NullPointerException: an unexpected cause>"),
-                                containsString("Stacktrace was: java.lang.IllegalArgumentException: Ack!"),
-                                containsString("Caused by: java.lang.NullPointerException: an unexpected cause")))},
-                {
-                        UseNoCustomMessage.class,
-                        hasSingleFailureWithMessage("Expected test to throw an instance of java.lang.IllegalArgumentException") },
-                {
-                        UseCustomMessageWithoutPlaceHolder.class,
-                        hasSingleFailureWithMessage(ARBITRARY_MESSAGE) },
-                {
-                        UseCustomMessageWithPlaceHolder.class,
-                        hasSingleFailureWithMessage(ARBITRARY_MESSAGE
-                                + " - an instance of java.lang.IllegalArgumentException") }
-        });
-    }
-
-    private final Class<?> classUnderTest;
-
-    private final Matcher<EventCollector> matcher;
-
-    public ExpectedExceptionTest(Class<?> classUnderTest,
-            Matcher<EventCollector> matcher) {
-        this.classUnderTest = classUnderTest;
-        this.matcher = matcher;
-    }
-
-    @Test
-    public void runTestAndVerifyResult() {
-        EventCollector collector = new EventCollector();
-        JUnitCore core = new JUnitCore();
-        core.addListener(collector);
-        core.run(classUnderTest);
-        assertThat(collector, matcher);
-    }
-
-    public static class EmptyTestExpectingNoException {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsNothing() {
-        }
-    }
-
-    public static class ThrowExceptionWithExpectedType {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsNullPointerException() {
-            thrown.expect(NullPointerException.class);
-            throw new NullPointerException();
-        }
-    }
-
-    public static class ThrowExceptionWithExpectedPartOfMessage {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsNullPointerExceptionWithMessage() {
-            thrown.expect(NullPointerException.class);
-            thrown.expectMessage(ARBITRARY_MESSAGE);
-            throw new NullPointerException(ARBITRARY_MESSAGE + "something else");
-        }
-    }
-
-    public static class ThrowExceptionWithWrongType {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsNullPointerException() {
-            thrown.expect(NullPointerException.class);
-            throw new IllegalArgumentException();
-        }
-    }
-
-    public static class HasWrongMessage {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsNullPointerException() {
-            thrown.expectMessage("expectedMessage");
-            throw new IllegalArgumentException("actualMessage");
-        }
-    }
-
-    public static class ThrowNoExceptionButExpectExceptionWithType {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void doesntThrowNullPointerException() {
-            thrown.expect(NullPointerException.class);
-        }
-    }
-
-    public static class WronglyExpectsExceptionMessage {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void doesntThrowAnything() {
-            thrown.expectMessage("anything!");
-        }
-    }
-
-    public static class ExpectsSubstring {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsMore() {
-            thrown.expectMessage("anything!");
-            throw new NullPointerException(
-                    "This could throw anything! (as long as it has the right substring)");
-        }
-    }
-
-    public static class ExpectsSubstringNullMessage {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsMore() {
-            thrown.expectMessage("anything!");
-            throw new NullPointerException();
-        }
-    }
-
-    public static class ExpectsMessageMatcher {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsMore() {
-            thrown.expectMessage(startsWith(ARBITRARY_MESSAGE));
-            throw new NullPointerException(ARBITRARY_MESSAGE + "!");
-        }
-    }
-
-    public static class ExpectedMessageMatcherFails {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsMore() {
-            thrown.expectMessage(equalTo("Wrong start"));
-            throw new NullPointerException("Back!");
-        }
-    }
-
-    public static class ExpectsMatcher {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsMore() {
-            thrown.expect(any(Exception.class));
-            throw new NullPointerException("Ack!");
-        }
-    }
-
-    public static class ExpectsMultipleMatchers {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwsMore() {
-            thrown.expect(IllegalArgumentException.class);
-            thrown.expectMessage("Ack!");
-            throw new NullPointerException("Ack!");
-        }
-    }
-
-    //https://github.com/junit-team/junit/pull/583
-    public static class ExpectAssertionErrorWhichIsNotThrown {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void fails() {
-            thrown.expect(AssertionError.class);
-        }
-    }
-
-    public static class FailBeforeExpectingException {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void fails() {
-            fail(ARBITRARY_MESSAGE);
-            thrown.expect(IllegalArgumentException.class);
-        }
-    }
-
-    public static class FailedAssumptionAndExpectException {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void failedAssumption() {
-            assumeTrue(false);
-            thrown.expect(NullPointerException.class);
-        }
-    }
-
-    public static class ThrowExceptionWithMatchingCause {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwExceptionWithMatchingCause() {
-            NullPointerException expectedCause = new NullPointerException("expected cause");
-
-            thrown.expect(IllegalArgumentException.class);
-            thrown.expectMessage("Ack!");
-            thrown.expectCause(is(expectedCause));
-
-            throw new IllegalArgumentException("Ack!", expectedCause);
-        }
-    }
-
-    public static class ThrowExpectedNullCause {
-        @Rule
-        public ExpectedException thrown = none();
-
-        @Test
-        public void throwExpectedNullCause() {
-            thrown.expect(IllegalArgumentException.class);
-            thrown.expectMessage("Ack!");
-            thrown.expectCause(nullValue(Throwable.class));
-
-            throw new IllegalArgumentException("Ack!");
-        }
-    }
-
-    public static class ThrowUnexpectedCause {
-
-        @Rule
-        public ExpectedException thrown = ExpectedException.none();
-
-        @Test
-        public void throwWithCause() {
-            thrown.expect(IllegalArgumentException.class);
-            thrown.expectMessage("Ack!");
-            thrown.expectCause(is(new NullPointerException("expected cause")));
-
-            throw new IllegalArgumentException("Ack!", new NullPointerException("an unexpected cause"));
-        }
-    }
-    
-    public static class UseNoCustomMessage {
-
-        @Rule
-        public ExpectedException thrown= ExpectedException.none();
-
-        @Test
-        public void noThrow() {
-            thrown.expect(IllegalArgumentException.class);
-        }
-    }
-
-    public static class UseCustomMessageWithPlaceHolder {
-
-        @Rule
-        public ExpectedException thrown = ExpectedException.none();
-
-        @Test
-        public void noThrow() {
-            thrown.expect(IllegalArgumentException.class);
-            thrown.reportMissingExceptionWithMessage(ARBITRARY_MESSAGE
-                    + " - %s");
-        }
-    }
-
-    public static class UseCustomMessageWithoutPlaceHolder {
-
-        @Rule
-        public ExpectedException thrown= ExpectedException.none();
-
-        @Test
-        public void noThrow() {
-            thrown.expect(IllegalArgumentException.class);
-            thrown.reportMissingExceptionWithMessage(ARBITRARY_MESSAGE);
-        }
-    }
-}
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/ExternalResourceRuleTest.java Deleted

@@ -1,45 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExternalResource;
-
-public class ExternalResourceRuleTest {
-    private static String callSequence;
-
-    public static class UsesExternalResource {
-        @Rule
-        public ExternalResource resource = new ExternalResource() {
-            @Override
-            protected void before() throws Throwable {
-                callSequence += "before ";
-            }
-
-            ;
-
-            @Override
-            protected void after() {
-                callSequence += "after ";
-            }
-
-            ;
-        };
-
-        @Test
-        public void testFoo() {
-            callSequence += "test ";
-        }
-    }
-
-    @Test
-    public void externalResourceGeneratesCorrectSequence() {
-        callSequence = "";
-        assertThat(testResult(UsesExternalResource.class), isSuccessful());
-        assertEquals("before test after ", callSequence);
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/LoggingTestWatcher.java Deleted

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/MethodRulesTest.java Deleted

@@ -1,408 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.rules.TestName;
-import org.junit.rules.TestRule;
-import org.junit.rules.TestWatchman;
-import org.junit.runner.Description;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-@SuppressWarnings("deprecation")
-public class MethodRulesTest {
-    private static boolean wasRun;
-
-    public static class ExampleTest {
-        @Rule
-        public MethodRule example = new MethodRule() {
-            public Statement apply(final Statement base,
-                    FrameworkMethod method, Object target) {
-                return new Statement() {
-                    @Override
-                    public void evaluate() throws Throwable {
-                        wasRun = true;
-                        base.evaluate();
-                    }
-
-                    ;
-                };
-            }
-        };
-
-        @Test
-        public void nothing() {
-
-        }
-    }
-
-    @Test
-    public void ruleIsIntroducedAndEvaluated() {
-        wasRun = false;
-        JUnitCore.runClasses(ExampleTest.class);
-        assertTrue(wasRun);
-    }
-
-    public static class SonOfExampleTest extends ExampleTest {
-
-    }
-
-    @Test
-    public void ruleIsIntroducedAndEvaluatedOnSubclass() {
-        wasRun = false;
-        JUnitCore.runClasses(SonOfExampleTest.class);
-        assertTrue(wasRun);
-    }
-
-    private static int runCount;
-
-    private static class Increment implements MethodRule {
-        public Statement apply(final Statement base,
-                FrameworkMethod method, Object target) {
-            return new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    runCount++;
-                    base.evaluate();
-                }
-            };
-        }
-    }
-    
-    public static class MultipleRuleTest {
-
-        @Rule
-        public MethodRule incrementor1 = new Increment();
-
-        @Rule
-        public MethodRule incrementor2 = new Increment();
-
-        @Test
-        public void nothing() {
-
-        }
-    }
-
-    @Test
-    public void multipleRulesAreRun() {
-        runCount = 0;
-        JUnitCore.runClasses(MultipleRuleTest.class);
-        assertEquals(2, runCount);
-    }
-
-    public static class NoRulesTest {
-        public int x;
-
-        @Test
-        public void nothing() {
-
-        }
-    }
-
-    @Test
-    public void ignoreNonRules() {
-        Result result = JUnitCore.runClasses(NoRulesTest.class);
-        assertEquals(0, result.getFailureCount());
-    }
-
-    private static String log;
-
-    public static class OnFailureTest {
-        @Rule
-        public MethodRule watchman = new TestWatchman() {
-            @Override
-            public void failed(Throwable e, FrameworkMethod method) {
-                log += method.getName() + " " + e.getClass().getSimpleName();
-            }
-        };
-
-        @Test
-        public void nothing() {
-            fail();
-        }
-    }
-
-    @Test
-    public void onFailure() {
-        log = "";
-        Result result = JUnitCore.runClasses(OnFailureTest.class);
-        assertEquals("nothing AssertionError", log);
-        assertEquals(1, result.getFailureCount());
-    }
-
-    public static class WatchmanTest {
-        private static String watchedLog;
-
-        @Rule
-        public MethodRule watchman = new TestWatchman() {
-            @Override
-            public void failed(Throwable e, FrameworkMethod method) {
-                watchedLog += method.getName() + " "
-                        + e.getClass().getSimpleName() + "\n";
-            }
-
-            @Override
-            public void succeeded(FrameworkMethod method) {
-                watchedLog += method.getName() + " " + "success!\n";
-            }
-        };
-
-        @Test
-        public void fails() {
-            fail();
-        }
-
-        @Test
-        public void succeeds() {
-        }
-    }
-
-    @Test
-    public void succeeded() {
-        WatchmanTest.watchedLog = "";
-        JUnitCore.runClasses(WatchmanTest.class);
-        assertThat(WatchmanTest.watchedLog, containsString("fails AssertionError"));
-        assertThat(WatchmanTest.watchedLog, containsString("succeeds success!"));
-    }
-
-    public static class BeforesAndAfters {
-        private static String watchedLog;
-
-        @Before
-        public void before() {
-            watchedLog += "before ";
-        }
-
-        @Rule
-        public MethodRule watchman = new TestWatchman() {
-            @Override
-            public void starting(FrameworkMethod method) {
-                watchedLog += "starting ";
-            }
-
-            @Override
-            public void finished(FrameworkMethod method) {
-                watchedLog += "finished ";
-            }
-
-            @Override
-            public void succeeded(FrameworkMethod method) {
-                watchedLog += "succeeded ";
-            }
-        };
-
-        @After
-        public void after() {
-            watchedLog += "after ";
-        }
-
-        @Test
-        public void succeeds() {
-            watchedLog += "test ";
-        }
-    }
-
-    @Test
-    public void beforesAndAfters() {
-        BeforesAndAfters.watchedLog = "";
-        JUnitCore.runClasses(BeforesAndAfters.class);
-        assertThat(BeforesAndAfters.watchedLog, is("starting before test after succeeded finished "));
-    }
-
-    public static class WrongTypedField {
-        @Rule
-        public int x = 5;
-
-        @Test
-        public void foo() {
-        }
-    }
-
-    @Test
-    public void validateWrongTypedField() {
-        assertThat(testResult(WrongTypedField.class),
-                hasSingleFailureContaining("must implement MethodRule"));
-    }
-
-    public static class SonOfWrongTypedField extends WrongTypedField {
-
-    }
-
-    @Test
-    public void validateWrongTypedFieldInSuperclass() {
-        assertThat(testResult(SonOfWrongTypedField.class),
-                hasSingleFailureContaining("must implement MethodRule"));
-    }
-
-    public static class PrivateRule {
-        @Rule
-        private TestRule rule = new TestName();
-
-        @Test
-        public void foo() {
-        }
-    }
-
-    @Test
-    public void validatePrivateRule() {
-        assertThat(testResult(PrivateRule.class),
-                hasSingleFailureContaining("must be public"));
-    }
-
-    public static class CustomTestName implements TestRule {
-        public String name = null;
-
-        public Statement apply(final Statement base, final Description description) {
-            return new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    name = description.getMethodName();
-                    base.evaluate();
-                }
-            };
-        }
-    }
-
-    public static class UsesCustomMethodRule {
-        @Rule
-        public CustomTestName counter = new CustomTestName();
-
-        @Test
-        public void foo() {
-            assertEquals("foo", counter.name);
-        }
-    }
-
-    @Test
-    public void useCustomMethodRule() {
-        assertThat(testResult(UsesCustomMethodRule.class), isSuccessful());
-    }
-    
-    public static class HasMethodReturningMethodRule {
-        private MethodRule methodRule = new MethodRule() {
-            public Statement apply(final Statement base, FrameworkMethod method, Object target) {
-                return new Statement() {
-                    
-                    @Override
-                    public void evaluate() throws Throwable {
-                        wasRun = true;
-                        base.evaluate();
-                    }
-                };
-            }
-        };
-        
-        @Rule
-        public MethodRule methodRule() {
-            return methodRule;
-        }
-        
-        @Test
-        public void doNothing() {
-            
-        }
-    }
-
-    /**
-     * If there are any public methods annotated with @Rule returning a {@link MethodRule}
-     * then it should also be run.
-     * 
-     * <p>This case has been added with 
-     * <a href="https://github.com/junit-team/junit/issues/589">Issue #589</a> - 
-     * Support @Rule for methods works only for TestRule but not for MethodRule
-     */
-    @Test
-    public void runsMethodRuleThatIsReturnedByMethod() {
-        wasRun = false;
-        JUnitCore.runClasses(HasMethodReturningMethodRule.class);
-        assertTrue(wasRun);
-    }
-    
-    public static class HasMultipleMethodsReturningMethodRule {
-        @Rule
-        public Increment methodRule1() {
-            return new Increment();
-        }
-        
-        @Rule
-        public Increment methodRule2() {
-            return new Increment();
-        }
-        
-        @Test
-        public void doNothing() {
-            
-        }
-    }
-
-    /**
-     * If there are multiple public methods annotated with @Rule returning a {@link MethodRule}
-     * then all the rules returned should be run.
-     * 
-     * <p>This case has been added with 
-     * <a href="https://github.com/junit-team/junit/issues/589">Issue #589</a> - 
-     * Support @Rule for methods works only for TestRule but not for MethodRule
-     */
-    @Test
-    public void runsAllMethodRulesThatAreReturnedByMethods() {
-        runCount = 0;
-        JUnitCore.runClasses(HasMultipleMethodsReturningMethodRule.class);
-        assertEquals(2, runCount);
-    }
-    
-    
-    public static class CallsMethodReturningRuleOnlyOnce {
-        int callCount = 0;
-        
-        private static class Dummy implements MethodRule {
-            public Statement apply(final Statement base, FrameworkMethod method, Object target) {
-                return new Statement() {
-                    
-                    @Override
-                    public void evaluate() throws Throwable {
-                        base.evaluate();
-                    }
-                };
-            }
-        };
-       
-        
-        @Rule
-        public MethodRule methodRule() {
-            callCount++;
-            return new Dummy();
-        }
-        
-        @Test
-        public void doNothing() {
-            assertEquals(1, callCount);
-        }
-    }
-
-    /**
-     * If there are any public methods annotated with @Rule returning a {@link MethodRule}
-     * then method should be called only once.
-     * 
-     * <p>This case has been added with 
-     * <a href="https://github.com/junit-team/junit/issues/589">Issue #589</a> - 
-     * Support @Rule for methods works only for TestRule but not for MethodRule
-     */
-    @Test
-    public void callsMethodReturningRuleOnlyOnce() {
-        assertTrue(JUnitCore.runClasses(CallsMethodReturningRuleOnlyOnce.class).wasSuccessful());
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/NameRulesTest.java Deleted

@@ -1,51 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-
-@RunWith(Enclosed.class)
-public class NameRulesTest {
-    public static class TestNames {
-        @Rule
-        public TestName name = new TestName();
-
-        @Test
-        public void testA() {
-            assertEquals("testA", name.getMethodName());
-        }
-
-        @Test
-        public void testB() {
-            assertEquals("testB", name.getMethodName());
-        }
-    }
-
-    public static class BeforeAndAfterTest {
-        @Rule
-        public TestName name = new TestName();
-
-        private final String expectedName = "x";
-
-        @Before
-        public void setUp() {
-            assertEquals(expectedName, name.getMethodName());
-        }
-
-        @Test
-        public void x() {
-            assertEquals(expectedName, name.getMethodName());
-        }
-
-        @After
-        public void tearDown() {
-            assertEquals(expectedName, name.getMethodName());
-        }
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/RuleChainTest.java Deleted

@@ -1,60 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.rules.RuleChain.outerRule;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-
-public class RuleChainTest {
-    private static final List<String> LOG = new ArrayList<String>();
-
-    private static class LoggingRule extends TestWatcher {
-        private final String label;
-
-        public LoggingRule(String label) {
-            this.label = label;
-        }
-
-        @Override
-        protected void starting(Description description) {
-            LOG.add("starting " + label);
-        }
-
-        @Override
-        protected void finished(Description description) {
-            LOG.add("finished " + label);
-        }
-    }
-
-    public static class UseRuleChain {
-        @Rule
-        public final RuleChain chain = outerRule(new LoggingRule("outer rule"))
-                .around(new LoggingRule("middle rule")).around(
-                        new LoggingRule("inner rule"));
-
-        @Test
-        public void example() {
-            assertTrue(true);
-        }
-    }
-
-    @Test
-    public void executeRulesInCorrectOrder() throws Exception {
-        testResult(UseRuleChain.class);
-        List<String> expectedLog = asList("starting outer rule",
-                "starting middle rule", "starting inner rule",
-                "finished inner rule", "finished middle rule",
-                "finished outer rule");
-        assertEquals(expectedLog, LOG);
-    }
-}
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/RuleMemberValidatorTest.java Deleted

@@ -1,356 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.internal.runners.rules.RuleMemberValidator.CLASS_RULE_METHOD_VALIDATOR;
-import static org.junit.internal.runners.rules.RuleMemberValidator.CLASS_RULE_VALIDATOR;
-import static org.junit.internal.runners.rules.RuleMemberValidator.RULE_METHOD_VALIDATOR;
-import static org.junit.internal.runners.rules.RuleMemberValidator.RULE_VALIDATOR;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestRule;
-import org.junit.rules.TestWatchman;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-import org.junit.runners.model.TestClass;
-
-public class RuleMemberValidatorTest {
-    private final List<Throwable> errors = new ArrayList<Throwable>();
-
-    @Test
-    public void rejectProtectedClassRule() {
-        TestClass target = new TestClass(TestWithProtectedClassRule.class);
-        CLASS_RULE_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @ClassRule 'temporaryFolder' must be public.");
-    }
-
-    public static class TestWithProtectedClassRule {
-        @ClassRule
-        protected static TestRule temporaryFolder = new TemporaryFolder();
-    }
-
-    @Test
-    public void rejectNonStaticClassRule() {
-        TestClass target = new TestClass(TestWithNonStaticClassRule.class);
-        CLASS_RULE_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @ClassRule 'temporaryFolder' must be static.");
-    }
-
-    public static class TestWithNonStaticClassRule {
-        @ClassRule
-        public TestRule temporaryFolder = new TemporaryFolder();
-    }
-
-    @Test
-    public void acceptStaticTestRuleThatIsAlsoClassRule() {
-        TestClass target = new TestClass(TestWithStaticClassAndTestRule.class);
-        CLASS_RULE_VALIDATOR.validate(target, errors);
-        assertNumberOfErrors(0);
-    }
-
-    public static class TestWithStaticClassAndTestRule {
-        @ClassRule
-        @Rule
-        public static TestRule temporaryFolder = new TemporaryFolder();
-    }
-
-    @Test
-    public void rejectClassRuleInNonPublicClass() {
-        TestClass target = new TestClass(NonPublicTestWithClassRule.class);
-        CLASS_RULE_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @ClassRule 'temporaryFolder' must be declared in a public class.");
-    }
-
-    static class NonPublicTestWithClassRule {
-        @ClassRule
-        public static TestRule temporaryFolder = new TemporaryFolder();
-    }
-    
-    /**
-     * If there is any property annotated with @ClassRule then it must implement
-     * {@link TestRule}
-     * 
-     * <p>This case has been added with 
-     * <a href="https://github.com/junit-team/junit/issues/1019">Issue #1019</a>
-     */
-    @Test
-    public void rejectClassRuleThatIsImplemetationOfMethodRule() {
-        TestClass target = new TestClass(TestWithClassRuleIsImplementationOfMethodRule.class);
-        CLASS_RULE_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @ClassRule 'classRule' must implement TestRule.");
-    }
-    
-    public static class TestWithClassRuleIsImplementationOfMethodRule {
-        @ClassRule
-        public static MethodRule classRule = new MethodRule() {
-            
-            public Statement apply(Statement base, FrameworkMethod method, Object target) {
-                return base;
-            }
-        };
-    }
-
-    /**
-     * If there is any method annotated with @ClassRule then it must return an 
-     * implementation of {@link TestRule}
-     * 
-     * <p>This case has been added with 
-     * <a href="https://github.com/junit-team/junit/issues/1019">Issue #1019</a>
-     */
-    @Test
-    public void rejectClassRuleThatReturnsImplementationOfMethodRule() {
-        TestClass target = new TestClass(TestWithClassRuleMethodThatReturnsMethodRule.class);
-        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @ClassRule 'methodRule' must return an implementation of TestRule.");
-    }
-
-    public static class TestWithClassRuleMethodThatReturnsMethodRule {
-        @ClassRule
-        public static MethodRule methodRule() {
-            return new MethodRule() {
-                
-                public Statement apply(Statement base, FrameworkMethod method, Object target) {
-                    return base;
-                }
-            };
-        }
-    }
-    
-    /**
-     * If there is any property annotated with @ClassRule then it must implement
-     * {@link TestRule}
-     * 
-     * <p>This case has been added with 
-     * <a href="https://github.com/junit-team/junit/issues/1019">Issue #1019</a>
-     */
-    @Test
-    public void rejectClassRuleIsAnArbitraryObject() throws Exception {
-        TestClass target = new TestClass(TestWithClassRuleIsAnArbitraryObject.class);
-        CLASS_RULE_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @ClassRule 'arbitraryObject' must implement TestRule.");
-    }
-
-    public static class TestWithClassRuleIsAnArbitraryObject {
-        @ClassRule
-        public static Object arbitraryObject = 1;
-    }
-    
-    /**
-     * If there is any method annotated with @ClassRule then it must return an 
-     * implementation of {@link TestRule}
-     * 
-     * <p>This case has been added with 
-     * <a href="https://github.com/junit-team/junit/issues/1019">Issue #1019</a> 
-     */
-    @Test
-    public void rejectClassRuleMethodReturnsAnArbitraryObject() throws Exception {
-        TestClass target = new TestClass(TestWithClassRuleMethodReturnsAnArbitraryObject.class);
-        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @ClassRule 'arbitraryObject' must return an implementation of TestRule.");
-    }
-
-    public static class TestWithClassRuleMethodReturnsAnArbitraryObject {
-        @ClassRule
-        public static Object arbitraryObject() {
-            return 1;
-        }
-    }
-    
-    @Test
-    public void acceptNonStaticTestRule() {
-        TestClass target = new TestClass(TestWithNonStaticTestRule.class);
-        RULE_VALIDATOR.validate(target, errors);
-        assertNumberOfErrors(0);
-    }
-
-    public static class TestWithNonStaticTestRule {
-        @Rule
-        public TestRule temporaryFolder = new TemporaryFolder();
-    }
-
-    @Test
-    public void rejectStaticTestRule() {
-        TestClass target = new TestClass(TestWithStaticTestRule.class);
-        RULE_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @Rule 'temporaryFolder' must not be static or it must be annotated with @ClassRule.");
-    }
-
-    public static class TestWithStaticTestRule {
-        @Rule
-        public static TestRule temporaryFolder = new TemporaryFolder();
-    }
-
-    @Test
-    public void rejectStaticMethodRule() {
-        TestClass target = new TestClass(TestWithStaticMethodRule.class);
-        RULE_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @Rule 'testWatchman' must not be static.");
-    }
-
-    public static class TestWithStaticMethodRule {
-        @SuppressWarnings("deprecation")
-        @Rule
-        public static MethodRule testWatchman = new TestWatchman();
-    }
-    
-    @Test
-    public void acceptMethodRule() throws Exception {
-        TestClass target = new TestClass(TestWithMethodRule.class);
-        RULE_VALIDATOR.validate(target, errors);
-        assertNumberOfErrors(0);
-    }
-
-    public static class TestWithMethodRule {
-        @Rule
-        public MethodRule temporaryFolder = new MethodRule() {
-            public Statement apply(Statement base, FrameworkMethod method,
-                    Object target) {
-                return null;
-            }
-        };
-    }
-
-    @Test
-    public void rejectArbitraryObjectWithRuleAnnotation() throws Exception {
-        TestClass target = new TestClass(TestWithArbitraryObjectWithRuleAnnotation.class);
-        RULE_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @Rule 'arbitraryObject' must implement MethodRule or TestRule.");
-    }
-
-    public static class TestWithArbitraryObjectWithRuleAnnotation {
-        @Rule
-        public Object arbitraryObject = 1;
-    }
-
-    @Test
-    public void methodRejectProtectedClassRule() {
-        TestClass target = new TestClass(MethodTestWithProtectedClassRule.class);
-        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @ClassRule 'getTemporaryFolder' must be public.");
-    }
-
-    public static class MethodTestWithProtectedClassRule {
-        @ClassRule
-        protected static TestRule getTemporaryFolder() {
-            return new TemporaryFolder();
-        }
-    }
-
-    @Test
-    public void methodRejectNonStaticClassRule() {
-        TestClass target = new TestClass(MethodTestWithNonStaticClassRule.class);
-        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @ClassRule 'getTemporaryFolder' must be static.");
-    }
-
-    public static class MethodTestWithNonStaticClassRule {
-        @ClassRule
-        public TestRule getTemporaryFolder() {
-            return new TemporaryFolder();
-        }
-    }
-
-    @Test
-    public void acceptMethodStaticTestRuleThatIsAlsoClassRule() {
-        TestClass target = new TestClass(MethodTestWithStaticClassAndTestRule.class);
-        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertNumberOfErrors(0);
-    }
-
-    public static class MethodTestWithStaticClassAndTestRule {
-        @ClassRule
-        @Rule
-        public static TestRule getTemporaryFolder() {
-            return new TemporaryFolder();
-        }
-    }
-
-    @Test
-    public void acceptMethodNonStaticTestRule() {
-        TestClass target = new TestClass(TestMethodWithNonStaticTestRule.class);
-        RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertNumberOfErrors(0);
-    }
-
-    public static class TestMethodWithNonStaticTestRule {
-        @Rule
-        public TestRule getTemporaryFolder() {
-            return new TemporaryFolder();
-        }
-    }
-
-    @Test
-    public void rejectMethodStaticTestRule() {
-        TestClass target = new TestClass(TestMethodWithStaticTestRule.class);
-        RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @Rule 'getTemporaryFolder' must not be static or it must be annotated with @ClassRule.");
-    }
-
-    public static class TestMethodWithStaticTestRule {
-        @Rule
-        public static TestRule getTemporaryFolder() {
-            return new TemporaryFolder();
-        }
-    }
-
-    @Test
-    public void rejectMethodStaticMethodRule() {
-        TestClass target = new TestClass(TestMethodWithStaticMethodRule.class);
-        RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @Rule 'getTestWatchman' must not be static.");
-    }
-
-    public static class TestMethodWithStaticMethodRule {
-        @SuppressWarnings("deprecation")
-        @Rule
-        public static MethodRule getTestWatchman() { return new TestWatchman(); }
-    }
-
-    @Test
-    public void methodAcceptMethodRuleMethod() throws Exception {
-        TestClass target = new TestClass(MethodTestWithMethodRule.class);
-        RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertNumberOfErrors(0);
-    }
-
-    public static class MethodTestWithMethodRule {
-        @Rule
-        public MethodRule getTemporaryFolder() {
-            return new MethodRule() {
-                public Statement apply(Statement base, FrameworkMethod method,
-                        Object target) {
-                    return null;
-                }
-            };
-        }
-    }
-
-    @Test
-    public void methodRejectArbitraryObjectWithRuleAnnotation() throws Exception {
-        TestClass target = new TestClass(MethodTestWithArbitraryObjectWithRuleAnnotation.class);
-        RULE_METHOD_VALIDATOR.validate(target, errors);
-        assertOneErrorWithMessage("The @Rule 'getArbitraryObject' must return an implementation of MethodRule or TestRule.");
-    }
-
-    public static class MethodTestWithArbitraryObjectWithRuleAnnotation {
-        @Rule
-        public Object getArbitraryObject() {
-            return 1;
-        }
-    }
-
-    private void assertOneErrorWithMessage(String message) {
-        assertNumberOfErrors(1);
-        assertEquals("Wrong error message:", message, errors.get(0).getMessage());
-    }
-
-    private void assertNumberOfErrors(int numberOfErrors) {
-        assertEquals("Wrong number of errors:", numberOfErrors, errors.size());
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/TempFolderRuleTest.java Deleted

@@ -1,239 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.failureCountIs;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-public class TempFolderRuleTest {
-    private static File createdFiles = new File20;
-
-    public static class HasTempFolder {
-        @Rule
-        public TemporaryFolder folder = new TemporaryFolder();
-
-        @Test
-        public void testUsingTempFolder() throws IOException {
-            createdFiles0 = folder.newFile("myfile.txt");
-            assertTrue(createdFiles0.exists());
-        }
-    }
-
-    @Test
-    public void tempFolderIsDeleted() {
-        assertThat(testResult(HasTempFolder.class), isSuccessful());
-        assertFalse(createdFiles0.exists());
-    }
-
-    public static class CreatesSubFolder {
-        @Rule
-        public TemporaryFolder folder = new TemporaryFolder();
-
-        @Test
-        public void testUsingTempFolderStringReflection() throws Exception {
-            String subfolder = "subfolder";
-            String filename = "a.txt";
-            // force usage of folder.newFolder(String),
-            // check is available and works, to avoid a potential NoSuchMethodError with non-recompiled code.
-            Method method = folder.getClass().getMethod("newFolder", new Class<?>{String.class});
-            createdFiles0 = (File) method.invoke(folder, subfolder);
-            new File(createdFiles0, filename).createNewFile();
-
-            File expectedFile = new File(folder.getRoot(), join(subfolder, filename));
-
-            assertTrue(expectedFile.exists());
-        }
-
-        @Test
-        public void testUsingTempFolderString() throws IOException {
-            String subfolder = "subfolder";
-            String filename = "a.txt";
-            // this uses newFolder(String), ensure that a single String works
-            createdFiles0 = folder.newFolder(subfolder);
-            new File(createdFiles0, filename).createNewFile();
-
-            File expectedFile = new File(folder.getRoot(), join(subfolder, filename));
-
-            assertTrue(expectedFile.exists());
-        }
-
-        @Test
-        public void testUsingTempTreeFolders() throws IOException {
-            String subfolder = "subfolder";
-            String anotherfolder = "anotherfolder";
-            String filename = "a.txt";
-
-            createdFiles0 = folder.newFolder(subfolder, anotherfolder);
-            new File(createdFiles0, filename).createNewFile();
-
-            File expectedFile = new File(folder.getRoot(), join(subfolder, anotherfolder, filename));
-
-            assertTrue(expectedFile.exists());
-        }
-
-        private String join(String... folderNames) {
-            StringBuilder path = new StringBuilder();
-            for (String folderName : folderNames) {
-                path.append(File.separator).append(folderName);
-            }
-            return path.toString();
-        }
-    }
-
-    @Test
-    public void subFolderIsDeleted() {
-        assertThat(testResult(CreatesSubFolder.class), isSuccessful());
-        assertFalse(createdFiles0.exists());
-    }
-
-    public static class CreatesRandomSubFolders {
-        @Rule
-        public TemporaryFolder folder = new TemporaryFolder();
-
-        @Test
-        public void testUsingRandomTempFolders() throws IOException {
-            for (int i = 0; i < 20; i++) {
-                File newFolder = folder.newFolder();
-                assertThat(Arrays.asList(createdFiles), not(hasItem(newFolder)));
-                createdFilesi = newFolder;
-                new File(newFolder, "a.txt").createNewFile();
-                assertTrue(newFolder.exists());
-            }
-        }
-    }
-
-    @Test
-    public void randomSubFoldersAreDeleted() {
-        assertThat(testResult(CreatesRandomSubFolders.class), isSuccessful());
-        for (File f : createdFiles) {
-            assertFalse(f.exists());
-        }
-    }
-
-    public static class CreatesRandomFiles {
-        @Rule
-        public TemporaryFolder folder = new TemporaryFolder();
-
-        @Test
-        public void testUsingRandomTempFiles() throws IOException {
-            for (int i = 0; i < 20; i++) {
-                File newFile = folder.newFile();
-                assertThat(Arrays.asList(createdFiles), not(hasItem(newFile)));
-                createdFilesi = newFile;
-                assertTrue(newFile.exists());
-            }
-        }
-    }
-
-    @Test
-    public void randomFilesAreDeleted() {
-        assertThat(testResult(CreatesRandomFiles.class), isSuccessful());
-        for (File f : createdFiles) {
-            assertFalse(f.exists());
-        }
-    }
-
-    @Test
-    public void recursiveDeleteFolderWithOneElement() throws IOException {
-        TemporaryFolder folder = new TemporaryFolder();
-        folder.create();
-        File file = folder.newFile("a");
-        folder.delete();
-        assertFalse(file.exists());
-        assertFalse(folder.getRoot().exists());
-    }
-
-    @Test
-    public void recursiveDeleteFolderWithOneRandomElement() throws IOException {
-        TemporaryFolder folder = new TemporaryFolder();
-        folder.create();
-        File file = folder.newFile();
-        folder.delete();
-        assertFalse(file.exists());
-        assertFalse(folder.getRoot().exists());
-    }
-
-    @Test
-    public void recursiveDeleteFolderWithZeroElements() throws IOException {
-        TemporaryFolder folder = new TemporaryFolder();
-        folder.create();
-        folder.delete();
-        assertFalse(folder.getRoot().exists());
-    }
-
-    public static class NameClashes {
-        @Rule
-        public TemporaryFolder folder = new TemporaryFolder();
-
-        @Test
-        public void fileWithFileClash() throws IOException {
-            folder.newFile("something.txt");
-            folder.newFile("something.txt");
-        }
-
-        @Test
-        public void fileWithFolderTest() throws IOException {
-            folder.newFolder("dummy");
-            folder.newFile("dummy");
-        }
-    }
-
-    @Test
-    public void nameClashesResultInTestFailures() {
-        assertThat(testResult(NameClashes.class), failureCountIs(2));
-    }
-
-    private static final String GET_ROOT_DUMMY = "dummy-getRoot";
-
-    private static final String NEW_FILE_DUMMY = "dummy-newFile";
-
-    private static final String NEW_FOLDER_DUMMY = "dummy-newFolder";
-
-    public static class IncorrectUsage {
-        public TemporaryFolder folder = new TemporaryFolder();
-
-        @Test
-        public void testGetRoot() throws IOException {
-            new File(folder.getRoot(), GET_ROOT_DUMMY).createNewFile();
-        }
-
-        @Test
-        public void testNewFile() throws IOException {
-            folder.newFile(NEW_FILE_DUMMY);
-        }
-
-        @Test
-        public void testNewFolder() throws IOException {
-            folder.newFolder(NEW_FOLDER_DUMMY);
-        }
-    }
-
-    @Test
-    public void incorrectUsageWithoutApplyingTheRuleShouldNotPolluteTheCurrentWorkingDirectory() {
-        assertThat(testResult(IncorrectUsage.class), failureCountIs(3));
-        assertFalse("getRoot should have failed early", new File(GET_ROOT_DUMMY).exists());
-        assertFalse("newFile should have failed early", new File(NEW_FILE_DUMMY).exists());
-        assertFalse("newFolder should have failed early", new File(NEW_FOLDER_DUMMY).exists());
-    }
-
-    @After
-    public void cleanCurrentWorkingDirectory() {
-        new File(GET_ROOT_DUMMY).delete();
-        new File(NEW_FILE_DUMMY).delete();
-        new File(NEW_FOLDER_DUMMY).delete();
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/TemporaryFolderUsageTest.java Deleted

@@ -1,217 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.rules.TemporaryFolder;
-
-/**
- * <tt>TemporaryFolderUsageTest</tt> provides tests for API usage correctness
- * and ensure implementation symmetry of public methods against a root folder.
- */
-public class TemporaryFolderUsageTest {
-
-    private TemporaryFolder tempFolder;
-
-    @Rule
-    public final ExpectedException thrown = ExpectedException.none();
-
-    @Before
-    public void setUp() {
-        tempFolder = new TemporaryFolder();
-    }
-
-    @After
-    public void tearDown() {
-        tempFolder.delete();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void getRootShouldThrowIllegalStateExceptionIfCreateWasNotInvoked() {
-        new TemporaryFolder().getRoot();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void newFileThrowsIllegalStateExceptionIfCreateWasNotInvoked()
-            throws IOException {
-        new TemporaryFolder().newFile();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void newFileWithGivenNameThrowsIllegalStateExceptionIfCreateWasNotInvoked()
-            throws IOException {
-        new TemporaryFolder().newFile("MyFile.txt");
-    }
-
-    @Test
-    public void newFileWithGivenFilenameThrowsIllegalArgumentExceptionIfFileExists() throws IOException {
-        tempFolder.create();
-        tempFolder.newFile("MyFile.txt");
-
-        thrown.expect(IOException.class);
-        thrown.expectMessage("a file with the name 'MyFile.txt' already exists in the test folder");
-        tempFolder.newFile("MyFile.txt");
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void newFolderThrowsIllegalStateExceptionIfCreateWasNotInvoked()
-            throws IOException {
-        new TemporaryFolder().newFolder();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void newFolderWithGivenPathThrowsIllegalStateExceptionIfCreateWasNotInvoked() throws IOException {
-        new TemporaryFolder().newFolder("level1", "level2", "level3");
-    }
-
-    @Test
-    public void newFolderWithGivenFolderThrowsIllegalArgumentExceptionIfFolderExists() throws IOException {
-        tempFolder.create();
-        tempFolder.newFolder("level1");
-
-        thrown.expect(IOException.class);
-        thrown.expectMessage("a folder with the name 'level1' already exists");
-        tempFolder.newFolder("level1");
-    }
-    
-    @Test
-    public void newFolderWithGivenFolderThrowsIOExceptionIfFolderNameConsistsOfMultiplePathComponents()
-            throws IOException {
-        tempFolder.create();
-        thrown.expect(IOException.class);
-        thrown.expectMessage("name cannot consist of multiple path components");
-        tempFolder.newFolder("temp1/temp2");
-    }
-    
-    @Test
-    public void newFolderWithGivenPathThrowsIllegalArgumentExceptionIfPathExists() throws IOException {
-        tempFolder.create();
-        tempFolder.newFolder("level1", "level2", "level3");
-
-        thrown.expect(IOException.class);
-        thrown.expectMessage("a folder with the name 'level3' already exists");
-        tempFolder.newFolder("level1", "level2", "level3");
-    }
-
-    @Test
-    public void newFolderWithGivenPathThrowsIOExceptionIfFolderNamesConsistOfMultiplePathComponents()
-            throws IOException {
-        tempFolder.create();
-        thrown.expect(IOException.class);
-        thrown.expectMessage("name cannot consist of multiple path components");
-        tempFolder.newFolder("temp1", "temp2", "temp3/temp4");
-    }
-    
-    @Test
-    public void createInitializesRootFolder() throws IOException {
-        tempFolder.create();
-        assertFileExists(tempFolder.getRoot());
-    }
-
-    @Test
-    public void deleteShouldDoNothingIfRootFolderWasNotInitialized() {
-        tempFolder.delete();
-    }
-
-    @Test
-    public void deleteRemovesRootFolder() throws IOException {
-        tempFolder.create();
-        tempFolder.delete();
-        assertFileDoesNotExist(tempFolder.getRoot());
-    }
-
-    @Test
-    public void newRandomFileIsCreatedUnderRootFolder() throws IOException {
-        tempFolder.create();
-
-        File f = tempFolder.newFile();
-        assertFileExists(f);
-        assertFileCreatedUnderRootFolder("Random file", f);
-    }
-
-    @Test
-    public void newNamedFileIsCreatedUnderRootFolder() throws IOException {
-        final String fileName = "SampleFile.txt";
-        tempFolder.create();
-
-        File f = tempFolder.newFile(fileName);
-
-        assertFileExists(f);
-        assertFileCreatedUnderRootFolder("Named file", f);
-        assertThat("file name", f.getName(), equalTo(fileName));
-    }
-
-    @Test
-    public void newRandomFolderIsCreatedUnderRootFolder() throws IOException {
-        tempFolder.create();
-
-        File f = tempFolder.newFolder();
-        assertFileExists(f);
-        assertFileCreatedUnderRootFolder("Random folder", f);
-    }
-
-    @Test
-    public void newNestedFoldersCreatedUnderRootFolder() throws IOException {
-        tempFolder.create();
-
-        File f = tempFolder.newFolder("top", "middle", "bottom");
-        assertFileExists(f);
-        assertParentFolderForFileIs(f, new File(tempFolder.getRoot(),
-                "top/middle"));
-        assertParentFolderForFileIs(f.getParentFile(),
-                new File(tempFolder.getRoot(), "top"));
-        assertFileCreatedUnderRootFolder("top", f.getParentFile()
-                .getParentFile());
-    }
-
-    @Test
-    public void canSetTheBaseFileForATemporaryFolder() throws IOException {
-        File tempDir = createTemporaryFolder();
-
-        TemporaryFolder folder = new TemporaryFolder(tempDir);
-        folder.create();
-
-        assertThat(tempDir, is(folder.getRoot().getParentFile()));
-    }
-
-    private File createTemporaryFolder() throws IOException {
-        File tempDir = File.createTempFile("junit", "tempFolder");
-        assertTrue("Unable to delete temporary file", tempDir.delete());
-        assertTrue("Unable to create temp directory", tempDir.mkdir());
-        return tempDir;
-    }
-
-    private void assertFileDoesNotExist(File file) {
-        checkFileExists("exists", file, false);
-    }
-
-    private void checkFileExists(String msg, File file, boolean exists) {
-        assertThat("File is null", file, is(notNullValue()));
-        assertThat("File '" + file.getAbsolutePath() + "' " + msg,
-                file.exists(), is(exists));
-    }
-
-    private void assertFileExists(File file) {
-        checkFileExists("does not exist", file, true);
-    }
-
-    private void assertFileCreatedUnderRootFolder(String msg, File f) {
-        assertParentFolderForFileIs(f, tempFolder.getRoot());
-    }
-
-    private void assertParentFolderForFileIs(File f, File parentFolder) {
-        assertThat("'" + f.getAbsolutePath() + "': not under root",
-                f.getParentFile(), is(parentFolder));
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/TestRuleTest.java Deleted

@@ -1,744 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
-import org.junit.rules.TestName;
-import org.junit.rules.TestRule;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-public class TestRuleTest {
-    private static boolean wasRun;
-
-    public static class ExampleTest {
-        @Rule
-        public TestRule example = new TestRule() {
-            public Statement apply(final Statement base, Description description) {
-                return new Statement() {
-                    @Override
-                    public void evaluate() throws Throwable {
-                        wasRun = true;
-                        base.evaluate();
-                    }
-
-                    ;
-                };
-            }
-        };
-
-        @Test
-        public void nothing() {
-
-        }
-    }
-
-    @Test
-    public void ruleIsIntroducedAndEvaluated() {
-        wasRun = false;
-        JUnitCore.runClasses(ExampleTest.class);
-        assertTrue(wasRun);
-    }
-
-    public static class BothKindsOfRule implements TestRule, org.junit.rules.MethodRule {
-        public int applications = 0;
-
-        public Statement apply(Statement base, FrameworkMethod method,
-                Object target) {
-            applications++;
-            return base;
-        }
-
-        public Statement apply(Statement base, Description description) {
-            applications++;
-            return base;
-        }
-    }
-
-    public static class OneFieldTwoKindsOfRule {
-        @Rule
-        public BothKindsOfRule both = new BothKindsOfRule();
-
-        @Test
-        public void onlyOnce() {
-            assertEquals(1, both.applications);
-        }
-    }
-
-
-    @Test
-    public void onlyApplyOnceEvenIfImplementsBothInterfaces() {
-        assertTrue(JUnitCore.runClasses(OneFieldTwoKindsOfRule.class).wasSuccessful());
-    }
-
-    public static class SonOfExampleTest extends ExampleTest {
-
-    }
-
-    @Test
-    public void ruleIsIntroducedAndEvaluatedOnSubclass() {
-        wasRun = false;
-        JUnitCore.runClasses(SonOfExampleTest.class);
-        assertTrue(wasRun);
-    }
-
-    private static int runCount;
-
-    public static class MultipleRuleTest {
-        private static class Increment implements TestRule {
-            public Statement apply(final Statement base, Description description) {
-                return new Statement() {
-                    @Override
-                    public void evaluate() throws Throwable {
-                        runCount++;
-                        base.evaluate();
-                    }
-
-                    ;
-                };
-            }
-        }
-
-        @Rule
-        public TestRule incrementor1 = new Increment();
-
-        @Rule
-        public TestRule incrementor2 = new Increment();
-
-        @Test
-        public void nothing() {
-
-        }
-    }
-
-    @Test
-    public void multipleRulesAreRun() {
-        runCount = 0;
-        JUnitCore.runClasses(MultipleRuleTest.class);
-        assertEquals(2, runCount);
-    }
-
-    public static class NoRulesTest {
-        public int x;
-
-        @Test
-        public void nothing() {
-
-        }
-    }
-
-    @Test
-    public void ignoreNonRules() {
-        Result result = JUnitCore.runClasses(NoRulesTest.class);
-        assertEquals(0, result.getFailureCount());
-    }
-
-    private static String log;
-
-    public static class OnFailureTest {
-        @Rule
-        public TestRule watcher = new TestWatcher() {
-            @Override
-            protected void failed(Throwable e, Description description) {
-                log += description + " " + e.getClass().getSimpleName();
-            }
-        };
-
-        @Test
-        public void nothing() {
-            fail();
-        }
-    }
-
-    @Test
-    public void onFailure() {
-        log = "";
-        Result result = JUnitCore.runClasses(OnFailureTest.class);
-        assertEquals(String.format("nothing(%s) AssertionError", OnFailureTest.class.getName()), log);
-        assertEquals(1, result.getFailureCount());
-    }
-
-    public static class WatchmanTest {
-        private static String watchedLog;
-
-        @Rule
-        public TestRule watcher = new TestWatcher() {
-            @Override
-            protected void failed(Throwable e, Description description) {
-                watchedLog += description + " "
-                        + e.getClass().getSimpleName() + "\n";
-            }
-
-            @Override
-            protected void succeeded(Description description) {
-                watchedLog += description + " " + "success!\n";
-            }
-        };
-
-        @Test
-        public void fails() {
-            fail();
-        }
-
-        @Test
-        public void succeeds() {
-        }
-    }
-
-    @Test
-    public void succeeded() {
-        WatchmanTest.watchedLog = "";
-        JUnitCore.runClasses(WatchmanTest.class);
-        assertThat(WatchmanTest.watchedLog, containsString(String.format("fails(%s) AssertionError", WatchmanTest.class.getName())));
-        assertThat(WatchmanTest.watchedLog, containsString(String.format("succeeds(%s) success!", WatchmanTest.class.getName())));
-    }
-
-    public static class BeforesAndAfters {
-        private static StringBuilder watchedLog = new StringBuilder();
-
-        @Before
-        public void before() {
-            watchedLog.append("before ");
-        }
-
-        @Rule
-        public TestRule watcher = new LoggingTestWatcher(watchedLog);
-
-        @After
-        public void after() {
-            watchedLog.append("after ");
-        }
-
-        @Test
-        public void succeeds() {
-            watchedLog.append("test ");
-        }
-    }
-
-    @Test
-    public void beforesAndAfters() {
-        BeforesAndAfters.watchedLog = new StringBuilder();
-        JUnitCore.runClasses(BeforesAndAfters.class);
-        assertThat(BeforesAndAfters.watchedLog.toString(),
-                is("starting before test after succeeded finished "));
-    }
-
-    public static class WrongTypedField {
-        @Rule
-        public int x = 5;
-
-        @Test
-        public void foo() {
-        }
-    }
-
-    @Test
-    public void validateWrongTypedField() {
-        assertThat(testResult(WrongTypedField.class),
-                hasSingleFailureContaining("must implement MethodRule"));
-    }
-
-    public static class SonOfWrongTypedField extends WrongTypedField {
-
-    }
-
-    @Test
-    public void validateWrongTypedFieldInSuperclass() {
-        assertThat(testResult(SonOfWrongTypedField.class),
-                hasSingleFailureContaining("must implement MethodRule"));
-    }
-
-    public static class PrivateRule {
-        @Rule
-        private TestRule rule = new TestName();
-
-        @Test
-        public void foo() {
-        }
-    }
-
-    @Test
-    public void validatePrivateRule() {
-        assertThat(testResult(PrivateRule.class),
-                hasSingleFailureContaining("must be public"));
-    }
-
-    public static class CustomTestName implements TestRule {
-        public String name = null;
-
-        public Statement apply(final Statement base, final Description description) {
-            return new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    name = description.getMethodName();
-                    base.evaluate();
-                }
-            };
-        }
-    }
-
-    public static class UsesCustomMethodRule {
-        @Rule
-        public CustomTestName counter = new CustomTestName();
-
-        @Test
-        public void foo() {
-            assertEquals("foo", counter.name);
-        }
-    }
-
-    @Test
-    public void useCustomMethodRule() {
-        assertThat(testResult(UsesCustomMethodRule.class), isSuccessful());
-    }
-
-    public static class MethodExampleTest {
-        private TestRule example = new TestRule() {
-            public Statement apply(final Statement base, Description description) {
-                return new Statement() {
-                    @Override
-                    public void evaluate() throws Throwable {
-                        wasRun = true;
-                        base.evaluate();
-                    }
-
-                    ;
-                };
-            }
-        };
-
-        @Rule
-        public TestRule getExample() {
-            return example;
-        }
-
-        @Test
-        public void nothing() {
-
-        }
-    }
-
-    @Test
-    public void methodRuleIsIntroducedAndEvaluated() {
-        wasRun = false;
-        JUnitCore.runClasses(MethodExampleTest.class);
-        assertTrue(wasRun);
-    }
-
-    public static class MethodBothKindsOfRule implements TestRule, org.junit.rules.MethodRule {
-        public int applications = 0;
-
-        public Statement apply(Statement base, FrameworkMethod method,
-                Object target) {
-            applications++;
-            return base;
-        }
-
-        public Statement apply(Statement base, Description description) {
-            applications++;
-            return base;
-        }
-    }
-
-    public static class MethodOneFieldTwoKindsOfRule {
-        private MethodBothKindsOfRule both = new MethodBothKindsOfRule();
-
-        @Rule
-        public MethodBothKindsOfRule getBoth() {
-            return both;
-        }
-
-        @Test
-        public void onlyOnce() {
-            assertEquals(1, both.applications);
-        }
-    }
-
-
-    @Test
-    public void methodOnlyApplyOnceEvenIfImplementsBothInterfaces() {
-        assertTrue(JUnitCore.runClasses(MethodOneFieldTwoKindsOfRule.class).wasSuccessful());
-    }
-
-    public static class MethodSonOfExampleTest extends MethodExampleTest {
-
-    }
-
-    @Test
-    public void methodRuleIsIntroducedAndEvaluatedOnSubclass() {
-        wasRun = false;
-        JUnitCore.runClasses(MethodSonOfExampleTest.class);
-        assertTrue(wasRun);
-    }
-
-//	private static int runCount;
-
-    public static class MethodMultipleRuleTest {
-        private static class Increment implements TestRule {
-            public Statement apply(final Statement base, Description description) {
-                return new Statement() {
-                    @Override
-                    public void evaluate() throws Throwable {
-                        runCount++;
-                        base.evaluate();
-                    }
-
-                    ;
-                };
-            }
-        }
-
-        private TestRule incrementor1 = new Increment();
-
-        @Rule
-        public TestRule getIncrementor1() {
-            return incrementor1;
-        }
-
-        private TestRule incrementor2 = new Increment();
-
-        @Rule
-        public TestRule getIncrementor2() {
-            return incrementor2;
-        }
-
-        @Test
-        public void nothing() {
-
-        }
-    }
-
-    @Test
-    public void methodMultipleRulesAreRun() {
-        runCount = 0;
-        JUnitCore.runClasses(MethodMultipleRuleTest.class);
-        assertEquals(2, runCount);
-    }
-
-    public static class MethodNoRulesTest {
-        public int x;
-
-        @Test
-        public void nothing() {
-
-        }
-    }
-
-    @Test
-    public void methodIgnoreNonRules() {
-        Result result = JUnitCore.runClasses(MethodNoRulesTest.class);
-        assertEquals(0, result.getFailureCount());
-    }
-
-    public static class MethodOnFailureTest {
-        private TestRule watchman = new TestWatcher() {
-            @Override
-            protected void failed(Throwable e, Description description) {
-                log += description + " " + e.getClass().getSimpleName();
-            }
-        };
-
-        @Rule
-        public TestRule getWatchman() {
-            return watchman;
-        }
-
-        @Test
-        public void nothing() {
-            fail();
-        }
-    }
-
-    @Test
-    public void methodOnFailure() {
-        log = "";
-        Result result = JUnitCore.runClasses(MethodOnFailureTest.class);
-        assertEquals(String.format("nothing(%s) AssertionError", MethodOnFailureTest.class.getName()), log);
-        assertEquals(1, result.getFailureCount());
-    }
-
-    public static class MethodOnSkippedTest {
-        private TestRule watchman = new TestWatcher() {
-            @Override
-            protected void skipped(AssumptionViolatedException e, Description description) {
-                log += description + " " + e.getClass().getSimpleName();
-            }
-        };
-
-        @Rule
-        public TestRule getWatchman() {
-            return watchman;
-        }
-
-        @Test
-        public void nothing() {
-            Assume.assumeTrue(false);
-        }
-    }
-
-    @Test
-    public void methodOnSkipped() {
-        log = "";
-        Result result = JUnitCore.runClasses(MethodOnSkippedTest.class);
-        assertEquals(String.format("nothing(%s) AssumptionViolatedException", MethodOnSkippedTest.class.getName()), log);
-        assertEquals(0, result.getFailureCount());
-        assertEquals(1, result.getRunCount());
-    }
-
-    public static class MethodWatchmanTest {
-        @SuppressWarnings("unused")
-        private static String watchedLog;
-
-        private TestRule watchman = new TestWatcher() {
-            @Override
-            protected void failed(Throwable e, Description description) {
-                watchedLog += description + " "
-                        + e.getClass().getSimpleName() + "\n";
-            }
-
-            @Override
-            protected void succeeded(Description description) {
-                watchedLog += description + " " + "success!\n";
-            }
-        };
-
-        @Rule
-        public TestRule getWatchman() {
-            return watchman;
-        }
-
-        @Test
-        public void fails() {
-            fail();
-        }
-
-        @Test
-        public void succeeds() {
-        }
-    }
-
-    @Test
-    public void methodSucceeded() {
-        WatchmanTest.watchedLog = "";
-        JUnitCore.runClasses(WatchmanTest.class);
-        assertThat(WatchmanTest.watchedLog, containsString(String.format("fails(%s) AssertionError", WatchmanTest.class.getName())));
-        assertThat(WatchmanTest.watchedLog, containsString(String.format("succeeds(%s) success!", WatchmanTest.class.getName())));
-    }
-
-    public static class MethodBeforesAndAfters {
-        private static String watchedLog;
-
-        @Before
-        public void before() {
-            watchedLog += "before ";
-        }
-
-        private TestRule watchman = new TestWatcher() {
-            @Override
-            protected void starting(Description d) {
-                watchedLog += "starting ";
-            }
-
-            @Override
-            protected void finished(Description d) {
-                watchedLog += "finished ";
-            }
-
-            @Override
-            protected void succeeded(Description d) {
-                watchedLog += "succeeded ";
-            }
-        };
-
-        @Rule
-        public TestRule getWatchman() {
-            return watchman;
-        }
-
-        @After
-        public void after() {
-            watchedLog += "after ";
-        }
-
-        @Test
-        public void succeeds() {
-            watchedLog += "test ";
-        }
-    }
-
-    @Test
-    public void methodBeforesAndAfters() {
-        MethodBeforesAndAfters.watchedLog = "";
-        JUnitCore.runClasses(MethodBeforesAndAfters.class);
-        assertThat(MethodBeforesAndAfters.watchedLog, is("starting before test after succeeded finished "));
-    }
-
-    public static class MethodWrongTypedField {
-        @Rule
-        public int getX() {
-            return 5;
-        }
-
-        @Test
-        public void foo() {
-        }
-    }
-
-    @Test
-    public void methodValidateWrongTypedField() {
-        assertThat(testResult(MethodWrongTypedField.class),
-                hasSingleFailureContaining("must return an implementation of MethodRule"));
-    }
-
-    public static class MethodSonOfWrongTypedField extends MethodWrongTypedField {
-
-    }
-
-    @Test
-    public void methodValidateWrongTypedFieldInSuperclass() {
-        assertThat(testResult(MethodSonOfWrongTypedField.class),
-                hasSingleFailureContaining("must return an implementation of MethodRule"));
-    }
-
-    public static class MethodPrivateRule {
-        @Rule
-        private TestRule getRule() {
-            return new TestName();
-        }
-
-        @Test
-        public void foo() {
-        }
-    }
-
-    @Test
-    public void methodValidatePrivateRule() {
-        assertThat(testResult(MethodPrivateRule.class),
-                hasSingleFailureContaining("must be public"));
-    }
-
-    public static class MethodUsesCustomMethodRule {
-        private CustomTestName counter = new CustomTestName();
-
-        @Rule
-        public CustomTestName getCounter() {
-            return counter;
-        }
-
-        @Test
-        public void foo() {
-            assertEquals("foo", counter.name);
-        }
-    }
-
-    @Test
-    public void methodUseCustomMethodRule() {
-        assertThat(testResult(MethodUsesCustomMethodRule.class), isSuccessful());
-    }
-
-    private static final List<String> orderList = new LinkedList<String>();
-
-    private static class OrderTestRule implements TestRule {
-        private String name;
-
-        public OrderTestRule(String name) {
-            this.name = name;
-        }
-
-        public Statement apply(final Statement base, final Description description) {
-            return new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    orderList.add(name);
-                    base.evaluate();
-                }
-            };
-        }
-    }
-
-    ;
-
-    public static class UsesFieldAndMethodRule {
-        @Rule
-        public OrderTestRule orderMethod() {
-            return new OrderTestRule("orderMethod");
-        }
-
-        @Rule
-        public OrderTestRule orderField = new OrderTestRule("orderField");
-
-        @Test
-        public void foo() {
-            assertEquals("orderField", orderList.get(0));
-            assertEquals("orderMethod", orderList.get(1));
-        }
-    }
-
-    @Test
-    public void usesFieldAndMethodRule() {
-        orderList.clear();
-        assertThat(testResult(UsesFieldAndMethodRule.class), isSuccessful());
-    }
-
-    public static class MultipleCallsTest implements TestRule {
-        public int applications = 0;
-
-        public Statement apply(Statement base, Description description) {
-            applications++;
-            return base;
-        }
-    }
-
-    public static class CallMethodOnlyOnceRule {
-        int countOfMethodCalls = 0;
-
-        private static class Dummy implements TestRule {
-            public Statement apply(final Statement base, Description description) {
-                return new Statement() {
-                    @Override
-                    public void evaluate() throws Throwable {
-                        base.evaluate();
-                    }
-
-                    ;
-                };
-            }
-        }
-
-        @Rule
-        public Dummy both() {
-            countOfMethodCalls++;
-            return new Dummy();
-        }
-
-        @Test
-        public void onlyOnce() {
-            assertEquals(1, countOfMethodCalls);
-        }
-    }
-
-    @Test
-    public void testCallMethodOnlyOnceRule() {
-        assertTrue(JUnitCore.runClasses(CallMethodOnlyOnceRule.class).wasSuccessful());
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/TestWatcherTest.java Deleted

@@ -1,191 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.failureCountIs;
-import static org.junit.experimental.results.ResultMatchers.hasFailureContaining;
-import static org.junit.runner.JUnitCore.runClasses;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.results.PrintableResult;
-import org.junit.internal.AssumptionViolatedException;
-import org.junit.rules.TestRule;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-
-public class TestWatcherTest {
-    public static class ViolatedAssumptionTest {
-        private static StringBuilder watchedLog = new StringBuilder();
-
-        @Rule
-        public TestRule watcher = new LoggingTestWatcher(watchedLog);
-
-        @Test
-        public void succeeds() {
-            assumeTrue(false);
-        }
-    }
-
-    @Test
-    public void neitherLogSuccessNorFailedForViolatedAssumption() {
-        ViolatedAssumptionTest.watchedLog = new StringBuilder();
-        runClasses(ViolatedAssumptionTest.class);
-        assertThat(ViolatedAssumptionTest.watchedLog.toString(),
-                is("starting skipped finished "));
-    }
-
-    public static class InternalViolatedAssumptionTest {
-        private static StringBuilder watchedLog = new StringBuilder();
-
-        @Rule
-        public TestRule watcher = new TestWatcher() {
-            @Override
-            protected void starting(Description description) {
-                watchedLog.append("starting ");
-            }
-
-            @Override
-            protected void finished(Description description) {
-                watchedLog.append("finished ");
-            }
-
-            protected void skipped(AssumptionViolatedException e, Description description) {
-                watchedLog.append("skipped ");
-            }
-        };
-
-        @Test
-        public void succeeds() {
-            throw new AssumptionViolatedException("don't run");
-        }
-    }
-
-    @Test
-    public void internalViolatedAssumption() {
-        InternalViolatedAssumptionTest.watchedLog = new StringBuilder();
-        runClasses(InternalViolatedAssumptionTest.class);
-        assertThat(InternalViolatedAssumptionTest.watchedLog.toString(),
-                is("starting skipped finished "));
-    }
-
-    public static class TestWatcherSkippedThrowsExceptionTest {
-        @Rule
-        public TestRule watcher = new TestWatcher() {
-            @Override
-            protected void skipped(AssumptionViolatedException e, Description description) {
-                throw new RuntimeException("watcher failure");
-            }
-        };
-
-        @Test
-        public void fails() {
-            throw new AssumptionViolatedException("test failure");
-        }
-    }
-
-    @Test
-    public void testWatcherSkippedThrowsException() {
-        PrintableResult result = testResult(TestWatcherSkippedThrowsExceptionTest.class);
-        assertThat(result, failureCountIs(2));
-        assertThat(result, hasFailureContaining("test failure"));
-        assertThat(result, hasFailureContaining("watcher failure"));
-    }
-
-    public static class FailingTest {
-        private static StringBuilder watchedLog = new StringBuilder();
-
-        @Rule
-        public TestRule watcher = new LoggingTestWatcher(watchedLog);
-
-        @Test
-        public void succeeds() {
-            fail();
-        }
-    }
-
-    @Test
-    public void logFailingTest() {
-        FailingTest.watchedLog = new StringBuilder();
-        runClasses(FailingTest.class);
-        assertThat(FailingTest.watchedLog.toString(),
-                is("starting failed finished "));
-    }
-
-    public static class TestWatcherFailedThrowsExceptionTest {
-        @Rule
-        public TestRule watcher = new TestWatcher() {
-            @Override
-            protected void failed(Throwable e, Description description) {
-                throw new RuntimeException("watcher failure");
-            }
-        };
-
-        @Test
-        public void fails() {
-            throw new IllegalArgumentException("test failure");
-        }
-    }
-
-    @Test
-    public void testWatcherFailedThrowsException() {
-        PrintableResult result = testResult(TestWatcherFailedThrowsExceptionTest.class);
-        assertThat(result, failureCountIs(2));
-        assertThat(result, hasFailureContaining("test failure"));
-        assertThat(result, hasFailureContaining("watcher failure"));
-    }
-
-    public static class TestWatcherStartingThrowsExceptionTest {
-        @Rule
-        public TestRule watcher = new TestWatcher() {
-            @Override
-            protected void starting(Description description) {
-                throw new RuntimeException("watcher failure");
-            }
-        };
-
-        @Test
-        public void fails() {
-            throw new IllegalArgumentException("test failure");
-        }
-    }
-
-    @Test
-    public void testWatcherStartingThrowsException() {
-        PrintableResult result = testResult(TestWatcherStartingThrowsExceptionTest.class);
-        assertThat(result, failureCountIs(2));
-        assertThat(result, hasFailureContaining("test failure"));
-        assertThat(result, hasFailureContaining("watcher failure"));
-    }
-
-    public static class TestWatcherFailedAndFinishedThrowsExceptionTest {
-        @Rule
-        public TestRule watcher = new TestWatcher() {
-            @Override
-            protected void failed(Throwable e, Description description) {
-                throw new RuntimeException("watcher failed failure");
-            }
-
-            @Override
-            protected void finished(Description description) {
-                throw new RuntimeException("watcher finished failure");
-            }
-        };
-
-        @Test
-        public void fails() {
-            throw new IllegalArgumentException("test failure");
-        }
-    }
-
-    @Test
-    public void testWatcherFailedAndFinishedThrowsException() {
-        PrintableResult result = testResult(TestWatcherFailedAndFinishedThrowsExceptionTest.class);
-        assertThat(result, failureCountIs(3));
-        assertThat(result, hasFailureContaining("test failure"));
-        assertThat(result, hasFailureContaining("watcher failed failure"));
-        assertThat(result, hasFailureContaining("watcher finished failure"));
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/TestWatchmanTest.java Deleted

@@ -1,73 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static junit.framework.Assert.fail;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeTrue;
-import static org.junit.runner.JUnitCore.runClasses;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestWatchman;
-import org.junit.runners.model.FrameworkMethod;
-
-@SuppressWarnings("deprecation")
-public class TestWatchmanTest {
-    public static class ViolatedAssumptionTest {
-        @Rule
-        public static LoggingTestWatchman watchman = new LoggingTestWatchman();
-
-        @Test
-        public void succeeds() {
-            assumeTrue(false);
-        }
-    }
-
-    @Test
-    public void neitherLogSuccessNorFailedForViolatedAssumption() {
-        runClasses(ViolatedAssumptionTest.class);
-        assertThat(ViolatedAssumptionTest.watchman.log.toString(),
-                is("starting finished "));
-    }
-
-    public static class FailingTest {
-        @Rule
-        public static LoggingTestWatchman watchman = new LoggingTestWatchman();
-
-        @Test
-        public void succeeds() {
-            fail();
-        }
-    }
-
-    @Test
-    public void logFailingTest() {
-        runClasses(FailingTest.class);
-        assertThat(FailingTest.watchman.log.toString(),
-                is("starting failed finished "));
-    }
-
-    private static class LoggingTestWatchman extends TestWatchman {
-        private final StringBuilder log = new StringBuilder();
-
-        @Override
-        public void succeeded(FrameworkMethod method) {
-            log.append("succeeded ");
-        }
-
-        @Override
-        public void failed(Throwable e, FrameworkMethod method) {
-            log.append("failed ");
-        }
-
-        @Override
-        public void starting(FrameworkMethod method) {
-            log.append("starting ");
-        }
-
-        @Override
-        public void finished(FrameworkMethod method) {
-            log.append("finished ");
-        }
-    }
-}
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/TimeoutRuleTest.java Deleted

@@ -1,165 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-
-public class TimeoutRuleTest {
-    private static final ReentrantLock run1Lock = new ReentrantLock();
-
-    private static volatile boolean run4done = false;
-
-    public abstract static class AbstractTimeoutTest {
-        public static final StringBuffer logger = new StringBuffer();
-
-        @Rule
-        public final TemporaryFolder tmpFile = new TemporaryFolder();
-
-        @Test
-        public void run1() throws InterruptedException {
-            logger.append("run1");
-            TimeoutRuleTest.run1Lock.lockInterruptibly();
-            TimeoutRuleTest.run1Lock.unlock();
-        }
-
-        @Test
-        public void run2() throws InterruptedException {
-            logger.append("run2");
-            Thread.currentThread().join();
-        }
-
-        @Test
-        public synchronized void run3() throws InterruptedException {
-            logger.append("run3");
-            wait();
-        }
-
-        @Test
-        public void run4() {
-            logger.append("run4");
-            while (!run4done) {
-            }
-        }
-
-        @Test
-        public void run5() throws IOException {
-            logger.append("run5");
-            Random rnd = new Random();
-            byte data = new byte1024;
-            File tmp = tmpFile.newFile();
-            while (true) {
-                RandomAccessFile randomAccessFile = new RandomAccessFile(tmp, "rw");
-                try {
-                    FileChannel channel = randomAccessFile.getChannel();
-                    rnd.nextBytes(data);
-                    ByteBuffer buffer = ByteBuffer.wrap(data);
-                    // Interrupted thread closes channel and throws ClosedByInterruptException.
-                    channel.write(buffer);
-                } finally {
-                    randomAccessFile.close();
-                }
-                tmp.delete();
-            }
-        }
-
-        @Test
-        public void run6() throws InterruptedIOException {
-            logger.append("run6");
-            // Java IO throws InterruptedIOException only on SUN machines.
-            throw new InterruptedIOException();
-        }
-    }
-
-    public static class HasGlobalLongTimeout extends AbstractTimeoutTest {
-
-        @Rule
-        public final TestRule globalTimeout = Timeout.millis(200);
-    }
-
-    public static class HasGlobalTimeUnitTimeout extends AbstractTimeoutTest {
-
-        @Rule
-        public final TestRule globalTimeout = new Timeout(200, TimeUnit.MILLISECONDS);
-    }
-    
-    public static class HasNullTimeUnit {
-
-        @Rule
-        public final TestRule globalTimeout = new Timeout(200, null);
-        
-        @Test
-        public void wouldPass() {
-        }
-    }
-
-    @Before
-    public void before() {
-        run4done = false;
-        run1Lock.lock();
-    }
-
-    @After
-    public void after() {
-        // set run4done to make sure that the thread won't continue at run4()
-        run4done = true;
-        run1Lock.unlock();
-    }
-
-    @Test
-    public void timeUnitTimeout() {
-        HasGlobalTimeUnitTimeout.logger.setLength(0);
-        Result result = JUnitCore.runClasses(HasGlobalTimeUnitTimeout.class);
-        assertEquals(6, result.getFailureCount());
-        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run1"));
-        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run2"));
-        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run3"));
-        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run4"));
-        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run5"));
-        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run6"));
-    }
-
-    @Test
-    public void longTimeout() {
-        HasGlobalLongTimeout.logger.setLength(0);
-        Result result = JUnitCore.runClasses(HasGlobalLongTimeout.class);
-        assertEquals(6, result.getFailureCount());
-        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run1"));
-        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run2"));
-        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run3"));
-        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run4"));
-        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run5"));
-        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run6"));
-    }
-
-    @Test
-    public void nullTimeUnit() {
-        Result result = JUnitCore.runClasses(HasNullTimeUnit.class);
-        assertEquals(1, result.getFailureCount());
-        Failure failure = result.getFailures().get(0);
-        assertThat(failure.getException().getMessage(),
-                containsString("Invalid parameters for Timeout"));
-        Throwable cause = failure.getException().getCause();
-        assertThat(cause.getMessage(), containsString("TimeUnit cannot be null"));
-    }
-}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/rules/VerifierRuleTest.java Deleted

@@ -1,151 +0,0 @@
-package org.junit.tests.experimental.rules;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.hasFailureContaining;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
-
-import java.util.concurrent.Callable;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.results.PrintableResult;
-import org.junit.rules.ErrorCollector;
-import org.junit.rules.Verifier;
-
-public class VerifierRuleTest {
-    public static class UsesErrorCollector {
-        @Rule
-        public ErrorCollector collector = new ErrorCollector();
-
-        @Test
-        public void example() {
-            collector.addError(new Throwable("message"));
-        }
-    }
-
-    @Test
-    public void usedErrorCollectorShouldFail() {
-        assertThat(testResult(UsesErrorCollector.class), hasFailureContaining("message"));
-    }
-
-    public static class UsesErrorCollectorTwice {
-        @Rule
-        public ErrorCollector collector = new ErrorCollector();
-
-        @Test
-        public void example() {
-            collector.addError(new Throwable("first thing went wrong"));
-            collector.addError(new Throwable("second thing went wrong"));
-        }
-    }
-
-    @Test
-    public void usedErrorCollectorTwiceShouldFail() {
-        PrintableResult testResult = testResult(UsesErrorCollectorTwice.class);
-        assertThat(testResult, hasFailureContaining("first thing went wrong"));
-        assertThat(testResult, hasFailureContaining("second thing went wrong"));
-    }
-
-    public static class UsesErrorCollectorCheckThat {
-        @Rule
-        public ErrorCollector collector = new ErrorCollector();
-
-        @Test
-        public void example() {
-            collector.checkThat(3, is(4));
-            collector.checkThat(5, is(6));
-            collector.checkThat("reason 1", 7, is(8));
-            collector.checkThat("reason 2", 9, is(16));
-        }
-    }
-
-    @Test
-    public void usedErrorCollectorCheckThatShouldFail() {
-        PrintableResult testResult = testResult(UsesErrorCollectorCheckThat.class);
-        assertThat(testResult, hasFailureContaining("was <3>"));
-        assertThat(testResult, hasFailureContaining("was <5>"));
-        assertThat(testResult, hasFailureContaining("reason 1"));
-        assertThat(testResult, hasFailureContaining("was <7>"));
-        assertThat(testResult, hasFailureContaining("reason 2"));
-        assertThat(testResult, hasFailureContaining("was <9>"));
-    }
-
-    public static class UsesErrorCollectorCheckSucceeds {
-        @Rule
-        public ErrorCollector collector = new ErrorCollector();
-
-        @Test
-        public void example() {
-            collector.checkSucceeds(new Callable<Object>() {
-                public Object call() throws Exception {
-                    throw new RuntimeException("first!");
-                }
-            });
-            collector.checkSucceeds(new Callable<Integer>() {
-                public Integer call() throws Exception {
-                    throw new RuntimeException("second!");
-                }
-            });
-            Integer result = collector.checkSucceeds(new Callable<Integer>() {
-                public Integer call() throws Exception {
-                    return 1;
-                }
-            });
-            assertEquals(Integer.valueOf(1), result);
-        }
-    }
-
-    @Test
-    public void usedErrorCollectorCheckSucceedsShouldFail() {
-        PrintableResult testResult = testResult(UsesErrorCollectorCheckSucceeds.class);
-        assertThat(testResult, hasFailureContaining("first!"));
-        assertThat(testResult, hasFailureContaining("second!"));
-    }
-
-    public static class UsesErrorCollectorCheckSucceedsPasses {
-        @Rule
-        public ErrorCollector collector = new ErrorCollector();
-
-        @Test
-        public void example() {
-            assertEquals(3, collector.checkSucceeds(new Callable<Object>() {
-                public Object call() throws Exception {
-                    return 3;
-                }
-            }));
-        }
-    }
-
-    @Test
-    public void usedErrorCollectorCheckSucceedsShouldPass() {
-        PrintableResult testResult = testResult(UsesErrorCollectorCheckSucceedsPasses.class);
-        assertThat(testResult, isSuccessful());
-    }
-
-    private static String sequence;
-
-    public static class UsesVerifier {
-        @Rule
-        public Verifier collector = new Verifier() {
-            @Override
-            protected void verify() {
-                sequence += "verify ";
-            }
-        };
-
-        @Test
-        public void example() {
-            sequence += "test ";
-        }
-    }
-
-    @Test
-    public void verifierRunsAfterTest() {
-        sequence = "";
-        assertThat(testResult(UsesVerifier.class), isSuccessful());
-        assertEquals("test verify ", sequence);
-    }
-}
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/internal Deleted

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/internal/runners Deleted

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/internal/runners/ErrorReportingRunnerTest.java Deleted

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/internal/runners/statements Deleted

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/internal/runners/statements/FailOnTimeoutTest.java Deleted

@@ -1,197 +0,0 @@
-package org.junit.tests.internal.runners.statements;
-
-import static java.lang.Long.MAX_VALUE;
-import static java.lang.Math.atan;
-import static java.lang.System.currentTimeMillis;
-import static java.lang.Thread.sleep;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.internal.runners.statements.FailOnTimeout;
-import org.junit.rules.ExpectedException;
-import org.junit.runners.model.Statement;
-import org.junit.runners.model.TestTimedOutException;
-
-/**
- * @author Asaf Ary, Stefan Birkner
- */
-public class FailOnTimeoutTest {
-    private static final int TIMEOUT = 100;
-    private static final int DURATION_THAT_EXCEEDS_TIMEOUT = 60 * 60 * 1000; //1 hour
-
-    @Rule
-    public final ExpectedException thrown = ExpectedException.none();
-
-    private final TestStatement statement = new TestStatement();
-
-    private final FailOnTimeout failOnTimeout = new FailOnTimeout(statement,
-            TIMEOUT);
-
-    @Test
-    public void throwsTestTimedOutException() throws Throwable {
-        thrown.expect(TestTimedOutException.class);
-        evaluateWithWaitDuration(DURATION_THAT_EXCEEDS_TIMEOUT);
-    }
-
-    @Test
-    public void throwExceptionWithNiceMessageOnTimeout() throws Throwable {
-        thrown.expectMessage("test timed out after 100 milliseconds");
-        evaluateWithWaitDuration(DURATION_THAT_EXCEEDS_TIMEOUT);
-    }
-
-    @Test
-    public void sendUpExceptionThrownByStatement() throws Throwable {
-        RuntimeException exception = new RuntimeException();
-        thrown.expect(is(exception));
-        evaluateWithException(exception);
-    }
-
-    @Test
-    public void throwExceptionIfTheSecondCallToEvaluateNeedsTooMuchTime()
-            throws Throwable {
-        thrown.expect(TestTimedOutException.class);
-        evaluateWithWaitDuration(0);
-        evaluateWithWaitDuration(DURATION_THAT_EXCEEDS_TIMEOUT);
-    }
-
-    @Test
-    public void throwTimeoutExceptionOnSecondCallAlthoughFirstCallThrowsException()
-            throws Throwable {
-        thrown.expectMessage("test timed out after 100 milliseconds");
-        try {
-            evaluateWithException(new RuntimeException());
-        } catch (Throwable expected) {
-        }
-        evaluateWithWaitDuration(DURATION_THAT_EXCEEDS_TIMEOUT);
-    }
-
-    @Test
-    public void throwsExceptionWithTimeoutValueAndTimeUnitSet()
-            throws Throwable {
-        try {
-            evaluateWithWaitDuration(DURATION_THAT_EXCEEDS_TIMEOUT);
-            fail("No exception was thrown when test timed out");
-        } catch (TestTimedOutException e) {
-            assertEquals(TIMEOUT, e.getTimeout());
-            assertEquals(TimeUnit.MILLISECONDS, e.getTimeUnit());
-        }
-    }
-
-    private void evaluateWithException(Exception exception) throws Throwable {
-        statement.nextException = exception;
-        statement.waitDuration = 0;
-        failOnTimeout.evaluate();
-    }
-
-    private void evaluateWithWaitDuration(int waitDuration) throws Throwable {
-        statement.nextException = null;
-        statement.waitDuration = waitDuration;
-        failOnTimeout.evaluate();
-    }
-
-    private static final class TestStatement extends Statement {
-        int waitDuration;
-
-        Exception nextException;
-
-        @Override
-        public void evaluate() throws Throwable {
-            sleep(waitDuration);
-            if (nextException != null) {
-                throw nextException;
-            }
-        }
-    }
-
-    @Test
-    public void stopEndlessStatement() throws Throwable {
-        InfiniteLoopStatement infiniteLoop = new InfiniteLoopStatement();
-        FailOnTimeout infiniteLoopTimeout = new FailOnTimeout(infiniteLoop,
-                TIMEOUT);
-        try {
-            infiniteLoopTimeout.evaluate();
-        } catch (Exception timeoutException) {
-            sleep(20); // time to interrupt the thread
-            int firstCount = InfiniteLoopStatement.COUNT;
-            sleep(20); // time to increment the count
-            assertTrue("Thread has not been stopped.",
-                    firstCount == InfiniteLoopStatement.COUNT);
-        }
-    }
-
-    private static final class InfiniteLoopStatement extends Statement {
-        private static int COUNT = 0;
-
-        @Override
-        public void evaluate() throws Throwable {
-            while (true) {
-                sleep(10); // sleep in order to enable interrupting thread
-                ++COUNT;
-            }
-        }
-    }
-
-    @Test
-    public void stackTraceContainsRealCauseOfTimeout() throws Throwable {
-        StuckStatement stuck = new StuckStatement();
-        FailOnTimeout stuckTimeout = new FailOnTimeout(stuck, TIMEOUT);
-        try {
-            stuckTimeout.evaluate();
-            // We must not get here, we expect a timeout exception
-            fail("Expected timeout exception");
-        } catch (Exception timeoutException) {
-            StackTraceElement stackTrace = timeoutException.getStackTrace();
-            boolean stackTraceContainsTheRealCauseOfTheTimeout = false;
-            boolean stackTraceContainsOtherThanTheRealCauseOfTheTimeout = false;
-            for (StackTraceElement element : stackTrace) {
-                String methodName = element.getMethodName();
-                if ("theRealCauseOfTheTimeout".equals(methodName)) {
-                    stackTraceContainsTheRealCauseOfTheTimeout = true;
-                }
-                if ("notTheRealCauseOfTheTimeout".equals(methodName)) {
-                    stackTraceContainsOtherThanTheRealCauseOfTheTimeout = true;
-                }
-            }
-            assertTrue(
-                    "Stack trace does not contain the real cause of the timeout",
-                    stackTraceContainsTheRealCauseOfTheTimeout);
-            assertFalse(
-                    "Stack trace contains other than the real cause of the timeout, which can be very misleading",
-                    stackTraceContainsOtherThanTheRealCauseOfTheTimeout);
-        }
-    }
-
-    private static final class StuckStatement extends Statement {
-
-        @Override
-        public void evaluate() throws Throwable {
-            try {
-                // Must show up in stack trace
-                theRealCauseOfTheTimeout();
-            } catch (InterruptedException e) {
-            } finally {
-                // Must _not_ show up in stack trace
-                notTheRealCauseOfTheTimeout();
-            }
-        }
-
-        private void theRealCauseOfTheTimeout() throws InterruptedException {
-            sleep(MAX_VALUE);
-        }
-
-        private void notTheRealCauseOfTheTimeout() {
-            for (long now = currentTimeMillis(), eta = now + 1000L; now < eta; now = currentTimeMillis()) {
-                // Doesn't matter, just pretend to be busy
-                atan(now);
-            }
-        }
-    }
-}

_service:tar_scm:r4.12.tar.gz/.classpath -> _service:tar_scm:r4.13.2.tar.gz/.classpath Changed

_service:tar_scm:r4.13.2.tar.gz/.gitattributes Added

@@ -0,0 +1,21 @@
+* text eol=lf
+*.gif binary
+*.GIF binary
+*.jar binary
+*.png binary
+*.jpg binary
+*.svg text eol=lf
+
+# These files do not have unix line endings. Do not normalize them for now.
+# Will fix these right before we cut JUnit 4.13.
+/src/main/java/org/junit/experimental/categories/CategoryFilterFactory.java -text
+/src/main/java/org/junit/experimental/categories/ExcludeCategories.java -text
+/src/main/java/org/junit/experimental/categories/IncludeCategories.java -text
+/src/main/java/org/junit/internal/Classes.java -text
+/src/main/java/org/junit/runner/FilterFactories.java -text
+/src/main/java/org/junit/runner/FilterFactory.java -text
+/src/main/java/org/junit/runner/FilterFactoryParams.java -text
+/src/main/java/org/junit/runner/JUnitCommandLineParseResult.java -text
+/src/test/java/org/junit/experimental/categories/CategoryFilterFactoryTest.java -text
+/src/test/java/org/junit/runner/FilterFactoriesTest.java -text
+/src/test/java/org/junit/runner/JUnitCommandLineParseResultTest.java -text

_service:tar_scm:r4.13.2.tar.gz/.github Added

_service:tar_scm:r4.13.2.tar.gz/.github/workflows Added

_service:tar_scm:r4.13.2.tar.gz/.github/workflows/main.yml Added

@@ -0,0 +1,48 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+
+  build-and-verify:
+    name: Build and verify (JDK ${{ matrix.java }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: 6, 8, 11, 15, 17-ea
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download Maven # Download with default JDK because OpenJDK 6 does not support TLS 1.2
+        run: ./mvnw --version
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Build and verify
+        run: ./mvnw verify javadoc:javadoc site:site --batch-mode --errors --settings .github/workflows/settings.xml
+
+  publish-snapshots:
+    name: Publish snapshot artifacts
+    if: github.event_name == 'push' && github.repository == 'junit-team/junit4' && github.ref == 'refs/heads/main'
+    needs: build-and-verify
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download Maven # Download with default JDK because OpenJDK 6 does not support TLS 1.2
+        run: ./mvnw --version
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 6
+      - name: Publish snapshot artifacts
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+        run: ./mvnw deploy --batch-mode --errors --activate-profiles generate-docs --settings .github/workflows/settings.xml

_service:tar_scm:r4.13.2.tar.gz/.github/workflows/settings.xml Added

_service:tar_scm:r4.12.tar.gz/.gitignore -> _service:tar_scm:r4.13.2.tar.gz/.gitignore Changed

_service:tar_scm:r4.13.2.tar.gz/.mvn Added

_service:tar_scm:r4.13.2.tar.gz/.mvn/wrapper Added

_service:tar_scm:r4.13.2.tar.gz/.mvn/wrapper/maven-wrapper.jar Added

_service:tar_scm:r4.13.2.tar.gz/.mvn/wrapper/maven-wrapper.properties Added

_service:tar_scm:r4.12.tar.gz/BUILDING -> _service:tar_scm:r4.13.2.tar.gz/BUILDING Changed

_service:tar_scm:r4.12.tar.gz/CODING_STYLE.txt -> _service:tar_scm:r4.13.2.tar.gz/CODING_STYLE.txt Changed

_service:tar_scm:r4.12.tar.gz/CONTRIBUTING.md -> _service:tar_scm:r4.13.2.tar.gz/CONTRIBUTING.md Changed

@@ -1,16 +1,45 @@
+## Project License:  Eclipse Public License v1.0
+
+- You will only Submit Contributions where You have authored 100% of the content.
+- You will only Submit Contributions to which You have the necessary rights. This means that if You are employed You have received the necessary permissions from Your employer to make the Contributions.
+- Whatever content You Contribute will be provided under the Project License(s).
+
+## Coding Conventions
+
+### Formatting
+
+See CODING_STYLE.txt(CODING_STYLE.txt) for how we format our code.
+
+## How to submit a pull request
+
 We love pull requests. Here is a quick guide:
 
 1. You need to have Maven and a JDK (at least version 1.5) installed.
-2. Fork the repo (see https://help.github.com/articles/fork-a-repo)
-3. Create a new branch from master.
-4. Ensure that you have a clean state by running `mvn verify`
+2. Fork the repo(https://help.github.com/articles/fork-a-repo).
+3. Create a new branch(https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/) from `main`.
+4. Ensure that you have a clean state by running `./mvnw verify`.
 5. Add your change together with a test (tests are not needed for refactorings and documentation changes).
 6. Format your code: Import the JUnit project in Eclipse and use its formatter or apply the rules in the `CODING_STYLE` file manually. Only format the code you've changed; reformatting unrelated code makes it harder for us to review your changes.
-6. Run `mvn verify` again and ensure all tests are passing.
-8. Push to your fork and submit a pull request.
+7. Run `./mvnw verify` again and ensure all tests are passing.
+8. Push to your fork and submit a pull request(https://help.github.com/articles/creating-a-pull-request/).
 
 Now you are waiting on us. We review your pull request and at least leave some comments.
 
 
 Note that if you are thinking of providing a fix for one of the bugs or feature requests, it's usually
 a good idea to add a comment to the bug to make sure that there's agreement on how we should proceed.
+
+## Limitations
+
+The JUnit team is not accepting changes to the code under the following paths:
+
+* `src/main/java/junit`
+* `test/java/junit/tests/framework`
+* `test/java/junit/tests/extensions`
+
+The reasoning is that the JUnit team feels that our users should focus on using either the JUnit4 or JUnit5 APIs.
+
+The team is also reluctant to accept changes that only update code from one code style to another.
+Generally the code in JUnit was approved by at least one person, so two people agreed that the style was reasonable.
+
+To find other places where you can have an impact, please see the Issues tagged "up-for-grabs"(https://github.com/junit-team/junit4/issues?q=is%3Aissue+is%3Aopen+label%3Aup-for-grabs).

_service:tar_scm:r4.13.2.tar.gz/KEYS Added

@@ -0,0 +1,70 @@
+This file contains the PGP key that is used to sign releases.
+
+Importing: `pgp < KEYS` or `gpg --import KEYS`
+
+Adding a key:
+`pgp -kxa <your name> >> KEYS`,
+or `(pgpk -ll <your name> && pgpk -xa <your name>) >> KEYS`,
+or `(gpg --list-sigs <your name> && gpg --armor --export <your name>) >> KEYS`
+
+================================
+
+pub   rsa4096 2018-04-08 SC
+      FF6E2C001948C5F2F38B0CC385911F425EC61B51
+uid            unknown Open Source Development <mail@marcphilipp.de>
+sig 3        85911F425EC61B51 2018-04-08  Open Source Development <mail@marcphilipp.de>
+sub   rsa4096 2018-04-08 E
+sig          85911F425EC61B51 2018-04-08  Open Source Development <mail@marcphilipp.de>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFrKW9IBEACkqUvM7hU1WqOOeb1gZ7pUsRliHuoUvYIrd+hdp+qhPmJ0NG0W
+YhZK5UtJBmqvtHKRkbwYxUuya9zlBmCfQFf0GpFKJ65JSrPSkZADI3aZ4aUkxIUw
+nIRoUHucmr10Xftpebr/zaJk5oR8RdaL5FapapmcZmAaHR9CDWB8XtI318u314jq
+M5rKatnAZMERoPugOvvuAOz4bfZKwdfCmZKfYUM/TMSrSinXrGExSW6z4RhtqmpC
+E5M/7OoVfvDynVJKqNazqgigpmMNhOyzAhQsiKh1K0akyxTZbjeZKsdYfhCXvq0q
+k9+KM/cTllQ54MPnFWiObLkHeK0Waw8bI/vAJ4h4x/XM9iGYpkXv7F2/FVsHQdPe
+YJcwD/CkD8KHyiPaRKMeApiUtZsdAHU0L4X/lNmcooea/7ipskruUgwcm+RdLhRZ
+P949t1e7nqDZfpEHy90NiFxmlRAPSNqBLwefxY/hwBgog2jabDALJVcLCMosFWPj
+MQhFlGSIODiVcW8folGIjzkyNZbNMWkwnl2QnWp/h2TAwYQJOMqcv2MG9o5pyzpx
+97Iz1ngq1FlM/gJnGnNUydP2tAjT2L2U3MP1uX/EdRChdgPqdolqYhdFfwCr0Fpf
+W527bUZpReHCEiQ29ABSnQ711mO+d9+qM6edRyHUoBWz89IHt8sCunuvNwARAQAB
+tC1PcGVuIFNvdXJjZSBEZXZlbG9wbWVudCA8bWFpbEBtYXJjcGhpbGlwcC5kZT6J
+Ak4EEwEIADgWIQT/biwAGUjF8vOLDMOFkR9CXsYbUQUCWspb0gIbAwULCQgHAgYV
+CAkKCwIEFgIDAQIeAQIXgAAKCRCFkR9CXsYbUQyRD/9xm3BqdpWcRCE5UyB6nbwV
+8TgzMmbOhpFhhcjzobly/pKAbcofKsjhreENJkfBVUo+zAFx21ToC5tbH20wRtIE
+vQVCP6sAIzhYWU1ohafqVFP4+PztNBuYTnS6vGvSwzp0IXLIIoxSxo0IOED9uUS9
+DTxh1n9NnDLDe2pfjrXBblQtLSW3W5ISDoUvcoyO7Hk1OByW6MNsSoLvXIUNeVhB
+ju9TfYxFACJSWBhUxJfgip9Y2GrNBJaYGLZrTAoW1Lh1H1DfLV3wHDClQ1+H+oyx
+IOZULEGYY3MgZTd6Ner2yNAUCB7gVa50NiCZXCS74m+XzMrTEsdWjSMUaOe+dL0I
+9MCrgi4ycUHWIfTKx9gGlIOo3hSDMN+8Nj33XPjLT8kcfoFeUX8jTOvC1HFfTuQJ
+x2t/dKHizdrS3F6A/JQa7v8GNTrZFnEXkwgRTf3ccLoo3gPwzNJeCm2xNjvne1VH
+fvxzwNmq8M05oicEigvEed2VMStMhvT7dSiMAf66rEJHjjaHAoNqbLDEATYrWUP2
+I52txHSSxSJohxVP6Ec6dERnqqYi0mVyzBPo7mmFFBisq74w8RvZXyzvXE3BTiDL
+we1E/Z/AXbtJye9DickQ/G6RFtVLbUHQfzyRS/65JPtlH8rqJr58YWlylGImVLwE
+OsKNQrwLZ0UkfaWV7wqr3rkCDQRaylvSARAAnQG636wliEOLkXN662OZS6Qz2+cF
+ltCWboq9oX9FnA1PHnTY2cAtwS214RfWZxkjg6Stau+d1Wb8TsF/SUN3eKRSyrkA
+xlX0v552vj3xmmfNsslQX47e6aEWZ0du0M8jw7/f7Qxp0InkBfpQwjSg4ECoH4cA
+6dOFJIdxBv8dgS4K90HNuIHa+QYfVSVMjGwOjD9St6Pwkbg1sLedITRo59Bbv0J1
+4nE9LdWbCiwNrkDr24jTewdgrDaCpN6msUwcH1E0nYxuKAetHEi2OpgBhaY3RQ6Q
+PQB6NywvmD0xRllMqu4hSp70pHFtm8LvJdWOsJ5we3KijHuZzEbBVTTl+2DhNMI0
+KMoh+P/OmyNOfWD8DL4NO3pVv+mPDZn82/eZ3XY1/oSQrpyJaCBjRKasVTtfiA/F
+gYqTml6qZMjy6iywg84rLezELgcxHHvjhAKd4CfxyuCCgnGT0iRLFZKw44ZmOUqP
+DkyvGRddIyHag1K7UaM/2UMn6iPMy7XWcaFiH5Huhz43SiOdsWGuwNk4dDxHdxmz
+Sjps0H5dkfCciOFhEc54AFcGEXCWHXuxVqIq/hwqTmVl1RY+PTcQUIOfx36WW1ix
+JQf8TpVxUbooK8vr1jOFF6khorDXoZDJNhI2VKomWp8Y38EPGyiUPZNcnmSiezx+
+MoQwAbeqjFMKG7UAEQEAAYkCNgQYAQgAIBYhBP9uLAAZSMXy84sMw4WRH0JexhtR
+BQJaylvSAhsMAAoJEIWRH0JexhtR0LEP/RvYGlaokoosAYI5vNORAiYEc1Ow2McP
+I1ZafHhcVxZhlwF48dAC2bYcasDX/PbEdcD6pwo8ZU8eI8Ht0VpRQxeV/sP01m2Y
+EpAuyZ6jI7IQQCGcwQdN4qzQJxMAASl9JlplH2NniXV1/994FOtesT59ePMyexm5
+7lzhYXP1PGcdt8dH37r6z3XQu0lHRG/KBn7YhyA3zwJcno324KdBRJiynlc7uqQq
++ZptU9fR1+Nx0uoWZoFMsrQUmY34aAOPJu7jGMTG+VseMH6vDdNhhZs9JOlD/e/V
+aF7NyadjOUD4j/ud7c0z2EwqjDKMFTHGbIdawT/7jartT+9yGUO+EmScBMiMuJUT
+dCP4YDh3ExRdqefEBff3uE/rAP73ndNYdIVq9U0gY0uSNCD9JPfj4aCN52y9a2pS
+7Dg7KB/Z8SH1R9IWP+t0HvVtAILdsLExNFTedJGHRh7uaC7pwRz01iivmtAKYICz
+ruqlJie/IdEFFK/sus6fZek29odTrQxx42HGHO5GCNyEdK9jKVAeuZ10vcaNbuBp
+iP7sf8/BsiEU4wHE8gjFeUPRiSjnERgXQwfJosLgf/K/SShQn2dCkYZRNF+SWJ6Z
+2tQxcW5rpUjtclV/bRVkUX21EYfwA6SMB811mI7AVy8WPXCe8La72ukmaxEGbpJ8
+mdzS2PJko7mm
+=l0XA
+-----END PGP PUBLIC KEY BLOCK-----

_service:tar_scm:r4.12.tar.gz/README.md -> _service:tar_scm:r4.13.2.tar.gz/README.md Changed

_service:tar_scm:r4.12.tar.gz/acknowledgements.txt -> _service:tar_scm:r4.13.2.tar.gz/acknowledgements.txt Changed

_service:tar_scm:r4.12.tar.gz/doc/ReleaseNotes4.10.html -> _service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.10.html Changed

_service:tar_scm:r4.12.tar.gz/doc/ReleaseNotes4.10.md -> _service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.10.md Changed

_service:tar_scm:r4.12.tar.gz/doc/ReleaseNotes4.12.md -> _service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.12.md Changed

@@ -2,23 +2,23 @@
 
 # Assertions
 
-### Pull request #611:(https://github.com/junit-team/junit/pull/611) Assert.assertNotEquals() for `float` parameters
+### Pull request #611:(https://github.com/junit-team/junit4/pull/611) Assert.assertNotEquals() for `float` parameters
 
 Version 4.11 added `Assert.assertEquals()` for `float` parameters with a delta, and `Assert.assertNotEquals()`. This is the combination of those two features.
 
 
-### Pull request #632:(https://github.com/junit-team/junit/pull/632) Assert.assertArrayEquals() for `boolean` parameters.
+### Pull request #632:(https://github.com/junit-team/junit4/pull/632) Assert.assertArrayEquals() for `boolean` parameters.
 
 `Assert.assertArrayEquals()` previously existed for all primitive array types, except `boolean`. This has now been added for `boolean`.
 
 
-### Pull request #918:(https://github.com/junit-team/junit/pull/918) Avoid potentially expensive reflection-based loop in Assert.assertArrayEquals()
+### Pull request #918:(https://github.com/junit-team/junit4/pull/918) Avoid potentially expensive reflection-based loop in Assert.assertArrayEquals()
 
 In the usual case, where the array elements are in fact exactly equal, the potentially expensive reflection-based loop to compare them is avoided by using `Arrays.deepEquals()` first. The exact comparison is only executed when `deepEquals()` returns `false`.
 
 
 # Command-line options
-### Pull request #647:(https://github.com/junit-team/junit/pull/647) Support command-line `--filter` param.
+### Pull request #647:(https://github.com/junit-team/junit4/pull/647) Support command-line `--filter` param.
 
 When running JUnit from the command line, a command-line parameter can be supplied using `--filter`, which supplies a filter that will restrict which tests and subtests from the rest of the command will be run.  For example, this will run only the tests in ExampleTestSuite that are in categories Cat1 or Cat2:
 
@@ -33,12 +33,12 @@
 # Test Runners
 
 
-### Pull request #763:(https://github.com/junit-team/junit/pull/763) Allow custom test runners to create their own TestClasses and customize the scanning of annotations.
+### Pull request #763:(https://github.com/junit-team/junit4/pull/763) Allow custom test runners to create their own TestClasses and customize the scanning of annotations.
 
 This introduces some extension points to `ParentRunner` to allow subclasses to control creation
 of the `TestClass` instance and to scan for annotations.
 
-### Pull request #817:(https://github.com/junit-team/junit/pull/817) Support for context hierarchies
+### Pull request #817:(https://github.com/junit-team/junit4/pull/817) Support for context hierarchies
 
 The `AnnotatedBuilder` is a strategy for constructing runners for test classes that have been annotated with the `@RunWith` annotation. All tests within such a class will be executed using the runner that was specified within the annotation.
 
@@ -95,17 +95,17 @@
 One example of a runner that makes use of this extension is the Hierarchical Context Runner (see https://github.com/bechte/junit-hierarchicalcontextrunner/wiki).
 
 
-### Pull request #716:(https://github.com/junit-team/junit/pull/716) Fix annotation collection from superclasses of JUnit3 tests.
+### Pull request #716:(https://github.com/junit-team/junit4/pull/716) Fix annotation collection from superclasses of JUnit3 tests.
 
 Previously `Description.getAnnotations()` would always return an empty list for _test*_ methods derived from superclasses. 
 
 
-### Pull request #625 (commit 72af03c49f):(https://github.com/junit-team/junit/commit/72af03c49fdad5f10e36c7eb4e7045feb971d253) Make `RunNotifier` code concurrent.
+### Pull request #625 (commit 72af03c49f):(https://github.com/junit-team/junit4/commit/72af03c49fdad5f10e36c7eb4e7045feb971d253) Make `RunNotifier` code concurrent.
 
 When running tests from multiple threads, JUnit will now call `RunListener` methods from multiple threads if the listener class is annotated with `@RunListener.ThreadSafe`. In addition, the code in `RunNotifier` has been modified to not use locks.
 
 
-### Pull request #684:(https://github.com/junit-team/junit/pull/684) Adding `AnnotationValidator` framework and validation checks for `@Category`.
+### Pull request #684:(https://github.com/junit-team/junit4/pull/684) Adding `AnnotationValidator` framework and validation checks for `@Category`.
 
 This allows for validation to be added to annotations. Validators should extend `AnnotationValidator` and be attached to annotations with the `@ValidateWith` annotation. `CategoryValidator` extends `AnnotationValidator` and ensures that incompatible annotations (`@BeforeClass`, `@AfterClass`, `@Before`, `@After`) are not used in conjunction with `@Category`.
 
@@ -113,12 +113,12 @@
 # Exception Testing
 
 
-### Pull request #583:(https://github.com/junit-team/junit/pull/583) Pull request #720:(https://github.com/junit-team/junit/pull/720) Fix handling of `AssertionError` and `AssumptionViolatedException` in `ExpectedException` rule.
+### Pull request #583:(https://github.com/junit-team/junit4/pull/583) Pull request #720:(https://github.com/junit-team/junit4/pull/720) Fix handling of `AssertionError` and `AssumptionViolatedException` in `ExpectedException` rule.
 
 `ExpectedException` didn't handle `AssertionError`s and `AssumptionViolatedException` well. This has been fixed. The new documentation explains the usage of `ExpectedException` for testing these exceptions. The two methods `handleAssertionErrors()` and `handleAssumptionViolatedExceptions()` are not needed anymore. If you have used them, just remove it and read `ExpectedException`'s documentation.
 
 
-### Pull request #818:(https://github.com/junit-team/junit/pull/818) Pull request #993:(https://github.com/junit-team/junit/pull/993) External version of AssumptionViolatedException
+### Pull request #818:(https://github.com/junit-team/junit4/pull/818) Pull request #993:(https://github.com/junit-team/junit4/pull/993) External version of AssumptionViolatedException
 
 In JUnit 4.11 and earlier, if you wanted to write a custom runner that handled
 `AssumptionViolatedException` or you needed to create an instance of `AssumptionViolatedException`
@@ -133,7 +133,7 @@
 it's recommended that you create `AssumptionViolatedException` via the methods in `Assume`.
 
 
-### Pull request #985:(https://github.com/junit-team/junit/pull/985) Change AssumptionViolatedException to not set the cause to null; fixes issue #494
+### Pull request #985:(https://github.com/junit-team/junit4/pull/985) Change AssumptionViolatedException to not set the cause to null; fixes issue #494
 
 Previously, the `AssumptionViolatedException` constructors would explicitly set the cause to `null`
 (unless you use a constructor where you provide a `Throwable`, in which case it would set that as
@@ -144,7 +144,7 @@
 It's recommended that you create `AssumptionViolatedException` via the methods in `Assume`.
 
 
-### Pull request #542:(https://github.com/junit-team/junit/pull/542) Customized failure message for `ExpectedException`
+### Pull request #542:(https://github.com/junit-team/junit4/pull/542) Customized failure message for `ExpectedException`
 
 `ExpectedException` now allows customization of the failure message when the test does not throw the expected exception. For example:
 
@@ -155,15 +155,22 @@
 If a custom failure message is not provided, a default message is used.
 
 
+### Pull request #1013:(https://github.com/junit-team/junit4/pull/1013) Make ErrorCollector#checkSucceeds generic
+
+The method `ErrorCollector.checkSucceeds()` is now generic. Previously, you could only pass
+in a `Callable<Object>` and it returned `Object`. You can now pass any `Callable` and the
+return type will match the type of the callable.
+
+
 # Timeout for Tests
-*See also Timeout for tests(https://github.com/junit-team/junit/wiki/Timeout-for-tests)*
+*See also Timeout for tests(https://github.com/junit-team/junit4/wiki/Timeout-for-tests)*
 
-### Pull request #823:(https://github.com/junit-team/junit/pull/823) Throw `TestFailedOnTimeoutException` instead of plain `Exception` on timeout
+### Pull request #823:(https://github.com/junit-team/junit4/pull/823) Throw `TestFailedOnTimeoutException` instead of plain `Exception` on timeout
 
 When a test times out, a `org.junit.runners.model.TestTimedOutException` is now thrown instead of a plain `java.lang.Exception`.
 
 
-### Pull request #742:(https://github.com/junit-team/junit/pull/742) Pull request #986:(https://github.com/junit-team/junit/pull/986) `Timeout` exceptions now include stack trace from stuck thread (experimental)
+### Pull request #742:(https://github.com/junit-team/junit4/pull/742) Pull request #986:(https://github.com/junit-team/junit4/pull/986) `Timeout` exceptions now include stack trace from stuck thread (experimental)
 
 `Timeout` exceptions try to determine if there is a child thread causing the problem, and if so its stack trace is included in the exception in addition to the one of the main thread. This feature must be enabled with the timeout rule by creating it through the new `Timeout.builder()` method:
 
@@ -183,7 +190,7 @@
 ```
 
 
-### Pull request #544:(https://github.com/junit-team/junit/pull/544) New constructor and factories in `Timeout`
+### Pull request #544:(https://github.com/junit-team/junit4/pull/544) New constructor and factories in `Timeout`
 
 `Timeout` deprecated the old constructor `Timeout(int millis)`.
 A new constructor is available: `Timeout(long timeout, TimeUnit unit)`. It enables you to use different granularities of time units like `NANOSECONDS`, `MICROSECONDS`, `MILLISECONDS`, and `SECONDS`. Examples:
@@ -209,7 +216,7 @@
 This usage avoids the truncation, which was the problem in the deprecated constructor `Timeout(int millis)` when casting `long` to `int`.
 
 
-### Pull request #549:(https://github.com/junit-team/junit/pull/549) fixes for #544 and #545
+### Pull request #549:(https://github.com/junit-team/junit4/pull/549) fixes for #544 and #545
 
 The `Timeout` rule applies the same timeout to all test methods in a class:
 
@@ -243,18 +250,20 @@
 ```
 Each test is run in a new _daemon_ thread. If the specified timeout elapses before the test completes, its execution is interrupted via `Thread#interrupt()`. This happens in interruptable I/O (operations throwing `java.io.InterruptedIOException` and `java.nio.channels.ClosedByInterruptException`), locks (package `java.util.concurrent`) and methods in `java.lang.Object` and `java.lang.Thread` throwing `java.lang.InterruptedException`.
 
-### Pull request #876:(https://github.com/junit-team/junit/pull/876) The timeout rule never times out if you pass in a timeout of zero.
+### Pull request #876:(https://github.com/junit-team/junit4/pull/876) The timeout rule never times out if you pass in a timeout of zero.
+
+A specified timeout of 0 will be interpreted as not set, however tests still launch from separate threads. This can be useful for disabling timeouts in environments where they are dynamically set based on some property.
 
 
 # Parameterized Tests
 
 
-### Pull request #702:(https://github.com/junit-team/junit/pull/702) Support more return types for the `@Parameters` method of the `Parameterized` runner
+### Pull request #702:(https://github.com/junit-team/junit4/pull/702) Support more return types for the `@Parameters` method of the `Parameterized` runner
 
 The return types `Iterator<? extends Object>`, `Object` and `Object` are now supported on methods annotated with `@Parameters`. You don't have to wrap arrays with `Iterable`s and single parameters with `Object` arrays.
 
 
-### Pull request #773:(https://github.com/junit-team/junit/pull/773) Allow configurable creation of child runners of parameterized suites
+### Pull request #773:(https://github.com/junit-team/junit4/pull/773) Allow configurable creation of child runners of parameterized suites
 
 The factory for creating the `Runner` instance of a single set of parameters is now configurable. It can be specified by the `@UseParametersRunnerFactory` annotation.
 
@@ -262,7 +271,7 @@
 # Rules
 
 
-### Pull request #552:(https://github.com/junit-team/junit/pull/552) Pull request #937:(https://github.com/junit-team/junit/pull/937) `Stopwatch` rule
+### Pull request #552:(https://github.com/junit-team/junit4/pull/552) Pull request #937:(https://github.com/junit-team/junit4/pull/937) `Stopwatch` rule
 
 The `Stopwatch` Rule notifies one of its own protected methods of the time spent by a test. Override them to get the time in nanoseconds. For example, this class will keep logging the time spent by each passed, failed, skipped, and finished test:
 
@@ -327,9 +336,9 @@
 }
 ```
 
-### Pull request #932:(https://github.com/junit-team/junit/pull/932) Allow static `@Rule`s also annotated with `@ClassRule`
+### Pull request #932:(https://github.com/junit-team/junit4/pull/932) Allow static `@Rule`s also annotated with `@ClassRule`
 
-JUnit 4.11 introduced restrictions requiring `@Rule` members to be non-static and `@ClassRule` members to be static. These restrictions have been relaxed slightly, in that a static member annotated with both `@Rule` and `@ClassRule` is now considered valid. This means a single rule may be used to perform actions both before/after a class (e.g. setup/tear down an external resource) and between tests (e.g. reset the external resource), without the need for any workarounds mentioned in issue #793(https://github.com/junit-team/junit/issues/793).
+JUnit 4.11 introduced restrictions requiring `@Rule` members to be non-static and `@ClassRule` members to be static. These restrictions have been relaxed slightly, in that a static member annotated with both `@Rule` and `@ClassRule` is now considered valid. This means a single rule may be used to perform actions both before/after a class (e.g. setup/tear down an external resource) and between tests (e.g. reset the external resource), without the need for any workarounds mentioned in issue #793(https://github.com/junit-team/junit4/issues/793).
 
 Note that a non-static `@ClassRule` annotated member is still considered invalid, even if annotated with `@Rule`.
 
@@ -343,7 +352,7 @@
 
 Be warned that if you have static methods or fields annotated with `@Rule` you will not be able to run your test methods in parallel.
 
-### Pull request #956:(https://github.com/junit-team/junit/pull/956) `DisableOnDebug` rule
+### Pull request #956:(https://github.com/junit-team/junit4/pull/956) `DisableOnDebug` rule
 
 The `DisableOnDebug` rule allows users to disable other rules when the JVM is launched in debug mode. Prior to this feature the common approach to disable rules that make debugging difficult was to comment them out and remember to revert the change. When using this feature users no longer have to modify their test code nor do they need to remember to revert changes.
 
@@ -354,15 +363,15 @@
 public DisableOnDebug timeout = new DisableOnDebug(Timeout.seconds(1));
 ```
 
-See the Javadoc for more detail and limitations. Related to https://github.com/junit-team/junit/issues/738
+See the Javadoc for more detail and limitations. Related to https://github.com/junit-team/junit4/issues/738
 
-### Pull request #974:(https://github.com/junit-team/junit/pull/974) Updated `TemporaryFolder.newFolder()` to give an error message if a path contains a slash.
+### Pull request #974:(https://github.com/junit-team/junit4/pull/974) Updated `TemporaryFolder.newFolder()` to give an error message if a path contains a slash.
 
 If you call `TemporaryFolder.newFolder("foo/bar")` in JUnit 4.10 the method returns a `File` object for the new folder but actually fails to create it. That is contrary to the expected behaviour of the method which is to actually create the folder. In JUnit 4.11 the same call throws an exception. Nowhere in the documentation does it explain that the String(s) passed to that method can only be single path components.
 
 With this fix, folder names are validated to contain single path name. If the folder name consists of multiple path names, an exception is thrown stating that usage of multiple path components in a string containing folder name is disallowed.
 
-### Pull request #1015:(https://github.com/junit-team/junit/pull/1015) Methods annotated with `Rule` can return a `MethodRule`.
+### Pull request #1015:(https://github.com/junit-team/junit4/pull/1015) Methods annotated with `Rule` can return a `MethodRule`.
 
 Methods annotated with `@Rule` can now return either a `TestRule` (or subclass) or a
 `MethodRule` (or subclass).
@@ -373,7 +382,7 @@
 `MethodRule`. For methods annotated with `@Rule` that return other values, see the notes
 for pull request #1020.
 
-### Pull request #1020:(https://github.com/junit-team/junit/pull/1020) Added validation that @ClassRule should only be implementation of TestRule.
+### Pull request #1020:(https://github.com/junit-team/junit4/pull/1020) Added validation that @ClassRule should only be implementation of TestRule.
 
 Prior to this change, fields annotated with `@ClassRule` that did not have a type of `TestRule`
 (or a class that implements `TestRule`) were ignored. With this change, the test will fail
@@ -383,7 +392,7 @@
 of `TestRule`(or a class that implements `TestRule`) were ignored. With this change, the test
 will fail with a validation error.
 
-### Pull request #1021:(https://github.com/junit-team/junit/pull/1021) JavaDoc of TemporaryFolder: folder not guaranteed to be deleted.
+### Pull request #1021:(https://github.com/junit-team/junit4/pull/1021) JavaDoc of TemporaryFolder: folder not guaranteed to be deleted.
 
 Adjusted JavaDoc of TemporaryFolder to reflect that temporary folders are not guaranteed to be
 deleted.
@@ -391,12 +400,12 @@
 # Theories
 
 
-### Pull request #529:(https://github.com/junit-team/junit/pull/529) `@DataPoints`-annotated methods can now yield `null` values
+### Pull request #529:(https://github.com/junit-team/junit4/pull/529) `@DataPoints`-annotated methods can now yield `null` values
 
 Up until JUnit 4.11 a `@DataPoints`-annotated array field could contain `null` values, but the array returned by a `@DataPoints`-annotated method could not. This asymmetry has been resolved: _both_ can now provide a `null` data point. 
 
 
-### Pull request #572:(https://github.com/junit-team/junit/pull/572) Ensuring no-generic-type-parms validator called/tested for theories
+### Pull request #572:(https://github.com/junit-team/junit4/pull/572) Ensuring no-generic-type-parms validator called/tested for theories
 
 The `Theories` runner now disallows `Theory` methods with parameters that have "unresolved" generic type parameters (e.g. `List<T>` where `T` is a type variable). It is exceedingly difficult for the `DataPoint(s)` scraper or other `ParameterSupplier`s to correctly decide values that can legitimately be assigned to such parameters in a type-safe way, so JUnit now disallows them altogether. Theory parameters such as `List<String>` and `Iterable<? extends Number>` are still allowed.
 
@@ -405,7 +414,7 @@
 junit.contrib(https://github.com/junit-team/junit.contrib)'s rendition of theories performs the same validation.
 
 
-### Pull request #607:(https://github.com/junit-team/junit/pull/607) Improving theory failure messages
+### Pull request #607:(https://github.com/junit-team/junit4/pull/607) Improving theory failure messages
 
 Theory failure messages previously were of the form: `ParameterizedAssertionError: theoryTest(badDatapoint, allValues1, otherVar)`, where allValues, badDatapoint and otherVar were the variables the datapoints was sourced from. These messages are now of the form: 
 
@@ -415,7 +424,7 @@
 ```
 
 
-### Pull request #601:(https://github.com/junit-team/junit/pull/601) Allow use of `Assume` in tests run by `Theories` runner
+### Pull request #601:(https://github.com/junit-team/junit4/pull/601) Allow use of `Assume` in tests run by `Theories` runner
 
 If, in a theory, all parameters were "assumed" away, the `Theories` runner would properly fail, informing you that no parameters were found to actually test something. However, if you had another method in that same class, that was not a theory (annotated with `@Test` only,) you could not use Assume in that test. Now, the `Theories` runner will verify the method is annotated with `@Theory` before failing due to no parameters being found.
 
@@ -440,12 +449,12 @@
 ```
 
 
-### Pull request #623:(https://github.com/junit-team/junit/pull/623) Ensure data points array fields and methods are `public` and `static` in Theory classes.
+### Pull request #623:(https://github.com/junit-team/junit4/pull/623) Ensure data points array fields and methods are `public` and `static` in Theory classes.
 
 Previously if a data points array field or method was non-`static` or non-`public` it would be silently ignored and the data points not used. Now the `Theories` runner verifies that all `@DataPoint` or `@DataPoints` annotated fields or methods in classes are both `public` and `static`, and such classes will fail to run with `InitializationError`s if they are not.
 
 
-### Pull request #621:(https://github.com/junit-team/junit/pull/621) Added mechanism for matching specific data points in theories to specific parameters, by naming data points.
+### Pull request #621:(https://github.com/junit-team/junit4/pull/621) Added mechanism for matching specific data points in theories to specific parameters, by naming data points.
 
 `@DataPoints` fields or methods can now be given (one or more) names in the annotation, and `@Theory` method parameters can be annotated with `@FromDataPoints(name)`, to limit the data points considered for that parameter to only the data points with that name:
 
@@ -475,26 +484,26 @@
 ```
 
 
-### Pull request #654:(https://github.com/junit-team/junit/pull/654) Auto-generation of `enum` and `boolean` data points
+### Pull request #654:(https://github.com/junit-team/junit4/pull/654) Auto-generation of `enum` and `boolean` data points
 
 Any theory method parameters with `boolean` or `enum` types that cannot be supplied with values by any other sources will be automatically supplied with default values: `true` and `false`, or every value of the given `enum`. If other explicitly defined values are available (e.g. from a specified `ParameterSupplier` or some `DataPoints` method in the theory class), only those explicitly defined values will be used.
 
 
-### Pull request #651:(https://github.com/junit-team/junit/pull/651) Improvements to Theory parameter and DataPoint type matching
+### Pull request #651:(https://github.com/junit-team/junit4/pull/651) Improvements to Theory parameter and DataPoint type matching
 
  * Validity of `DataPoints` for theory parameters for all field data points and multi-valued method data points (i.e. not single-valued method data points) is now done on runtime type, not field/method return type (previously this was the case for multi-valued array methods only).
 
  * Validity of `DataPoints` for theory parameters for all data points now correctly handles boxing and unboxing for primitive and wrapper types; e.g. `int` values will be considered for theory parameters that are `Integer` assignable, and vice versa.
 
 
-### Pull request #639:(https://github.com/junit-team/junit/pull/639) Failing theory datapoint methods now cause theory test failures
+### Pull request #639:(https://github.com/junit-team/junit4/pull/639) Failing theory datapoint methods now cause theory test failures
 
 Previously `@DataPoint(s)` methods that threw exceptions were quietly ignored and if another `DataPoint` source was available then those values alone were used, leaving the theory passing using only a subset of the (presumably) intended input values. Now, any data point method failures during invocation of a theory will cause the theory being tested to fail immediately.
 
 *This is a non-backward-compatible change*, and could potentially break theory tests that depended on failing methods. If that was desired behavior, then the expected exceptions can instead be specifically ignored using the new `ignoredExceptions` array attribute on `@DataPoint` and `@DataPoints` methods. Adding an exception to this `ignoredExceptions` array will stop theory methods from failing if the given exception, or subclasses of it, are thrown in the annotated method. This attribute has no effect on data point fields.
 
 
-### Pull request #658:(https://github.com/junit-team/junit/pull/658) `Iterable`s can now be used as data points
+### Pull request #658:(https://github.com/junit-team/junit4/pull/658) `Iterable`s can now be used as data points
 
 Previously, when building sets of data points for theory parameters, the only valid multi-valued `@DataPoints` types were arrays. This has now been extended to also take parameters from `Iterable` `@DataPoints` methods and fields.
 
@@ -502,12 +511,12 @@
 # Categories
 
 
-### Pull request #566:(https://github.com/junit-team/junit/pull/566) Enables inheritance on `Category` by adding `@Inherited`
+### Pull request #566:(https://github.com/junit-team/junit4/pull/566) Enables inheritance on `Category` by adding `@Inherited`
 
 `@interface Category` now is annotated with `@Inherited` itself. This enables inheritance of categories from ancestors (e.g. abstract test-classes). Note that you are able to "overwrite" `@Category` on inheritors and that this has no effect on method-level categories (see @Inherited(http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/Inherited.html)).
 
 
-### Pull request #503:(https://github.com/junit-team/junit/pull/503) Configurable Categories
+### Pull request #503:(https://github.com/junit-team/junit4/pull/503) Configurable Categories
 
 From a given set of test classes, the `Categories` runner runs only the classes and methods
 that are annotated with either the category given with the `@IncludeCategory` annotation, or a subtype of that category. Either classes or interfaces can be used as categories. Subtyping works, so if you say `@IncludeCategory(SuperClass.class)`, a test marked `@Category({SubClass.class})` will be run.
@@ -582,7 +591,7 @@
 # Use with Maven
 
 
-### Pull request #879: (https://github.com/junit-team/junit/pull/879) Add the default 'Implementation-*' headers to the manifest
+### Pull request #879: (https://github.com/junit-team/junit4/pull/879) Add the default 'Implementation-*' headers to the manifest
 
 The default Maven-style 'Implementation-*' headers are now present in the manifest of `junit.jar`. Example:
 ```
@@ -593,7 +602,7 @@
 ```
 
 
-### Pull request #511:(https://github.com/junit-team/junit/pull/511) Maven project junit:junit:jar
+### Pull request #511:(https://github.com/junit-team/junit4/pull/511) Maven project junit:junit:jar
 
 
 #### How to install Maven
@@ -609,7 +618,7 @@
 
 #### How to launch the build from the command line
 
-Clone the project (git clone https://github.com/junit-team/junit.git) and navigate to the project root on your local system (cd junit).
+Clone the project (git clone https://github.com/junit-team/junit4.git) and navigate to the project root on your local system (cd junit).
 Clean the previous build in _target_ directory, build the project, and install new artifacts in your local repository:
 
 `apache-maven-3.0.4/bin/mvn clean install`
@@ -659,15 +668,15 @@
 # Miscellaneous
 
 
-### Pull request #776:(https://github.com/junit-team/junit/pull/776) Add support for Travis CI(http://travis-ci.org)
+### Pull request #776:(https://github.com/junit-team/junit4/pull/776) Add support for Travis CI(http://travis-ci.org)
 
 Travis CI is a free CI server for public Github repositories. Every pull request is run by Travis CI and Github's web interface shows the CI result for each pull request. Every user can use Travis CI for testing her branches, too.
 
-### Pull request #921:(https://github.com/junit-team/junit/pull/921) Apply Google Code Style
+### Pull request #921:(https://github.com/junit-team/junit4/pull/921) Apply Google Code Style
 
 JUnit is now using the well documented Google Code Style(http://google-styleguide.googlecode.com/svn/trunk/javaguide.html)
 
-### Pull request #939(https://github.com/junit-team/junit/pull/939) Renamed license file
+### Pull request #939(https://github.com/junit-team/junit4/pull/939) Renamed license file
 
 While using JUnit in Android apps, if any other referenced library has a file named `LICENSE.txt`, the APK generation failed with the following error -
 
@@ -676,7 +685,7 @@
 To avoid this, the license file has been renamed to `LICENSE-junit.txt` 
 
 
-### Pull request #962:(https://github.com/junit-team/junit/pull/962) Do not include thread start time in test timeout measurements.
+### Pull request #962:(https://github.com/junit-team/junit4/pull/962) Do not include thread start time in test timeout measurements.
 
 The time it takes to start a thread can be surprisingly large.
 Especially in virtualized cloud environments where noisy neighbours.
@@ -693,31 +702,31 @@
 release candidates for JUnit 4.12. You can ignore this section if you are
 trying to understand the changes between 4.11 and 4.12.
 
-### Pull request #961:(https://github.com/junit-team/junit/pull/961) Restore field names with f prefix.
+### Pull request #961:(https://github.com/junit-team/junit4/pull/961) Restore field names with f prefix.
 
 In order to make the JUnit code more consistent with current coding practices, we changed
 a number of field names to not start with the prefix "f". Unfortunately, at least one IDE
 referenced a private field via reflection. This change reverts the field names for fields
 known to be read via reflection.
 
-### Pull request #988:(https://github.com/junit-team/junit/pull/988) Revert "Delete classes that are deprecated for six years."
+### Pull request #988:(https://github.com/junit-team/junit4/pull/988) Revert "Delete classes that are deprecated for six years."
 
-In 745ca05(https://github.com/junit-team/junit/commit/745ca05dccf5cc907e43a58142bb8be97da2b78f)
+In 745ca05(https://github.com/junit-team/junit4/commit/745ca05dccf5cc907e43a58142bb8be97da2b78f)
 we removed classes that were deprecated for many releases. There was some concern that people
 might not expect classes to be removed in a 4.x release. Even though we are not aware of any
 problems from the deletion, we decided to add them back.
 
 These classes may be removed in JUnit 5.0 or later.
 
-### Pull request #989:(https://github.com/junit-team/junit/pull/989) Add JUnitSystem.exit() back.
+### Pull request #989:(https://github.com/junit-team/junit4/pull/989) Add JUnitSystem.exit() back.
 
-In 917a88f(https://github.com/junit-team/junit/commit/917a88fad06ce108a596a8fdb4607b1a2fbb3f3e)
+In 917a88f(https://github.com/junit-team/junit4/commit/917a88fad06ce108a596a8fdb4607b1a2fbb3f3e)
 the exit() method in JUnit was removed. This caused problems for at least one user. Even
 though this class is in an internal package, we decided to add it back, and deprecated it.
 
 This method may be removed in JUnit 5.0 or later.
 
-### Pull request #994:(https://github.com/junit-team/junit/pull/994) Pull request #1000:(https://github.com/junit-team/junit/pull/1000) Ensure serialization compatibility where possible.
+### Pull request #994:(https://github.com/junit-team/junit4/pull/994) Pull request #1000:(https://github.com/junit-team/junit4/pull/1000) Ensure serialization compatibility where possible.
 
 JUnit 4.12 RC1 introduced serilization incompatibilities with some of the classes. For example,
 these pre-release versions of JUnit could not read instances of `Result` that were serialized

_service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.13.1.md Added

_service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.13.2.md Added

@@ -0,0 +1,38 @@
+## Summary of changes in version 4.13.2
+
+# Rules
+
+### Pull request #1687:(https://github.com/junit-team/junit/pull/1687) Mark ThreadGroups created by FailOnTimeout as daemon groups
+
+In JUnit 4.13 (pull request #1517(https://github.com/junit-team/junit4/pull/1517)) an attempt was
+made to fix leakage of the `ThreadGroup` instances created when a test is run with a timeout. That
+change explicitly destroyed the `ThreadGroup` that was created for the time-limited test. Numerous
+people reported problems that were caused by explicitly destroying the `ThreadGroup`.
+
+In this change, the code was updated to call  `ThreadGroup.setDaemon(true)` instead of destroying the
+ThreadGroup.
+
+### Pull request $1691:(https://github.com/junit-team/junit/pull/1691) Only create ThreadGroups if FailOnTimeout.lookForStuckThread is true.
+
+In JUnit 4.12 (pull request #742(https://github.com/junit-team/junit4/pull/742)) the `Timeout`
+Rule was updated to optionally display the stacktrace of the thread that appears to be stuck
+(enabled on an opt-in basis by passing `true` to `Timeout.Builder.lookForStuckThread(boolean)`).
+When that change was made, time-limited tests were changed to start the new thread in a new
+`ThreadGroup`, even if the test did not call `lookForStuckThread()`. This subtle change in
+behavior resulted in visible behavior changes to some tests (for example, tests of code that uses
+`java.beans.ThreadGroupContext`).
+
+In this change, the code is updated to only create a new `ThreadGroup` if the caller calls
+`Timeout.Builder.lookForStuckThread(true)`. Tests with timeouts that do not make this call will
+behave as they did in JUnit 4.11 (and more similar to tests that do not have a timeout). This
+unfortunately could result in visible changes of tests written or updated since the 4.12
+release. If this change adversely affects your tests, you can create the `Timeout` rule via the
+builder and call `Timeout.Builder.lookForStuckThread(true)`.
+
+# Exceptions
+
+### Pull request #1654:(https://github.com/junit-team/junit/pull/1654) Fix for issue #1192: NotSerializableException with AssumptionViolatedException
+
+This change fixes an issue where `AssumptionViolatedException` instances could not be serialized
+if they were created with a constructor that takes in an `org.hamcrest.Matcher` instance (these
+constructors are used if you use one of the `assumeThat()` methods in `org.junit.Assume`).

_service:tar_scm:r4.12.tar.gz/doc/ReleaseNotes4.13.md -> _service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.13.md Changed

@@ -1,6 +1,327 @@
-## Summary of changes in version 4.13 unreleased!
+## Summary of changes in version 4.13
 
-We collect release notes in the wiki:
-https://github.com/junit-team/junit/wiki/4.13-release-notes
+# Assertions
 
-This file will be updated right before release.
+### Pull request #1054:(https://github.com/junit-team/junit/pull/1054) Improved error message for `assertArrayEquals` when multi-dimensional arrays have different lengths
+
+Previously, JUnit's assertion error message would indicate only that some array lengths _x_ and _y_ were unequal, without indicating whether this pertained to the outer array or some nested array. Now, in case of a length mismatch between two nested arrays, JUnit will tell at which indices they reside.
+
+### Pull request #1154(https://github.com/junit-team/junit/pull/1154) and #1504(https://github.com/junit-team/junit/pull/1504) Add `assertThrows`
+
+The `Assert` class now includes methods that can assert that a given function call (specified, for instance, as a lambda expression or method reference) results in a particular type of exception being thrown. In addition it returns the exception that was thrown, so that further assertions can be made (e.g. to verify that the message and cause are correct).
+
+### Pull request #1300:(https://github.com/junit-team/junit/pull/1300) Show contents of actual array when array lengths differ
+
+Previously, when comparing two arrays which differ in length, `assertArrayEquals()` would only report that they differ in length. Now, it does the usual array comparison even when arrays differ in length, producing a failure message which combines the difference in length and the first difference in content. Where the content is another array, it is described by its type and length.
+
+### Pull request #1315:(https://github.com/junit-team/junit4/pull/1315) `assertArrayEquals` shouldn't throw an NPE when test suites are compiled/run across versions of junit
+
+A redundant field, `fCause`, was removed on v4.12, and was seemingly harmless because `Throwable#initCause()` could directly initialize `cause` in the constructor. Unfortunately, this backwards incompatible change got aggravated when a test class, compiled with the latest (4.12+), ran with an older version that depended on fCause when building the assertion message<sup>1(#1315-f1)</sup>.
+
+This change adds back `fCause`, and overrides `getCause()` to handle forward compatibility<sup>2(#1315-f2)</sup>.
+
+To ensure serializability of further changes in `ArrayAssertionFailure` (until excising these fields by a major rev), a unit test now runs against v4.11, v4.12 failures, asserting around `#toString/getCause()`.
+
+<a name="1315-f1">1</a> Issue #1178(https://github.com/junit-team/junit4/issues/1178) details a particular case where gradle v2.2 is packaged with junit v4.11 and is used on running a test, generating test reports, despite specifying a particular version of junit (users would specify v4.12, or v4.+) in the test compile dependencies).
+
+<a name="1315-f2">2</a> Case(https://github.com/junit-team/junit4/pull/1315#issuecomment-222905229) if the test class is compiled with <= v4.11, where only `fCause` is initialized and not `Throwable#cause`, it can now fallback to the field, `fCause`, when building the message.
+
+### Pull request #1150:(https://github.com/junit-team/junit4/pull/1150) Deprecate `Assert#assertThat`
+
+The method `assertThat` is used for writing assertions with Hamcrest. Hamcrest is an independent assertion library and contains an own `assertThat` method in the class `org.hamcrest.MatcherAssert`. It is available both in the old Hamcrest 1.3 release and in the current Hamcrest 2.1. Therefore the JUnit team recommends to use Hamcrest's own `assertThat` directly.
+
+# Test Runners
+
+### Pull request #1037:(https://github.com/junit-team/junit/pull/1037) `BlockJUnit4ClassRunner#createTest` now accepts `FrameworkMethod`
+
+Subclasses of `BlockJUnit4ClassRunner` can now produce a custom test object based on the `FrameworkMethod` test being executed by implementing the new `createTest(FrameworkMethod)` method. The default implementation calls the existing `createTest()` method.
+
+### Pull request #1082(https://github.com/junit-team/junit/pull/1082): Ensure exceptions from `BlockJUnit4ClassRunner.methodBlock()` don't result in unrooted tests
+
+The introduction of the `runLeaf()` method in `BlockJUnit4ClassRunner` in JUnit 4.9 introduced a regression with regard to exception handling. Specifically, in JUnit 4.9 through 4.12 the invocation of `methodBlock()` is no longer executed within a try-catch block as was the case in previous versions of JUnit. Custom modifications to `methodBlock()` or the methods it invokes may in fact throw exceptions, and such exceptions cause the current test execution to abort immediately. As a result, the failing test method is unrooted in test reports, and subsequent test methods are never invoked. Furthermore, any `RunListener` registered with JUnit is not notified.
+
+As of JUnit 4.13, the invocation of `methodBlock()` is once again wrapped within a try-catch block. If an exception is _not_ thrown, the resulting `Statement` is passed to `runLeaf()`. If an exception _is_ thrown, it is wrapped in a `Fail` statement which is passed to `runLeaf()`.
+
+### Pull request #1286(https://github.com/junit-team/junit/pull/1286): Provide better feedback to the user in case of invalid test classes
+
+Only one exception per invalid test class is now thrown, rather than one per validation error.
+The message of the exception includes all of the validation errors.
+
+Example:
+
+    org.junit.runners.InvalidTestClassError: Invalid test class 'com.example.MyTest':
+      1. Method staticAfterMethod() should not be static
+      2. Method staticBeforeMethod() should not be static
+
+is the exception thrown when running the following test class with any kind of `ParentRunner`:
+
+    public class MyTest {
+
+        @Before
+        public static void staticBeforeMethod() { .. }
+
+        @After
+        public static void staticAfterMethod() { .. }
+
+        @Test
+        public void myTest() { .. }
+    }
+
+Validation errors for the same test class now count only once in the failure count. Therefore, in the example above, `Result#getFailureCount` will return 1.
+
+### Pull request #1252(https://github.com/junit-team/junit4/pull/1252): Restore ability use ParentRunner lost in separate class loader
+
+`ParentRunner.getDescription()` now uses the class instance of the test class to create the description
+(previously the class instance was loaded using the current classloader).
+
+### Pull request #1377(https://github.com/junit-team/junit4/pull/1377): Description produced by Request.classes() shouldn't be null
+
+When obtaining a `Runner` via Request.classes(Class<?>... classes)(http://junit.org/junit4/javadoc/4.12/org/junit/runner/Request.html#classes(java.lang.Class...)), that Runner's `Description` will now print "classes" for the root item. This replaces the misleading output of String "null".
+
+### Issue #1290(https://github.com/junit-team/junit4/issues/1290): Tests expecting AssumptionViolatedException are now correctly marked as passed
+
+    @Test(expected = AssumptionViolatedException.class)
+    public void shouldThrowAssumptionViolatedException() {
+        throw new AssumptionViolatedException("expected");
+    }
+
+This test would previously be marked as skipped; now will be marked as passed.
+
+
+### Pull request #1465(https://github.com/junit-team/junit/pull/1465): Provide helpful message if parameter cannot be set.
+
+JUnit throws an exception with a message like
+
+    Cannot set parameter 'name'. Ensure that the the field 'name' is public.
+
+if a field of a parameterized test is annotated `@Parameter`, but its visibility is not public. Before an IllegalAccessException was thrown with a message like "Class ... can not access a member of class X with modifiers private".
+
+
+### Issue #1329(https://github.com/junit-team/junit4/issus/1329): Support assumptions in `@Parameters` method
+
+No test is run when an assumption in the `@Parameters` method fails. The test result for this test class contains one assumption failure and run count is zero.
+
+
+### Pull request #1449(https://github.com/junit-team/junit/pull/1449): Parameterized runner reuses TestClass instance
+
+Reduce memory consumption of parameterized tests by not creating a new instance of `TestClass` for every test.
+
+### Pull request #1130(https://github.com/junit-team/junit/pull/1130): Add Ordering, Orderable and @OrderWith
+
+Test classes can now be annotated with `@OrderWith` to specify that the tests should execute in a particular
+order. All runners extending `ParentRunner` support `@OrderWith`. Runners can also be ordered using
+`Request.orderWith(Ordering)`
+
+Classes annotated with `@RunWith(Suite.class)` can also be ordered with `@OrderWith`. Note that if this is done, nested classes annotated with `@FixMethodOrder` will not be reordered (i.e. the `@FixMethodOrder` annotation is
+always respected). Having a test class annotated with both `@OrderWith` and `@FixMethodOrder` will result in a
+validation error (see
+pull request #1638(https://github.com/junit-team/junit4/pull/1638)).
+
+### Pull request #1408(https://github.com/junit-team/junit/pull/1408): Suites don't have to be public
+
+Classes annotated with `@RunWith(Suite.class)` do not need to be public. This fixes a regression bug in JUnit 4.12. Suites didn't had to be public before 4.12.
+
+### Pull request #1638(https://github.com/junit-team/junit4/pull/1638): Never reorder classes annotated with @FixMethodOrder
+
+Changing the order of a test run using `Request.sortWith()` no longer changes the order of test classes annotated
+with `@FixMethodOrder`. The same holds true when you reorder tests with `Request.orderWith()` (`orderWith()` 
+was introduced in Pull request #1130(https://github.com/junit-team/junit/pull/1130)).
+
+This was done because usually `@FixMethodOrder` is added to a class because the tests in the class they only pass
+if run in a specific order. 
+
+Test suites annotated with `@OrderWith` will also respect the `@FixMethodOrder` annotation.
+
+Having a test class annotated with both `@OrderWith` and `@FixMethodOrder` will result in a validation error.
+
+# Rules
+
+### Pull request #1044:(https://github.com/junit-team/junit/pull/1044) Strict verification of resource deletion in `TemporaryFolder` rule
+
+Previously `TemporaryFolder` rule did not fail the test if some temporary resources could not be deleted. With this change a new `assuredDeletion` parameter is introduced which will fail the test with an `AssertionError`, if resource deletion fails. The default behavior of `TemporaryFolder` is unchanged.
+
+This feature must be enabled by creating a `TemporaryFolder` using the `TemporaryFolder.builder()` method:
+```java
+@Rule public TemporaryFolder folder = TemporaryFolder.builder().assureDeletion().build();
+```
+
+### Issue #1100:(https://github.com/junit-team/junit/issues/1110) StopWatch does not need to be abstract.
+
+Previously `StopWatch` was an abstract class, which means it cannot be used without extending it or using an anonymous class. The abstract modifier has been removed and StopWatch can be used easily now.
+
+### Issue #1157:(https://github.com/junit-team/junit/issues/1157) TestName: Make 'name' field volatile
+
+The `name` field in the `TestName` rule was updated to be volatile. This should ensure that the name
+is published even when tests are running in parallel.
+
+### Issue #1223:(https://github.com/junit-team/junit/issues/1223) TemporaryFolder doesn't work for parallel test execution in several JVMs
+
+Previously `TemporaryFolder` rule silently succeeded if it failed to create a fresh temporary directory. With this change it will notice the failure, retry with a new name, and ultimately throw an `IOException` if all such attempts fail.
+
+### Pull request #1305:(https://github.com/junit-team/junit/pull/1305) Add `ErrorCollector.checkThrows`
+
+The `ErrorCollector` class now has a `checkThrows` method that can assert that a given function call (specified, for instance, as a lambda expression or method reference) results in a particular type of exception being thrown.
+
+### Issue #1303:(https://github.com/junit-team/junit/issues/1303) Prevent following symbolic links when deleting temporary directories
+
+Previously, `TemporaryFolder` would follow symbolic links; now it just deletes them.
+
+Following symbolic links when removing files can lead to the removal of files outside the directory structure rooted in the temporary folder, and it can lead to unbounded recursion if a symbolic link points to a directory where the link is directly reachable from.
+
+### Issue #1295:(https://github.com/junit-team/junit/issues/1295) Javadoc for RuleChain contains errors
+
+Removed error from RuleChain Javadoc and clarified how it works with existing rules. Removed `static` modifier, added missing closing parenthesis of method calls and added clarification.
+
+### Pull request #1313(https://github.com/junit-team/junit4/pull/1313): `RuleChain.around()` rejects null arguments
+`RuleChain.around()` now implements a fail-fast strategy which also allows for better feedback to the final user, as the stacktrace will point to the exact line where the null rule is declared.
+
+### Pull request #1397(https://github.com/junit-team/junit4/pull/1397): Change generics on `ExpectedException.expectCause()`
+The signature of `ExpectedException.expectCause()` would not allow the caller to pass in a `Matcher<Object>` (which is returned by `CoreMatchers.notNullValue()`). This was fixed by changing the method to take in a
+`Matcher<?>` (ideally, the method should take in `Matcher<? super Throwable>` but there was concern that
+changing the parameter type to `Matcher<? super Throwable>` would break some callers).  
+
+### Pull request #1443(https://github.com/junit-team/junit4/pull/1443): `ExpectedException.isAnyExceptionExpected()` is now public
+The method `ExpectedException.isAnyExceptionExpected()` returns `true` if there is at least one expectation present for the `ExpectedException` rule.
+
+### Pull request #1395(https://github.com/junit-team/junit4/pull/1395): Wrap assumption violations in ErrorCollector
+Both `ErrorCollector.addError()` and `ErrorCollector.checkSucceeds()` now wrap `AssumptionViolatedException`.
+In addition, `ErrorCollector.addError()` will throw a `NullPointerException` if you pass in a `null` value.
+
+### Pull request #1402(https://github.com/junit-team/junit4/pull/1402): TemporaryFolder.newFolder(String) supports paths with slashes
+There was a regression in JUnit 4.12 where `TemporaryFolder.newFolder(String)` no longer supported passing
+in strings with separator characters. This has been fixed. he overload of newFolder() that
+supports passing in multiple strings still does not allow path separators.
+
+### Pull requests #1406 (part 1)(https://github.com/junit-team/junit4/pull/1406) and #1568(https://github.com/junit-team/junit4/pull/1568): Improve error message when TemporaryFolder.newFolder(String) fails
+When `newFolder(String path)` was not able to create the folder then it always failed with the error message "a folder with the name '`<path>`' already exists" although the reason for the failure could be something else. This message is now only used if the folder really exists. The message is "a file with the path '`<path>`' exists" if the whole path or a part of the path points to a file. In all other cases it fails now with the message "could not create a folder with the path '`<path>`'"
+
+### Pull request #1406 (part 2)(https://github.com/junit-team/junit4/pull/1406): TemporaryFolder.newFolder(String...) supports path separator
+You can now pass paths with path separators to `TemporaryFolder.newFolder(String...)`. E.g.
+
+    tempFolder.newFolder("temp1", "temp2", "temp3/temp4")
+
+It creates a folder `temp1/temp2/temp3/temp4`.
+
+
+### Pull request #1406 (part 3)(https://github.com/junit-team/junit4/pull/1406): TemporaryFolder.newFolder(String...) fails for empty array
+
+When you call
+
+    tempFolder.newFolder(new String)
+
+then it throws an `IllegalArgumentException` instead of returning an already existing folder.
+
+
+### Pull request #1335(https://github.com/junit-team/junit4/pull/1335): Fix ExternalResource: the test failure could be lost
+When both the test failed and closing the resource failed, only the exception coming from the `after()` method was propagated, as per semantics of the try-finally (see also http://docs.oracle.com/javase/specs/jls/se8/html/jls-14.html#jls-14.20.2).
+
+The new behavior is compatible with @After method semantics, as implemented in RunAfters(https://github.com/junit-team/junit4/blob/HEAD/src/main/java/org/junit/internal/runners/statements/RunAfters.java).
+
+### Pull request #1435(https://github.com/junit-team/junit4/pull/1435): @BeforeParam/@AfterParam method annotations for Parameterized tests.
+This allows having preparation and/or cleanup in tests for specific parameter values.
+
+### Pull request #1460(https://github.com/junit-team/junit4/pull/1460): Handle assumption violations in the @Parameters method for Parameterized tests.
+This allows skipping the whole test class when its assumptions are not met.
+
+### Pull request #1445(https://github.com/junit-team/junit4/pull/1445) and Pull request #1335(https://github.com/junit-team/junit4/pull/1501): Declarative ordering of rules.
+The order in which rules are executed is specified by the annotation attribute: `@Rule(order = N)`, deprecating `RuleChain`. This may be used for avoiding some common pitfalls with `TestWatcher, `ErrorCollector` and `ExpectedException` for example. The Javadoc of `TestWatcher` was retrofitted accordingly.
+
+### Pull request #1517(https://github.com/junit-team/junit4/pull/1517): Timeout rule destroys its ThreadGroups at the end
+The `ThreadGroup` created for handling the timeout of tests is now destroyed, so the main thread group no longer keeps a reference to all timeout groups created during the tests. This caused the `threadGroup` to remain in memory, and all of its context along with it.
+
+### Pull request #1633(https://github.com/junit-team/junit4/pull/1633): Deprecate ExpectedException.none()
+The method Assert.assertThrows provides a nicer way for verifying exceptions. In addition the use of ExpectedException is error-prone when used with other rules like TestWatcher because the order of rules is important in that case.
+
+### Pull request #1413(https://github.com/junit-team/junit4/pull/1413): Ignore bridge methods when scanning for annotated methods
+
+In a setup with a class hierarchy for test classes the order of rules (from methods), before methods, after methods and others depends on the class that contains these methods. Compilers can add bridge methods to child classes and therefore the order of the aforementioned methods can change in older JUnit releases. This is now fixed because bridge methods are ignored when scanning for annotated methods.
+
+### Pull request #1612(https://github.com/junit-team/junit4/pull/1612): Make @ValidateWith only applicable to annotation types
+
+`@Target(ANNOTATION_TYPE)` has been added to `@ValidateWith` since it's only designed to be applied to another annotation.
+
+# Run Listener
+
+### Pull request #1118:(https://github.com/junit-team/junit4/pull/1118) Add suite start/finish events to listener
+
+The `RunListener` class now has `fireTestSuiteStarted` and `fireTestSuiteFinished` methods that notify when test suites are about to be started/finished.
+
+
+# Exception Testing
+
+### Pull request #1359:(https://github.com/junit-team/junit4/pull/1359) Fixes how `MultipleFailureException` stack traces are printed
+
+Previously, calling `MultipleFailureException.printStackTrace()` only printed the stack trace for the `MultipleFailureException` itself. After this change, the stack trace for each exception caught in the `MultipleFailureException` is printed.
+
+### Pull request #1376:(https://github.com/junit-team/junit4/pull/1376) Initializing MultipleFailureException with an empty list will now fail the test
+
+Previously, initializing `MultipleFailureException` with an empty list of contained Exceptions and throwing it in a test case wouldn't actually fail the test. Now an `IllegalArgumentException` will be raised in this situation and thus also fail the test.
+
+### Pull request #1371:(https://github.com/junit-team/junit4/pull/1371) Update MultipleFailureException.assertEmpty() to wrap assumption failure
+
+`MultipleFailureException` will now wrap `MultipleFailureException` with `TestCouldNotBeSkippedException`. Previously, if you passed `MultipleFailureException` one `MultipleFailureException`--and no other exceptions--
+then the test would be skipped, otherwise it would fail. With the new behavior, it will always fail.
+
+### Issue #1290:(https://github.com/junit-team/junit4/issues/1290) `@Test(expected = AssumptionViolatedException.class)` passes for AssumptionViolatedException
+
+Tests annotated with `@test(expected = AssumptionViolatedException.class)`
+which throw AssumptionViolatedException had been marked as skipped. Now the are marked as successful tests.
+
+
+# JUnit 3 Changes
+
+### Pull request #1227:(https://github.com/junit-team/junit/pull/1227) Behave better if the `SecurityManager` denies access to `junit.properties`
+
+Previously, running tests with a `SecurityManager` would cause the test runner itself to throw an `AccessControlException` if the security policy didn't want it reading from `~/junit.properties`. This will now be treated the same as if the file does not exist.
+
+# Misc
+
+### Pull request #1571:(https://github.com/junit-team/junit4/pull/1571) Set "junit" as "Automatic-Module-Name"
+
+For existing releases of JUnit the `Automatic-Module-Name` was derived from the name of the jar. In most cases it is already the name "junit". JUnit 4.13 explicitly sets the module name to "junit" so that it is independent from the jar's name.
+
+
+### Pull request #1028:(https://github.com/junit-team/junit4/pull/1028) Trim stack trace
+
+JUnit's command-line runner (`JUnitCore`) prints smaller stack traces. It skips all stack trace elements that come before the test method so that it starts at the test method. E.g. the output for the example from Getting started(https://github.com/junit-team/junit4/wiki/Getting-started) page is now
+
+    .E
+    Time: 0,006
+    There was 1 failure:
+    1) evaluatesExpression(CalculatorTest)
+    java.lang.AssertionError: expected:<6> but was:<-6>
+    	at org.junit.Assert.fail(Assert.java:89)
+    	at org.junit.Assert.failNotEquals(Assert.java:835)
+    	at org.junit.Assert.assertEquals(Assert.java:647)
+    	at org.junit.Assert.assertEquals(Assert.java:633)
+    	at CalculatorTest.evaluatesExpression(CalculatorTest.java:9)
+
+    FAILURES!!!
+    Tests run: 1,  Failures: 1
+
+
+### Pull request #1403:(https://github.com/junit-team/junit4/pull/1403) Restore CategoryFilter constructor
+
+The constructor `CategoryFilter(Class<?> includedCategory, Class<?> excludedCategory)` has been removed in JUnit 4.12. It is now available again.
+
+
+### Pull request #1530:(https://github.com/junit-team/junit4/pull/1530) Add Result#getAssumptionFailureCount
+
+Add method `getAssumptionFailureCount()` to `Result` which returns the number of assumption failures.
+
+### Pull request #1292:(https://github.com/junit-team/junit4/pull/1292) Fix ResultMatchers#hasFailureContaining
+ 
+`ResultMatchers.hasFailureContaining()` should return `false` when the given `PrintableResult` has no failures.
+
+### Pull request #1380:(https://github.com/junit-team/junit4/pull/1380) Fix Assume#assumeNotNull
+
+`Assume.assumeNotNull` should throw AssumptionViolatedException when called with a `null` array.
+
+### Pull request #1557:(https://github.com/junit-team/junit4/pull/1380) MaxCore always closes stream of history file
+
+MaxCore didn't close the output stream of the history file when write failed. Now it does.
+
+### Signing
+
+The 4.13 release is signed with a new key (id 5EC61B51):
+https://github.com/junit-team/junit4/blob/8c0df64ff17fead54c304a8b189da839084925c2/KEYS

_service:tar_scm:r4.12.tar.gz/doc/ReleaseNotes4.4.html -> _service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.4.html Changed

@@ -48,7 +48,7 @@
 
 <h3>assertThat</h3>
 
-<p>Two years ago, Joe Walnes built a <a href="http://joe.truemesh.com/blog/000511.html">new assertion mechanism</a> on top of what was 
+<p>Two years ago, Joe Walnes built a <a href="http://joewalnes.com/2005/05/13/flexible-junit-assertions-with-assertthat/">new assertion mechanism</a> on top of what was 
 then <a href="http://www.jmock.org/download.html">JMock 1</a>.  The method name was <code>assertThat</code>, and the syntax looked like this:</p>
 
 <pre><code>assertThat(x, is(3));
@@ -84,7 +84,7 @@
 </code></pre></li>
 <li><p>Custom Matchers.  By implementing the <code>Matcher</code> interface yourself, you can get all of the
 above benefits for your own custom assertions.</p></li>
-<li><p>For a more thorough description of these points, see <a href="http://joe.truemesh.com/blog/000511.html">Joe Walnes's
+<li><p>For a more thorough description of these points, see <a href="http://joewalnes.com/2005/05/13/flexible-junit-assertions-with-assertthat/">Joe Walnes's
 original post</a>.</p></li>
 </ul>

_service:tar_scm:r4.12.tar.gz/doc/ReleaseNotes4.4.md -> _service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.4.md Changed

_service:tar_scm:r4.12.tar.gz/doc/ReleaseNotes4.5.html -> _service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.5.html Changed

@@ -97,7 +97,7 @@
 
 <h3>assertThat</h3>
 
-<p>Two years ago, Joe Walnes built a <a href="http://joe.truemesh.com/blog/000511.html">new assertion mechanism</a> on top of what was 
+<p>Two years ago, Joe Walnes built a <a href="http://joewalnes.com/2005/05/13/flexible-junit-assertions-with-assertthat/">new assertion mechanism</a> on top of what was 
 then <a href="http://www.jmock.org/download.html">JMock 1</a>.  The method name was <code>assertThat</code>, and the syntax looked like this:</p>
 
 <pre><code>assertThat(x, is(3));
@@ -133,7 +133,7 @@
 </code></pre></li>
 <li><p>Custom Matchers.  By implementing the <code>Matcher</code> interface yourself, you can get all of the
 above benefits for your own custom assertions.</p></li>
-<li><p>For a more thorough description of these points, see <a href="http://joe.truemesh.com/blog/000511.html">Joe Walnes's
+<li><p>For a more thorough description of these points, see <a href="http://joewalnes.com/2005/05/13/flexible-junit-assertions-with-assertthat/">Joe Walnes's
 original post</a>.:</p></li>
 </ul>

_service:tar_scm:r4.12.tar.gz/doc/ReleaseNotes4.7.md -> _service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.7.md Changed

_service:tar_scm:r4.12.tar.gz/doc/ReleaseNotes4.9.md -> _service:tar_scm:r4.13.2.tar.gz/doc/ReleaseNotes4.9.md Changed

_service:tar_scm:r4.12.tar.gz/doc/building-junit.txt -> _service:tar_scm:r4.13.2.tar.gz/doc/building-junit.txt Changed

@@ -4,8 +4,8 @@
   - Write release notes
 - Not too tedious:
   - Push to github (junit-team)
-  - Run the mvn clean install
-  - If not done, update src/main/config/settings.xml in /private/.../settings.xml on CloudBees' webdav share.
+  - Run the ./mvnw clean install
+  - If not done, update $M2_HOME/settings.xml
   - If not done, copy GnuPG keys in to ${gpg.homedir}. See settings.xml.
   - Perform Maven deployment of a snapshot or release version in Jenkins
     Remember that the version specified in the pom.xml indicates the version
@@ -14,11 +14,11 @@
 
     - (to deploy gpg signed snapshot version)
 
-      $ mvn -Pjunit-release clean deploy
+      $ ./mvnw -Pjunit-release clean deploy
 
     - (to cut a release of the current targetted version)
 
-      $ mvn -B release:prepare release:perform
+      $ ./mvnw -B release:prepare release:perform
 
       This will result in the current pom.xml version having -SNAPSHOT removed
       and the release cut from that version. The version will then be incremented
@@ -26,7 +26,7 @@
 
     - (to cut a release of while changing the version from the current target)
 
-      $ mvn -B -DreleaseVersion=5.0 release:prepare release:perform
+      $ ./mvnw -B -DreleaseVersion=5.0 release:prepare release:perform
 
       This will ignore the current version in the pom.xml, set it to 5.0 and
       the release cut from that 5.0 version. Then 5.0 will be incremented (to 5.1)
@@ -35,12 +35,12 @@
     - (to deploy specified release version and next target release in non-interactive mode -B)
       An example with the next development version and deploying release version:
 
-      $ mvn -B -DreleaseVersion=4.12 -DdevelopmentVersion=4.13-SNAPSHOT release:prepare release:perform
+      $ ./mvnw -B -DreleaseVersion=4.12 -DdevelopmentVersion=4.13-SNAPSHOT release:prepare release:perform
 
   - If you are not an official release manager, and you want to cut a release of
     JUnit for use within your organization, use the following command
 
-      $ mvn -DpushChanges=false -DlocalCheckout '-Darguments=-Dgpg.skip=true -DaltDeploymentRepository=my-company-repo-id::default::my-company-repo-url' -B -DreleaseVersion=4.12-mycompany-1 release:prepare release:perform 
+      $ ./mvnw -DpushChanges=false -DlocalCheckout '-Darguments=-Dgpg.skip=true -DaltDeploymentRepository=my-company-repo-id::default::my-company-repo-url' -B -DreleaseVersion=4.12-mycompany-1 release:prepare release:perform 
 
     where 
       - my-company-repo-id is the <id> of your company's <server> entry in your

_service:tar_scm:r4.12.tar.gz/doc/testinfected/testing.htm -> _service:tar_scm:r4.13.2.tar.gz/doc/testinfected/testing.htm Changed

@@ -181,14 +181,14 @@
 result report. The value a string representation created by
 the toString converter method.
 There are <a href="../../javadoc/junit/framework/Assert.html">
-other asertXXXX variants</a> not discussed here.
+other assertXXXX variants</a> not discussed here.
 <p>Now that we have implemented two test cases we notice some code duplication
 for setting-up the tests. It would be nice to reuse some of this test set-up
 code. In other words, we would like to have a common fixture for running
 the tests. With JUnit you can do so by storing the fixture's objects in
 instance variables of your
 <a href="../../javadoc/junit/framework/TestCase.html">TestCase</a>
-subclass and initialize them by overridding
+subclass and initialize them by overriding
 the setUp method. The symmetric operation to setUp is tearDown which you
 can override to clean up the test fixture at the end of a test. Each test
 runs in its own fixture and JUnit calls setUp and tearDown for each test
@@ -435,7 +435,7 @@
 public IMoney addMoneyBag(MoneyBag s) {
 &nbsp;&nbsp;&nbsp; return s.addMoney(this);
 }</tt></pre>
-Here is the implemenation in MoneyBag which assumes additional constructors
+Here is the implementation in MoneyBag which assumes additional constructors
 to create a MoneyBag from a Money and a MoneyBag and from two MoneyBags.
 <pre><tt>public IMoney addMoney(Money m) {
 &nbsp;&nbsp;&nbsp; return new MoneyBag(m, this);

_service:tar_scm:r4.13.2.tar.gz/mvnw Added

@@ -0,0 +1,227 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if  -z "$MAVEN_SKIP_RC"  ; then
+
+  if  -f /etc/mavenrc  ; then
+    . /etc/mavenrc
+  fi
+
+  if  -f "$HOME/.mavenrc"  ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if  -z "$JAVA_HOME" ; then
+      if  -x "/usr/libexec/java_home" ; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if  -z "$JAVA_HOME"  ; then
+  if  -r /etc/gentoo-release  ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if  -z "$M2_HOME"  ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while  -h "$PRG"  ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> $.*$$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+   -n "$M2_HOME"  &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+   -n "$JAVA_HOME"  &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+   -n "$CLASSPATH"  &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+   -n "$M2_HOME"  &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+   -n "$JAVA_HOME"  &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
+fi
+
+if  -z "$JAVA_HOME" ; then
+  javaExecutable="`which javac`"
+  if  -n "$javaExecutable"  && !  "`expr \"$javaExecutable\" : '$^ *$'`" = "no" ; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if  ! `expr "$readLink" : '$^ *$'` = "no" ; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '$.*$/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if  -z "$JAVACMD"  ; then
+  if  -n "$JAVA_HOME"   ; then
+    if  -x "$JAVA_HOME/jre/sh/java"  ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if  ! -x "$JAVACMD"  ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if  -z "$JAVA_HOME"  ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if  -z "$1" 
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while  "$wdir" != '/'  ; do
+    if  -d "$wdir"/.mvn  ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if  -d "${wdir}" ; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if  -f "$1" ; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if  -z "$BASE_DIR" ; then
+  exit 1;
+fi
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if  "$MVNW_VERBOSE" = true ; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+   -n "$M2_HOME"  &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+   -n "$JAVA_HOME"  &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+   -n "$CLASSPATH"  &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+   -n "$MAVEN_PROJECTBASEDIR"  &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

_service:tar_scm:r4.13.2.tar.gz/mvnw.cmd Added

@@ -0,0 +1,143 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

_service:tar_scm:r4.12.tar.gz/pom.xml -> _service:tar_scm:r4.13.2.tar.gz/pom.xml Changed

@@ -4,7 +4,7 @@
 
     <groupId>junit</groupId>
     <artifactId>junit</artifactId>
-    <version>4.12</version>
+    <version>4.13.2</version>
 
     <name>JUnit</name>
     <description>JUnit is a unit testing framework for Java, created by Erich Gamma and Kent Beck.</description>
@@ -48,42 +48,34 @@
         <contributor>
             <name>JUnit contributors</name>
             <organization>JUnit</organization>
-            <email>junit@yahoogroups.com</email>
-            <url>https://github.com/junit-team/junit/graphs/contributors</url>
+            <email>team@junit.org</email>
+            <url>https://github.com/junit-team/junit4/graphs/contributors</url>
             <roles>
                 <role>developers</role>
             </roles>
         </contributor>
     </contributors>
 
-    <mailingLists>
-        <mailingList>
-            <name>JUnit Mailing List</name>
-            <post>junit@yahoogroups.com</post>
-            <archive>https://groups.yahoo.com/neo/groups/junit/info</archive>
-        </mailingList>
-    </mailingLists>
-
     <prerequisites>
         <maven>3.0.4</maven>
     </prerequisites>
 
     <scm>
-        <connection>scm:git:git://github.com/junit-team/junit.git</connection>
-        <developerConnection>scm:git:git@github.com:junit-team/junit.git</developerConnection>
-        <url>http://github.com/junit-team/junit/tree/master</url>
-      <tag>r4.12</tag>
+        <connection>scm:git:git://github.com/junit-team/junit4.git</connection>
+        <developerConnection>scm:git:git@github.com:junit-team/junit4.git</developerConnection>
+        <url>https://github.com/junit-team/junit4</url>
+      <tag>r4.13.2</tag>
   </scm>
     <issueManagement>
         <system>github</system>
-        <url>https://github.com/junit-team/junit/issues</url>
+        <url>https://github.com/junit-team/junit4/issues</url>
     </issueManagement>
     <ciManagement>
-        <system>jenkins</system>
-        <url>https://junit.ci.cloudbees.com/</url>
+        <system>github</system>
+        <url>https://github.com/junit-team/junit4/actions</url>
     </ciManagement>
     <distributionManagement>
-        <downloadUrl>https://github.com/junit-team/junit/wiki/Download-and-Install</downloadUrl>
+        <downloadUrl>https://github.com/junit-team/junit4/wiki/Download-and-Install</downloadUrl>
         <snapshotRepository>
             <id>junit-snapshot-repo</id>
             <name>Nexus Snapshot Repository</name>
@@ -96,12 +88,17 @@
         </repository>
         <site>
             <id>junit.github.io</id>
-            <url>gitsite:git@github.com/junit-team/junit.git</url>
+            <url>gitsite:git@github.com/junit-team/junit4.git</url>
         </site>
     </distributionManagement>
 
     <properties>
         <jdkVersion>1.5</jdkVersion>
+        <surefireVersion>2.19.1</surefireVersion>
+        <hamcrestVersion>1.3</hamcrestVersion>
+        <enforcerPluginVersion>1.4</enforcerPluginVersion>
+        <jarPluginVersion>2.6</jarPluginVersion>
+        <javadocPluginVersion>2.10.3</javadocPluginVersion>
         <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
         <arguments />
         <gpg.keyname>67893CC4</gpg.keyname>
@@ -111,7 +108,14 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
+            <version>${hamcrestVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${hamcrestVersion}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -146,7 +150,7 @@
                 the project, requires only release versions of dependencies of other artifacts.
                 -->
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.3.1</version>
+                <version>${enforcerPluginVersion}</version>
                 <executions>
                     <execution>
                         <id>enforce-versions</id>
@@ -199,8 +203,8 @@
                 </executions>
                 <configuration>
                     <ignoreMissingFile>false</ignoreMissingFile>
-                    <file>src/main/java/junit/runner/Version.java.template</file>
-                    <outputFile>src/main/java/junit/runner/Version.java</outputFile>
+                    <file>${project.build.sourceDirectory}/junit/runner/Version.java.template</file>
+                    <outputFile>${project.build.sourceDirectory}/junit/runner/Version.java</outputFile>
                     <regex>false</regex>
                     <token>@version@</token>
                     <value>${project.version}</value>
@@ -211,7 +215,7 @@
                 java compiler plugin forked in extra process
                 -->
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.3</version>
                 <configuration>
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <source>${jdkVersion}</source>
@@ -232,7 +236,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.11</version>
+                <version>1.14</version>
                 <executions>
                     <execution>
                         <id>signature-check</id>
@@ -256,12 +260,19 @@
                 our junit suite "AllTests" after the sources are compiled.
                 -->
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.17</version>
+                <version>${surefireVersion}</version>
                 <configuration>
                     <test>org/junit/tests/AllTests.java</test>
                     <useSystemClassLoader>true</useSystemClassLoader>
                     <enableAssertions>false</enableAssertions>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>${surefireVersion}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>2.4</version>
             </plugin>
             <plugin>
                 
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>${javadocPluginVersion}</version>
                 <configuration>
                     <stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
                     <show>protected</show>
@@ -287,7 +298,7 @@
                     <detectLinks>false</detectLinks>
                     <linksource>true</linksource>
                     <keywords>true</keywords>
-                    <use>false</use>
+                    <use>true</use>
                     <windowtitle>JUnit API</windowtitle>
                     <encoding>UTF-8</encoding>
                     <locale>en</locale>
@@ -298,7 +309,7 @@
                             <value>http://docs.oracle.com/javase/${jdkVersion}.0/docs/api/</value>
                         </property>
                     </javaApiLinks>
-                    <excludePackageNames>junit.*,*.internal.*</excludePackageNames>
+                    <excludePackageNames>*.internal.*</excludePackageNames>
                     <verbose>true</verbose>
                     <minmemory>32m</minmemory>
                     <maxmemory>128m</maxmemory>
@@ -311,7 +322,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.5.2</version>
                 <configuration>
                     <mavenExecutorId>forked-path</mavenExecutorId>
                     <useReleaseProfile>false</useReleaseProfile>
@@ -321,7 +332,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.4</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.github.stephenc.wagon</groupId>
@@ -337,16 +348,35 @@
             </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
+                <version>${jarPluginVersion}</version>
                 <configuration>
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>
                         <manifest>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
+                        <manifestEntries>
+                            <Automatic-Module-Name>junit</Automatic-Module-Name>
+                        </manifestEntries>                        
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.6.1</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.7</version>
+            </plugin>
         </plugins>
     </build>
 
@@ -354,7 +384,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.7</version>
+                <version>2.8</version>
                 <configuration>
                     <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                     
@@ -381,7 +411,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>${javadocPluginVersion}</version>
                 <configuration>
                     <destDir>javadoc/latest</destDir>
                     <stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
@@ -391,7 +421,7 @@
                     <detectLinks>false</detectLinks>
                     <linksource>true</linksource>
                     <keywords>true</keywords>
-                    <use>false</use>
+                    <use>true</use>
                     <windowtitle>JUnit API</windowtitle>
                     <encoding>UTF-8</encoding>
                     <locale>en</locale>
@@ -440,7 +470,7 @@
                         (&ndash;&ndash; stands for double dash)
                         -->
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>gpg-sign</id>
@@ -527,25 +557,77 @@
             </reporting>
         </profile>
         <profile>
-            <id>fast-tests</id>
+            <id>java9</id>
+            <activation>
+                <jdk>1.9,12)</jdk>
+            </activation>
+            <properties>
+                
+                <jdkVersion>1.6</jdkVersion>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
-                            <parallel>classes</parallel>
-                            <threadCountClasses>2</threadCountClasses>
+                            <source>1.6</source>
                         </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>2.17</version>
-                            </dependency>
-                        </dependencies>
                     </plugin>
                 </plugins>
             </build>
+            <reporting>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <source>1.6</source>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </reporting>
+        </profile>
+        <profile>
+            <id>java12</id>
+            <activation>
+                <jdk>12,)</jdk>
+            </activation>
+            <properties>
+                
+                <jdkVersion>1.7</jdkVersion>
+                <enforcerPluginVersion>3.0.0-M3</enforcerPluginVersion>
+                <jarPluginVersion>3.2.0</jarPluginVersion>
+                <javadocPluginVersion>3.2.0</javadocPluginVersion>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <source>1.7</source>
+                            <failOnError>false</failOnError>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <compilerArgs>
+                                <arg>-Xdoclint:none</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <reporting>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <source>1.7</source>
+                            <failOnError>false</failOnError>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </reporting>
         </profile>
     </profiles>
 </project>

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/extensions/ActiveTestSuite.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/extensions/ActiveTestSuite.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/extensions/TestDecorator.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/extensions/TestDecorator.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/framework/Assert.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/framework/Assert.java Changed

@@ -17,7 +17,7 @@
      * Asserts that a condition is true. If it isn't it throws
      * an AssertionFailedError with the given message.
      */
-    static public void assertTrue(String message, boolean condition) {
+    public static void assertTrue(String message, boolean condition) {
         if (!condition) {
             fail(message);
         }
@@ -27,7 +27,7 @@
      * Asserts that a condition is true. If it isn't it throws
      * an AssertionFailedError.
      */
-    static public void assertTrue(boolean condition) {
+    public static void assertTrue(boolean condition) {
         assertTrue(null, condition);
     }
 
@@ -35,7 +35,7 @@
      * Asserts that a condition is false. If it isn't it throws
      * an AssertionFailedError with the given message.
      */
-    static public void assertFalse(String message, boolean condition) {
+    public static void assertFalse(String message, boolean condition) {
         assertTrue(message, !condition);
     }
 
@@ -43,14 +43,14 @@
      * Asserts that a condition is false. If it isn't it throws
      * an AssertionFailedError.
      */
-    static public void assertFalse(boolean condition) {
+    public static void assertFalse(boolean condition) {
         assertFalse(null, condition);
     }
 
     /**
      * Fails a test with the given message.
      */
-    static public void fail(String message) {
+    public static void fail(String message) {
         if (message == null) {
             throw new AssertionFailedError();
         }
@@ -60,7 +60,7 @@
     /**
      * Fails a test with no message.
      */
-    static public void fail() {
+    public static void fail() {
         fail(null);
     }
 
@@ -68,7 +68,7 @@
      * Asserts that two objects are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertEquals(String message, Object expected, Object actual) {
+    public static void assertEquals(String message, Object expected, Object actual) {
         if (expected == null && actual == null) {
             return;
         }
@@ -82,14 +82,14 @@
      * Asserts that two objects are equal. If they are not
      * an AssertionFailedError is thrown.
      */
-    static public void assertEquals(Object expected, Object actual) {
+    public static void assertEquals(Object expected, Object actual) {
         assertEquals(null, expected, actual);
     }
 
     /**
      * Asserts that two Strings are equal.
      */
-    static public void assertEquals(String message, String expected, String actual) {
+    public static void assertEquals(String message, String expected, String actual) {
         if (expected == null && actual == null) {
             return;
         }
@@ -103,7 +103,7 @@
     /**
      * Asserts that two Strings are equal.
      */
-    static public void assertEquals(String expected, String actual) {
+    public static void assertEquals(String expected, String actual) {
         assertEquals(null, expected, actual);
     }
 
@@ -112,12 +112,12 @@
      * an AssertionFailedError is thrown with the given message.  If the expected
      * value is infinity then the delta value is ignored.
      */
-    static public void assertEquals(String message, double expected, double actual, double delta) {
+    public static void assertEquals(String message, double expected, double actual, double delta) {
         if (Double.compare(expected, actual) == 0) {
             return;
         }
         if (!(Math.abs(expected - actual) <= delta)) {
-            failNotEquals(message, new Double(expected), new Double(actual));
+            failNotEquals(message, Double.valueOf(expected), Double.valueOf(actual));
         }
     }
 
@@ -125,7 +125,7 @@
      * Asserts that two doubles are equal concerning a delta. If the expected
      * value is infinity then the delta value is ignored.
      */
-    static public void assertEquals(double expected, double actual, double delta) {
+    public static void assertEquals(double expected, double actual, double delta) {
         assertEquals(null, expected, actual, delta);
     }
 
@@ -134,12 +134,12 @@
      * are not an AssertionFailedError is thrown with the given message. If the
      * expected value is infinity then the delta value is ignored.
      */
-    static public void assertEquals(String message, float expected, float actual, float delta) {
+    public static void assertEquals(String message, float expected, float actual, float delta) {
         if (Float.compare(expected, actual) == 0) {
             return;
         }
         if (!(Math.abs(expected - actual) <= delta)) {
-            failNotEquals(message, new Float(expected), new Float(actual));
+            failNotEquals(message, Float.valueOf(expected), Float.valueOf(actual));
         }
     }
 
@@ -147,7 +147,7 @@
      * Asserts that two floats are equal concerning a delta. If the expected
      * value is infinity then the delta value is ignored.
      */
-    static public void assertEquals(float expected, float actual, float delta) {
+    public static void assertEquals(float expected, float actual, float delta) {
         assertEquals(null, expected, actual, delta);
     }
 
@@ -155,14 +155,14 @@
      * Asserts that two longs are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertEquals(String message, long expected, long actual) {
+    public static void assertEquals(String message, long expected, long actual) {
         assertEquals(message, Long.valueOf(expected), Long.valueOf(actual));
     }
 
     /**
      * Asserts that two longs are equal.
      */
-    static public void assertEquals(long expected, long actual) {
+    public static void assertEquals(long expected, long actual) {
         assertEquals(null, expected, actual);
     }
 
@@ -170,14 +170,14 @@
      * Asserts that two booleans are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertEquals(String message, boolean expected, boolean actual) {
+    public static void assertEquals(String message, boolean expected, boolean actual) {
         assertEquals(message, Boolean.valueOf(expected), Boolean.valueOf(actual));
     }
 
     /**
      * Asserts that two booleans are equal.
      */
-    static public void assertEquals(boolean expected, boolean actual) {
+    public static void assertEquals(boolean expected, boolean actual) {
         assertEquals(null, expected, actual);
     }
 
@@ -185,14 +185,14 @@
      * Asserts that two bytes are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertEquals(String message, byte expected, byte actual) {
+    public static void assertEquals(String message, byte expected, byte actual) {
         assertEquals(message, Byte.valueOf(expected), Byte.valueOf(actual));
     }
 
     /**
      * Asserts that two bytes are equal.
      */
-    static public void assertEquals(byte expected, byte actual) {
+    public static void assertEquals(byte expected, byte actual) {
         assertEquals(null, expected, actual);
     }
 
@@ -200,14 +200,14 @@
      * Asserts that two chars are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertEquals(String message, char expected, char actual) {
+    public static void assertEquals(String message, char expected, char actual) {
         assertEquals(message, Character.valueOf(expected), Character.valueOf(actual));
     }
 
     /**
      * Asserts that two chars are equal.
      */
-    static public void assertEquals(char expected, char actual) {
+    public static void assertEquals(char expected, char actual) {
         assertEquals(null, expected, actual);
     }
 
@@ -215,14 +215,14 @@
      * Asserts that two shorts are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertEquals(String message, short expected, short actual) {
+    public static void assertEquals(String message, short expected, short actual) {
         assertEquals(message, Short.valueOf(expected), Short.valueOf(actual));
     }
 
     /**
      * Asserts that two shorts are equal.
      */
-    static public void assertEquals(short expected, short actual) {
+    public static void assertEquals(short expected, short actual) {
         assertEquals(null, expected, actual);
     }
 
@@ -230,21 +230,21 @@
      * Asserts that two ints are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertEquals(String message, int expected, int actual) {
+    public static void assertEquals(String message, int expected, int actual) {
         assertEquals(message, Integer.valueOf(expected), Integer.valueOf(actual));
     }
 
     /**
      * Asserts that two ints are equal.
      */
-    static public void assertEquals(int expected, int actual) {
+    public static void assertEquals(int expected, int actual) {
         assertEquals(null, expected, actual);
     }
 
     /**
      * Asserts that an object isn't null.
      */
-    static public void assertNotNull(Object object) {
+    public static void assertNotNull(Object object) {
         assertNotNull(null, object);
     }
 
@@ -252,7 +252,7 @@
      * Asserts that an object isn't null. If it is
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertNotNull(String message, Object object) {
+    public static void assertNotNull(String message, Object object) {
         assertTrue(message, object != null);
     }
 
@@ -263,7 +263,7 @@
      *
      * @param object Object to check or <code>null</code>
      */
-    static public void assertNull(Object object) {
+    public static void assertNull(Object object) {
         if (object != null) {
             assertNull("Expected: <null> but was: " + object.toString(), object);
         }
@@ -273,7 +273,7 @@
      * Asserts that an object is null.  If it is not
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertNull(String message, Object object) {
+    public static void assertNull(String message, Object object) {
         assertTrue(message, object == null);
     }
 
@@ -281,7 +281,7 @@
      * Asserts that two objects refer to the same object. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    static public void assertSame(String message, Object expected, Object actual) {
+    public static void assertSame(String message, Object expected, Object actual) {
         if (expected == actual) {
             return;
         }
@@ -292,7 +292,7 @@
      * Asserts that two objects refer to the same object. If they are not
      * the same an AssertionFailedError is thrown.
      */
-    static public void assertSame(Object expected, Object actual) {
+    public static void assertSame(Object expected, Object actual) {
         assertSame(null, expected, actual);
     }
 
@@ -301,7 +301,7 @@
      * refer to the same object an AssertionFailedError is thrown with the
      * given message.
      */
-    static public void assertNotSame(String message, Object expected, Object actual) {
+    public static void assertNotSame(String message, Object expected, Object actual) {
         if (expected == actual) {
             failSame(message);
         }
@@ -311,21 +311,21 @@
      * Asserts that two objects do not refer to the same object. If they do
      * refer to the same object an AssertionFailedError is thrown.
      */
-    static public void assertNotSame(Object expected, Object actual) {
+    public static void assertNotSame(Object expected, Object actual) {
         assertNotSame(null, expected, actual);
     }
 
-    static public void failSame(String message) {
+    public static void failSame(String message) {
         String formatted = (message != null) ? message + " " : "";
         fail(formatted + "expected not same");
     }
 
-    static public void failNotSame(String message, Object expected, Object actual) {
+    public static void failNotSame(String message, Object expected, Object actual) {
         String formatted = (message != null) ? message + " " : "";
         fail(formatted + "expected same:<" + expected + "> was not:<" + actual + ">");
     }
 
-    static public void failNotEquals(String message, Object expected, Object actual) {
+    public static void failNotEquals(String message, Object expected, Object actual) {
         fail(format(message, expected, actual));
     }

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/framework/ComparisonCompactor.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/framework/ComparisonCompactor.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/framework/JUnit4TestAdapter.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/framework/JUnit4TestAdapter.java Changed

@@ -9,11 +9,23 @@
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.manipulation.Filterable;
+import org.junit.runner.manipulation.Orderer;
+import org.junit.runner.manipulation.InvalidOrderingException;
 import org.junit.runner.manipulation.NoTestsRemainException;
-import org.junit.runner.manipulation.Sortable;
+import org.junit.runner.manipulation.Orderable;
 import org.junit.runner.manipulation.Sorter;
 
-public class JUnit4TestAdapter implements Test, Filterable, Sortable, Describable {
+/**
+ * The JUnit4TestAdapter enables running JUnit-4-style tests using a JUnit-3-style test runner.
+ *
+ * <p> To use it, add the following to a test class:
+ * <pre>
+      public static Test suite() {
+        return new JUnit4TestAdapter(<em>YourJUnit4TestClass</em>.class);
+      }
+</pre>
+ */
+public class JUnit4TestAdapter implements Test, Filterable, Orderable, Describable {
     private final Class<?> fNewTestClass;
 
     private final Runner fRunner;
@@ -83,4 +95,13 @@
     public void sort(Sorter sorter) {
         sorter.apply(fRunner);
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @since 4.13
+     */
+    public void order(Orderer orderer) throws InvalidOrderingException {
+        orderer.apply(fRunner);
+    }
 }
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/framework/Protectable.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/framework/Protectable.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/framework/TestCase.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/framework/TestCase.java Changed

@@ -73,6 +73,7 @@
  * @see TestResult
  * @see TestSuite
  */
+@SuppressWarnings("deprecation")
 public abstract class TestCase extends Assert implements Test {
     /**
      * the name of the test case
@@ -102,7 +103,7 @@
     }
 
     /**
-     * Creates a default TestResult object
+     * Creates a default TestResult object.
      *
      * @see TestResult
      */
@@ -187,7 +188,6 @@
      * Asserts that a condition is true. If it isn't it throws
      * an AssertionFailedError with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertTrue(String message, boolean condition) {
         Assert.assertTrue(message, condition);
     }
@@ -196,7 +196,6 @@
      * Asserts that a condition is true. If it isn't it throws
      * an AssertionFailedError.
      */
-    @SuppressWarnings("deprecation")
     public static void assertTrue(boolean condition) {
         Assert.assertTrue(condition);
     }
@@ -205,7 +204,6 @@
      * Asserts that a condition is false. If it isn't it throws
      * an AssertionFailedError with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertFalse(String message, boolean condition) {
         Assert.assertFalse(message, condition);
     }
@@ -214,7 +212,6 @@
      * Asserts that a condition is false. If it isn't it throws
      * an AssertionFailedError.
      */
-    @SuppressWarnings("deprecation")
     public static void assertFalse(boolean condition) {
         Assert.assertFalse(condition);
     }
@@ -222,7 +219,6 @@
     /**
      * Fails a test with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void fail(String message) {
         Assert.fail(message);
     }
@@ -230,7 +226,6 @@
     /**
      * Fails a test with no message.
      */
-    @SuppressWarnings("deprecation")
     public static void fail() {
         Assert.fail();
     }
@@ -239,7 +234,6 @@
      * Asserts that two objects are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, Object expected, Object actual) {
         Assert.assertEquals(message, expected, actual);
     }
@@ -248,7 +242,6 @@
      * Asserts that two objects are equal. If they are not
      * an AssertionFailedError is thrown.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(Object expected, Object actual) {
         Assert.assertEquals(expected, actual);
     }
@@ -256,7 +249,6 @@
     /**
      * Asserts that two Strings are equal.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, String expected, String actual) {
         Assert.assertEquals(message, expected, actual);
     }
@@ -264,7 +256,6 @@
     /**
      * Asserts that two Strings are equal.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String expected, String actual) {
         Assert.assertEquals(expected, actual);
     }
@@ -274,7 +265,6 @@
      * an AssertionFailedError is thrown with the given message.  If the expected
      * value is infinity then the delta value is ignored.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, double expected, double actual, double delta) {
         Assert.assertEquals(message, expected, actual, delta);
     }
@@ -283,7 +273,6 @@
      * Asserts that two doubles are equal concerning a delta. If the expected
      * value is infinity then the delta value is ignored.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(double expected, double actual, double delta) {
         Assert.assertEquals(expected, actual, delta);
     }
@@ -293,7 +282,6 @@
      * are not an AssertionFailedError is thrown with the given message. If the
      * expected value is infinity then the delta value is ignored.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, float expected, float actual, float delta) {
         Assert.assertEquals(message, expected, actual, delta);
     }
@@ -302,7 +290,6 @@
      * Asserts that two floats are equal concerning a delta. If the expected
      * value is infinity then the delta value is ignored.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(float expected, float actual, float delta) {
         Assert.assertEquals(expected, actual, delta);
     }
@@ -311,7 +298,6 @@
      * Asserts that two longs are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, long expected, long actual) {
         Assert.assertEquals(message, expected, actual);
     }
@@ -319,7 +305,6 @@
     /**
      * Asserts that two longs are equal.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(long expected, long actual) {
         Assert.assertEquals(expected, actual);
     }
@@ -328,7 +313,6 @@
      * Asserts that two booleans are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, boolean expected, boolean actual) {
         Assert.assertEquals(message, expected, actual);
     }
@@ -336,7 +320,6 @@
     /**
      * Asserts that two booleans are equal.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(boolean expected, boolean actual) {
         Assert.assertEquals(expected, actual);
     }
@@ -345,7 +328,6 @@
      * Asserts that two bytes are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, byte expected, byte actual) {
         Assert.assertEquals(message, expected, actual);
     }
@@ -353,7 +335,6 @@
     /**
      * Asserts that two bytes are equal.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(byte expected, byte actual) {
         Assert.assertEquals(expected, actual);
     }
@@ -362,7 +343,6 @@
      * Asserts that two chars are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, char expected, char actual) {
         Assert.assertEquals(message, expected, actual);
     }
@@ -370,7 +350,6 @@
     /**
      * Asserts that two chars are equal.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(char expected, char actual) {
         Assert.assertEquals(expected, actual);
     }
@@ -379,7 +358,6 @@
      * Asserts that two shorts are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, short expected, short actual) {
         Assert.assertEquals(message, expected, actual);
     }
@@ -387,7 +365,6 @@
     /**
      * Asserts that two shorts are equal.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(short expected, short actual) {
         Assert.assertEquals(expected, actual);
     }
@@ -396,7 +373,6 @@
      * Asserts that two ints are equal. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(String message, int expected, int actual) {
         Assert.assertEquals(message, expected, actual);
     }
@@ -404,7 +380,6 @@
     /**
      * Asserts that two ints are equal.
      */
-    @SuppressWarnings("deprecation")
     public static void assertEquals(int expected, int actual) {
         Assert.assertEquals(expected, actual);
     }
@@ -412,7 +387,6 @@
     /**
      * Asserts that an object isn't null.
      */
-    @SuppressWarnings("deprecation")
     public static void assertNotNull(Object object) {
         Assert.assertNotNull(object);
     }
@@ -421,7 +395,6 @@
      * Asserts that an object isn't null. If it is
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertNotNull(String message, Object object) {
         Assert.assertNotNull(message, object);
     }
@@ -433,7 +406,6 @@
      *
      * @param object Object to check or <code>null</code>
      */
-    @SuppressWarnings("deprecation")
     public static void assertNull(Object object) {
         Assert.assertNull(object);
     }
@@ -442,7 +414,6 @@
      * Asserts that an object is null.  If it is not
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertNull(String message, Object object) {
         Assert.assertNull(message, object);
     }
@@ -451,7 +422,6 @@
      * Asserts that two objects refer to the same object. If they are not
      * an AssertionFailedError is thrown with the given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertSame(String message, Object expected, Object actual) {
         Assert.assertSame(message, expected, actual);
     }
@@ -460,7 +430,6 @@
      * Asserts that two objects refer to the same object. If they are not
      * the same an AssertionFailedError is thrown.
      */
-    @SuppressWarnings("deprecation")
     public static void assertSame(Object expected, Object actual) {
         Assert.assertSame(expected, actual);
     }
@@ -470,7 +439,6 @@
      * refer to the same object an AssertionFailedError is thrown with the
      * given message.
      */
-    @SuppressWarnings("deprecation")
     public static void assertNotSame(String message, Object expected, Object actual) {
         Assert.assertNotSame(message, expected, actual);
     }
@@ -479,27 +447,22 @@
      * Asserts that two objects do not refer to the same object. If they do
      * refer to the same object an AssertionFailedError is thrown.
      */
-    @SuppressWarnings("deprecation")
     public static void assertNotSame(Object expected, Object actual) {
         Assert.assertNotSame(expected, actual);
     }
 
-    @SuppressWarnings("deprecation")
     public static void failSame(String message) {
         Assert.failSame(message);
     }
 
-    @SuppressWarnings("deprecation")
     public static void failNotSame(String message, Object expected, Object actual) {
         Assert.failNotSame(message, expected, actual);
     }
 
-    @SuppressWarnings("deprecation")
     public static void failNotEquals(String message, Object expected, Object actual) {
         Assert.failNotEquals(message, expected, actual);
     }
 
-    @SuppressWarnings("deprecation")
     public static String format(String message, Object expected, Object actual) {
         return Assert.format(message, expected, actual);
     }
@@ -519,7 +482,7 @@
     }
 
     /**
-     * Returns a string representation of the test case
+     * Returns a string representation of the test case.
      */
     @Override
     public String toString() {
@@ -527,7 +490,7 @@
     }
 
     /**
-     * Gets the name of a TestCase
+     * Gets the name of a TestCase.
      *
      * @return the name of the TestCase
      */
@@ -536,7 +499,7 @@
     }
 
     /**
-     * Sets the name of a TestCase
+     * Sets the name of a TestCase.
      *
      * @param name the name to set
      */

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/framework/TestFailure.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/framework/TestFailure.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/framework/TestResult.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/framework/TestResult.java Changed

@@ -52,14 +52,14 @@
     }
 
     /**
-     * Registers a TestListener
+     * Registers a TestListener.
      */
     public synchronized void addListener(TestListener listener) {
         fListeners.add(listener);
     }
 
     /**
-     * Unregisters a TestListener
+     * Unregisters a TestListener.
      */
     public synchronized void removeListener(TestListener listener) {
         fListeners.remove(listener);
@@ -91,7 +91,7 @@
     }
 
     /**
-     * Returns an Enumeration for the errors
+     * Returns an Enumeration for the errors.
      */
     public synchronized Enumeration<TestFailure> errors() {
         return Collections.enumeration(fErrors);
@@ -106,7 +106,7 @@
     }
 
     /**
-     * Returns an Enumeration for the failures
+     * Returns an Enumeration for the failures.
      */
     public synchronized Enumeration<TestFailure> failures() {
         return Collections.enumeration(fFailures);
@@ -150,7 +150,7 @@
     }
 
     /**
-     * Checks whether the test run should stop
+     * Checks whether the test run should stop.
      */
     public synchronized boolean shouldStop() {
         return fStop;

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/framework/TestSuite.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/framework/TestSuite.java Changed

@@ -1,7 +1,5 @@
 package junit.framework;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -12,6 +10,7 @@
 import java.util.Vector;
 
 import org.junit.internal.MethodSorter;
+import org.junit.internal.Throwables;
 
 /**
  * A <code>TestSuite</code> is a <code>Composite</code> of Tests.
@@ -35,7 +34,7 @@
  * <p>
  * A final option is to do the same for a large array of test classes.
  * <pre>
- * Class testClasses = { MathTest.class, AnotherTest.class }
+ * Class testClasses = { MathTest.class, AnotherTest.class };
  * TestSuite suite= new TestSuite(testClasses);
  * </pre>
  *
@@ -65,11 +64,11 @@
                 test = constructor.newInstance(new Object{name});
             }
         } catch (InstantiationException e) {
-            return (warning("Cannot instantiate test case: " + name + " (" + exceptionToString(e) + ")"));
+            return (warning("Cannot instantiate test case: " + name + " (" + Throwables.getStacktrace(e) + ")"));
         } catch (InvocationTargetException e) {
-            return (warning("Exception in constructor: " + name + " (" + exceptionToString(e.getTargetException()) + ")"));
+            return (warning("Exception in constructor: " + name + " (" + Throwables.getStacktrace(e.getTargetException()) + ")"));
         } catch (IllegalAccessException e) {
-            return (warning("Cannot access test case: " + name + " (" + exceptionToString(e) + ")"));
+            return (warning("Cannot access test case: " + name + " (" + Throwables.getStacktrace(e) + ")"));
         }
         return (Test) test;
     }
@@ -99,16 +98,6 @@
         };
     }
 
-    /**
-     * Converts the stack trace into a string
-     */
-    private static String exceptionToString(Throwable e) {
-        StringWriter stringWriter = new StringWriter();
-        PrintWriter writer = new PrintWriter(stringWriter);
-        e.printStackTrace(writer);
-        return stringWriter.toString();
-    }
-
     private String fName;
 
     private Vector<Test> fTests = new Vector<Test>(10); // Cannot convert this to List because it is used directly by some test runners
@@ -210,7 +199,7 @@
     }
 
     /**
-     * Adds the tests from the given class to the suite
+     * Adds the tests from the given class to the suite.
      */
     public void addTestSuite(Class<? extends TestCase> testClass) {
         addTest(new TestSuite(testClass));
@@ -262,21 +251,21 @@
     }
 
     /**
-     * Returns the test at the given index
+     * Returns the test at the given index.
      */
     public Test testAt(int index) {
         return fTests.get(index);
     }
 
     /**
-     * Returns the number of tests in this suite
+     * Returns the number of tests in this suite.
      */
     public int testCount() {
         return fTests.size();
     }
 
     /**
-     * Returns the tests as an enumeration
+     * Returns the tests as an enumeration.
      */
     public Enumeration<Test> tests() {
         return fTests.elements();

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/runner/BaseTestRunner.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/runner/BaseTestRunner.java Changed

@@ -20,6 +20,8 @@
 import junit.framework.TestListener;
 import junit.framework.TestSuite;
 
+import org.junit.internal.Throwables;
+
 /**
  * Base class for all test runners.
  * This class was born live on stage in Sardinia during XP2000.
@@ -233,6 +235,7 @@
             setPreferences(new Properties(getPreferences()));
             getPreferences().load(is);
         } catch (IOException ignored) {
+        } catch (SecurityException ignored) {
         } finally {
             try {
                 if (is != null) {
@@ -264,11 +267,7 @@
      * Returns a filtered stack trace
      */
     public static String getFilteredTrace(Throwable e) {
-        StringWriter stringWriter = new StringWriter();
-        PrintWriter writer = new PrintWriter(stringWriter);
-        e.printStackTrace(writer);
-        String trace = stringWriter.toString();
-        return BaseTestRunner.getFilteredTrace(trace);
+        return BaseTestRunner.getFilteredTrace(Throwables.getStacktrace(e));
     }
 
     /**

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/runner/TestRunListener.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/runner/TestRunListener.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/runner/Version.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/runner/Version.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/junit/textui/TestRunner.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/junit/textui/TestRunner.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/Assert.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/Assert.java Changed

@@ -2,6 +2,7 @@
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
+import org.junit.function.ThrowingRunnable;
 import org.junit.internal.ArrayComparisonFailure;
 import org.junit.internal.ExactComparisonCriteria;
 import org.junit.internal.InexactComparisonCriteria;
@@ -36,7 +37,7 @@
      * okay)
      * @param condition condition to be checked
      */
-    static public void assertTrue(String message, boolean condition) {
+    public static void assertTrue(String message, boolean condition) {
         if (!condition) {
             fail(message);
         }
@@ -48,7 +49,7 @@
      *
      * @param condition condition to be checked
      */
-    static public void assertTrue(boolean condition) {
+    public static void assertTrue(boolean condition) {
         assertTrue(null, condition);
     }
 
@@ -60,7 +61,7 @@
      * okay)
      * @param condition condition to be checked
      */
-    static public void assertFalse(String message, boolean condition) {
+    public static void assertFalse(String message, boolean condition) {
         assertTrue(message, !condition);
     }
 
@@ -70,7 +71,7 @@
      *
      * @param condition condition to be checked
      */
-    static public void assertFalse(boolean condition) {
+    public static void assertFalse(boolean condition) {
         assertFalse(null, condition);
     }
 
@@ -81,7 +82,7 @@
      * okay)
      * @see AssertionError
      */
-    static public void fail(String message) {
+    public static void fail(String message) {
         if (message == null) {
             throw new AssertionError();
         }
@@ -91,7 +92,7 @@
     /**
      * Fails a test with no message.
      */
-    static public void fail() {
+    public static void fail() {
         fail(null);
     }
 
@@ -106,11 +107,12 @@
      * @param expected expected value
      * @param actual actual value
      */
-    static public void assertEquals(String message, Object expected,
+    public static void assertEquals(String message, Object expected,
             Object actual) {
         if (equalsRegardingNull(expected, actual)) {
             return;
-        } else if (expected instanceof String && actual instanceof String) {
+        }
+        if (expected instanceof String && actual instanceof String) {
             String cleanMessage = message == null ? "" : message;
             throw new ComparisonFailure(cleanMessage, (String) expected,
                     (String) actual);
@@ -140,7 +142,7 @@
      * @param expected expected value
      * @param actual the value to check against <code>expected</code>
      */
-    static public void assertEquals(Object expected, Object actual) {
+    public static void assertEquals(Object expected, Object actual) {
         assertEquals(null, expected, actual);
     }
 
@@ -155,7 +157,7 @@
      * @param unexpected unexpected value to check
      * @param actual the value to check against <code>unexpected</code>
      */
-    static public void assertNotEquals(String message, Object unexpected,
+    public static void assertNotEquals(String message, Object unexpected,
             Object actual) {
         if (equalsRegardingNull(unexpected, actual)) {
             failEquals(message, actual);
@@ -171,7 +173,7 @@
      * @param unexpected unexpected value to check
      * @param actual the value to check against <code>unexpected</code>
      */
-    static public void assertNotEquals(Object unexpected, Object actual) {
+    public static void assertNotEquals(Object unexpected, Object actual) {
         assertNotEquals(null, unexpected, actual);
     }
 
@@ -194,7 +196,7 @@
      * @param unexpected unexpected value to check
      * @param actual the value to check against <code>unexpected</code>
      */
-    static public void assertNotEquals(String message, long unexpected, long actual) {
+    public static void assertNotEquals(String message, long unexpected, long actual) {
         if (unexpected == actual) {
             failEquals(message, Long.valueOf(actual));
         }
@@ -207,7 +209,7 @@
      * @param unexpected unexpected value to check
      * @param actual the value to check against <code>unexpected</code>
      */
-    static public void assertNotEquals(long unexpected, long actual) {
+    public static void assertNotEquals(long unexpected, long actual) {
         assertNotEquals(null, unexpected, actual);
     }
 
@@ -226,7 +228,7 @@
      * <code>actual</code> for which both numbers are still
      * considered equal.
      */
-    static public void assertNotEquals(String message, double unexpected,
+    public static void assertNotEquals(String message, double unexpected,
             double actual, double delta) {
         if (!doubleIsDifferent(unexpected, actual, delta)) {
             failEquals(message, Double.valueOf(actual));
@@ -245,7 +247,7 @@
      * <code>actual</code> for which both numbers are still
      * considered equal.
      */
-    static public void assertNotEquals(double unexpected, double actual, double delta) {
+    public static void assertNotEquals(double unexpected, double actual, double delta) {
         assertNotEquals(null, unexpected, actual, delta);
     }
 
@@ -261,7 +263,7 @@
      * <code>actual</code> for which both numbers are still
      * considered equal.
      */
-    static public void assertNotEquals(float unexpected, float actual, float delta) {
+    public static void assertNotEquals(float unexpected, float actual, float delta) {
         assertNotEquals(null, unexpected, actual, delta);
     }
 
@@ -297,7 +299,7 @@
     public static void assertArrayEquals(Object expecteds, Object actuals) {
         assertArrayEquals(null, expecteds, actuals);
     }
-    
+
     /**
      * Asserts that two boolean arrays are equal. If they are not, an
      * {@link AssertionError} is thrown with the given message. If
@@ -312,8 +314,8 @@
     public static void assertArrayEquals(String message, boolean expecteds,
             boolean actuals) throws ArrayComparisonFailure {
         internalArrayEquals(message, expecteds, actuals);
-    }    
-    
+    }
+
     /**
      * Asserts that two boolean arrays are equal. If they are not, an
      * {@link AssertionError} is thrown. If <code>expected</code> and
@@ -547,7 +549,7 @@
      * <code>actual</code> for which both numbers are still
      * considered equal.
      */
-    static public void assertEquals(String message, double expected,
+    public static void assertEquals(String message, double expected,
             double actual, double delta) {
         if (doubleIsDifferent(expected, actual, delta)) {
             failNotEquals(message, Double.valueOf(expected), Double.valueOf(actual));
@@ -569,7 +571,7 @@
      * <code>actual</code> for which both numbers are still
      * considered equal.
      */
-    static public void assertEquals(String message, float expected,
+    public static void assertEquals(String message, float expected,
             float actual, float delta) {
         if (floatIsDifferent(expected, actual, delta)) {
             failNotEquals(message, Float.valueOf(expected), Float.valueOf(actual));
@@ -591,14 +593,14 @@
      * <code>actual</code> for which both numbers are still
      * considered equal.
      */
-    static public void assertNotEquals(String message, float unexpected,
+    public static void assertNotEquals(String message, float unexpected,
             float actual, float delta) {
         if (!floatIsDifferent(unexpected, actual, delta)) {
             failEquals(message, Float.valueOf(actual));
         }
     }
 
-    static private boolean doubleIsDifferent(double d1, double d2, double delta) {
+    private static boolean doubleIsDifferent(double d1, double d2, double delta) {
         if (Double.compare(d1, d2) == 0) {
             return false;
         }
@@ -609,7 +611,7 @@
         return true;
     }
 
-    static private boolean floatIsDifferent(float f1, float f2, float delta) {
+    private static boolean floatIsDifferent(float f1, float f2, float delta) {
         if (Float.compare(f1, f2) == 0) {
             return false;
         }
@@ -627,7 +629,7 @@
      * @param expected expected long value.
      * @param actual actual long value
      */
-    static public void assertEquals(long expected, long actual) {
+    public static void assertEquals(long expected, long actual) {
         assertEquals(null, expected, actual);
     }
 
@@ -640,7 +642,7 @@
      * @param expected long expected value.
      * @param actual long actual value
      */
-    static public void assertEquals(String message, long expected, long actual) {
+    public static void assertEquals(String message, long expected, long actual) {
         if (expected != actual) {
             failNotEquals(message, Long.valueOf(expected), Long.valueOf(actual));
         }
@@ -652,7 +654,7 @@
      *             instead
      */
     @Deprecated
-    static public void assertEquals(double expected, double actual) {
+    public static void assertEquals(double expected, double actual) {
         assertEquals(null, expected, actual);
     }
 
@@ -662,7 +664,7 @@
      *             instead
      */
     @Deprecated
-    static public void assertEquals(String message, double expected,
+    public static void assertEquals(String message, double expected,
             double actual) {
         fail("Use assertEquals(expected, actual, delta) to compare floating-point numbers");
     }
@@ -679,7 +681,7 @@
      * <code>actual</code> for which both numbers are still
      * considered equal.
      */
-    static public void assertEquals(double expected, double actual, double delta) {
+    public static void assertEquals(double expected, double actual, double delta) {
         assertEquals(null, expected, actual, delta);
     }
 
@@ -695,8 +697,7 @@
      * <code>actual</code> for which both numbers are still
      * considered equal.
      */
-
-    static public void assertEquals(float expected, float actual, float delta) {
+    public static void assertEquals(float expected, float actual, float delta) {
         assertEquals(null, expected, actual, delta);
     }
 
@@ -708,7 +709,7 @@
      * okay)
      * @param object Object to check or <code>null</code>
      */
-    static public void assertNotNull(String message, Object object) {
+    public static void assertNotNull(String message, Object object) {
         assertTrue(message, object != null);
     }
 
@@ -718,7 +719,7 @@
      *
      * @param object Object to check or <code>null</code>
      */
-    static public void assertNotNull(Object object) {
+    public static void assertNotNull(Object object) {
         assertNotNull(null, object);
     }
 
@@ -730,7 +731,7 @@
      * okay)
      * @param object Object to check or <code>null</code>
      */
-    static public void assertNull(String message, Object object) {
+    public static void assertNull(String message, Object object) {
         if (object == null) {
             return;
         }
@@ -743,11 +744,11 @@
      *
      * @param object Object to check or <code>null</code>
      */
-    static public void assertNull(Object object) {
+    public static void assertNull(Object object) {
         assertNull(null, object);
     }
 
-    static private void failNotNull(String message, Object actual) {
+    private static void failNotNull(String message, Object actual) {
         String formatted = "";
         if (message != null) {
             formatted = message + " ";
@@ -764,7 +765,7 @@
      * @param expected the expected object
      * @param actual the object to compare to <code>expected</code>
      */
-    static public void assertSame(String message, Object expected, Object actual) {
+    public static void assertSame(String message, Object expected, Object actual) {
         if (expected == actual) {
             return;
         }
@@ -778,7 +779,7 @@
      * @param expected the expected object
      * @param actual the object to compare to <code>expected</code>
      */
-    static public void assertSame(Object expected, Object actual) {
+    public static void assertSame(Object expected, Object actual) {
         assertSame(null, expected, actual);
     }
 
@@ -792,7 +793,7 @@
      * @param unexpected the object you don't expect
      * @param actual the object to compare to <code>unexpected</code>
      */
-    static public void assertNotSame(String message, Object unexpected,
+    public static void assertNotSame(String message, Object unexpected,
             Object actual) {
         if (unexpected == actual) {
             failSame(message);
@@ -807,11 +808,11 @@
      * @param unexpected the object you don't expect
      * @param actual the object to compare to <code>unexpected</code>
      */
-    static public void assertNotSame(Object unexpected, Object actual) {
+    public static void assertNotSame(Object unexpected, Object actual) {
         assertNotSame(null, unexpected, actual);
     }
 
-    static private void failSame(String message) {
+    private static void failSame(String message) {
         String formatted = "";
         if (message != null) {
             formatted = message + " ";
@@ -819,7 +820,7 @@
         fail(formatted + "expected not same");
     }
 
-    static private void failNotSame(String message, Object expected,
+    private static void failNotSame(String message, Object expected,
             Object actual) {
         String formatted = "";
         if (message != null) {
@@ -829,19 +830,19 @@
                 + ">");
     }
 
-    static private void failNotEquals(String message, Object expected,
+    private static void failNotEquals(String message, Object expected,
             Object actual) {
         fail(format(message, expected, actual));
     }
 
     static String format(String message, Object expected, Object actual) {
         String formatted = "";
-        if (message != null && !message.equals("")) {
+        if (message != null && !"".equals(message)) {
             formatted = message + " ";
         }
         String expectedString = String.valueOf(expected);
         String actualString = String.valueOf(actual);
-        if (expectedString.equals(actualString)) {
+        if (equalsRegardingNull(expectedString, actualString)) {
             return formatted + "expected: "
                     + formatClassAndValue(expected, expectedString)
                     + " but was: " + formatClassAndValue(actual, actualString);
@@ -851,6 +852,11 @@
         }
     }
 
+    private static String formatClass(Class<?> value) {
+        String className = value.getCanonicalName();
+        return className == null ? value.getName() : className;
+    }
+
     private static String formatClassAndValue(Object value, String valueString) {
         String className = value == null ? "null" : value.getClass().getName();
         return className + "<" + valueString + ">";
@@ -917,8 +923,9 @@
      * @param matcher an expression, built of {@link Matcher}s, specifying allowed
      * values
      * @see org.hamcrest.CoreMatchers
-     * @see org.hamcrest.MatcherAssert
+     * @deprecated use {@code org.hamcrest.MatcherAssert.assertThat()}
      */
+    @Deprecated
     public static <T> void assertThat(T actual, Matcher<? super T> matcher) {
         assertThat("", actual, matcher);
     }
@@ -949,10 +956,79 @@
      * @param matcher an expression, built of {@link Matcher}s, specifying allowed
      * values
      * @see org.hamcrest.CoreMatchers
-     * @see org.hamcrest.MatcherAssert
+     * @deprecated use {@code org.hamcrest.MatcherAssert.assertThat()}
      */
+    @Deprecated
     public static <T> void assertThat(String reason, T actual,
             Matcher<? super T> matcher) {
         MatcherAssert.assertThat(reason, actual, matcher);
     }
+
+    /**
+     * Asserts that {@code runnable} throws an exception of type {@code expectedThrowable} when
+     * executed. If it does, the exception object is returned. If it does not throw an exception, an
+     * {@link AssertionError} is thrown. If it throws the wrong type of exception, an {@code
+     * AssertionError} is thrown describing the mismatch; the exception that was actually thrown can
+     * be obtained by calling {@link AssertionError#getCause}.
+     *
+     * @param expectedThrowable the expected type of the exception
+     * @param runnable       a function that is expected to throw an exception when executed
+     * @return the exception thrown by {@code runnable}
+     * @since 4.13
+     */
+    public static <T extends Throwable> T assertThrows(Class<T> expectedThrowable,
+            ThrowingRunnable runnable) {
+        return assertThrows(null, expectedThrowable, runnable);
+    }
+
+    /**
+     * Asserts that {@code runnable} throws an exception of type {@code expectedThrowable} when
+     * executed. If it does, the exception object is returned. If it does not throw an exception, an
+     * {@link AssertionError} is thrown. If it throws the wrong type of exception, an {@code
+     * AssertionError} is thrown describing the mismatch; the exception that was actually thrown can
+     * be obtained by calling {@link AssertionError#getCause}.
+     *
+     * @param message the identifying message for the {@link AssertionError} (<code>null</code>
+     * okay)
+     * @param expectedThrowable the expected type of the exception
+     * @param runnable a function that is expected to throw an exception when executed
+     * @return the exception thrown by {@code runnable}
+     * @since 4.13
+     */
+    public static <T extends Throwable> T assertThrows(String message, Class<T> expectedThrowable,
+            ThrowingRunnable runnable) {
+        try {
+            runnable.run();
+        } catch (Throwable actualThrown) {
+            if (expectedThrowable.isInstance(actualThrown)) {
+                @SuppressWarnings("unchecked") T retVal = (T) actualThrown;
+                return retVal;
+            } else {
+                String expected = formatClass(expectedThrowable);
+                Class<? extends Throwable> actualThrowable = actualThrown.getClass();
+                String actual = formatClass(actualThrowable);
+                if (expected.equals(actual)) {
+                    // There must be multiple class loaders. Add the identity hash code so the message
+                    // doesn't say "expected: java.lang.String<my.package.MyException> ..."
+                    expected += "@" + Integer.toHexString(System.identityHashCode(expectedThrowable));
+                    actual += "@" + Integer.toHexString(System.identityHashCode(actualThrowable));
+                }
+                String mismatchMessage = buildPrefix(message)
+                        + format("unexpected exception type thrown;", expected, actual);
+
+                // The AssertionError(String, Throwable) ctor is only available on JDK7.
+                AssertionError assertionError = new AssertionError(mismatchMessage);
+                assertionError.initCause(actualThrown);
+                throw assertionError;
+            }
+        }
+        String notThrownMessage = buildPrefix(message) + String
+                .format("expected %s to be thrown, but nothing was thrown",
+                        formatClass(expectedThrowable));
+        throw new AssertionError(notThrownMessage);
+    }
+
+    private static String buildPrefix(String message) {
+        return message != null && message.length() != 0 ? message + ": " : "";
+    }
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/Assume.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/Assume.java Changed

@@ -14,7 +14,7 @@
  * basically means "don't run this test if these conditions don't apply". The default JUnit runner skips tests with
  * failing assumptions. Custom runners may behave differently.
  * <p>
- *     A good example of using assumptions is in <a href="https://github.com/junit-team/junit/wiki/Theories">Theories</a> where they are needed to exclude certain datapoints that aren't suitable or allowed for a certain test case.
+ *     A good example of using assumptions is in <a href="https://github.com/junit-team/junit4/wiki/Theories">Theories</a> where they are needed to exclude certain datapoints that aren't suitable or allowed for a certain test case.
  * </p>
  * Failed assumptions are usually not logged, because there may be many tests that don't apply to certain
  * configurations.
@@ -29,11 +29,20 @@
  * </pre>
  * </p>
  *
- * @see <a href="https://github.com/junit-team/junit/wiki/Theories">Theories</a>
+ * @see <a href="https://github.com/junit-team/junit4/wiki/Theories">Theories</a>
  *
  * @since 4.4
  */
 public class Assume {
+
+    /**
+     * Do not instantiate.
+     * @deprecated since 4.13.
+     */
+    @Deprecated
+    public Assume() {
+    }
+
     /**
      * If called with an expression evaluating to {@code false}, the test will halt and be ignored.
      */
@@ -45,7 +54,7 @@
      * The inverse of {@link #assumeTrue(boolean)}.
      */
     public static void assumeFalse(boolean b) {
-        assumeTrue(!b);
+        assumeThat(b, is(false));
     }
 
     /**
@@ -67,9 +76,11 @@
     }
 
     /**
-     * If called with one or more null elements in <code>objects</code>, the test will halt and be ignored.
+     * If called with a {@code null} array or one or more {@code null} elements in {@code objects},
+     * the test will halt and be ignored.
      */
     public static void assumeNotNull(Object... objects) {
+        assumeThat(objects, notNullValue());
         assumeThat(asList(objects), everyItem(notNullValue()));
     }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/AssumptionViolatedException.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/AssumptionViolatedException.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/ClassRule.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/ClassRule.java Changed

@@ -28,7 +28,10 @@
  * annotated {@link ClassRule}s on a class, they will be applied in an order
  * that depends on your JVM's implementation of the reflection API, which is
  * undefined, in general. However, Rules defined by fields will always be applied
- * before Rules defined by methods.
+ * after Rules defined by methods, i.e. the Statements returned by the former will
+ * be executed around those returned by the latter.
+ *
+ * <h3>Usage</h3>
  * <p>
  * For example, here is a test suite that connects to a server once before
  * all the test classes run, and disconnects after they are finished:
@@ -79,9 +82,37 @@
  * <p>
  * For more information and more examples, see {@link org.junit.rules.TestRule}.
  *
+ * <h3>Ordering</h3>
+ * <p>
+ * You can use {@link #order()} if you want to have control over the order in
+ * which the Rules are applied.
+ *
+ * <pre>
+ * public class ThreeClassRules {
+ *     &#064;ClassRule(order = 0)
+ *     public static LoggingRule outer = new LoggingRule("outer rule");
+ *
+ *     &#064;ClassRule(order = 1)
+ *     public static LoggingRule middle = new LoggingRule("middle rule");
+ *
+ *     &#064;ClassRule(order = 2)
+ *     public static LoggingRule inner = new LoggingRule("inner rule");
+ *
+ *     // ...
+ * }
+ * </pre>
+ *
  * @since 4.9
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.METHOD})
 public @interface ClassRule {
+
+    /**
+     * Specifies the order in which rules are applied. The rules with a higher value are inner.
+     *
+     * @since 4.13
+     */
+    int order() default Rule.DEFAULT_ORDER;
+
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/ComparisonFailure.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/ComparisonFailure.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/Rule.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/Rule.java Changed

@@ -16,12 +16,14 @@
  * to the {@link org.junit.rules.TestRule} will run any {@link Before} methods,
  * then the {@link Test} method, and finally any {@link After} methods,
  * throwing an exception if any of these fail.  If there are multiple
- * annotated {@link Rule}s on a class, they will be applied in order of fields first, then methods.
+ * annotated {@link Rule}s on a class, they will be applied in order of methods first, then fields.
  * However, if there are multiple fields (or methods) they will be applied in an order
  * that depends on your JVM's implementation of the reflection API, which is
  * undefined, in general. Rules defined by fields will always be applied
- * before Rules defined by methods. You can use a {@link org.junit.rules.RuleChain} if you want
- * to have control over the order in which the Rules are applied.
+ * after Rules defined by methods, i.e. the Statements returned by the former will
+ * be executed around those returned by the latter.
+ *
+ * <h3>Usage</h3>
  * <p>
  * For example, here is a test class that creates a temporary folder before
  * each test method, and deletes it after each:
@@ -61,10 +63,39 @@
  * For more information and more examples, see
  * {@link org.junit.rules.TestRule}.
  *
+ * <h3>Ordering</h3>
+ * <p>
+ * You can use {@link #order()} if you want to have control over the order in
+ * which the Rules are applied.
+ *
+ * <pre>
+ * public class ThreeRules {
+ *     &#064;Rule(order = 0)
+ *     public LoggingRule outer = new LoggingRule("outer rule");
+ *
+ *     &#064;Rule(order = 1)
+ *     public LoggingRule middle = new LoggingRule("middle rule");
+ *
+ *     &#064;Rule(order = 2)
+ *     public LoggingRule inner = new LoggingRule("inner rule");
+ *
+ *     // ...
+ * }
+ * </pre>
+ *
  * @since 4.7
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.METHOD})
 public @interface Rule {
 
-}
\ No newline at end of file
+    int DEFAULT_ORDER = -1;
+
+    /**
+     * Specifies the order in which rules are applied. The rules with a higher value are inner.
+     *
+     * @since 4.13
+     */
+    int order() default DEFAULT_ORDER;
+
+}

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/Test.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/Test.java Changed

@@ -1,5 +1,7 @@
 package org.junit;
 
+import org.junit.function.ThrowingRunnable;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -23,24 +25,40 @@
  * }
  * </pre>
  * <p>
- * The <code>Test</code> annotation supports two optional parameters.
- * The first, <code>expected</code>, declares that a test method should throw
+ * The <code>Test</code> annotation supports two optional parameters for
+ * exception testing and for limiting test execution time.
+ *
+ * <h3>Exception Testing</h3>
+ * <p>
+ * The parameter <code>expected</code> declares that a test method should throw
  * an exception. If it doesn't throw an exception or if it throws a different exception
  * than the one declared, the test fails. For example, the following test succeeds:
  * <pre>
- *    &#064;Test(<b>expected=IndexOutOfBoundsException.class</b>) public void outOfBounds() {
+ *    &#064;Test(<b>expected=IndexOutOfBoundsException.class</b>)
+ *    public void outOfBounds() {
  *       new ArrayList&lt;Object&gt;().get(1);
  *    }
  * </pre>
- * If the exception's message or one of its properties should be verified, the
- * {@link org.junit.rules.ExpectedException ExpectedException} rule can be used. Further
+ *
+ * Using the parameter <code>expected</code> for exception testing comes with
+ * some limitations: only the exception's type can be checked and it is not
+ * possible to precisely specify the code that throws the exception. Therefore
+ * JUnit 4 has improved its support for exception testing with
+ * {@link Assert#assertThrows(Class, ThrowingRunnable)} and the
+ * {@link org.junit.rules.ExpectedException ExpectedException} rule.
+ * With <code>assertThrows</code> the code that throws the exception can be
+ * precisely specified. If the exception's message or one of its properties
+ * should be verified, the <code>ExpectedException</code> rule can be used. Further
  * information about exception testing can be found at the
- * <a href="https://github.com/junit-team/junit/wiki/Exception-testing">JUnit Wiki</a>.
+ * <a href="https://github.com/junit-team/junit4/wiki/Exception-testing">JUnit Wiki</a>.
+ *
+ * <h3>Timeout</h3>
  * <p>
- * The second optional parameter, <code>timeout</code>, causes a test to fail if it takes
+ * The parameter <code>timeout</code> causes a test to fail if it takes
  * longer than a specified amount of clock time (measured in milliseconds). The following test fails:
  * <pre>
- *    &#064;Test(<b>timeout=100</b>) public void infinity() {
+ *    &#064;Test(<b>timeout=100</b>)
+ *    public void infinity() {
  *       while(true);
  *    }
  * </pre>
@@ -49,7 +67,8 @@
  * following test may or may not fail depending on how the operating system
  * schedules threads:
  * <pre>
- *    &#064;Test(<b>timeout=100</b>) public void sleep100() {
+ *    &#064;Test(<b>timeout=100</b>)
+ *    public void sleep100() {
  *       Thread.sleep(100);
  *    }
  * </pre>
@@ -66,7 +85,7 @@
 public @interface Test {
 
     /**
-     * Default empty exception
+     * Default empty exception.
      */
     static class None extends Throwable {
         private static final long serialVersionUID = 1L;

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/TestCouldNotBeSkippedException.java Added

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/experimental/categories/Categories.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/experimental/categories/Categories.java Changed

@@ -2,8 +2,10 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.junit.runner.Description;
@@ -76,7 +78,7 @@
  * </pre>
  *
  * @version 4.12
- * @see <a href="https://github.com/junit-team/junit/wiki/Categories">Categories at JUnit wiki</a>
+ * @see <a href="https://github.com/junit-team/junit4/wiki/Categories">Categories at JUnit wiki</a>
  */
 public class Categories extends Suite {
 
@@ -86,13 +88,13 @@
          * Determines the tests to run that are annotated with categories specified in
          * the value of this annotation or their subtypes unless excluded with {@link ExcludeCategory}.
          */
-        public Class<?> value() default {};
+        Class<?> value() default {};
 
         /**
          * If <tt>true</tt>, runs tests annotated with <em>any</em> of the categories in
          * {@link IncludeCategory#value()}. Otherwise, runs tests only if annotated with <em>all</em> of the categories.
          */
-        public boolean matchAny() default true;
+        boolean matchAny() default true;
     }
 
     @Retention(RetentionPolicy.RUNTIME)
@@ -101,13 +103,13 @@
          * Determines the tests which do not run if they are annotated with categories specified in the
          * value of this annotation or their subtypes regardless of being included in {@link IncludeCategory#value()}.
          */
-        public Class<?> value() default {};
+        Class<?> value() default {};
 
         /**
          * If <tt>true</tt>, the tests annotated with <em>any</em> of the categories in {@link ExcludeCategory#value()}
          * do not run. Otherwise, the tests do not run if and only if annotated with <em>all</em> categories.
          */
-        public boolean matchAny() default true;
+        boolean matchAny() default true;
     }
 
     public static class CategoryFilter extends Filter {
@@ -117,10 +119,7 @@
         private final boolean excludedAny;
 
         public static CategoryFilter include(boolean matchAny, Class<?>... categories) {
-            if (hasNull(categories)) {
-                throw new NullPointerException("has null category");
-            }
-            return categoryFilter(matchAny, createSet(categories), true, null);
+            return new CategoryFilter(matchAny, categories, true, null);
         }
 
         public static CategoryFilter include(Class<?> category) {
@@ -132,10 +131,7 @@
         }
 
         public static CategoryFilter exclude(boolean matchAny, Class<?>... categories) {
-            if (hasNull(categories)) {
-                throw new NullPointerException("has null category");
-            }
-            return categoryFilter(true, null, matchAny, createSet(categories));
+            return new CategoryFilter(true, null, matchAny, categories);
         }
 
         public static CategoryFilter exclude(Class<?> category) {
@@ -151,14 +147,30 @@
             return new CategoryFilter(matchAnyInclusions, inclusions, matchAnyExclusions, exclusions);
         }
 
+        @Deprecated
+        public CategoryFilter(Class<?> includedCategory, Class<?> excludedCategory) {
+            includedAny = true;
+            excludedAny = true;
+            included = nullableClassToSet(includedCategory);
+            excluded = nullableClassToSet(excludedCategory);
+        }
+
         protected CategoryFilter(boolean matchAnyIncludes, Set<Class<?>> includes,
-                               boolean matchAnyExcludes, Set<Class<?>> excludes) {
+                                 boolean matchAnyExcludes, Set<Class<?>> excludes) {
             includedAny = matchAnyIncludes;
             excludedAny = matchAnyExcludes;
             included = copyAndRefine(includes);
             excluded = copyAndRefine(excludes);
         }
 
+        private CategoryFilter(boolean matchAnyIncludes, Class<?> inclusions,
+                               boolean matchAnyExcludes, Class<?> exclusions) {
+            includedAny = matchAnyIncludes; 
+            excludedAny = matchAnyExcludes;
+            included = createSet(inclusions);
+            excluded = createSet(exclusions);
+        }
+
         /**
          * @see #toString()
          */
@@ -284,23 +296,13 @@
         }
 
         private static Set<Class<?>> copyAndRefine(Set<Class<?>> classes) {
-            HashSet<Class<?>> c= new HashSet<Class<?>>();
+            Set<Class<?>> c= new LinkedHashSet<Class<?>>();
             if (classes != null) {
                 c.addAll(classes);
             }
             c.remove(null);
             return c;
         }
-
-        private static boolean hasNull(Class<?>... classes) {
-            if (classes == null) return false;
-            for (Class<?> clazz : classes) {
-                if (clazz == null) {
-                    return true;
-                }
-            }
-            return false;
-        }
     }
 
     public Categories(Class<?> klass, RunnerBuilder builder) throws InitializationError {
@@ -315,7 +317,6 @@
         } catch (NoTestsRemainException e) {
             throw new InitializationError(e);
         }
-        assertNoCategorizedDescendentsOfUncategorizeableParents(getDescription());
     }
 
     private static Set<Class<?>> getIncludedCategory(Class<?> klass) {
@@ -338,34 +339,6 @@
         return annotation == null || annotation.matchAny();
     }
 
-    private static void assertNoCategorizedDescendentsOfUncategorizeableParents(Description description) throws InitializationError {
-        if (!canHaveCategorizedChildren(description)) {
-            assertNoDescendantsHaveCategoryAnnotations(description);
-        }
-        for (Description each : description.getChildren()) {
-            assertNoCategorizedDescendentsOfUncategorizeableParents(each);
-        }
-    }
-
-    private static void assertNoDescendantsHaveCategoryAnnotations(Description description) throws InitializationError {
-        for (Description each : description.getChildren()) {
-            if (each.getAnnotation(Category.class) != null) {
-                throw new InitializationError("Category annotations on Parameterized classes are not supported on individual methods.");
-            }
-            assertNoDescendantsHaveCategoryAnnotations(each);
-        }
-    }
-
-    // If children have names like 0, our current magical category code can't determine their parentage.
-    private static boolean canHaveCategorizedChildren(Description description) {
-        for (Description each : description.getChildren()) {
-            if (each.getTestClass() == null) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     private static boolean hasAssignableTo(Set<Class<?>> assigns, Class<?> to) {
         for (final Class<?> from : assigns) {
             if (to.isAssignableFrom(from)) {
@@ -375,11 +348,28 @@
         return false;
     }
 
-    private static Set<Class<?>> createSet(Class<?>... t) {
-        final Set<Class<?>> set= new HashSet<Class<?>>();
-        if (t != null) {
-            Collections.addAll(set, t);
+    private static Set<Class<?>> createSet(Class<?> classes) {
+        // Not throwing a NPE if t is null is a bad idea, but it's the behavior from JUnit 4.12
+        // for include(boolean, Class<?>...) and exclude(boolean, Class<?>...)
+        if (classes == null || classes.length == 0) {
+            return Collections.emptySet();
+        }
+        for (Class<?> category : classes) {
+            if (category == null) {
+                throw new NullPointerException("has null category");
+            }
         }
-        return set;
+
+        return classes.length == 1
+            ? Collections.<Class<?>>singleton(classes0)
+            : new LinkedHashSet<Class<?>>(Arrays.asList(classes));
+    }
+
+    private static Set<Class<?>> nullableClassToSet(Class<?> nullableClass) {
+        // Not throwing a NPE if t is null is a bad idea, but it's the behavior from JUnit 4.11
+        // for CategoryFilter(Class<?> includedCategory, Class<?> excludedCategory)
+        return nullableClass == null
+                ? Collections.<Class<?>>emptySet()
+                : Collections.<Class<?>>singleton(nullableClass);
     }
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/experimental/categories/CategoryFilterFactory.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/experimental/categories/CategoryFilterFactory.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/experimental/max/MaxHistory.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/experimental/max/MaxHistory.java Changed

@@ -64,7 +64,7 @@
     /*
      * We have to use the f prefix until the next major release to ensure
      * serialization compatibility. 
-     * See https://github.com/junit-team/junit/issues/976
+     * See https://github.com/junit-team/junit4/issues/976
      */
     private final Map<String, Long> fDurations = new HashMap<String, Long>();
     private final Map<String, Long> fFailureTimestamps = new HashMap<String, Long>();
@@ -75,10 +75,15 @@
     }
 
     private void save() throws IOException {
-        ObjectOutputStream stream = new ObjectOutputStream(new FileOutputStream(
-                fHistoryStore));
-        stream.writeObject(this);
-        stream.close();
+        ObjectOutputStream stream = null;
+        try {
+            stream = new ObjectOutputStream(new FileOutputStream(fHistoryStore));
+            stream.writeObject(this);
+        } finally {
+            if (stream != null) {
+                stream.close();
+            }
+        }
     }
 
     Long getFailureTimestamp(Description key) {

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/experimental/results/PrintableResult.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/experimental/results/PrintableResult.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/experimental/results/ResultMatchers.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/experimental/results/ResultMatchers.java Changed

@@ -14,6 +14,15 @@
  * </pre>
  */
 public class ResultMatchers {
+
+    /**
+     * Do not instantiate.
+     * @deprecated will be private soon.
+     */
+    @Deprecated
+    public ResultMatchers() {
+    }
+
     /**
      * Matches if the tests are all successful
      */
@@ -53,13 +62,33 @@
     }
 
     /**
+     * Matches if the result has exactly one failure matching the given matcher.
+     *
+     * @since 4.13
+     */
+    public static Matcher<PrintableResult> hasSingleFailureMatching(final Matcher<Throwable> matcher) {
+        return new TypeSafeMatcher<PrintableResult>() {
+            @Override
+            public boolean matchesSafely(PrintableResult item) {
+                return item.failureCount() == 1 && matcher.matches(item.failures().get(0).getException());
+            }
+
+            public void describeTo(Description description) {
+                description.appendText("has failure with exception matching ");
+                matcher.describeTo(description);
+            }
+        };
+    }
+
+    /**
      * Matches if the result has one or more failures, and at least one of them
      * contains {@code string}
      */
     public static Matcher<PrintableResult> hasFailureContaining(final String string) {
-        return new BaseMatcher<PrintableResult>() {
-            public boolean matches(Object item) {
-                return item.toString().contains(string);
+        return new TypeSafeMatcher<PrintableResult>() {
+            @Override
+            public boolean matchesSafely(PrintableResult item) {
+                return item.failureCount() > 0 && item.toString().contains(string);
             }
 
             public void describeTo(Description description) {

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/experimental/theories/ParametersSuppliedBy.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/experimental/theories/ParametersSuppliedBy.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/experimental/theories/Theories.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/experimental/theories/Theories.java Changed

@@ -51,11 +51,11 @@
  *      }
  * }
  * </pre>
- * This makes it clear that the user's filename should be included in the config file name,
+ * This makes it clear that the username should be included in the config file name,
  * only if it doesn't contain a slash. Another test or theory might define what happens when a username does contain
  * a slash. <code>UserTest</code> will attempt to run <code>filenameIncludesUsername</code> on every compatible data
  * point defined in the class. If any of the assumptions fail, the data point is silently ignored. If all of the
- * assumptions pass, but an assertion fails, the test fails.
+ * assumptions pass, but an assertion fails, the test fails. If no parameters can be found that satisfy all assumptions, the test fails.
  * <p>
  * Defining general statements as theories allows data point reuse across a bunch of functionality tests and also
  * allows automated tools to search for new, unexpected data points that expose bugs.
@@ -73,6 +73,11 @@
         super(klass);
     }
 
+    /** @since 4.13 */
+    protected Theories(TestClass testClass) throws InitializationError {
+        super(testClass);
+    }
+
     @Override
     protected void collectInitializationErrors(List<Throwable> errors) {
         super.collectInitializationErrors(errors);
@@ -215,7 +220,7 @@
 
         protected void runWithCompleteAssignment(final Assignments complete)
                 throws Throwable {
-            new BlockJUnit4ClassRunner(getTestClass().getJavaClass()) {
+            new BlockJUnit4ClassRunner(getTestClass()) {
                 @Override
                 protected void collectInitializationErrors(
                         List<Throwable> errors) {

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/experimental/theories/internal/Assignments.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/experimental/theories/internal/Assignments.java Changed

@@ -47,7 +47,7 @@
     }
 
     public boolean isComplete() {
-        return unassigned.size() == 0;
+        return unassigned.isEmpty();
     }
 
     public ParameterSignature nextUnassigned() {
@@ -55,11 +55,10 @@
     }
 
     public Assignments assignNext(PotentialAssignment source) {
-        List<PotentialAssignment> assigned = new ArrayList<PotentialAssignment>(
-                this.assigned);
-        assigned.add(source);
+        List<PotentialAssignment> potentialAssignments = new ArrayList<PotentialAssignment>(assigned);
+        potentialAssignments.add(source);
 
-        return new Assignments(assigned, unassigned.subList(1,
+        return new Assignments(potentialAssignments, unassigned.subList(1,
                 unassigned.size()), clazz);
     }
 
@@ -77,7 +76,7 @@
         ParameterSignature unassigned = nextUnassigned();
         List<PotentialAssignment> assignments = getSupplier(unassigned).getValueSources(unassigned);
         
-        if (assignments.size() == 0) {
+        if (assignments.isEmpty()) {
             assignments = generateAssignmentsFromTypeAlone(unassigned);
         }

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/function Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/function/ThrowingRunnable.java Added

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/ArrayComparisonFailure.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/ArrayComparisonFailure.java Changed

@@ -16,11 +16,12 @@
 
     /*
      * We have to use the f prefix until the next major release to ensure
-     * serialization compatibility. 
-     * See https://github.com/junit-team/junit/issues/976
+     * serialization compatibility.
+     * See https://github.com/junit-team/junit4/issues/976
      */
     private final List<Integer> fIndices = new ArrayList<Integer>();
     private final String fMessage;
+    private final AssertionError fCause;
 
     /**
      * Construct a new <code>ArrayComparisonFailure</code> with an error text and the array's
@@ -32,7 +33,8 @@
      */
     public ArrayComparisonFailure(String message, AssertionError cause, int index) {
         this.fMessage = message;
-        initCause(cause);
+        this.fCause = cause;
+        initCause(fCause);
         addDimension(index);
     }
 
@@ -41,6 +43,11 @@
     }
 
     @Override
+    public synchronized Throwable getCause() {
+        return super.getCause() == null ? fCause : super.getCause();
+    }
+
+    @Override
     public String getMessage() {
         StringBuilder sb = new StringBuilder();
         if (fMessage != null) {

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/AssumptionViolatedException.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/AssumptionViolatedException.java Changed

@@ -1,5 +1,8 @@
 package org.junit.internal;
 
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.SelfDescribing;
@@ -18,7 +21,7 @@
     /*
      * We have to use the f prefix until the next major release to ensure
      * serialization compatibility. 
-     * See https://github.com/junit-team/junit/issues/976
+     * See https://github.com/junit-team/junit4/issues/976
      */
     private final String fAssumption;
     private final boolean fValueMatcher;
@@ -108,4 +111,29 @@
             }
         }
     }
+
+    /**
+     * Override default Java object serialization to correctly deal with potentially unserializable matchers or values.
+     * By not implementing readObject, we assure ourselves of backwards compatibility and compatibility with the
+     * standard way of Java serialization.
+     *
+     * @param objectOutputStream The outputStream to write our representation to
+     * @throws IOException When serialization fails
+     */
+    private void writeObject(ObjectOutputStream objectOutputStream) throws IOException {
+        ObjectOutputStream.PutField putField = objectOutputStream.putFields();
+        putField.put("fAssumption", fAssumption);
+        putField.put("fValueMatcher", fValueMatcher);
+
+        // We have to wrap the matcher into a serializable form.
+        putField.put("fMatcher", SerializableMatcherDescription.asSerializableMatcher(fMatcher));
+
+        // We have to wrap the value inside a non-String class (instead of serializing the String value directly) as
+        // A Description will handle a String and non-String object differently (1st is surrounded by '"' while the
+        // latter will be surrounded by '<' '>'. Wrapping it makes sure that the description of a serialized and
+        // non-serialized instance produce the exact same description
+        putField.put("fValue", SerializableValueDescription.asSerializableValue(fValue));
+
+        objectOutputStream.writeFields();
+    }
 }

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/Checks.java Added

@@ -0,0 +1,37 @@
+package org.junit.internal;
+
+/** @since 4.13 */
+public final class Checks {
+
+    private Checks() {}
+
+    /**
+     * Checks that the given value is not {@code null}.
+     *
+     * @param value object reference to check
+     * @return the passed-in value, if not {@code null}
+     * @throws NullPointerException if {@code value} is {@code null}
+     */
+    public static <T> T notNull(T value) {
+        if (value == null) {
+            throw new NullPointerException();
+        }
+        return value;
+    }
+
+    /**
+     * Checks that the given value is not {@code null}, using the given message
+     * as the exception message if an exception is thrown.
+     *
+     * @param value object reference to check
+     * @param message message to use if {@code value} is {@code null}
+     * @return the passed-in value, if not {@code null}
+     * @throws NullPointerException if {@code value} is {@code null}
+     */
+    public static <T> T notNull(T value, String message) {
+        if (value == null) {
+            throw new NullPointerException(message);
+        }
+        return value;
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/Classes.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/Classes.java Changed

@@ -6,13 +6,39 @@
  * Miscellaneous functions dealing with classes.
  */
 public class Classes {
+
+    /**
+     * Do not instantiate.
+     * @deprecated will be private soon.
+     */
+    @Deprecated
+    public Classes() {
+    }
+
     /**
      * Returns Class.forName for {@code className} using the current thread's class loader.
+     * If the current thread does not have a class loader, falls back to the class loader for
+     * {@link Classes}.
      *
      * @param className Name of the class.
      * @throws ClassNotFoundException
      */
     public static Class<?> getClass(String className) throws ClassNotFoundException {
-        return Class.forName(className, true, currentThread().getContextClassLoader());
+        return getClass(className, Classes.class);
+    }
+
+    /**
+     * Returns Class.forName for {@code className} using the current thread's class loader.
+     * If the current thread does not have a class loader, falls back to the class loader for the
+     * passed-in class.
+     *
+     * @param className Name of the class.
+     * @param callingClass Class that is requesting a the class
+     * @throws ClassNotFoundException
+     * @since 4.13
+     */
+    public static Class<?> getClass(String className, Class<?> callingClass) throws ClassNotFoundException {
+        ClassLoader classLoader = currentThread().getContextClassLoader();
+        return Class.forName(className, true, classLoader == null ? callingClass.getClassLoader() : classLoader);
     }
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/ComparisonCriteria.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/ComparisonCriteria.java Changed

@@ -25,6 +25,11 @@
      */
     public void arrayEquals(String message, Object expecteds, Object actuals)
             throws ArrayComparisonFailure {
+        arrayEquals(message, expecteds, actuals, true);
+    }
+
+    private void arrayEquals(String message, Object expecteds, Object actuals, boolean outer)
+            throws ArrayComparisonFailure {
         if (expecteds == actuals
             || Arrays.deepEquals(new Object {expecteds}, new Object {actuals})) {
             // The reflection-based loop below is potentially very slow, especially for primitive
@@ -34,19 +39,37 @@
         }
         String header = message == null ? "" : message + ": ";
 
-        int expectedsLength = assertArraysAreSameLength(expecteds,
-                actuals, header);
+        // Only include the user-provided message in the outer exception.
+        String exceptionMessage = outer ? header : "";
+
+        if (expecteds == null) {
+            Assert.fail(exceptionMessage + "expected array was null");
+        }
+        if (actuals == null) {
+            Assert.fail(exceptionMessage + "actual array was null");
+        }
+
+        int actualsLength = Array.getLength(actuals);
+        int expectedsLength = Array.getLength(expecteds);
+        if (actualsLength != expectedsLength) {
+            header += "array lengths differed, expected.length="
+                    + expectedsLength + " actual.length=" + actualsLength + "; ";
+        }
+        int prefixLength = Math.min(actualsLength, expectedsLength);
 
-        for (int i = 0; i < expectedsLength; i++) {
+        for (int i = 0; i < prefixLength; i++) {
             Object expected = Array.get(expecteds, i);
             Object actual = Array.get(actuals, i);
 
             if (isArray(expected) && isArray(actual)) {
                 try {
-                    arrayEquals(message, expected, actual);
+                    arrayEquals(message, expected, actual, false);
                 } catch (ArrayComparisonFailure e) {
                     e.addDimension(i);
                     throw e;
+                } catch (AssertionError e) {
+                    // Array lengths differed.
+                    throw new ArrayComparisonFailure(header, e, i);
                 }
             } else {
                 try {
@@ -56,27 +79,53 @@
                 }
             }
         }
-    }
 
-    private boolean isArray(Object expected) {
-        return expected != null && expected.getClass().isArray();
+        if (actualsLength != expectedsLength) {
+            Object expected = getToStringableArrayElement(expecteds, expectedsLength, prefixLength);
+            Object actual = getToStringableArrayElement(actuals, actualsLength, prefixLength);
+            try {
+                Assert.assertEquals(expected, actual);
+            } catch (AssertionError e) {
+                throw new ArrayComparisonFailure(header, e, prefixLength);
+            }
+        }
     }
 
-    private int assertArraysAreSameLength(Object expecteds,
-            Object actuals, String header) {
-        if (expecteds == null) {
-            Assert.fail(header + "expected array was null");
-        }
-        if (actuals == null) {
-            Assert.fail(header + "actual array was null");
+    private static final Object END_OF_ARRAY_SENTINEL = objectWithToString("end of array");
+
+    private Object getToStringableArrayElement(Object array, int length, int index) {
+        if (index < length) {
+            Object element = Array.get(array, index);
+            if (isArray(element)) {
+                return objectWithToString(componentTypeName(element.getClass()) + "" + Array.getLength(element) + "");
+            } else {
+                return element;
+            }
+        } else {
+            return END_OF_ARRAY_SENTINEL;
         }
-        int actualsLength = Array.getLength(actuals);
-        int expectedsLength = Array.getLength(expecteds);
-        if (actualsLength != expectedsLength) {
-            Assert.fail(header + "array lengths differed, expected.length="
-                    + expectedsLength + " actual.length=" + actualsLength);
+    }
+
+    private static Object objectWithToString(final String string) {
+        return new Object() {
+            @Override
+            public String toString() {
+                return string;
+            }
+        };
+    }
+
+    private String componentTypeName(Class<?> arrayClass) {
+        Class<?> componentType = arrayClass.getComponentType();
+        if (componentType.isArray()) {
+            return componentTypeName(componentType) + "";
+        } else {
+            return componentType.getName();
         }
-        return expectedsLength;
+    }
+
+    private boolean isArray(Object expected) {
+        return expected != null && expected.getClass().isArray();
     }
 
     protected abstract void assertElementsEqual(Object expected, Object actual);

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/SerializableMatcherDescription.java Added

@@ -0,0 +1,47 @@
+package org.junit.internal;
+
+import java.io.Serializable;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
+
+/**
+ * This class exists solely to provide a serializable description of a matcher to be serialized as a field in
+ * {@link AssumptionViolatedException}. Being a {@link Throwable}, it is required to be {@link Serializable}, but most
+ * implementations of {@link Matcher} are not. This class works around that limitation as
+ * {@link AssumptionViolatedException} only every uses the description of the {@link Matcher}, while still retaining
+ * backwards compatibility with classes compiled against its class signature before 4.14 and/or deserialization of
+ * previously serialized instances.
+ */
+class SerializableMatcherDescription<T> extends BaseMatcher<T> implements Serializable {
+
+    private final String matcherDescription;
+
+    private SerializableMatcherDescription(Matcher<T> matcher) {
+        matcherDescription = StringDescription.asString(matcher);
+    }
+
+    public boolean matches(Object o) {
+        throw new UnsupportedOperationException("This Matcher implementation only captures the description");
+    }
+
+    public void describeTo(Description description) {
+        description.appendText(matcherDescription);
+    }
+
+    /**
+     * Factory method that checks to see if the matcher is already serializable.
+     * @param matcher the matcher to make serializable
+     * @return The provided matcher if it is null or already serializable,
+     * the SerializableMatcherDescription representation of it if it is not.
+     */
+    static <T> Matcher<T> asSerializableMatcher(Matcher<T> matcher) {
+        if (matcher == null || matcher instanceof Serializable) {
+            return matcher;
+        } else {
+            return new SerializableMatcherDescription<T>(matcher);
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/SerializableValueDescription.java Added

@@ -0,0 +1,38 @@
+package org.junit.internal;
+
+import java.io.Serializable;
+
+/**
+ * This class exists solely to provide a serializable description of a value to be serialized as a field in
+ * {@link AssumptionViolatedException}. Being a {@link Throwable}, it is required to be {@link Serializable}, but a
+ * value of type Object provides no guarantee to be serializable. This class works around that limitation as
+ * {@link AssumptionViolatedException} only every uses the string representation of the value, while still retaining
+ * backwards compatibility with classes compiled against its class signature before 4.14 and/or deserialization of
+ * previously serialized instances.
+ */
+class SerializableValueDescription implements Serializable {
+    private final String value;
+
+    private SerializableValueDescription(Object value) {
+        this.value = String.valueOf(value);
+    }
+
+    /**
+     * Factory method that checks to see if the value is already serializable.
+     * @param value the value to make serializable
+     * @return The provided value if it is null or already serializable,
+     * the SerializableValueDescription representation of it if it is not.
+     */
+    static Object asSerializableValue(Object value) {
+        if (value == null || value instanceof Serializable) {
+            return value;
+        } else {
+            return new SerializableValueDescription(value);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/TextListener.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/TextListener.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/Throwables.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/Throwables.java Changed

@@ -1,5 +1,17 @@
 package org.junit.internal;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Miscellaneous functions dealing with {@code Throwable}.
  *
@@ -39,4 +51,223 @@
     private static <T extends Throwable> void rethrow(Throwable e) throws T {
         throw (T) e;
     }
+
+    /**
+     * Returns the stacktrace of the given Throwable as a String.
+     *
+     * @since 4.13
+     */
+    public static String getStacktrace(Throwable exception) {
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter writer = new PrintWriter(stringWriter);
+        exception.printStackTrace(writer);
+        return stringWriter.toString();
+    }
+
+    /**
+     * Gets a trimmed version of the stack trace of the given exception. Stack trace
+     * elements that are below the test method are filtered out.
+     *
+     * @return a trimmed stack trace, or the original trace if trimming wasn't possible
+     */
+    public static String getTrimmedStackTrace(Throwable exception) {
+        List<String> trimmedStackTraceLines = getTrimmedStackTraceLines(exception);
+        if (trimmedStackTraceLines.isEmpty()) {
+            return getFullStackTrace(exception);
+        }
+
+        StringBuilder result = new StringBuilder(exception.toString());
+        appendStackTraceLines(trimmedStackTraceLines, result);
+        appendStackTraceLines(getCauseStackTraceLines(exception), result);
+        return result.toString();
+    }
+
+    private static List<String> getTrimmedStackTraceLines(Throwable exception) {
+        List<StackTraceElement> stackTraceElements = Arrays.asList(exception.getStackTrace());
+        int linesToInclude = stackTraceElements.size();
+
+        State state = State.PROCESSING_OTHER_CODE;
+        for (StackTraceElement stackTraceElement : asReversedList(stackTraceElements)) {
+            state = state.processStackTraceElement(stackTraceElement);
+            if (state == State.DONE) {
+                List<String> trimmedLines = new ArrayList<String>(linesToInclude + 2);
+                trimmedLines.add("");
+                for (StackTraceElement each : stackTraceElements.subList(0, linesToInclude)) {
+                    trimmedLines.add("\tat " + each);
+                }
+                if (exception.getCause() != null) {
+                    trimmedLines.add("\t... " + (stackTraceElements.size() - trimmedLines.size()) + " trimmed");
+                }
+                return trimmedLines;
+            }
+            linesToInclude--;
+        }
+        return Collections.emptyList();
+    }
+
+    private static final Method getSuppressed = initGetSuppressed();
+
+    private static Method initGetSuppressed() {
+        try {
+            return Throwable.class.getMethod("getSuppressed");
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    private static boolean hasSuppressed(Throwable exception) {
+        if (getSuppressed == null) {
+            return false;
+        }
+        try {
+            Throwable suppressed = (Throwable) getSuppressed.invoke(exception);
+            return suppressed.length != 0;
+        } catch (Throwable e) {
+            return false;
+        }
+    }
+
+    private static List<String> getCauseStackTraceLines(Throwable exception) {
+        if (exception.getCause() != null || hasSuppressed(exception)) {
+            String fullTrace = getFullStackTrace(exception);
+            BufferedReader reader = new BufferedReader(
+                    new StringReader(fullTrace.substring(exception.toString().length())));
+            List<String> causedByLines = new ArrayList<String>();
+    
+            try {
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if (line.startsWith("Caused by: ") || line.trim().startsWith("Suppressed: ")) {
+                        causedByLines.add(line);
+                        while ((line = reader.readLine()) != null) {
+                            causedByLines.add(line);
+                        }
+                        return causedByLines;
+                    }
+                }
+            } catch (IOException e) {
+                // We should never get here, because we are reading from a StringReader
+            }
+        }
+
+        return Collections.emptyList();
+    }
+
+    private static String getFullStackTrace(Throwable exception) {
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter writer = new PrintWriter(stringWriter);
+        exception.printStackTrace(writer);
+        return stringWriter.toString();
+    }
+
+    private static void appendStackTraceLines(
+            List<String> stackTraceLines, StringBuilder destBuilder) {
+        for (String stackTraceLine : stackTraceLines) {
+            destBuilder.append(String.format("%s%n", stackTraceLine));
+        }
+    }
+
+    private static <T> List<T> asReversedList(final List<T> list) {
+        return new AbstractList<T>() {
+
+            @Override
+            public T get(int index) {
+                return list.get(list.size() - index - 1);
+            }
+
+            @Override
+            public int size() {
+                return list.size();
+            }
+        };
+    }
+
+    private enum State {
+        PROCESSING_OTHER_CODE {
+            @Override public State processLine(String methodName) {
+                if (isTestFrameworkMethod(methodName)) {
+                    return PROCESSING_TEST_FRAMEWORK_CODE;
+                }
+                return this;
+            }
+        },
+        PROCESSING_TEST_FRAMEWORK_CODE {
+            @Override public State processLine(String methodName) {
+                if (isReflectionMethod(methodName)) {
+                    return PROCESSING_REFLECTION_CODE;
+                } else if (isTestFrameworkMethod(methodName)) {
+                    return this;
+                }
+                return PROCESSING_OTHER_CODE;
+            } 
+        },
+        PROCESSING_REFLECTION_CODE {
+            @Override public State processLine(String methodName) {
+                if (isReflectionMethod(methodName)) {
+                    return this;
+                } else if (isTestFrameworkMethod(methodName)) {
+                    // This is here to handle TestCase.runBare() calling TestCase.runTest().
+                    return PROCESSING_TEST_FRAMEWORK_CODE;
+                }
+                return DONE;
+            } 
+        },
+        DONE {
+            @Override public State processLine(String methodName) {
+                return this;
+            } 
+        };
+
+        /** Processes a stack trace element method name, possibly moving to a new state. */
+        protected abstract State processLine(String methodName);
+        
+        /** Processes a stack trace element, possibly moving to a new state. */
+        public final State processStackTraceElement(StackTraceElement element) {
+            return processLine(element.getClassName() + "." + element.getMethodName() + "()");
+        }
+    }
+
+    private static final String TEST_FRAMEWORK_METHOD_NAME_PREFIXES = {
+        "org.junit.runner.",
+        "org.junit.runners.",
+        "org.junit.experimental.runners.",
+        "org.junit.internal.",
+        "junit.extensions",
+        "junit.framework",
+        "junit.runner",
+        "junit.textui",
+    };
+
+    private static final String TEST_FRAMEWORK_TEST_METHOD_NAME_PREFIXES = {
+        "org.junit.internal.StackTracesTest",
+    };
+
+    private static boolean isTestFrameworkMethod(String methodName) {
+        return isMatchingMethod(methodName, TEST_FRAMEWORK_METHOD_NAME_PREFIXES) &&
+                !isMatchingMethod(methodName, TEST_FRAMEWORK_TEST_METHOD_NAME_PREFIXES);
+    }
+    
+    private static final String REFLECTION_METHOD_NAME_PREFIXES = {
+        "sun.reflect.",
+        "java.lang.reflect.",
+        "jdk.internal.reflect.",
+        "org.junit.rules.RunRules.<init>(",
+        "org.junit.rules.RunRules.applyAll(", // calls TestRules
+        "org.junit.runners.RuleContainer.apply(", // calls MethodRules & TestRules
+        "junit.framework.TestCase.runBare(", // runBare() directly calls setUp() and tearDown()
+   };
+    
+    private static boolean isReflectionMethod(String methodName) {
+        return isMatchingMethod(methodName, REFLECTION_METHOD_NAME_PREFIXES);
+    }
+
+    private static boolean isMatchingMethod(String methodName, String methodNamePrefixes) {
+        for (String methodNamePrefix : methodNamePrefixes) {
+            if (methodName.startsWith(methodNamePrefix)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/builders/JUnit4Builder.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/builders/JUnit4Builder.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/management Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/management/FakeRuntimeMXBean.java Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/management/FakeThreadMXBean.java Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/management/ManagementFactory.java Added

@@ -0,0 +1,77 @@
+package org.junit.internal.management;
+
+import org.junit.internal.Classes;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * Reflective wrapper around {@link java.lang.management.ManagementFactory}
+ */
+public class ManagementFactory {
+  private static final class FactoryHolder {
+    private static final Class<?> MANAGEMENT_FACTORY_CLASS;
+
+    static {
+      Class<?> managementFactoryClass = null;
+      try {
+        managementFactoryClass = Classes.getClass("java.lang.management.ManagementFactory");
+      } catch (ClassNotFoundException e) {
+        // do nothing, managementFactoryClass will be none on failure
+      }
+      MANAGEMENT_FACTORY_CLASS = managementFactoryClass;
+    }
+
+    static Object getBeanObject(String methodName) {
+      if (MANAGEMENT_FACTORY_CLASS != null) {
+        try {
+          return MANAGEMENT_FACTORY_CLASS.getMethod(methodName).invoke(null);
+        } catch (IllegalAccessException e) {
+          // fallthrough
+        } catch (IllegalArgumentException e) {
+          // fallthrough
+        } catch (InvocationTargetException e) {
+          // fallthrough
+        } catch (NoSuchMethodException e) {
+          // fallthrough
+        } catch (SecurityException e) {
+          // fallthrough
+        }
+      }
+      return null;
+    }
+  }
+
+  private static final class RuntimeHolder {
+    private static final RuntimeMXBean RUNTIME_MX_BEAN =
+        getBean(FactoryHolder.getBeanObject("getRuntimeMXBean"));
+
+    private static final RuntimeMXBean getBean(Object runtimeMxBean) {
+      return runtimeMxBean != null
+          ? new ReflectiveRuntimeMXBean(runtimeMxBean) : new FakeRuntimeMXBean();
+    }
+  }
+
+  private static final class ThreadHolder {
+    private static final ThreadMXBean THREAD_MX_BEAN =
+        getBean(FactoryHolder.getBeanObject("getThreadMXBean"));
+
+    private static final ThreadMXBean getBean(Object threadMxBean) {
+      return threadMxBean != null
+          ? new ReflectiveThreadMXBean(threadMxBean) : new FakeThreadMXBean();
+    }
+  }
+
+  /**
+   * @see java.lang.management.ManagementFactory#getRuntimeMXBean()
+   */
+  public static RuntimeMXBean getRuntimeMXBean() {
+    return RuntimeHolder.RUNTIME_MX_BEAN;
+  }
+
+  /**
+   * @see java.lang.management.ManagementFactory#getThreadMXBean()
+   */
+  public static ThreadMXBean getThreadMXBean() {
+    return ThreadHolder.THREAD_MX_BEAN;
+  }
+}

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/management/ReflectiveRuntimeMXBean.java Added

@@ -0,0 +1,61 @@
+package org.junit.internal.management;
+
+import org.junit.internal.Classes;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Implementation of {@link RuntimeMXBean} using the JVM reflectively.
+ */
+final class ReflectiveRuntimeMXBean implements RuntimeMXBean {
+  private final Object runtimeMxBean;
+
+  private static final class Holder {
+    private static final Method getInputArgumentsMethod;
+    static {
+      Method inputArguments = null;
+      try {
+        Class<?> threadMXBeanClass = Classes.getClass("java.lang.management.RuntimeMXBean");
+        inputArguments = threadMXBeanClass.getMethod("getInputArguments");
+      } catch (ClassNotFoundException e) {
+        // do nothing, input arguments will be null on failure
+      } catch (NoSuchMethodException e) {
+        // do nothing, input arguments will be null on failure
+      } catch (SecurityException e) {
+        // do nothing, input arguments will be null on failure
+      }
+      getInputArgumentsMethod = inputArguments;
+    }
+  }
+
+  ReflectiveRuntimeMXBean(Object runtimeMxBean) {
+    super();
+    this.runtimeMxBean = runtimeMxBean;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @SuppressWarnings("unchecked")
+  public List<String> getInputArguments() {
+    if (Holder.getInputArgumentsMethod != null) {
+      try {
+        return (List<String>) Holder.getInputArgumentsMethod.invoke(runtimeMxBean);
+      } catch (ClassCastException e) { // no multi-catch with source level 6
+        // fallthrough
+      } catch (IllegalAccessException e) {
+        // fallthrough
+      } catch (IllegalArgumentException e) {
+        // fallthrough
+      } catch (InvocationTargetException e) {
+        // fallthrough
+      }
+    }
+    return Collections.emptyList();
+  }
+
+}
+

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/management/ReflectiveThreadMXBean.java Added

@@ -0,0 +1,92 @@
+package org.junit.internal.management;
+
+import org.junit.internal.Classes;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Implementation of {@link ThreadMXBean} using the JVM reflectively.
+ */
+final class ReflectiveThreadMXBean implements ThreadMXBean {
+  private final Object threadMxBean;
+
+
+  private static final class Holder {
+    static final Method getThreadCpuTimeMethod;
+    static final Method isThreadCpuTimeSupportedMethod;
+
+    private static final String FAILURE_MESSAGE = "Unable to access ThreadMXBean";
+
+    static {
+      Method threadCpuTime = null;
+      Method threadCpuTimeSupported = null;
+      try {
+        Class<?> threadMXBeanClass = Classes.getClass("java.lang.management.ThreadMXBean");
+        threadCpuTime = threadMXBeanClass.getMethod("getThreadCpuTime", long.class);
+        threadCpuTimeSupported = threadMXBeanClass.getMethod("isThreadCpuTimeSupported");
+      } catch (ClassNotFoundException e) {
+        // do nothing, the methods will be null on failure
+      } catch (NoSuchMethodException e) {
+        // do nothing, the methods will be null on failure
+      } catch (SecurityException e) {
+        // do nothing, the methods will be null on failure
+      }
+      getThreadCpuTimeMethod = threadCpuTime;
+      isThreadCpuTimeSupportedMethod = threadCpuTimeSupported;
+    }
+  }
+
+  ReflectiveThreadMXBean(Object threadMxBean) {
+    super();
+    this.threadMxBean = threadMxBean;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public long getThreadCpuTime(long id) {
+    if (Holder.getThreadCpuTimeMethod != null) {
+      Exception error = null;
+      try {
+        return (Long) Holder.getThreadCpuTimeMethod.invoke(threadMxBean, id);
+      } catch (ClassCastException e) {
+        error = e;
+        // fallthrough
+      } catch (IllegalAccessException e) {
+        error = e;
+        // fallthrough
+      } catch (IllegalArgumentException e) {
+        error = e;
+        // fallthrough
+      } catch (InvocationTargetException e) {
+        error = e;
+        // fallthrough
+      }
+      throw new UnsupportedOperationException(Holder.FAILURE_MESSAGE, error);
+    }
+    throw new UnsupportedOperationException(Holder.FAILURE_MESSAGE);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public boolean isThreadCpuTimeSupported() {
+    if (Holder.isThreadCpuTimeSupportedMethod != null) {
+      try {
+        return (Boolean) Holder.isThreadCpuTimeSupportedMethod.invoke(threadMxBean);
+      } catch (ClassCastException e) {
+        // fallthrough
+      } catch (IllegalAccessException e) {
+        // fallthrough
+      } catch (IllegalArgumentException e) {
+        // fallthrough
+      } catch (InvocationTargetException e) {
+        // fallthrough
+      }
+    }
+    return false;
+  }
+
+}
+

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/management/RuntimeMXBean.java Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/management/ThreadMXBean.java Added

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/requests/ClassRequest.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/requests/ClassRequest.java Changed

@@ -1,20 +1,18 @@
 package org.junit.internal.requests;
 
 import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
-import org.junit.runner.Request;
+import org.junit.internal.builders.SuiteMethodBuilder;
 import org.junit.runner.Runner;
+import org.junit.runners.model.RunnerBuilder;
 
-public class ClassRequest extends Request {
-    private final Object runnerLock = new Object();
-
+public class ClassRequest extends MemoizingRequest {
     /*
      * We have to use the f prefix, because IntelliJ's JUnit4IdeaTestRunner uses
      * reflection to access this field. See
-     * https://github.com/junit-team/junit/issues/960
+     * https://github.com/junit-team/junit4/issues/960
      */
     private final Class<?> fTestClass;
     private final boolean canUseSuiteMethod;
-    private volatile Runner runner;
 
     public ClassRequest(Class<?> testClass, boolean canUseSuiteMethod) {
         this.fTestClass = testClass;
@@ -26,14 +24,31 @@
     }
 
     @Override
-    public Runner getRunner() {
-        if (runner == null) {
-            synchronized (runnerLock) {
-                if (runner == null) {
-                    runner = new AllDefaultPossibilitiesBuilder(canUseSuiteMethod).safeRunnerForClass(fTestClass);
-                }
+    protected Runner createRunner() {
+        return new CustomAllDefaultPossibilitiesBuilder().safeRunnerForClass(fTestClass);
+    }
+
+    private class CustomAllDefaultPossibilitiesBuilder extends AllDefaultPossibilitiesBuilder {
+
+        @Override
+        protected RunnerBuilder suiteMethodBuilder() {
+            return new CustomSuiteMethodBuilder();
+        }
+    }
+
+    /*
+     * Customization of {@link SuiteMethodBuilder} that prevents use of the
+     * suite method when creating a runner for fTestClass when canUseSuiteMethod
+     * is false.
+     */
+    private class CustomSuiteMethodBuilder extends SuiteMethodBuilder {
+
+        @Override
+        public Runner runnerForClass(Class<?> testClass) throws Throwable {
+            if (testClass == fTestClass && !canUseSuiteMethod) {
+                return null;
             }
+            return super.runnerForClass(testClass);
         }
-        return runner;
     }
 }
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/requests/FilterRequest.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/requests/FilterRequest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/requests/MemoizingRequest.java Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/requests/OrderingRequest.java Added

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/ErrorReportingRunner.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/ErrorReportingRunner.java Changed

@@ -1,33 +1,44 @@
 package org.junit.internal.runners;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
 import java.util.List;
 
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.model.InvalidTestClassError;
 import org.junit.runners.model.InitializationError;
 
+import static java.util.Collections.singletonList;
+
 public class ErrorReportingRunner extends Runner {
     private final List<Throwable> causes;
 
-    private final Class<?> testClass;
+    private final String classNames;
 
     public ErrorReportingRunner(Class<?> testClass, Throwable cause) {
-        if (testClass == null) {
-            throw new NullPointerException("Test class cannot be null");
+        this(cause, testClass);
+    }
+    
+    public ErrorReportingRunner(Throwable cause, Class<?>... testClasses) {
+        if (testClasses == null || testClasses.length == 0) {
+            throw new NullPointerException("Test classes cannot be null or empty");
         }
-        this.testClass = testClass;
+        for (Class<?> testClass : testClasses) {
+            if (testClass == null) {
+                throw new NullPointerException("Test class cannot be null");
+            }
+        }
+        classNames = getClassNames(testClasses);
         causes = getCauses(cause);
     }
-
+    
     @Override
     public Description getDescription() {
-        Description description = Description.createSuiteDescription(testClass);
+        Description description = Description.createSuiteDescription(classNames);
         for (Throwable each : causes) {
-            description.addChild(describeCause(each));
+            description.addChild(describeCause());
         }
         return description;
     }
@@ -39,11 +50,25 @@
         }
     }
 
+    private String getClassNames(Class<?>... testClasses) {
+        final StringBuilder builder = new StringBuilder();
+        for (Class<?> testClass : testClasses) {
+            if (builder.length() != 0) {
+                builder.append(", ");
+            }
+            builder.append(testClass.getName());
+        }
+        return builder.toString();
+    }
+
     @SuppressWarnings("deprecation")
     private List<Throwable> getCauses(Throwable cause) {
         if (cause instanceof InvocationTargetException) {
             return getCauses(cause.getCause());
         }
+        if (cause instanceof InvalidTestClassError) {
+            return singletonList(cause);
+        }
         if (cause instanceof InitializationError) {
             return ((InitializationError) cause).getCauses();
         }
@@ -51,16 +76,15 @@
             return ((org.junit.internal.runners.InitializationError) cause)
                     .getCauses();
         }
-        return Arrays.asList(cause);
+        return singletonList(cause);
     }
 
-    private Description describeCause(Throwable child) {
-        return Description.createTestDescription(testClass,
-                "initializationError");
+    private Description describeCause() {
+        return Description.createTestDescription(classNames, "initializationError");
     }
 
     private void runCause(Throwable child, RunNotifier notifier) {
-        Description description = describeCause(child);
+        Description description = describeCause();
         notifier.fireTestStarted(description);
         notifier.fireTestFailure(new Failure(description, child));
         notifier.fireTestFinished(description);

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/InitializationError.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/InitializationError.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java Changed

@@ -1,5 +1,8 @@
 package org.junit.internal.runners;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
 import junit.extensions.TestDecorator;
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
@@ -12,15 +15,16 @@
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.manipulation.Filterable;
+import org.junit.runner.manipulation.Orderer;
+import org.junit.runner.manipulation.InvalidOrderingException;
 import org.junit.runner.manipulation.NoTestsRemainException;
+import org.junit.runner.manipulation.Orderable;
 import org.junit.runner.manipulation.Sortable;
 import org.junit.runner.manipulation.Sorter;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
 
-public class JUnit38ClassRunner extends Runner implements Filterable, Sortable {
+public class JUnit38ClassRunner extends Runner implements Filterable, Orderable {
     private static final class OldTestClassAdaptingListener implements
             TestListener {
         private final RunNotifier notifier;
@@ -170,6 +174,18 @@
         }
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @since 4.13
+     */
+    public void order(Orderer orderer) throws InvalidOrderingException {
+        if (getTest() instanceof Orderable) {
+            Orderable adapter = (Orderable) getTest();
+            adapter.order(orderer);
+        }
+    }
+
     private void setTest(Test test) {
         this.test = test;
     }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/MethodValidator.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/MethodValidator.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/TestClass.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/TestClass.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/model/EachTestNotifier.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/model/EachTestNotifier.java Changed

@@ -45,4 +45,27 @@
     public void fireTestIgnored() {
         notifier.fireTestIgnored(description);
     }
+
+    /**
+     * Calls {@link RunNotifier#fireTestSuiteStarted(Description)}, passing the
+     * {@link Description} that was passed to the {@code EachTestNotifier} constructor.
+     * This should be called when a test suite is about to be started.
+     * @see RunNotifier#fireTestSuiteStarted(Description)
+     * @since 4.13
+     */
+    public void fireTestSuiteStarted() {
+        notifier.fireTestSuiteStarted(description);
+    }
+
+    /**
+     * Calls {@link RunNotifier#fireTestSuiteFinished(Description)}, passing the
+     * {@link Description} that was passed to the {@code EachTestNotifier} constructor.
+     * This should be called when a test suite has finished, whether the test suite succeeds
+     * or fails.
+     * @see RunNotifier#fireTestSuiteFinished(Description)
+     * @since 4.13
+     */
+    public void fireTestSuiteFinished() {
+        notifier.fireTestSuiteFinished(description);
+    }
 }
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/rules/ValidationError.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/rules/ValidationError.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/statements/ExpectException.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/statements/ExpectException.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java Changed

@@ -1,8 +1,8 @@
 package org.junit.internal.runners.statements;
 
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadMXBean;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -10,6 +10,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import org.junit.internal.management.ManagementFactory;
+import org.junit.internal.management.ThreadMXBean;
 import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;
 import org.junit.runners.model.TestTimedOutException;
@@ -19,7 +21,6 @@
     private final TimeUnit timeUnit;
     private final long timeout;
     private final boolean lookForStuckThread;
-    private volatile ThreadGroup threadGroup = null;
 
     /**
      * Returns a new builder for building an instance.
@@ -119,7 +120,7 @@
     public void evaluate() throws Throwable {
         CallableStatement callable = new CallableStatement();
         FutureTask<Throwable> task = new FutureTask<Throwable>(callable);
-        threadGroup = new ThreadGroup("FailOnTimeoutGroup");
+        ThreadGroup threadGroup = threadGroupForNewThread();
         Thread thread = new Thread(threadGroup, task, "Time-limited test");
         thread.setDaemon(true);
         thread.start();
@@ -130,6 +131,31 @@
         }
     }
 
+    private ThreadGroup threadGroupForNewThread() {
+        if (!lookForStuckThread) {
+            // Use the default ThreadGroup (usually the one from the current
+            // thread).
+            return null;
+        }
+
+        // Create the thread in a new ThreadGroup, so if the time-limited thread
+        // becomes stuck, getStuckThread() can find the thread likely to be the
+        // culprit.
+        ThreadGroup threadGroup = new ThreadGroup("FailOnTimeoutGroup");
+        if (!threadGroup.isDaemon()) {
+            // Mark the new ThreadGroup as a daemon thread group, so it will be
+            // destroyed after the time-limited thread completes. By ensuring the
+            // ThreadGroup is destroyed, any data associated with the ThreadGroup
+            // (ex: via java.beans.ThreadGroupContext) is destroyed.
+            try {
+                threadGroup.setDaemon(true);
+            } catch (SecurityException e) {
+                // Swallow the exception to keep the same behavior as in JUnit 4.12.
+            }
+        }
+        return threadGroup;
+    }
+
     /**
      * Wait for the test task, returning the exception thrown by the test if the
      * test failed, an exception indicating a timeout if the test timed out, or
@@ -162,7 +188,7 @@
         }
         if (stuckThread != null) {
             Exception stuckThreadException = 
-                new Exception ("Appears to be stuck in thread " +
+                new Exception("Appears to be stuck in thread " +
                                stuckThread.getName());
             stuckThreadException.setStackTrace(getStackTrace(stuckThread));
             return new MultipleFailureException(
@@ -197,11 +223,8 @@
      * to {@code mainThread}.
      */
     private Thread getStuckThread(Thread mainThread) {
-        if (threadGroup == null) {
-            return null;
-        }
-        Thread threadsInGroup = getThreadArray(threadGroup);
-        if (threadsInGroup == null) {
+        List<Thread> threadsInGroup = getThreadsInGroup(mainThread.getThreadGroup());
+        if (threadsInGroup.isEmpty()) {
             return null;
         }
 
@@ -228,49 +251,27 @@
      * Returns all active threads belonging to a thread group.  
      * @param group The thread group.
      * @return The active threads in the thread group.  The result should be a
-     * complete list of the active threads at some point in time.  Returns {@code null}
+     * complete list of the active threads at some point in time.  Returns an empty list
      * if this cannot be determined, e.g. because new threads are being created at an
      * extremely fast rate.
      */
-    private Thread getThreadArray(ThreadGroup group) {
-        final int count = group.activeCount(); // this is just an estimate
-        int enumSize = Math.max(count * 2, 100);
-        int enumCount;
-        Thread threads;
-        int loopCount = 0;
-        while (true) {
-            threads = new ThreadenumSize;
-            enumCount = group.enumerate(threads);
-            if (enumCount < enumSize) {
-                break;
+    private List<Thread> getThreadsInGroup(ThreadGroup group) {
+        final int activeThreadCount = group.activeCount(); // this is just an estimate
+        int threadArraySize = Math.max(activeThreadCount * 2, 100);
+        for (int loopCount = 0; loopCount < 5; loopCount++) {
+            Thread threads = new ThreadthreadArraySize;
+            int enumCount = group.enumerate(threads);
+            if (enumCount < threadArraySize) {
+                return Arrays.asList(threads).subList(0, enumCount);
             }
             // if there are too many threads to fit into the array, enumerate's result
             // is >= the array's length; therefore we can't trust that it returned all
             // the threads.  Try again.
-            enumSize += 100;
-            if (++loopCount >= 5) {
-                return null;
-            }
-            // threads are proliferating too fast for us.  Bail before we get into 
-            // trouble.
-        }
-        return copyThreads(threads, enumCount);
-    }
-
-    /**
-     * Returns an array of the first {@code count} Threads in {@code threads}. 
-     * (Use instead of Arrays.copyOf to maintain compatibility with Java 1.5.)
-     * @param threads The source array.
-     * @param count The maximum length of the result array.
-     * @return The first {@count} (at most) elements of {@code threads}.
-     */
-    private Thread copyThreads(Thread threads, int count) {
-        int length = Math.min(count, threads.length);
-        Thread result = new Threadlength;
-        for (int i = 0; i < length; i++) {
-            resulti = threadsi;
+            threadArraySize += 100;
         }
-        return result;
+        // threads are proliferating too fast for us.  Bail before we get into 
+        // trouble.
+        return Collections.emptyList();
     }
 
     /**
@@ -278,7 +279,7 @@
      * @param thr The thread to query.
      * @return The CPU time used by {@code thr}, or 0 if it cannot be determined.
      */
-    private long cpuTime (Thread thr) {
+    private long cpuTime(Thread thr) {
         ThreadMXBean mxBean = ManagementFactory.getThreadMXBean();
         if (mxBean.isThreadCpuTimeSupported()) {
             try {

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/statements/RunAfters.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/statements/RunAfters.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/internal/runners/statements/RunBefores.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/internal/runners/statements/RunBefores.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/DisableOnDebug.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/DisableOnDebug.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/ErrorCollector.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/ErrorCollector.java Changed

@@ -1,11 +1,14 @@
 package org.junit.rules;
 
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertThrows;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 
+import org.junit.function.ThrowingRunnable;
+import org.junit.internal.AssumptionViolatedException;
 import org.hamcrest.Matcher;
 import org.junit.runners.model.MultipleFailureException;
 
@@ -43,7 +46,16 @@
      * Adds a Throwable to the table.  Execution continues, but the test will fail at the end.
      */
     public void addError(Throwable error) {
-        errors.add(error);
+        if (error == null) {
+            throw new NullPointerException("Error cannot be null");
+        }
+        if (error instanceof AssumptionViolatedException) {
+            AssertionError e = new AssertionError(error.getMessage());
+            e.initCause(error);
+            errors.add(e);
+        } else {
+            errors.add(error);
+        }
     }
 
     /**
@@ -76,9 +88,33 @@
     public <T> T checkSucceeds(Callable<T> callable) {
         try {
             return callable.call();
+        } catch (AssumptionViolatedException e) {
+            AssertionError error = new AssertionError("Callable threw AssumptionViolatedException");
+            error.initCause(e);
+            addError(error);
+            return null;
         } catch (Throwable e) {
             addError(e);
             return null;
         }
     }
+
+    /**
+     * Adds a failure to the table if {@code runnable} does not throw an
+     * exception of type {@code expectedThrowable} when executed.
+     * Execution continues, but the test will fail at the end if the runnable
+     * does not throw an exception, or if it throws a different exception.
+     *
+     * @param expectedThrowable the expected type of the exception
+     * @param runnable       a function that is expected to throw an exception when executed
+     * @since 4.13
+     */
+    public void checkThrows(Class<? extends Throwable> expectedThrowable, ThrowingRunnable runnable) {
+        try {
+            assertThrows(expectedThrowable, runnable);
+        } catch (AssertionError e) {
+            addError(e);
+        }
+    }
+
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/ExpectedException.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/ExpectedException.java Changed

@@ -7,7 +7,6 @@
 import static org.junit.Assert.fail;
 import static org.junit.internal.matchers.ThrowableCauseMatcher.hasCause;
 import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
-
 import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
 import org.junit.AssumptionViolatedException;
@@ -21,7 +20,7 @@
  *
  * <pre> public class SimpleExpectedExceptionTest {
  *     &#064;Rule
- *     public ExpectedException thrown= ExpectedException.none();
+ *     public ExpectedException thrown = ExpectedException.none();
  *
  *     &#064;Test
  *     public void throwsNothing() {
@@ -35,16 +34,19 @@
  *     }
  * }</pre>
  * 
- * <p>
- * You have to add the {@code ExpectedException} rule to your test.
+ * <p>You have to add the {@code ExpectedException} rule to your test.
  * This doesn't affect your existing tests (see {@code throwsNothing()}).
- * After specifiying the type of the expected exception your test is
+ * After specifying the type of the expected exception your test is
  * successful when such an exception is thrown and it fails if a
  * different or no exception is thrown.
  *
- * <p>
- * Instead of specifying the exception's type you can characterize the
- * expected exception based on other criterias, too:
+ * <p>This rule does not perform any special magic to make execution continue
+ * as if the exception had not been thrown. So it is nearly always a mistake
+ * for a test method to have statements after the one that is expected to
+ * throw the exception.
+ *
+ * <p>Instead of specifying the exception's type you can characterize the
+ * expected exception based on other criteria, too:
  *
  * <ul>
  *   <li>The exception's message contains a specific text: {@link #expectMessage(String)}</li>
@@ -53,8 +55,7 @@
  *   <li>The exception itself complies with a Hamcrest matcher: {@link #expect(Matcher)}</li>
  * </ul>
  *
- * <p>
- * You can combine any of the presented expect-methods. The test is
+ * <p>You can combine any of the presented expect-methods. The test is
  * successful if all specifications are met.
  * <pre> &#064;Test
  * public void throwsException() {
@@ -63,9 +64,15 @@
  *     throw new NullPointerException(&quot;What happened?&quot;);
  * }</pre>
  *
+ * <p>It is recommended to set the {@link org.junit.Rule#order() order} of the
+ * {@code ExpectedException} to {@code Integer.MAX_VALUE} if it is used together
+ * with another rule that handles exceptions, e.g. {@link ErrorCollector}.
+ * Otherwise failing tests may be successful.
+ * <pre> &#064;Rule(order = Integer.MAX_VALUE)
+ * public ExpectedException thrown = ExpectedException.none();</pre>
+ *
  * <h3>AssumptionViolatedExceptions</h3>
- * <p>
- * JUnit uses {@link AssumptionViolatedException}s for indicating that a test
+ * <p>JUnit uses {@link AssumptionViolatedException}s for indicating that a test
  * provides no useful information. (See {@link org.junit.Assume} for more
  * information.) You have to call {@code assume} methods before you set
  * expectations of the {@code ExpectedException} rule. In this case the rule
@@ -80,8 +87,7 @@
  *
  * <h3>AssertionErrors</h3>
  *
- * <p>
- * JUnit uses {@link AssertionError}s for indicating that a test is failing. You
+ * <p>JUnit uses {@link AssertionError}s for indicating that a test is failing. You
  * have to call {@code assert} methods before you set expectations of the
  * {@code ExpectedException} rule, if they should be handled by the framework.
  * E.g. the following test fails because of the {@code assertTrue} statement.
@@ -93,8 +99,7 @@
  * }</pre>
  *
  * <h3>Missing Exceptions</h3>
- * <p>
- * By default missing exceptions are reported with an error message
+ * <p>By default missing exceptions are reported with an error message
  * like "Expected test to throw an instance of foo". You can configure a different
  * message by means of {@link #reportMissingExceptionWithMessage(String)}. You
  * can use a {@code %s} placeholder for the description of the expected
@@ -107,7 +112,13 @@
     /**
      * Returns a {@linkplain TestRule rule} that expects no exception to
      * be thrown (identical to behavior without this rule).
+     *
+     * @deprecated Since 4.13
+     * {@link org.junit.Assert#assertThrows(Class, org.junit.function.ThrowingRunnable)
+     * Assert.assertThrows} can be used to verify that your code throws a specific
+     * exception.
      */
+    @Deprecated
     public static ExpectedException none() {
         return new ExpectedException();
     }
@@ -222,10 +233,18 @@
      *     throw new IllegalArgumentException(&quot;What happened?&quot;, cause);
      * }</pre>
      */
-    public void expectCause(Matcher<? extends Throwable> expectedCause) {
+    public void expectCause(Matcher<?> expectedCause) {
         expect(hasCause(expectedCause));
     }
 
+    /**
+     * Check if any Exception is expected.
+     * @since 4.13
+     */
+    public final boolean isAnyExceptionExpected() {
+        return matcherBuilder.expectsThrowable();
+    }
+
     private class ExpectedExceptionStatement extends Statement {
         private final Statement next;
 
@@ -255,10 +274,6 @@
         }
     }
 
-    private boolean isAnyExceptionExpected() {
-        return matcherBuilder.expectsThrowable();
-    }
-
     private void failDueToMissingException() throws AssertionError {
         fail(missingExceptionMessage());
     }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/ExternalResource.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/ExternalResource.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/MethodRule.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/MethodRule.java Changed

@@ -10,21 +10,9 @@
  * {@link Statement} that executes the method is passed to each annotated
  * {@link Rule} in turn, and each may return a substitute or modified
  * {@link Statement}, which is passed to the next {@link Rule}, if any. For
- * examples of how this can be useful, see these provided MethodRules,
- * or write your own:
+ * an example of how this can be useful, see {@link TestWatchman}.
  *
- * <ul>
- *   <li>{@link ErrorCollector}: collect multiple errors in one test method</li>
- *   <li>{@link ExpectedException}: make flexible assertions about thrown exceptions</li>
- *   <li>{@link ExternalResource}: start and stop a server, for example</li>
- *   <li>{@link TemporaryFolder}: create fresh files, and delete after test</li>
- *   <li>{@link TestName}: remember the test name for use during the method</li>
- *   <li>{@link TestWatchman}: add logic at events during method execution</li>
- *   <li>{@link Timeout}: cause test to fail after a set time</li>
- *   <li>{@link Verifier}: fail test if object state ends up incorrect</li>
- * </ul>
- *
- * Note that {@link MethodRule} has been replaced by {@link TestRule},
+ * <p>Note that {@link MethodRule} has been replaced by {@link TestRule},
  * which has the added benefit of supporting class rules.
  *
  * @since 4.7

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/RuleChain.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/RuleChain.java Changed

@@ -4,26 +4,34 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.junit.Rule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
 /**
- * The RuleChain rule allows ordering of TestRules. You create a
+ * The {@code RuleChain} can be used for creating composite rules. You create a
  * {@code RuleChain} with {@link #outerRule(TestRule)} and subsequent calls of
  * {@link #around(TestRule)}:
  *
  * <pre>
- * public static class UseRuleChain {
- * 	&#064;Rule
- * 	public RuleChain chain= RuleChain
- * 	                       .outerRule(new LoggingRule("outer rule")
- * 	                       .around(new LoggingRule("middle rule")
- * 	                       .around(new LoggingRule("inner rule");
+ * public abstract class CompositeRules {
+ *   public static TestRule extendedLogging() {
+ *     return RuleChain.outerRule(new LoggingRule("outer rule"))
+ *                     .around(new LoggingRule("middle rule"))
+ *                     .around(new LoggingRule("inner rule"));
+ *   }
+ * }
+ * </pre>
+ *
+ * <pre>
+ * public class UseRuleChain {
+ *   &#064;Rule
+ *   public final TestRule extendedLogging = CompositeRules.extendedLogging();
  *
- * 	&#064;Test
- * 	public void example() {
- * 		assertTrue(true);
- *     }
+ *   &#064;Test
+ *   public void example() {
+ *     assertTrue(true);
+ *   }
  * }
  * </pre>
  *
@@ -38,6 +46,13 @@
  * finished outer rule
  * </pre>
  *
+ * In older versions of JUnit (before 4.13) {@code RuleChain} was used for
+ * ordering rules. We recommend to not use it for this purpose anymore. You can
+ * use the attribute {@code order} of the annotation {@link Rule#order() Rule}
+ * or {@link org.junit.ClassRule#order() ClassRule} for ordering rules.
+ *
+ * @see org.junit.Rule#order()
+ * @see org.junit.ClassRule#order()
  * @since 4.10
  */
 public class RuleChain implements TestRule {
@@ -72,13 +87,17 @@
     }
 
     /**
-     * Create a new {@code RuleChain}, which encloses the {@code nextRule} with
+     * Create a new {@code RuleChain}, which encloses the given {@link TestRule} with
      * the rules of the current {@code RuleChain}.
      *
-     * @param enclosedRule the rule to enclose.
+     * @param enclosedRule the rule to enclose; must not be {@code null}.
      * @return a new {@code RuleChain}.
+     * @throws NullPointerException if the argument {@code enclosedRule} is {@code null}
      */
     public RuleChain around(TestRule enclosedRule) {
+        if (enclosedRule == null) {
+            throw new NullPointerException("The enclosed rule must not be null");
+        }
         List<TestRule> rulesOfNewChain = new ArrayList<TestRule>();
         rulesOfNewChain.add(enclosedRule);
         rulesOfNewChain.addAll(rulesStartingWithInnerMost);
@@ -89,9 +108,6 @@
      * {@inheritDoc}
      */
     public Statement apply(Statement base, Description description) {
-        for (TestRule each : rulesStartingWithInnerMost) {
-            base = each.apply(base, description);
-        }
-        return base;
+        return new RunRules(base, rulesStartingWithInnerMost, description);
     }
 }
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/Stopwatch.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/Stopwatch.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/TemporaryFolder.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/TemporaryFolder.java Changed

@@ -1,15 +1,20 @@
 package org.junit.rules;
 
+import static org.junit.Assert.fail;
+
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 import org.junit.Rule;
 
 /**
  * The TemporaryFolder Rule allows creation of files and folders that should
  * be deleted when the test method finishes (whether it passes or
- * fails). Whether the deletion is successful or not is not checked by this rule.
- * No exception will be thrown in case the deletion fails.
+ * fails).
+ * By default no exception will be thrown in case the deletion fails.
  *
  * <p>Example of usage:
  * <pre>
@@ -26,18 +31,104 @@
  * }
  * </pre>
  *
+ * <p>TemporaryFolder rule supports assured deletion mode, which
+ * will fail the test in case deletion fails with {@link AssertionError}.
+ *
+ * <p>Creating TemporaryFolder with assured deletion:
+ * <pre>
+ *  &#064;Rule
+ *  public TemporaryFolder folder= TemporaryFolder.builder().assureDeletion().build();
+ * </pre>
+ *
  * @since 4.7
  */
 public class TemporaryFolder extends ExternalResource {
     private final File parentFolder;
+    private final boolean assureDeletion;
     private File folder;
 
+    private static final int TEMP_DIR_ATTEMPTS = 10000;
+    private static final String TMP_PREFIX = "junit";
+
+    /**
+     * Create a temporary folder which uses system default temporary-file 
+     * directory to create temporary resources.
+     */
     public TemporaryFolder() {
-        this(null);
+        this((File) null);
     }
 
+    /**
+     * Create a temporary folder which uses the specified directory to create
+     * temporary resources.
+     *
+     * @param parentFolder folder where temporary resources will be created.
+     * If {@code null} then system default temporary-file directory is used.
+     */
     public TemporaryFolder(File parentFolder) {
         this.parentFolder = parentFolder;
+        this.assureDeletion = false;
+    }
+
+    /**
+     * Create a {@link TemporaryFolder} initialized with
+     * values from a builder.
+     */
+    protected TemporaryFolder(Builder builder) {
+        this.parentFolder = builder.parentFolder;
+        this.assureDeletion = builder.assureDeletion;
+    }
+
+    /**
+     * Returns a new builder for building an instance of {@link TemporaryFolder}.
+     *
+     * @since 4.13
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Builds an instance of {@link TemporaryFolder}.
+     * 
+     * @since 4.13
+     */
+    public static class Builder {
+        private File parentFolder;
+        private boolean assureDeletion;
+
+        protected Builder() {}
+
+        /**
+         * Specifies which folder to use for creating temporary resources.
+         * If {@code null} then system default temporary-file directory is
+         * used.
+         *
+         * @return this
+         */
+        public Builder parentFolder(File parentFolder) {
+            this.parentFolder = parentFolder;
+            return this;
+        }
+
+        /**
+         * Setting this flag assures that no resources are left undeleted. Failure
+         * to fulfill the assurance results in failure of tests with an
+         * {@link AssertionError}.
+         *
+         * @return this
+         */
+        public Builder assureDeletion() {
+            this.assureDeletion = true;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TemporaryFolder} instance using the values in this builder.
+         */
+        public TemporaryFolder build() {
+            return new TemporaryFolder(this);
+        }
     }
 
     @Override
@@ -75,52 +166,63 @@
      * Returns a new fresh file with a random name under the temporary folder.
      */
     public File newFile() throws IOException {
-        return File.createTempFile("junit", null, getRoot());
+        return File.createTempFile(TMP_PREFIX, null, getRoot());
     }
 
     /**
-     * Returns a new fresh folder with the given name under the temporary
+     * Returns a new fresh folder with the given path under the temporary
      * folder.
      */
-    public File newFolder(String folder) throws IOException {
-        return newFolder(new String{folder});
+    public File newFolder(String path) throws IOException {
+        return newFolder(new String{path});
     }
 
     /**
-     * Returns a new fresh folder with the given name(s) under the temporary
-     * folder.
+     * Returns a new fresh folder with the given paths under the temporary
+     * folder. For example, if you pass in the strings {@code "parent"} and {@code "child"}
+     * then a directory named {@code "parent"} will be created under the temporary folder
+     * and a directory named {@code "child"} will be created under the newly-created
+     * {@code "parent"} directory.
      */
-    public File newFolder(String... folderNames) throws IOException {
-        File file = getRoot();
-        for (int i = 0; i < folderNames.length; i++) {
-            String folderName = folderNamesi;
-            validateFolderName(folderName);
-            file = new File(file, folderName);
-            if (!file.mkdir() && isLastElementInArray(i, folderNames)) {
-                throw new IOException(
-                        "a folder with the name \'" + folderName + "\' already exists");
-            }
+    public File newFolder(String... paths) throws IOException {
+        if (paths.length == 0) {
+            throw new IllegalArgumentException("must pass at least one path");
         }
-        return file;
-    }
-    
-    /**
-     * Validates if multiple path components were used while creating a folder.
-     * 
-     * @param folderName
-     *            Name of the folder being created
-     */
-    private void validateFolderName(String folderName) throws IOException {
-        File tempFile = new File(folderName);
-        if (tempFile.getParent() != null) {
-            String errorMsg = "Folder name cannot consist of multiple path components separated by a file separator."
-                    + " Please use newFolder('MyParentFolder','MyFolder') to create hierarchies of folders";
-            throw new IOException(errorMsg);
+
+        /*
+         * Before checking if the paths are absolute paths, check if create() was ever called,
+         * and if it wasn't, throw IllegalStateException.
+         */
+        File root = getRoot();
+        for (String path : paths) {
+            if (new File(path).isAbsolute()) {
+                throw new IOException("folder path \'" + path + "\' is not a relative path");
+            }
         }
-    }
 
-    private boolean isLastElementInArray(int index, String array) {
-        return index == array.length - 1;
+        File relativePath = null;
+        File file = root;
+        boolean lastMkdirsCallSuccessful = true;
+        for (String path : paths) {
+            relativePath = new File(relativePath, path);
+            file = new File(root, relativePath.getPath());
+
+            lastMkdirsCallSuccessful = file.mkdirs();
+            if (!lastMkdirsCallSuccessful && !file.isDirectory()) {
+                if (file.exists()) {
+                    throw new IOException(
+                            "a file with the path \'" + relativePath.getPath() + "\' exists");
+                } else {
+                    throw new IOException(
+                            "could not create a folder with the path \'" + relativePath.getPath() + "\'");
+                }
+            }
+        }
+        if (!lastMkdirsCallSuccessful) {
+            throw new IOException(
+                    "a folder with the path \'" + relativePath.getPath() + "\' already exists");
+        }
+        return file;
     }
 
     /**
@@ -130,11 +232,63 @@
         return createTemporaryFolderIn(getRoot());
     }
 
-    private File createTemporaryFolderIn(File parentFolder) throws IOException {
-        File createdFolder = File.createTempFile("junit", "", parentFolder);
-        createdFolder.delete();
-        createdFolder.mkdir();
-        return createdFolder;
+    private static File createTemporaryFolderIn(File parentFolder) throws IOException {
+        try {
+            return createTemporaryFolderWithNioApi(parentFolder);
+        } catch (ClassNotFoundException ignore) {
+            // Fallback for Java 5 and 6
+            return createTemporaryFolderWithFileApi(parentFolder);
+        } catch (InvocationTargetException e) {
+            Throwable cause = e.getCause();
+            if (cause instanceof IOException) {
+                throw (IOException) cause;
+            }
+            if (cause instanceof RuntimeException) {
+                throw (RuntimeException) cause;
+            }
+            IOException exception = new IOException("Failed to create temporary folder in " + parentFolder);
+            exception.initCause(cause);
+            throw exception;
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to create temporary folder in " + parentFolder, e);
+        }
+    }
+
+    private static File createTemporaryFolderWithNioApi(File parentFolder) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        Class<?> filesClass = Class.forName("java.nio.file.Files");
+        Object fileAttributeArray = Array.newInstance(Class.forName("java.nio.file.attribute.FileAttribute"), 0);
+        Class<?> pathClass = Class.forName("java.nio.file.Path");
+        Object tempDir;
+        if (parentFolder != null) {
+            Method createTempDirectoryMethod = filesClass.getDeclaredMethod("createTempDirectory", pathClass, String.class, fileAttributeArray.getClass());
+            Object parentPath = File.class.getDeclaredMethod("toPath").invoke(parentFolder);
+            tempDir = createTempDirectoryMethod.invoke(null, parentPath, TMP_PREFIX, fileAttributeArray);
+        } else {
+            Method createTempDirectoryMethod = filesClass.getDeclaredMethod("createTempDirectory", String.class, fileAttributeArray.getClass());
+            tempDir = createTempDirectoryMethod.invoke(null, TMP_PREFIX, fileAttributeArray);
+        }
+        return (File) pathClass.getDeclaredMethod("toFile").invoke(tempDir);
+    }
+
+    private static File createTemporaryFolderWithFileApi(File parentFolder) throws IOException {
+        File createdFolder = null;
+        for (int i = 0; i < TEMP_DIR_ATTEMPTS; ++i) {
+            // Use createTempFile to get a suitable folder name.
+            String suffix = ".tmp";
+            File tmpFile = File.createTempFile(TMP_PREFIX, suffix, parentFolder);
+            String tmpName = tmpFile.toString();
+            // Discard .tmp suffix of tmpName.
+            String folderName = tmpName.substring(0, tmpName.length() - suffix.length());
+            createdFolder = new File(folderName);
+            if (createdFolder.mkdir()) {
+                tmpFile.delete();
+                return createdFolder;
+            }
+            tmpFile.delete();
+        }
+        throw new IOException("Unable to create temporary directory in: "
+            + parentFolder.toString() + ". Tried " + TEMP_DIR_ATTEMPTS + " times. "
+            + "Last attempted to create: " + createdFolder.toString());
     }
 
     /**
@@ -150,21 +304,48 @@
 
     /**
      * Delete all files and folders under the temporary folder. Usually not
-     * called directly, since it is automatically applied by the {@link Rule}
+     * called directly, since it is automatically applied by the {@link Rule}.
+     *
+     * @throws AssertionError if unable to clean up resources
+     * and deletion of resources is assured.
      */
     public void delete() {
-        if (folder != null) {
-            recursiveDelete(folder);
+        if (!tryDelete()) {
+            if (assureDeletion) {
+                fail("Unable to clean up temporary folder " + folder);
+            }
+        }
+    }
+
+    /**
+     * Tries to delete all files and folders under the temporary folder and
+     * returns whether deletion was successful or not.
+     *
+     * @return {@code true} if all resources are deleted successfully,
+     *         {@code false} otherwise.
+     */
+    private boolean tryDelete() {
+        if (folder == null) {
+            return true;
         }
+        
+        return recursiveDelete(folder);
     }
 
-    private void recursiveDelete(File file) {
+    private boolean recursiveDelete(File file) {
+        // Try deleting file before assuming file is a directory
+        // to prevent following symbolic links.
+        if (file.delete()) {
+            return true;
+        }
         File files = file.listFiles();
         if (files != null) {
             for (File each : files) {
-                recursiveDelete(each);
+                if (!recursiveDelete(each)) {
+                    return false;
+                }
             }
         }
-        file.delete();
+        return file.delete();
     }
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/TestName.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/TestName.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/TestWatcher.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/TestWatcher.java Changed

@@ -4,6 +4,7 @@
 import java.util.List;
 
 import org.junit.AssumptionViolatedException;
+import org.junit.Rule;
 import org.junit.runner.Description;
 import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;
@@ -17,7 +18,7 @@
  * public static class WatchmanTest {
  *  private static String watchedLog;
  *
- *  &#064;Rule
+ *  &#064;Rule(order = Integer.MIN_VALUE)
  *  public TestWatcher watchman= new TestWatcher() {
  *      &#064;Override
  *      protected void failed(Throwable e, Description description) {
@@ -40,6 +41,11 @@
  *     }
  * }
  * </pre>
+ * <p>It is recommended to always set the {@link Rule#order() order} of the
+ * {@code TestWatcher} to {@code Integer.MIN_VALUE} so that it encloses all
+ * other rules. Otherwise it may see failed tests as successful and vice versa
+ * if some rule changes the result of a test (e.g. {@link ErrorCollector} or
+ * {@link ExpectedException}).
  *
  * @since 4.9
  */
@@ -54,7 +60,7 @@
                 try {
                     base.evaluate();
                     succeededQuietly(description, errors);
-                } catch (@SuppressWarnings("deprecation") org.junit.internal.AssumptionViolatedException  e) {
+                } catch (org.junit.internal.AssumptionViolatedException  e) {
                     errors.add(e);
                     skippedQuietly(e, description, errors);
                 } catch (Throwable e) {
@@ -87,7 +93,6 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
     private void skippedQuietly(
             org.junit.internal.AssumptionViolatedException e, Description description,
             List<Throwable> errors) {
@@ -135,7 +140,6 @@
     /**
      * Invoked when a test is skipped due to a failed assumption.
      */
-    @SuppressWarnings("deprecation")
     protected void skipped(AssumptionViolatedException e, Description description) {
         // For backwards compatibility with JUnit 4.11 and earlier, call the legacy version
         org.junit.internal.AssumptionViolatedException asInternalException = e;

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/rules/Timeout.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/rules/Timeout.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/Computer.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/Computer.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/Describable.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/Describable.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/Description.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/Description.java Changed

@@ -125,6 +125,17 @@
     }
 
     /**
+     * Create a <code>Description</code> named after <code>testClass</code>
+     *
+     * @param testClass A not null {@link Class} containing tests
+     * @param annotations meta-data about the test, for downstream interpreters
+     * @return a <code>Description</code> of <code>testClass</code>
+     */
+    public static Description createSuiteDescription(Class<?> testClass, Annotation... annotations) {
+        return new Description(testClass, testClass.getName(), annotations);
+    }
+
+    /**
      * Describes a Runner which runs no tests
      */
     public static final Description EMPTY = new Description(null, "No Tests");
@@ -139,7 +150,7 @@
     /*
      * We have to use the f prefix until the next major release to ensure
      * serialization compatibility. 
-     * See https://github.com/junit-team/junit/issues/976
+     * See https://github.com/junit-team/junit4/issues/976
      */
     private final Collection<Description> fChildren = new ConcurrentLinkedQueue<Description>();
     private final String fDisplayName;

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/FilterFactory.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/FilterFactory.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/JUnitCommandLineParseResult.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/JUnitCommandLineParseResult.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/OrderWith.java Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/OrderWithValidator.java Added

@@ -0,0 +1,38 @@
+package org.junit.runner;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+
+import java.util.List;
+
+import org.junit.FixMethodOrder;
+import org.junit.runners.model.TestClass;
+import org.junit.validator.AnnotationValidator;
+
+/**
+ * Validates that there are no errors in the use of the {@code OrderWith}
+ * annotation. If there is, a {@code Throwable} object will be added to the list
+ * of errors.
+ *
+ * @since 4.13
+ */
+public final class OrderWithValidator extends AnnotationValidator {
+
+    /**
+     * Adds to {@code errors} a throwable for each problem detected. Looks for
+     * {@code FixMethodOrder} annotations.
+     *
+     * @param testClass that is being validated
+     * @return A list of exceptions detected
+     *
+     * @since 4.13
+     */
+    @Override
+    public List<Exception> validateAnnotatedClass(TestClass testClass) {
+        if (testClass.getAnnotation(FixMethodOrder.class) != null) {
+            return singletonList(
+                    new Exception("@FixMethodOrder cannot be combined with @OrderWith"));
+        }
+        return emptyList();
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/Request.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/Request.java Changed

@@ -5,9 +5,11 @@
 import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
 import org.junit.internal.requests.ClassRequest;
 import org.junit.internal.requests.FilterRequest;
+import org.junit.internal.requests.OrderingRequest;
 import org.junit.internal.requests.SortingRequest;
 import org.junit.internal.runners.ErrorReportingRunner;
 import org.junit.runner.manipulation.Filter;
+import org.junit.runner.manipulation.Ordering;
 import org.junit.runners.model.InitializationError;
 
 /**
@@ -71,12 +73,11 @@
      */
     public static Request classes(Computer computer, Class<?>... classes) {
         try {
-            AllDefaultPossibilitiesBuilder builder = new AllDefaultPossibilitiesBuilder(true);
+            AllDefaultPossibilitiesBuilder builder = new AllDefaultPossibilitiesBuilder();
             Runner suite = computer.getSuite(builder, classes);
             return runner(suite);
         } catch (InitializationError e) {
-            throw new RuntimeException(
-                    "Bug in saff's brain: Suite constructor, called as above, should always complete");
+            return runner(new ErrorReportingRunner(e, classes));
         }
     }
 
@@ -132,13 +133,16 @@
     }
 
     /**
-     * Returns a Request that only runs contains tests whose {@link Description}
-     * equals <code>desiredDescription</code>
+     * Returns a Request that only runs tests whose {@link Description}
+     * matches the given description.
      *
-     * @param desiredDescription {@link Description} of those tests that should be run
+     * <p>Returns an empty {@code Request} if {@code desiredDescription} is not a single test and filters all but the single
+     * test if {@code desiredDescription} is a single test.</p>
+     *
+     * @param desiredDescription {@code Description} of those tests that should be run
      * @return the filtered Request
      */
-    public Request filterWith(final Description desiredDescription) {
+    public Request filterWith(Description desiredDescription) {
         return filterWith(Filter.matchMethodDescription(desiredDescription));
     }
 
@@ -149,15 +153,15 @@
      * For example, here is code to run a test suite in alphabetical order:
      * <pre>
      * private static Comparator&lt;Description&gt; forward() {
-     * return new Comparator&lt;Description&gt;() {
-     * public int compare(Description o1, Description o2) {
-     * return o1.getDisplayName().compareTo(o2.getDisplayName());
-     * }
-     * };
+     *   return new Comparator&lt;Description&gt;() {
+     *     public int compare(Description o1, Description o2) {
+     *       return o1.getDisplayName().compareTo(o2.getDisplayName());
+     *     }
+     *   };
      * }
      *
      * public static main() {
-     * new JUnitCore().run(Request.aClass(AllTests.class).sortWith(forward()));
+     *   new JUnitCore().run(Request.aClass(AllTests.class).sortWith(forward()));
      * }
      * </pre>
      *
@@ -167,4 +171,32 @@
     public Request sortWith(Comparator<Description> comparator) {
         return new SortingRequest(this, comparator);
     }
+
+    /**
+     * Returns a Request whose Tests can be run in a certain order, defined by
+     * <code>ordering</code>
+     * <p>
+     * For example, here is code to run a test suite in reverse order:
+     * <pre>
+     * private static Ordering reverse() {
+     *   return new Ordering() {
+     *     public List&lt;Description&gt; orderItems(Collection&lt;Description&gt; descriptions) {
+     *       List&lt;Description&gt; ordered = new ArrayList&lt;&gt;(descriptions);
+     *       Collections.reverse(ordered);
+     *       return ordered;
+     *     }
+     *   }
+     * }
+     *     
+     * public static main() {
+     *   new JUnitCore().run(Request.aClass(AllTests.class).orderWith(reverse()));
+     * }
+     * </pre>
+     *
+     * @return a Request with ordered Tests
+     * @since 4.13
+     */
+    public Request orderWith(Ordering ordering) {
+        return new OrderingRequest(this, ordering);
+    }
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/Result.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/Result.java Changed

@@ -28,6 +28,7 @@
             ObjectStreamClass.lookup(SerializedForm.class).getFields();
     private final AtomicInteger count;
     private final AtomicInteger ignoreCount;
+    private final AtomicInteger assumptionFailureCount;
     private final CopyOnWriteArrayList<Failure> failures;
     private final AtomicLong runTime;
     private final AtomicLong startTime;
@@ -38,6 +39,7 @@
     public Result() {
         count = new AtomicInteger();
         ignoreCount = new AtomicInteger();
+        assumptionFailureCount = new AtomicInteger();
         failures = new CopyOnWriteArrayList<Failure>();
         runTime = new AtomicLong();
         startTime = new AtomicLong();
@@ -46,34 +48,35 @@
     private Result(SerializedForm serializedForm) {
         count = serializedForm.fCount;
         ignoreCount = serializedForm.fIgnoreCount;
+        assumptionFailureCount = serializedForm.assumptionFailureCount;
         failures = new CopyOnWriteArrayList<Failure>(serializedForm.fFailures);
         runTime = new AtomicLong(serializedForm.fRunTime);
         startTime = new AtomicLong(serializedForm.fStartTime);
     }
 
     /**
-     * @return the number of tests run
+     * Returns the number of tests run
      */
     public int getRunCount() {
         return count.get();
     }
 
     /**
-     * @return the number of tests that failed during the run
+     * Returns the number of tests that failed during the run
      */
     public int getFailureCount() {
         return failures.size();
     }
 
     /**
-     * @return the number of milliseconds it took to run the entire suite to run
+     * Returns the number of milliseconds it took to run the entire suite to run
      */
     public long getRunTime() {
         return runTime.get();
     }
 
     /**
-     * @return the {@link Failure}s describing tests that failed and the problems they encountered
+     * Returns the {@link Failure}s describing tests that failed and the problems they encountered
      */
     public List<Failure> getFailures() {
         return failures;
@@ -87,6 +90,20 @@
     }
 
     /**
+     * Returns the number of tests skipped because of an assumption failure
+     *
+     * @throws UnsupportedOperationException if the result was serialized in a version before JUnit 4.13
+     * @since 4.13
+     */
+    public int getAssumptionFailureCount() {
+        if (assumptionFailureCount == null) {
+            throw new UnsupportedOperationException(
+                    "Result was serialized from a version of JUnit that doesn't support this method");
+        }
+        return assumptionFailureCount.get();
+    }
+
+    /**
      * @return <code>true</code> if all tests succeeded
      */
     public boolean wasSuccessful() {
@@ -137,7 +154,7 @@
 
         @Override
         public void testAssumptionFailure(Failure failure) {
-            // do nothing: same as passing (for 4.5; may change in 4.6)
+            assumptionFailureCount.getAndIncrement();
         }
     }
 
@@ -156,6 +173,7 @@
         private static final long serialVersionUID = 1L;
         private final AtomicInteger fCount;
         private final AtomicInteger fIgnoreCount;
+        private final AtomicInteger assumptionFailureCount;
         private final List<Failure> fFailures;
         private final long fRunTime;
         private final long fStartTime;
@@ -163,6 +181,7 @@
         public SerializedForm(Result result) {
             fCount = result.count;
             fIgnoreCount = result.ignoreCount;
+            assumptionFailureCount = result.assumptionFailureCount;
             fFailures = Collections.synchronizedList(new ArrayList<Failure>(result.failures));
             fRunTime = result.runTime.longValue();
             fStartTime = result.startTime.longValue();
@@ -172,6 +191,7 @@
         private SerializedForm(ObjectInputStream.GetField fields) throws IOException {
             fCount = (AtomicInteger) fields.get("fCount", null);
             fIgnoreCount = (AtomicInteger) fields.get("fIgnoreCount", null);
+            assumptionFailureCount = (AtomicInteger) fields.get("assumptionFailureCount", null);
             fFailures = (List<Failure>) fields.get("fFailures", null);
             fRunTime = fields.get("fRunTime", 0L);
             fStartTime = fields.get("fStartTime", 0L);
@@ -184,6 +204,7 @@
             fields.put("fFailures", fFailures);
             fields.put("fRunTime", fRunTime);
             fields.put("fStartTime", fStartTime);
+            fields.put("assumptionFailureCount", assumptionFailureCount);
             s.writeFields();
         }

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/manipulation/Alphanumeric.java Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/manipulation/InvalidOrderingException.java Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/manipulation/Orderable.java Added

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/manipulation/Orderer.java Added

@@ -0,0 +1,62 @@
+package org.junit.runner.manipulation;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.runner.Description;
+
+/**
+ * Orders tests.
+ *
+ * @since 4.13
+ */
+public final class Orderer  {
+    private final Ordering ordering;
+
+    Orderer(Ordering delegate) {
+        this.ordering = delegate;
+    }
+
+    /**
+     * Orders the descriptions.
+     *
+     * @return descriptions in order
+     */
+    public List<Description> order(Collection<Description> descriptions)
+            throws InvalidOrderingException {
+        List<Description> inOrder = ordering.orderItems(
+                Collections.unmodifiableCollection(descriptions));
+        if (!ordering.validateOrderingIsCorrect()) {
+            return inOrder;
+        }
+
+        Set<Description> uniqueDescriptions = new HashSet<Description>(descriptions);
+        if (!uniqueDescriptions.containsAll(inOrder)) {
+            throw new InvalidOrderingException("Ordering added items");
+        }
+        Set<Description> resultAsSet = new HashSet<Description>(inOrder);
+        if (resultAsSet.size() != inOrder.size()) {
+            throw new InvalidOrderingException("Ordering duplicated items");
+        } else if (!resultAsSet.containsAll(uniqueDescriptions)) {
+            throw new InvalidOrderingException("Ordering removed items");
+        }
+
+        return inOrder;
+    }
+
+    /**
+     * Order the tests in <code>target</code>.
+     *
+     * @throws InvalidOrderingException if ordering does something invalid (like remove or add
+     * children)
+     */
+    public void apply(Object target) throws InvalidOrderingException {
+        if (target instanceof Orderable) {
+            Orderable orderable = (Orderable) target;
+            orderable.order(this);
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/manipulation/Ordering.java Added

@@ -0,0 +1,172 @@
+package org.junit.runner.manipulation;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+import org.junit.runner.Description;
+import org.junit.runner.OrderWith;
+
+/**
+ * Reorders tests. An {@code Ordering} can reverse the order of tests, sort the
+ * order or even shuffle the order.
+ *
+ * <p>In general you will not need to use a <code>Ordering</code> directly.
+ * Instead, use {@link org.junit.runner.Request#orderWith(Ordering)}.
+ *
+ * @since 4.13
+ */
+public abstract class Ordering {
+    private static final String CONSTRUCTOR_ERROR_FORMAT
+            = "Ordering class %s should have a public constructor with signature "
+                    + "%s(Ordering.Context context)";
+
+    /**
+     * Creates an {@link Ordering} that shuffles the items using the given
+     * {@link Random} instance.
+     */
+    public static Ordering shuffledBy(final Random random) {
+        return new Ordering() {
+            @Override
+            boolean validateOrderingIsCorrect() {
+                return false;
+            }
+
+            @Override
+            protected List<Description> orderItems(Collection<Description> descriptions) {
+                List<Description> shuffled = new ArrayList<Description>(descriptions);
+                Collections.shuffle(shuffled, random);
+                return shuffled;
+            }
+        };
+    }
+
+    /**
+     * Creates an {@link Ordering} from the given factory class. The class must have a public no-arg
+     * constructor.
+     *
+     * @param factoryClass class to use to create the ordering
+     * @param annotatedTestClass test class that is annotated with {@link OrderWith}.
+     * @throws InvalidOrderingException if the instance could not be created
+     */
+    public static Ordering definedBy(
+            Class<? extends Ordering.Factory> factoryClass, Description annotatedTestClass)
+            throws InvalidOrderingException {
+        if (factoryClass == null) {
+            throw new NullPointerException("factoryClass cannot be null");
+        }
+        if (annotatedTestClass == null) {
+            throw new NullPointerException("annotatedTestClass cannot be null");
+        }
+
+        Ordering.Factory factory;
+        try {
+            Constructor<? extends Ordering.Factory> constructor = factoryClass.getConstructor();
+            factory = constructor.newInstance();
+        } catch (NoSuchMethodException e) {
+            throw new InvalidOrderingException(String.format(
+                    CONSTRUCTOR_ERROR_FORMAT,
+                    getClassName(factoryClass),
+                    factoryClass.getSimpleName()));
+        } catch (Exception e) {
+            throw new InvalidOrderingException(
+                    "Could not create ordering for " + annotatedTestClass, e);
+        }
+        return definedBy(factory, annotatedTestClass);
+    }
+
+    /**
+     * Creates an {@link Ordering} from the given factory.
+     *
+     * @param factory factory to use to create the ordering
+     * @param annotatedTestClass test class that is annotated with {@link OrderWith}.
+     * @throws InvalidOrderingException if the instance could not be created
+     */
+    public static Ordering definedBy(
+            Ordering.Factory factory, Description annotatedTestClass)
+            throws InvalidOrderingException {
+        if (factory == null) {
+            throw new NullPointerException("factory cannot be null");
+        }
+        if (annotatedTestClass == null) {
+            throw new NullPointerException("annotatedTestClass cannot be null");
+        }
+
+        return factory.create(new Ordering.Context(annotatedTestClass));
+    }
+
+    private static String getClassName(Class<?> clazz) {
+        String name = clazz.getCanonicalName();
+        if (name == null) {
+            return clazz.getName();
+        }
+        return name;
+    }
+
+    /**
+     * Order the tests in <code>target</code> using this ordering.
+     *
+     * @throws InvalidOrderingException if ordering does something invalid (like remove or add
+     * children)
+     */
+    public void apply(Object target) throws InvalidOrderingException {
+        /*
+         * Note that some subclasses of Ordering override apply(). The Sorter
+         * subclass of Ordering overrides apply() to apply the sort (this is
+         * done because sorting is more efficient than ordering).
+         */
+        if (target instanceof Orderable) {
+            Orderable orderable = (Orderable) target;
+            orderable.order(new Orderer(this));
+        }
+    }
+
+    /**
+     * Returns {@code true} if this ordering could produce invalid results (i.e.
+     * if it could add or remove values).
+     */
+    boolean validateOrderingIsCorrect() {
+        return true;
+    }
+
+    /**
+     * Implemented by sub-classes to order the descriptions.
+     *
+     * @return descriptions in order
+     */
+    protected abstract List<Description> orderItems(Collection<Description> descriptions);
+
+    /** Context about the ordering being applied. */
+    public static class Context {
+        private final Description description;
+
+        /**
+         * Gets the description for the top-level target being ordered.
+         */
+        public Description getTarget() {
+            return description;
+        }
+
+        private Context(Description description) {
+            this.description = description;
+        }
+    }
+
+    /**
+     * Factory for creating {@link Ordering} instances.
+     *
+     * <p>For a factory to be used with {@code @OrderWith} it needs to have a public no-arg
+     * constructor.
+     */
+    public interface Factory {
+        /**
+         * Creates an Ordering instance using the given context. Implementations
+         * of this method that do not need to use the context can return the
+         * same instance every time.
+         */
+        Ordering create(Context context);
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/manipulation/Sortable.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/manipulation/Sortable.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/manipulation/Sorter.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/manipulation/Sorter.java Changed

@@ -1,16 +1,21 @@
 package org.junit.runner.manipulation;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 import org.junit.runner.Description;
 
 /**
  * A <code>Sorter</code> orders tests. In general you will not need
- * to use a <code>Sorter</code> directly. Instead, use {@link org.junit.runner.Request#sortWith(Comparator)}.
+ * to use a <code>Sorter</code> directly. Instead, use
+ * {@link org.junit.runner.Request#sortWith(Comparator)}.
  *
  * @since 4.0
  */
-public class Sorter implements Comparator<Description> {
+public class Sorter extends Ordering implements Comparator<Description> {
     /**
      * NULL is a <code>Sorter</code> that leaves elements in an undefined order
      */
@@ -27,17 +32,26 @@
      * to sort tests
      *
      * @param comparator the {@link Comparator} to use when sorting tests
+     * @since 4.0
      */
     public Sorter(Comparator<Description> comparator) {
         this.comparator = comparator;
     }
 
     /**
-     * Sorts the test in <code>runner</code> using <code>comparator</code>
+     * Sorts the tests in <code>target</code> using <code>comparator</code>.
+     *
+     * @since 4.0
      */
-    public void apply(Object object) {
-        if (object instanceof Sortable) {
-            Sortable sortable = (Sortable) object;
+    @Override
+    public void apply(Object target) {
+        /*
+         * Note that all runners that are Orderable are also Sortable (because
+         * Orderable extends Sortable). Sorting is more efficient than ordering,
+         * so we override the parent behavior so we sort instead.
+         */
+        if (target instanceof Sortable) {
+            Sortable sortable = (Sortable) target;
             sortable.sort(this);
         }
     }
@@ -45,4 +59,32 @@
     public int compare(Description o1, Description o2) {
         return comparator.compare(o1, o2);
     }
+ 
+    /**
+     * {@inheritDoc}
+     *
+     * @since 4.13
+     */
+    @Override
+    protected final List<Description> orderItems(Collection<Description> descriptions) {
+        /*
+         * In practice, we will never get here--Sorters do their work in the
+         * compare() method--but the Liskov substitution principle demands that
+         * we obey the general contract of Orderable. Luckily, it's trivial to
+         * implement.
+         */
+        List<Description> sorted = new ArrayList<Description>(descriptions);
+        Collections.sort(sorted, this); // Note: it would be incorrect to pass in "comparator"
+        return sorted;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @since 4.13
+     */
+    @Override
+    boolean validateOrderingIsCorrect() {
+        return false;
+    }
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/notification/Failure.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/notification/Failure.java Changed

@@ -1,9 +1,8 @@
 package org.junit.runner.notification;
 
-import java.io.PrintWriter;
 import java.io.Serializable;
-import java.io.StringWriter;
 
+import org.junit.internal.Throwables;
 import org.junit.runner.Description;
 
 /**
@@ -21,7 +20,7 @@
     /*
      * We have to use the f prefix until the next major release to ensure
      * serialization compatibility. 
-     * See https://github.com/junit-team/junit/issues/976
+     * See https://github.com/junit-team/junit4/issues/976
      */
     private final Description fDescription;
     private final Throwable fThrownException;
@@ -65,15 +64,19 @@
     }
 
     /**
-     * Convenience method
-     *
-     * @return the printed form of the exception
+     * Gets the printed form of the exception and its stack trace.
      */
     public String getTrace() {
-        StringWriter stringWriter = new StringWriter();
-        PrintWriter writer = new PrintWriter(stringWriter);
-        getException().printStackTrace(writer);
-        return stringWriter.toString();
+        return Throwables.getStacktrace(getException());
+    }
+
+    /**
+     * Gets a the printed form of the exception, with a trimmed version of the stack trace.
+     * This method will attempt to filter out frames of the stack trace that are below
+     * the test method call.
+     */
+    public String getTrimmedTrace() {
+        return Throwables.getTrimmedStackTrace(getException());
     }
 
     /**

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/notification/RunListener.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/notification/RunListener.java Changed

@@ -70,6 +70,34 @@
     }
 
     /**
+     * Called when a test suite is about to be started. If this method is
+     * called for a given {@link Description}, then {@link #testSuiteFinished(Description)}
+     * will also be called for the same {@code Description}.
+     *
+     * <p>Note that not all runners will call this method, so runners should
+     * be prepared to handle {@link #testStarted(Description)} calls for tests
+     * where there was no corresponding {@code testSuiteStarted()} call for
+     * the parent {@code Description}.
+     *
+     * @param description the description of the test suite that is about to be run
+     *                    (generally a class name)
+     * @since 4.13
+     */
+    public void testSuiteStarted(Description description) throws Exception {
+    }
+
+    /**
+     * Called when a test suite has finished, whether the test suite succeeds or fails.
+     * This method will not be called for a given {@link Description} unless
+     * {@link #testSuiteStarted(Description)} was called for the same @code Description}.
+     *
+     * @param description the description of the test suite that just ran
+     * @since 4.13
+     */
+    public void testSuiteFinished(Description description) throws Exception {
+    }
+
+    /**
      * Called when an atomic test is about to be started.
      *
      * @param description the description of the test that is about to be run

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/notification/RunNotifier.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/notification/RunNotifier.java Changed

@@ -65,8 +65,8 @@
 
         void run() {
             int capacity = currentListeners.size();
-            ArrayList<RunListener> safeListeners = new ArrayList<RunListener>(capacity);
-            ArrayList<Failure> failures = new ArrayList<Failure>(capacity);
+            List<RunListener> safeListeners = new ArrayList<RunListener>(capacity);
+            List<Failure> failures = new ArrayList<Failure>(capacity);
             for (RunListener listener : currentListeners) {
                 try {
                     notifyListener(listener);
@@ -78,7 +78,7 @@
             fireTestFailures(safeListeners, failures);
         }
 
-        abstract protected void notifyListener(RunListener each) throws Exception;
+        protected abstract void notifyListener(RunListener each) throws Exception;
     }
 
     /**
@@ -106,6 +106,41 @@
     }
 
     /**
+     * Invoke to tell listeners that a test suite is about to start. Runners are strongly
+     * encouraged--but not required--to call this method. If this method is called for
+     * a given {@link Description} then {@link #fireTestSuiteFinished(Description)} MUST
+     * be called for the same {@code Description}.
+     *
+     * @param description the description of the suite test (generally a class name)
+     * @since 4.13
+     */
+    public void fireTestSuiteStarted(final Description description) {
+        new SafeNotifier() {
+            @Override
+            protected void notifyListener(RunListener each) throws Exception {
+                each.testSuiteStarted(description);
+            }
+        }.run();
+    }
+
+    /**
+     * Invoke to tell listeners that a test suite is about to finish. Always invoke
+     * this method if you invoke {@link #fireTestSuiteStarted(Description)}
+     * as listeners are likely to expect them to come in pairs.
+     *
+     * @param description the description of the suite test (generally a class name)
+     * @since 4.13
+     */
+    public void fireTestSuiteFinished(final Description description) {
+        new SafeNotifier() {
+            @Override
+            protected void notifyListener(RunListener each) throws Exception {
+                each.testSuiteFinished(description);
+            }
+        }.run();
+    }
+
+    /**
      * Invoke to tell listeners that an atomic test is about to start.
      *
      * @param description the description of the atomic test (generally a class and method name)

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runner/notification/SynchronizedRunListener.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runner/notification/SynchronizedRunListener.java Changed

@@ -10,7 +10,7 @@
  * <p>This class synchronizes all listener calls on a RunNotifier instance. This is done because
  * prior to JUnit 4.12, all listeners were called in a synchronized block in RunNotifier,
  * so no two listeners were ever called concurrently. If we instead made the methods here
- * sychronized, clients that added multiple listeners that called common code might see
+ * synchronized, clients that added multiple listeners that called common code might see
  * issues due to the reduced synchronization.
  *
  * @author Tibor Digana (tibor17)
@@ -43,6 +43,37 @@
         }
     }
 
+    /**
+     * {@inheritDoc}
+     * <p/>
+     * Synchronized decorator for {@link RunListener#testSuiteStarted(Description)}.
+     * @param description the description of the test suite that is about to be run
+     *                    (generally a class name).
+     * @throws Exception if any occurs.
+     * @since 4.13
+     */
+    @Override
+    public void testSuiteStarted(Description description) throws Exception {
+        synchronized (monitor) {
+            listener.testSuiteStarted(description);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p/>
+     * Synchronized decorator for {@link RunListener#testSuiteFinished(Description)}.
+     * @param description the description of the test suite that just ran.
+     * @throws Exception
+     * @since 4.13
+     */
+    @Override
+    public void testSuiteFinished(Description description) throws Exception {
+        synchronized (monitor) {
+            listener.testSuiteFinished(description);
+        }
+    }
+
     @Override
     public void testStarted(Description description) throws Exception {
         synchronized (monitor) {

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java Changed

@@ -3,8 +3,10 @@
 import static org.junit.internal.runners.rules.RuleMemberValidator.RULE_METHOD_VALIDATOR;
 import static org.junit.internal.runners.rules.RuleMemberValidator.RULE_VALIDATOR;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
@@ -21,14 +23,18 @@
 import org.junit.internal.runners.statements.RunAfters;
 import org.junit.internal.runners.statements.RunBefores;
 import org.junit.rules.MethodRule;
-import org.junit.rules.RunRules;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.model.FrameworkMember;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.MemberValueConsumer;
 import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;
+import org.junit.runners.model.TestClass;
+import org.junit.validator.PublicClassValidator;
+import org.junit.validator.TestClassValidator;
 
 /**
  * Implements the JUnit 4 standard test case class model, as defined by the
@@ -55,14 +61,27 @@
  * @since 4.5
  */
 public class BlockJUnit4ClassRunner extends ParentRunner<FrameworkMethod> {
-    private final ConcurrentHashMap<FrameworkMethod, Description> methodDescriptions = new ConcurrentHashMap<FrameworkMethod, Description>();
+    private static TestClassValidator PUBLIC_CLASS_VALIDATOR = new PublicClassValidator();
+
+    private final ConcurrentMap<FrameworkMethod, Description> methodDescriptions = new ConcurrentHashMap<FrameworkMethod, Description>();
+
+    /**
+     * Creates a BlockJUnit4ClassRunner to run {@code testClass}
+     *
+     * @throws InitializationError if the test class is malformed.
+     */
+    public BlockJUnit4ClassRunner(Class<?> testClass) throws InitializationError {
+        super(testClass);
+    }
+
     /**
-     * Creates a BlockJUnit4ClassRunner to run {@code klass}
+     * Creates a BlockJUnit4ClassRunner to run {@code testClass}.
      *
      * @throws InitializationError if the test class is malformed.
+     * @since 4.13
      */
-    public BlockJUnit4ClassRunner(Class<?> klass) throws InitializationError {
-        super(klass);
+    protected BlockJUnit4ClassRunner(TestClass testClass) throws InitializationError {
+        super(testClass);
     }
 
     //
@@ -75,10 +94,16 @@
         if (isIgnored(method)) {
             notifier.fireTestIgnored(description);
         } else {
-            runLeaf(methodBlock(method), description, notifier);
+            Statement statement = new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    methodBlock(method).evaluate();
+                }
+            };
+            runLeaf(statement, description, notifier);
         }
     }
-    
+
     /**
      * Evaluates whether {@link FrameworkMethod}s are ignored based on the
      * {@link Ignore} annotation.
@@ -123,6 +148,7 @@
     protected void collectInitializationErrors(List<Throwable> errors) {
         super.collectInitializationErrors(errors);
 
+        validatePublicConstructor(errors);
         validateNoNonStaticInnerClass(errors);
         validateConstructor(errors);
         validateInstanceMethods(errors);
@@ -130,6 +156,12 @@
         validateMethods(errors);
     }
 
+    private void validatePublicConstructor(List<Throwable> errors) {
+        if (getTestClass().getJavaClass() != null) {
+            errors.addAll(PUBLIC_CLASS_VALIDATOR.validateTestClass(getTestClass()));
+        }
+    }
+
     protected void validateNoNonStaticInnerClass(List<Throwable> errors) {
         if (getTestClass().isANonStaticInnerClass()) {
             String gripe = "The inner class " + getTestClass().getName()
@@ -180,6 +212,7 @@
      * Adds to {@code errors} for each method annotated with {@code @Test},
      * {@code @Before}, or {@code @After} that is not a public, void instance
      * method with no arguments.
+     * @deprecated
      */
     @Deprecated
     protected void validateInstanceMethods(List<Throwable> errors) {
@@ -187,7 +220,7 @@
         validatePublicVoidNoArgMethods(Before.class, false, errors);
         validateTestMethods(errors);
 
-        if (computeTestMethods().size() == 0) {
+        if (computeTestMethods().isEmpty()) {
             errors.add(new Exception("No runnable methods"));
         }
     }
@@ -218,6 +251,16 @@
     }
 
     /**
+     * Returns a new fixture to run a particular test {@code method} against.
+     * Default implementation executes the no-argument {@link #createTest()} method.
+     *
+     * @since 4.13
+     */
+    protected Object createTest(FrameworkMethod method) throws Exception {
+        return createTest();
+    }
+
+    /**
      * Returns the name that describes {@code method} for {@link Description}s.
      * Default implementation is the method's name
      */
@@ -232,10 +275,10 @@
      * Here is an outline of the default implementation:
      *
      * <ul>
-     * <li>Invoke {@code method} on the result of {@code createTest()}, and
+     * <li>Invoke {@code method} on the result of {@link #createTest(org.junit.runners.model.FrameworkMethod)}, and
      * throw any exceptions thrown by either operation.
-     * <li>HOWEVER, if {@code method}'s {@code @Test} annotation has the {@code
-     * expecting} attribute, return normally only if the previous step threw an
+     * <li>HOWEVER, if {@code method}'s {@code @Test} annotation has the {@link Test#expected()}
+     * attribute, return normally only if the previous step threw an
      * exception of the correct type, and throw an exception otherwise.
      * <li>HOWEVER, if {@code method}'s {@code @Test} annotation has the {@code
      * timeout} attribute, throw an exception if the previous step takes more
@@ -257,13 +300,13 @@
      * This can be overridden in subclasses, either by overriding this method,
      * or the implementations creating each sub-statement.
      */
-    protected Statement methodBlock(FrameworkMethod method) {
+    protected Statement methodBlock(final FrameworkMethod method) {
         Object test;
         try {
             test = new ReflectiveCallable() {
                 @Override
                 protected Object runReflectiveCall() throws Throwable {
-                    return createTest();
+                    return createTest(method);
                 }
             }.run();
         } catch (Throwable e) {
@@ -276,6 +319,7 @@
         statement = withBefores(method, test, statement);
         statement = withAfters(method, test, statement);
         statement = withRules(method, test, statement);
+        statement = withInterruptIsolation(statement);
         return statement;
     }
 
@@ -292,21 +336,22 @@
 
     /**
      * Returns a {@link Statement}: if {@code method}'s {@code @Test} annotation
-     * has the {@code expecting} attribute, return normally only if {@code next}
+     * has the {@link Test#expected()} attribute, return normally only if {@code next}
      * throws an exception of the correct type, and throw an exception
      * otherwise.
      */
     protected Statement possiblyExpectingExceptions(FrameworkMethod method,
             Object test, Statement next) {
         Test annotation = method.getAnnotation(Test.class);
-        return expectsException(annotation) ? new ExpectException(next,
-                getExpectedException(annotation)) : next;
+        Class<? extends Throwable> expectedExceptionClass = getExpectedException(annotation);
+        return expectedExceptionClass != null ? new ExpectException(next, expectedExceptionClass) : next;
     }
 
     /**
      * Returns a {@link Statement}: if {@code method}'s {@code @Test} annotation
      * has the {@code timeout} attribute, throw an exception if {@code next}
      * takes more than the specified number of milliseconds.
+     * @deprecated
      */
     @Deprecated
     protected Statement withPotentialTimeout(FrameworkMethod method,
@@ -348,28 +393,23 @@
                 target);
     }
 
-    private Statement withRules(FrameworkMethod method, Object target,
-            Statement statement) {
-        List<TestRule> testRules = getTestRules(target);
-        Statement result = statement;
-        result = withMethodRules(method, testRules, target, result);
-        result = withTestRules(method, testRules, result);
-
-        return result;
-    }
-
-    private Statement withMethodRules(FrameworkMethod method, List<TestRule> testRules,
-            Object target, Statement result) {
-        for (org.junit.rules.MethodRule each : getMethodRules(target)) {
-            if (!testRules.contains(each)) {
-                result = each.apply(result, method, target);
+    private Statement withRules(FrameworkMethod method, Object target, Statement statement) {
+        RuleContainer ruleContainer = new RuleContainer();
+        CURRENT_RULE_CONTAINER.set(ruleContainer);
+        try {
+            List<TestRule> testRules = getTestRules(target);
+            for (MethodRule each : rules(target)) {
+                if (!(each instanceof TestRule && testRules.contains(each))) {
+                    ruleContainer.add(each);
+                }
             }
+            for (TestRule rule : testRules) {
+                ruleContainer.add(rule);
+            }
+        } finally {
+            CURRENT_RULE_CONTAINER.remove();
         }
-        return result;
-    }
-
-    private List<org.junit.rules.MethodRule> getMethodRules(Object target) {
-        return rules(target);
+        return ruleContainer.apply(method, describeChild(method), target, statement);
     }
 
     /**
@@ -378,27 +418,12 @@
      *         test
      */
     protected List<MethodRule> rules(Object target) {
-        List<MethodRule> rules = getTestClass().getAnnotatedMethodValues(target, 
-                Rule.class, MethodRule.class);
-        
-        rules.addAll(getTestClass().getAnnotatedFieldValues(target,
-                Rule.class, MethodRule.class));
-        
-        return rules;
-    }
-
-    /**
-     * Returns a {@link Statement}: apply all non-static fields
-     * annotated with {@link Rule}.
-     *
-     * @param statement The base statement
-     * @return a RunRules statement if any class-level {@link Rule}s are
-     *         found, or the base statement
-     */
-    private Statement withTestRules(FrameworkMethod method, List<TestRule> testRules,
-            Statement statement) {
-        return testRules.isEmpty() ? statement :
-                new RunRules(statement, testRules, describeChild(method));
+        RuleCollector<MethodRule> collector = new RuleCollector<MethodRule>();
+        getTestClass().collectAnnotatedMethodValues(target, Rule.class, MethodRule.class,
+                collector);
+        getTestClass().collectAnnotatedFieldValues(target, Rule.class, MethodRule.class,
+                collector);
+        return collector.result;
     }
 
     /**
@@ -407,13 +432,10 @@
      *         test
      */
     protected List<TestRule> getTestRules(Object target) {
-        List<TestRule> result = getTestClass().getAnnotatedMethodValues(target,
-                Rule.class, TestRule.class);
-
-        result.addAll(getTestClass().getAnnotatedFieldValues(target,
-                Rule.class, TestRule.class));
-
-        return result;
+        RuleCollector<TestRule> collector = new RuleCollector<TestRule>();
+        getTestClass().collectAnnotatedMethodValues(target, Rule.class, TestRule.class, collector);
+        getTestClass().collectAnnotatedFieldValues(target, Rule.class, TestRule.class, collector);
+        return collector.result;
     }
 
     private Class<? extends Throwable> getExpectedException(Test annotation) {
@@ -424,14 +446,28 @@
         }
     }
 
-    private boolean expectsException(Test annotation) {
-        return getExpectedException(annotation) != null;
-    }
-
     private long getTimeout(Test annotation) {
         if (annotation == null) {
             return 0;
         }
         return annotation.timeout();
     }
+
+    private static final ThreadLocal<RuleContainer> CURRENT_RULE_CONTAINER =
+            new ThreadLocal<RuleContainer>();
+
+    private static class RuleCollector<T> implements MemberValueConsumer<T> {
+        final List<T> result = new ArrayList<T>();
+
+        public void accept(FrameworkMember<?> member, T value) {
+            Rule rule = member.getAnnotation(Rule.class);
+            if (rule != null) {
+                RuleContainer container = CURRENT_RULE_CONTAINER.get();
+                if (container != null) {
+                    container.setOrder(value, rule.order());
+                }
+            }
+            result.add(value);
+        }
+    }
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/JUnit4.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/JUnit4.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/Parameterized.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/Parameterized.java Changed

@@ -1,5 +1,6 @@
 package org.junit.runners;
 
+import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
@@ -8,12 +9,18 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.junit.internal.AssumptionViolatedException;
+import org.junit.runner.Description;
+import org.junit.runner.Result;
 import org.junit.runner.Runner;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.InvalidTestClassError;
 import org.junit.runners.model.TestClass;
 import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParametersFactory;
 import org.junit.runners.parameterized.ParametersRunnerFactory;
@@ -24,34 +31,37 @@
  * When running a parameterized test class, instances are created for the
  * cross-product of the test methods and the test data elements.
  * <p>
- * For example, to test a Fibonacci function, write:
+ * For example, to test the <code>+</code> operator, write:
  * <pre>
  * &#064;RunWith(Parameterized.class)
- * public class FibonacciTest {
- *     &#064;Parameters(name= &quot;{index}: fib{0}={1}&quot;)
+ * public class AdditionTest {
+ *     &#064;Parameters(name = &quot;{index}: {0} + {1} = {2}&quot;)
  *     public static Iterable&lt;Object&gt; data() {
- *         return Arrays.asList(new Object { { 0, 0 }, { 1, 1 }, { 2, 1 },
- *                 { 3, 2 }, { 4, 3 }, { 5, 5 }, { 6, 8 } });
+ *         return Arrays.asList(new Object { { 0, 0, 0 }, { 1, 1, 2 },
+ *                 { 3, 2, 5 }, { 4, 3, 7 } });
  *     }
  *
- *     private int fInput;
+ *     private int firstSummand;
  *
- *     private int fExpected;
+ *     private int secondSummand;
  *
- *     public FibonacciTest(int input, int expected) {
- *         fInput= input;
- *         fExpected= expected;
+ *     private int sum;
+ *
+ *     public AdditionTest(int firstSummand, int secondSummand, int sum) {
+ *         this.firstSummand = firstSummand;
+ *         this.secondSummand = secondSummand;
+ *         this.sum = sum;
  *     }
  *
  *     &#064;Test
  *     public void test() {
- *         assertEquals(fExpected, Fibonacci.compute(fInput));
+ *         assertEquals(sum, firstSummand + secondSummand);
  *     }
  * }
  * </pre>
  * <p>
- * Each instance of <code>FibonacciTest</code> will be constructed using the
- * two-argument constructor and the data values in the
+ * Each instance of <code>AdditionTest</code> will be constructed using the
+ * three-argument constructor and the data values in the
  * <code>&#064;Parameters</code> method.
  * <p>
  * In order that you can easily identify the individual tests, you may provide a
@@ -69,33 +79,36 @@
  * </dl>
  * <p>
  * In the example given above, the <code>Parameterized</code> runner creates
- * names like <code>1: fib(3)=2</code>. If you don't use the name parameter,
+ * names like <code>2: 3 + 2 = 5</code>. If you don't use the name parameter,
  * then the current parameter index is used as name.
  * <p>
  * You can also write:
  * <pre>
  * &#064;RunWith(Parameterized.class)
- * public class FibonacciTest {
- *  &#064;Parameters
- *  public static Iterable&lt;Object&gt; data() {
- *      return Arrays.asList(new Object { { 0, 0 }, { 1, 1 }, { 2, 1 },
- *                 { 3, 2 }, { 4, 3 }, { 5, 5 }, { 6, 8 } });
- *  }
- *  
- *  &#064;Parameter(0)
- *  public int fInput;
+ * public class AdditionTest {
+ *     &#064;Parameters(name = &quot;{index}: {0} + {1} = {2}&quot;)
+ *     public static Iterable&lt;Object&gt; data() {
+ *         return Arrays.asList(new Object { { 0, 0, 0 }, { 1, 1, 2 },
+ *                 { 3, 2, 5 }, { 4, 3, 7 } });
+ *     }
+ *
+ *     &#064;Parameter(0)
+ *     public int firstSummand;
  *
- *  &#064;Parameter(1)
- *  public int fExpected;
+ *     &#064;Parameter(1)
+ *     public int secondSummand;
  *
- *  &#064;Test
- *  public void test() {
- *      assertEquals(fExpected, Fibonacci.compute(fInput));
- *  }
+ *     &#064;Parameter(2)
+ *     public int sum;
+ *
+ *     &#064;Test
+ *     public void test() {
+ *         assertEquals(sum, firstSummand + secondSummand);
+ *     }
  * }
  * </pre>
  * <p>
- * Each instance of <code>FibonacciTest</code> will be constructed with the default constructor
+ * Each instance of <code>AdditionTest</code> will be constructed with the default constructor
  * and fields annotated by <code>&#064;Parameter</code>  will be initialized
  * with the data values in the <code>&#064;Parameters</code> method.
  *
@@ -105,8 +118,7 @@
  * <pre>
  * &#064;Parameters
  * public static Object data() {
- * 	return new Object { { 0, 0 }, { 1, 1 }, { 2, 1 }, { 3, 2 }, { 4, 3 },
- * 			{ 5, 5 }, { 6, 8 } };
+ * 	return new Object { { 0, 0, 0 }, { 1, 1, 2 }, { 3, 2, 5 }, { 4, 3, 7 } } };
  * }
  * </pre>
  * 
@@ -130,6 +142,19 @@
  * }
  * </pre>
  *
+ * <h3>Executing code before/after executing tests for specific parameters</h3>
+ * <p>
+ * If your test needs to perform some preparation or cleanup based on the
+ * parameters, this can be done by adding public static methods annotated with
+ * {@code @BeforeParam}/{@code @AfterParam}. Such methods should either have no
+ * parameters or the same parameters as the test.
+ * <pre>
+ * &#064;BeforeParam
+ * public static void beforeTestsForParameter(String onlyParameter) {
+ *     System.out.println("Testing " + onlyParameter);
+ * }
+ * </pre>
+ *
  * <h3>Create different runners</h3>
  * <p>
  * By default the {@code Parameterized} runner creates a slightly modified
@@ -141,7 +166,7 @@
  * The factory must have a public zero-arg constructor.
  *
  * <pre>
- * public class YourRunnerFactory implements ParameterizedRunnerFactory {
+ * public class YourRunnerFactory implements ParametersRunnerFactory {
  *     public Runner createRunnerForTestWithParameters(TestWithParameters test)
  *             throws InitializationError {
  *         return YourRunner(test);
@@ -160,6 +185,21 @@
  * }
  * </pre>
  *
+ * <h3>Avoid creating parameters</h3>
+ * <p>With {@link org.junit.Assume assumptions} you can dynamically skip tests.
+ * Assumptions are also supported by the <code>&#064;Parameters</code> method.
+ * Creating parameters is stopped when the assumption fails and none of the
+ * tests in the test class is executed. JUnit reports a
+ * {@link Result#getAssumptionFailureCount() single assumption failure} for the
+ * whole test class in this case.
+ * <pre>
+ * &#064;Parameters
+ * public static Iterable&lt;? extends Object&gt; data() {
+ * 	String os = System.getProperty("os.name").toLowerCase()
+ * 	Assume.assumeTrue(os.contains("win"));
+ * 	return Arrays.asList(&quot;first test&quot;, &quot;second test&quot;);
+ * }
+ * </pre>
  * @since 4.0
  */
 public class Parameterized extends Suite {
@@ -170,7 +210,7 @@
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.METHOD)
-    public static @interface Parameters {
+    public @interface Parameters {
         /**
          * Optional pattern to derive the test's name from the parameters. Use
          * numbers in braces to refer to the parameters or the additional data
@@ -201,7 +241,7 @@
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.FIELD)
-    public static @interface Parameter {
+    public @interface Parameter {
         /**
          * Method that returns the index of the parameter in the array
          * returned by the method annotated by <code>Parameters</code>.
@@ -230,122 +270,235 @@
         Class<? extends ParametersRunnerFactory> value() default BlockJUnit4ClassRunnerWithParametersFactory.class;
     }
 
-    private static final ParametersRunnerFactory DEFAULT_FACTORY = new BlockJUnit4ClassRunnerWithParametersFactory();
-
-    private static final List<Runner> NO_RUNNERS = Collections.<Runner>emptyList();
+    /**
+     * Annotation for {@code public static void} methods which should be executed before
+     * evaluating tests with particular parameters.
+     *
+     * @see org.junit.BeforeClass
+     * @see org.junit.Before
+     * @since 4.13
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface BeforeParam {
+    }
 
-    private final List<Runner> runners;
+    /**
+     * Annotation for {@code public static void} methods which should be executed after
+     * evaluating tests with particular parameters.
+     *
+     * @see org.junit.AfterClass
+     * @see org.junit.After
+     * @since 4.13
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface AfterParam {
+    }
 
     /**
      * Only called reflectively. Do not use programmatically.
      */
     public Parameterized(Class<?> klass) throws Throwable {
-        super(klass, NO_RUNNERS);
-        ParametersRunnerFactory runnerFactory = getParametersRunnerFactory(
-                klass);
-        Parameters parameters = getParametersMethod().getAnnotation(
-                Parameters.class);
-        runners = Collections.unmodifiableList(createRunnersForParameters(
-                allParameters(), parameters.name(), runnerFactory));
+        this(klass, new RunnersFactory(klass));
     }
 
-    private ParametersRunnerFactory getParametersRunnerFactory(Class<?> klass)
-            throws InstantiationException, IllegalAccessException {
-        UseParametersRunnerFactory annotation = klass
-                .getAnnotation(UseParametersRunnerFactory.class);
-        if (annotation == null) {
-            return DEFAULT_FACTORY;
-        } else {
-            Class<? extends ParametersRunnerFactory> factoryClass = annotation
-                    .value();
-            return factoryClass.newInstance();
-        }
+    private Parameterized(Class<?> klass, RunnersFactory runnersFactory) throws Exception {
+        super(klass, runnersFactory.createRunners());
+        validateBeforeParamAndAfterParamMethods(runnersFactory.parameterCount);
     }
 
-    @Override
-    protected List<Runner> getChildren() {
-        return runners;
+    private void validateBeforeParamAndAfterParamMethods(Integer parameterCount)
+            throws InvalidTestClassError {
+        List<Throwable> errors = new ArrayList<Throwable>();
+        validatePublicStaticVoidMethods(Parameterized.BeforeParam.class, parameterCount, errors);
+        validatePublicStaticVoidMethods(Parameterized.AfterParam.class, parameterCount, errors);
+        if (!errors.isEmpty()) {
+            throw new InvalidTestClassError(getTestClass().getJavaClass(), errors);
+        }
     }
 
-    private TestWithParameters createTestWithNotNormalizedParameters(
-            String pattern, int index, Object parametersOrSingleParameter) {
-        Object parameters= (parametersOrSingleParameter instanceof Object) ? (Object) parametersOrSingleParameter
-            : new Object { parametersOrSingleParameter };
-        return createTestWithParameters(getTestClass(), pattern, index,
-                parameters);
+    private void validatePublicStaticVoidMethods(
+            Class<? extends Annotation> annotation, Integer parameterCount,
+            List<Throwable> errors) {
+        List<FrameworkMethod> methods = getTestClass().getAnnotatedMethods(annotation);
+        for (FrameworkMethod fm : methods) {
+            fm.validatePublicVoid(true, errors);
+            if (parameterCount != null) {
+                int methodParameterCount = fm.getMethod().getParameterTypes().length;
+                if (methodParameterCount != 0 && methodParameterCount != parameterCount) {
+                    errors.add(new Exception("Method " + fm.getName()
+                            + "() should have 0 or " + parameterCount + " parameter(s)"));
+                }
+            }
+        }
     }
 
-    @SuppressWarnings("unchecked")
-    private Iterable<Object> allParameters() throws Throwable {
-        Object parameters = getParametersMethod().invokeExplosively(null);
-        if (parameters instanceof Iterable) {
-            return (Iterable<Object>) parameters;
-        } else if (parameters instanceof Object) {
-            return Arrays.asList((Object) parameters);
-        } else {
-            throw parametersMethodReturnedWrongType();
+    private static class AssumptionViolationRunner extends Runner {
+        private final Description description;
+        private final AssumptionViolatedException exception;
+
+        AssumptionViolationRunner(TestClass testClass, String methodName,
+                AssumptionViolatedException exception) {
+            this.description = Description
+                    .createTestDescription(testClass.getJavaClass(),
+                            methodName + "() assumption violation");
+            this.exception = exception;
+        }
+
+        @Override
+        public Description getDescription() {
+            return description;
+        }
+
+        @Override
+        public void run(RunNotifier notifier) {
+            notifier.fireTestAssumptionFailed(new Failure(description, exception));
         }
     }
 
-    private FrameworkMethod getParametersMethod() throws Exception {
-        List<FrameworkMethod> methods = getTestClass().getAnnotatedMethods(
-                Parameters.class);
-        for (FrameworkMethod each : methods) {
-            if (each.isStatic() && each.isPublic()) {
-                return each;
+    private static class RunnersFactory {
+        private static final ParametersRunnerFactory DEFAULT_FACTORY = new BlockJUnit4ClassRunnerWithParametersFactory();
+
+        private final TestClass testClass;
+        private final FrameworkMethod parametersMethod;
+        private final List<Object> allParameters;
+        private final int parameterCount;
+        private final Runner runnerOverride;
+
+        private RunnersFactory(Class<?> klass) throws Throwable {
+            testClass = new TestClass(klass);
+            parametersMethod = getParametersMethod(testClass);
+            List<Object> allParametersResult;
+            AssumptionViolationRunner assumptionViolationRunner = null;
+            try {
+                allParametersResult = allParameters(testClass, parametersMethod);
+            } catch (AssumptionViolatedException e) {
+                allParametersResult = Collections.emptyList();
+                assumptionViolationRunner = new AssumptionViolationRunner(testClass,
+                        parametersMethod.getName(), e);
             }
+            allParameters = allParametersResult;
+            runnerOverride = assumptionViolationRunner;
+            parameterCount =
+                    allParameters.isEmpty() ? 0 : normalizeParameters(allParameters.get(0)).length;
         }
 
-        throw new Exception("No public static parameters method on class "
-                + getTestClass().getName());
-    }
+        private List<Runner> createRunners() throws Exception {
+            if (runnerOverride != null) {
+                return Collections.singletonList(runnerOverride);
+            }
+            Parameters parameters = parametersMethod.getAnnotation(Parameters.class);
+            return Collections.unmodifiableList(createRunnersForParameters(
+                    allParameters, parameters.name(),
+                    getParametersRunnerFactory()));
+        }
 
-    private List<Runner> createRunnersForParameters(
-            Iterable<Object> allParameters, String namePattern,
-            ParametersRunnerFactory runnerFactory)
-            throws InitializationError,
-            Exception {
-        try {
-            List<TestWithParameters> tests = createTestsForParameters(
-                    allParameters, namePattern);
-            List<Runner> runners = new ArrayList<Runner>();
-            for (TestWithParameters test : tests) {
-                runners.add(runnerFactory
-                        .createRunnerForTestWithParameters(test));
+        private ParametersRunnerFactory getParametersRunnerFactory()
+                throws InstantiationException, IllegalAccessException {
+            UseParametersRunnerFactory annotation = testClass
+                    .getAnnotation(UseParametersRunnerFactory.class);
+            if (annotation == null) {
+                return DEFAULT_FACTORY;
+            } else {
+                Class<? extends ParametersRunnerFactory> factoryClass = annotation
+                        .value();
+                return factoryClass.newInstance();
             }
-            return runners;
-        } catch (ClassCastException e) {
-            throw parametersMethodReturnedWrongType();
         }
-    }
 
-    private List<TestWithParameters> createTestsForParameters(
-            Iterable<Object> allParameters, String namePattern)
-            throws Exception {
-        int i = 0;
-        List<TestWithParameters> children = new ArrayList<TestWithParameters>();
-        for (Object parametersOfSingleTest : allParameters) {
-            children.add(createTestWithNotNormalizedParameters(namePattern,
-                    i++, parametersOfSingleTest));
+        private TestWithParameters createTestWithNotNormalizedParameters(
+                String pattern, int index, Object parametersOrSingleParameter) {
+            Object parameters = normalizeParameters(parametersOrSingleParameter);
+            return createTestWithParameters(testClass, pattern, index, parameters);
         }
-        return children;
-    }
 
-    private Exception parametersMethodReturnedWrongType() throws Exception {
-        String className = getTestClass().getName();
-        String methodName = getParametersMethod().getName();
-        String message = MessageFormat.format(
-                "{0}.{1}() must return an Iterable of arrays.",
-                className, methodName);
-        return new Exception(message);
-    }
+        private static Object normalizeParameters(Object parametersOrSingleParameter) {
+            return (parametersOrSingleParameter instanceof Object) ? (Object) parametersOrSingleParameter
+                    : new Object { parametersOrSingleParameter };
+        }
 
-    private static TestWithParameters createTestWithParameters(
-            TestClass testClass, String pattern, int index, Object parameters) {
-        String finalPattern = pattern.replaceAll("\\{index\\}",
-                Integer.toString(index));
-        String name = MessageFormat.format(finalPattern, parameters);
-        return new TestWithParameters("" + name + "", testClass,
-                Arrays.asList(parameters));
+        @SuppressWarnings("unchecked")
+        private static List<Object> allParameters(
+                TestClass testClass, FrameworkMethod parametersMethod) throws Throwable {
+            Object parameters = parametersMethod.invokeExplosively(null);
+            if (parameters instanceof List) {
+                return (List<Object>) parameters;
+            } else if (parameters instanceof Collection) {
+                return new ArrayList<Object>((Collection<Object>) parameters);
+            } else if (parameters instanceof Iterable) {
+                List<Object> result = new ArrayList<Object>();
+                for (Object entry : ((Iterable<Object>) parameters)) {
+                    result.add(entry);
+                }
+                return result;
+            } else if (parameters instanceof Object) {
+                return Arrays.asList((Object) parameters);
+            } else {
+                throw parametersMethodReturnedWrongType(testClass, parametersMethod);
+            }
+        }
+
+        private static FrameworkMethod getParametersMethod(TestClass testClass) throws Exception {
+            List<FrameworkMethod> methods = testClass
+                    .getAnnotatedMethods(Parameters.class);
+            for (FrameworkMethod each : methods) {
+                if (each.isStatic() && each.isPublic()) {
+                    return each;
+                }
+            }
+
+            throw new Exception("No public static parameters method on class "
+                    + testClass.getName());
+        }
+
+        private List<Runner> createRunnersForParameters(
+                Iterable<Object> allParameters, String namePattern,
+                ParametersRunnerFactory runnerFactory) throws Exception {
+            try {
+                List<TestWithParameters> tests = createTestsForParameters(
+                        allParameters, namePattern);
+                List<Runner> runners = new ArrayList<Runner>();
+                for (TestWithParameters test : tests) {
+                    runners.add(runnerFactory
+                            .createRunnerForTestWithParameters(test));
+                }
+                return runners;
+            } catch (ClassCastException e) {
+                throw parametersMethodReturnedWrongType(testClass, parametersMethod);
+            }
+        }
+
+        private List<TestWithParameters> createTestsForParameters(
+                Iterable<Object> allParameters, String namePattern)
+                throws Exception {
+            int i = 0;
+            List<TestWithParameters> children = new ArrayList<TestWithParameters>();
+            for (Object parametersOfSingleTest : allParameters) {
+                children.add(createTestWithNotNormalizedParameters(namePattern,
+                        i++, parametersOfSingleTest));
+            }
+            return children;
+        }
+
+        private static Exception parametersMethodReturnedWrongType(
+                TestClass testClass, FrameworkMethod parametersMethod) throws Exception {
+            String className = testClass.getName();
+            String methodName = parametersMethod.getName();
+            String message = MessageFormat.format(
+                    "{0}.{1}() must return an Iterable of arrays.", className,
+                    methodName);
+            return new Exception(message);
+        }
+
+        private TestWithParameters createTestWithParameters(
+                TestClass testClass, String pattern, int index,
+                Object parameters) {
+            String finalPattern = pattern.replaceAll("\\{index\\}",
+                    Integer.toString(index));
+            String name = MessageFormat.format(finalPattern, parameters);
+            return new TestWithParameters("" + name + "", testClass,
+                    Arrays.asList(parameters));
+        }
     }
 }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/ParentRunner.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/ParentRunner.java Changed

@@ -1,21 +1,25 @@
 package org.junit.runners;
 
+import static org.junit.internal.Checks.notNull;
 import static org.junit.internal.runners.rules.RuleMemberValidator.CLASS_RULE_METHOD_VALIDATOR;
 import static org.junit.internal.runners.rules.RuleMemberValidator.CLASS_RULE_VALIDATOR;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
+import org.junit.FixMethodOrder;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.internal.AssumptionViolatedException;
@@ -28,18 +32,22 @@
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.manipulation.Filterable;
+import org.junit.runner.manipulation.Orderer;
+import org.junit.runner.manipulation.InvalidOrderingException;
 import org.junit.runner.manipulation.NoTestsRemainException;
-import org.junit.runner.manipulation.Sortable;
+import org.junit.runner.manipulation.Orderable;
 import org.junit.runner.manipulation.Sorter;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runner.notification.StoppedByUserException;
+import org.junit.runners.model.FrameworkMember;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.InvalidTestClassError;
+import org.junit.runners.model.MemberValueConsumer;
 import org.junit.runners.model.RunnerScheduler;
 import org.junit.runners.model.Statement;
 import org.junit.runners.model.TestClass;
 import org.junit.validator.AnnotationsValidator;
-import org.junit.validator.PublicClassValidator;
 import org.junit.validator.TestClassValidator;
 
 /**
@@ -56,15 +64,15 @@
  * @since 4.5
  */
 public abstract class ParentRunner<T> extends Runner implements Filterable,
-        Sortable {
-    private static final List<TestClassValidator> VALIDATORS = Arrays.asList(
-            new AnnotationsValidator(), new PublicClassValidator());
+        Orderable {
+    private static final List<TestClassValidator> VALIDATORS = Collections.<TestClassValidator>singletonList(
+            new AnnotationsValidator());
 
-    private final Object childrenLock = new Object();
+    private final Lock childrenLock = new ReentrantLock();
     private final TestClass testClass;
 
     // Guarded by childrenLock
-    private volatile Collection<T> filteredChildren = null;
+    private volatile List<T> filteredChildren = null;
 
     private volatile RunnerScheduler scheduler = new RunnerScheduler() {
         public void schedule(Runnable childStatement) {
@@ -84,6 +92,21 @@
         validate();
     }
 
+   /**
+    * Constructs a new {@code ParentRunner} that will run the {@code TestClass}.
+    *
+    * @since 4.13
+    */
+    protected ParentRunner(TestClass testClass) throws InitializationError {
+       this.testClass = notNull(testClass);
+       validate();
+    }
+
+    /**
+     * @deprecated Please use {@link #ParentRunner(org.junit.runners.model.TestClass)}.
+     * @since 4.12
+     */
+    @Deprecated
     protected TestClass createTestClass(Class<?> testClass) {
         return new TestClass(testClass);
     }
@@ -192,6 +215,7 @@
             statement = withBeforeClasses(statement);
             statement = withAfterClasses(statement);
             statement = withClassRules(statement);
+            statement = withInterruptIsolation(statement);
         }
         return statement;
     }
@@ -219,7 +243,7 @@
 
     /**
      * Returns a {@link Statement}: run all non-overridden {@code @AfterClass} methods on this class
-     * and superclasses before executing {@code statement}; all AfterClass methods are
+     * and superclasses after executing {@code statement}; all AfterClass methods are
      * always executed: exceptions thrown by previous steps are combined, if
      * necessary, with exceptions from AfterClass methods into a
      * {@link org.junit.runners.model.MultipleFailureException}.
@@ -251,9 +275,10 @@
      *         each method in the tested class.
      */
     protected List<TestRule> classRules() {
-        List<TestRule> result = testClass.getAnnotatedMethodValues(null, ClassRule.class, TestRule.class);
-        result.addAll(testClass.getAnnotatedFieldValues(null, ClassRule.class, TestRule.class));
-        return result;
+        ClassRuleCollector collector = new ClassRuleCollector();
+        testClass.collectAnnotatedMethodValues(null, ClassRule.class, TestRule.class, collector);
+        testClass.collectAnnotatedFieldValues(null, ClassRule.class, TestRule.class, collector);
+        return collector.getOrderedRules();
     }
 
     /**
@@ -271,6 +296,22 @@
     }
 
     /**
+     * @return a {@link Statement}: clears interrupt status of current thread after execution of statement
+     */
+    protected final Statement withInterruptIsolation(final Statement statement) {
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                try {
+                    statement.evaluate();
+                } finally {
+                    Thread.interrupted(); // clearing thread interrupted status for isolation
+                }
+            }
+        };
+    }
+
+    /**
      * Evaluates whether a child is ignored. The default implementation always
      * returns <code>false</code>.
      * 
@@ -346,8 +387,16 @@
 
     @Override
     public Description getDescription() {
-        Description description = Description.createSuiteDescription(getName(),
-                getRunnerAnnotations());
+        Class<?> clazz = getTestClass().getJavaClass();
+        Description description;
+        // if subclass overrides `getName()` then we should use it
+        // to maintain backwards compatibility with JUnit 4.12
+        if (clazz == null || !clazz.getName().equals(getName())) {
+            description = Description.createSuiteDescription(getName(), getRunnerAnnotations());
+        } else {
+            description = Description.createSuiteDescription(clazz, getRunnerAnnotations());
+        }
+
         for (T child : getFilteredChildren()) {
             description.addChild(describeChild(child));
         }
@@ -358,6 +407,7 @@
     public void run(final RunNotifier notifier) {
         EachTestNotifier testNotifier = new EachTestNotifier(notifier,
                 getDescription());
+        testNotifier.fireTestSuiteStarted();
         try {
             Statement statement = classBlock(notifier);
             statement.evaluate();
@@ -367,6 +417,8 @@
             throw e;
         } catch (Throwable e) {
             testNotifier.addFailure(e);
+        } finally {
+            testNotifier.fireTestSuiteFinished();
         }
     }
 
@@ -375,7 +427,8 @@
     //
 
     public void filter(Filter filter) throws NoTestsRemainException {
-        synchronized (childrenLock) {
+        childrenLock.lock();
+        try {
             List<T> children = new ArrayList<T>(getFilteredChildren());
             for (Iterator<T> iter = children.iterator(); iter.hasNext(); ) {
                 T each = iter.next();
@@ -389,21 +442,70 @@
                     iter.remove();
                 }
             }
-            filteredChildren = Collections.unmodifiableCollection(children);
+            filteredChildren = Collections.unmodifiableList(children);
             if (filteredChildren.isEmpty()) {
                 throw new NoTestsRemainException();
             }
+        } finally {
+            childrenLock.unlock();
         }
     }
 
     public void sort(Sorter sorter) {
-        synchronized (childrenLock) {
+        if (shouldNotReorder()) {
+            return;
+        }
+
+        childrenLock.lock();
+        try {
             for (T each : getFilteredChildren()) {
                 sorter.apply(each);
             }
             List<T> sortedChildren = new ArrayList<T>(getFilteredChildren());
             Collections.sort(sortedChildren, comparator(sorter));
-            filteredChildren = Collections.unmodifiableCollection(sortedChildren);
+            filteredChildren = Collections.unmodifiableList(sortedChildren);
+        } finally {
+            childrenLock.unlock();
+        }
+    }
+
+    /**
+     * Implementation of {@link Orderable#order(Orderer)}.
+     *
+     * @since 4.13
+     */
+    public void order(Orderer orderer) throws InvalidOrderingException {
+        if (shouldNotReorder()) {
+            return;
+        }
+
+        childrenLock.lock();
+        try {
+            List<T> children = getFilteredChildren();
+            // In theory, we could have duplicate Descriptions. De-dup them before ordering,
+            // and add them back at the end.
+            Map<Description, List<T>> childMap = new LinkedHashMap<Description, List<T>>(
+                    children.size());
+            for (T child : children) {
+                Description description = describeChild(child);
+                List<T> childrenWithDescription = childMap.get(description);
+                if (childrenWithDescription == null) {
+                    childrenWithDescription = new ArrayList<T>(1);
+                    childMap.put(description, childrenWithDescription);
+                }
+                childrenWithDescription.add(child);
+                orderer.apply(child);
+            }
+
+            List<Description> inOrder = orderer.order(childMap.keySet());
+
+            children = new ArrayList<T>(children.size());
+            for (Description description : inOrder) {
+                children.addAll(childMap.get(description));
+            }
+            filteredChildren = Collections.unmodifiableList(children);
+        } finally {
+            childrenLock.unlock();
         }
     }
 
@@ -411,20 +513,29 @@
     // Private implementation
     //
 
+    private boolean shouldNotReorder() {
+        // If the test specifies a specific order, do not reorder.
+        return getDescription().getAnnotation(FixMethodOrder.class) != null;
+    }
+
     private void validate() throws InitializationError {
         List<Throwable> errors = new ArrayList<Throwable>();
         collectInitializationErrors(errors);
         if (!errors.isEmpty()) {
-            throw new InitializationError(errors);
+            throw new InvalidTestClassError(testClass.getJavaClass(), errors);
         }
     }
 
-    private Collection<T> getFilteredChildren() {
+    private List<T> getFilteredChildren() {
         if (filteredChildren == null) {
-            synchronized (childrenLock) {
+            childrenLock.lock();
+            try {
                 if (filteredChildren == null) {
-                    filteredChildren = Collections.unmodifiableCollection(getChildren());
+                    filteredChildren = Collections.unmodifiableList(
+                            new ArrayList<T>(getChildren()));
                 }
+            } finally {
+                childrenLock.unlock();
             }
         }
         return filteredChildren;
@@ -449,4 +560,23 @@
     public void setScheduler(RunnerScheduler scheduler) {
         this.scheduler = scheduler;
     }
+
+    private static class ClassRuleCollector implements MemberValueConsumer<TestRule> {
+        final List<RuleContainer.RuleEntry> entries = new ArrayList<RuleContainer.RuleEntry>();
+
+        public void accept(FrameworkMember<?> member, TestRule value) {
+            ClassRule rule = member.getAnnotation(ClassRule.class);
+            entries.add(new RuleContainer.RuleEntry(value, RuleContainer.RuleEntry.TYPE_TEST_RULE,
+                    rule != null ? rule.order() : null));
+        }
+
+        public List<TestRule> getOrderedRules() {
+            Collections.sort(entries, RuleContainer.ENTRY_COMPARATOR);
+            List<TestRule> result = new ArrayList<TestRule>(entries.size());
+            for (RuleContainer.RuleEntry entry : entries) {
+                result.add((TestRule) entry.rule);
+            }
+            return result;
+        }
+    }
 }

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/RuleContainer.java Added

@@ -0,0 +1,113 @@
+package org.junit.runners;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.IdentityHashMap;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+/**
+ * Data structure for ordering of {@link TestRule}/{@link MethodRule} instances.
+ *
+ * @since 4.13
+ */
+class RuleContainer {
+    private final IdentityHashMap<Object, Integer> orderValues = new IdentityHashMap<Object, Integer>();
+    private final List<TestRule> testRules = new ArrayList<TestRule>();
+    private final List<MethodRule> methodRules = new ArrayList<MethodRule>();
+
+    /**
+     * Sets order value for the specified rule.
+     */
+    public void setOrder(Object rule, int order) {
+        orderValues.put(rule, order);
+    }
+
+    public void add(MethodRule methodRule) {
+        methodRules.add(methodRule);
+    }
+
+    public void add(TestRule testRule) {
+        testRules.add(testRule);
+    }
+
+    static final Comparator<RuleEntry> ENTRY_COMPARATOR = new Comparator<RuleEntry>() {
+        public int compare(RuleEntry o1, RuleEntry o2) {
+            int result = compareInt(o1.order, o2.order);
+            return result != 0 ? result : o1.type - o2.type;
+        }
+
+        private int compareInt(int a, int b) {
+            return (a < b) ? 1 : (a == b ? 0 : -1);
+        }
+    };
+
+    /**
+     * Returns entries in the order how they should be applied, i.e. inner-to-outer.
+     */
+    private List<RuleEntry> getSortedEntries() {
+        List<RuleEntry> ruleEntries = new ArrayList<RuleEntry>(
+                methodRules.size() + testRules.size());
+        for (MethodRule rule : methodRules) {
+            ruleEntries.add(new RuleEntry(rule, RuleEntry.TYPE_METHOD_RULE, orderValues.get(rule)));
+        }
+        for (TestRule rule : testRules) {
+            ruleEntries.add(new RuleEntry(rule, RuleEntry.TYPE_TEST_RULE, orderValues.get(rule)));
+        }
+        Collections.sort(ruleEntries, ENTRY_COMPARATOR);
+        return ruleEntries;
+    }
+
+    /**
+     * Applies all the rules ordered accordingly to the specified {@code statement}.
+     */
+    public Statement apply(FrameworkMethod method, Description description, Object target,
+            Statement statement) {
+        if (methodRules.isEmpty() && testRules.isEmpty()) {
+            return statement;
+        }
+        Statement result = statement;
+        for (RuleEntry ruleEntry : getSortedEntries()) {
+            if (ruleEntry.type == RuleEntry.TYPE_TEST_RULE) {
+                result = ((TestRule) ruleEntry.rule).apply(result, description);
+            } else {
+                result = ((MethodRule) ruleEntry.rule).apply(result, method, target);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Returns rule instances in the order how they should be applied, i.e. inner-to-outer.
+     * VisibleForTesting
+     */
+    List<Object> getSortedRules() {
+        List<Object> result = new ArrayList<Object>();
+        for (RuleEntry entry : getSortedEntries()) {
+            result.add(entry.rule);
+        }
+        return result;
+    }
+
+    static class RuleEntry {
+        static final int TYPE_TEST_RULE = 1;
+        static final int TYPE_METHOD_RULE = 0;
+
+        final Object rule;
+        final int type;
+        final int order;
+
+        RuleEntry(Object rule, int type, Integer order) {
+            this.rule = rule;
+            this.type = type;
+            this.order = order != null ? order.intValue() : Rule.DEFAULT_ORDER;
+        }
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/Suite.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/Suite.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/model/FrameworkField.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/model/FrameworkField.java Changed

@@ -14,12 +14,26 @@
 public class FrameworkField extends FrameworkMember<FrameworkField> {
     private final Field field;
 
-    FrameworkField(Field field) {
+    /**
+     * Returns a new {@code FrameworkField} for {@code field}.
+     *
+     * <p>Access relaxed to {@code public} since version 4.13.1.
+     */
+    public FrameworkField(Field field) {
         if (field == null) {
             throw new NullPointerException(
                     "FrameworkField cannot be created without an underlying field.");
         }
         this.field = field;
+
+        if (isPublic()) {
+            // This field could be a public field in a package-scope base class
+            try {
+                field.setAccessible(true);
+            } catch (SecurityException e) {
+                // We may get an IllegalAccessException when we try to access the field
+            }
+        }
     }
 
     @Override
@@ -41,6 +55,11 @@
     }
 
     @Override
+    boolean isBridgeMethod() {
+        return false;
+    }
+
+    @Override
     protected int getModifiers() {
         return field.getModifiers();
     }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/model/FrameworkMember.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/model/FrameworkMember.java Changed

@@ -12,15 +12,29 @@
         Annotatable {
     abstract boolean isShadowedBy(T otherMember);
 
-    boolean isShadowedBy(List<T> members) {
-        for (T each : members) {
-            if (isShadowedBy(each)) {
-                return true;
+    T handlePossibleBridgeMethod(List<T> members) {
+        for (int i = members.size() - 1; i >=0; i--) {
+            T otherMember = members.get(i);
+            if (isShadowedBy(otherMember)) {
+                if (otherMember.isBridgeMethod()) {
+                    /*
+                     *  We need to return the previously-encountered bridge method
+                     *  because JUnit won't be able to call the parent method,
+                     *  because the parent class isn't public.
+                     */
+                    members.remove(i);
+                    return otherMember;
+                }
+                // We found a shadowed member that isn't a bridge method. Ignore it.
+                return null;
             }
         }
-        return false;
+        // No shadow or bridge method found. The caller should add *this* member.
+        return (T) this;
     }
 
+    abstract boolean isBridgeMethod();
+
     protected abstract int getModifiers();
 
     /**

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/model/FrameworkMethod.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/model/FrameworkMethod.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/model/InitializationError.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/model/InitializationError.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/model/InvalidTestClassError.java Added

@@ -0,0 +1,39 @@
+package org.junit.runners.model;
+
+import java.util.List;
+
+/**
+ * Thrown by {@link org.junit.runner.Runner}s in case the class under test is not valid.
+ * <p>
+ * Its message conveniently lists all of the validation errors.
+ *
+ * @since 4.13
+ */
+public class InvalidTestClassError extends InitializationError {
+    private static final long serialVersionUID = 1L;
+
+    private final String message;
+
+    public InvalidTestClassError(Class<?> offendingTestClass, List<Throwable> validationErrors) {
+        super(validationErrors);
+        this.message = createMessage(offendingTestClass, validationErrors);
+    }
+
+    private static String createMessage(Class<?> testClass, List<Throwable> validationErrors) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(String.format("Invalid test class '%s':", testClass.getName()));
+        int i = 1;
+        for (Throwable error : validationErrors) {
+            sb.append("\n  " + (i++) + ". " + error.getMessage());
+        }
+        return sb.toString();
+    }
+
+    /**
+     * @return a message with a list of all of the validation errors
+     */
+    @Override
+    public String getMessage() {
+        return message;
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/model/MemberValueConsumer.java Added

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/model/MultipleFailureException.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/model/MultipleFailureException.java Changed

@@ -1,9 +1,13 @@
 package org.junit.runners.model;
 
+import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.junit.TestCouldNotBeSkippedException;
+import org.junit.internal.AssumptionViolatedException;
 import org.junit.internal.Throwables;
 
 /**
@@ -17,12 +21,22 @@
     /*
      * We have to use the f prefix until the next major release to ensure
      * serialization compatibility. 
-     * See https://github.com/junit-team/junit/issues/976
+     * See https://github.com/junit-team/junit4/issues/976
      */
     private final List<Throwable> fErrors;
 
     public MultipleFailureException(List<Throwable> errors) {
-        this.fErrors = new ArrayList<Throwable>(errors);
+        if (errors.isEmpty()) {
+            throw new IllegalArgumentException(
+                    "List of Throwables must not be empty");
+        }
+        this.fErrors = new ArrayList<Throwable>(errors.size());
+        for (Throwable error : errors) {
+            if (error instanceof AssumptionViolatedException) {
+                error = new TestCouldNotBeSkippedException((AssumptionViolatedException) error);
+            }
+            fErrors.add(error);
+        }
     }
 
     public List<Throwable> getFailures() {
@@ -34,11 +48,32 @@
         StringBuilder sb = new StringBuilder(
                 String.format("There were %d errors:", fErrors.size()));
         for (Throwable e : fErrors) {
-            sb.append(String.format("\n  %s(%s)", e.getClass().getName(), e.getMessage()));
+            sb.append(String.format("%n  %s(%s)", e.getClass().getName(), e.getMessage()));
         }
         return sb.toString();
     }
 
+    @Override
+    public void printStackTrace() {
+        for (Throwable e: fErrors) {
+            e.printStackTrace();
+        }
+    }
+    
+    @Override
+    public void printStackTrace(PrintStream s) {
+        for (Throwable e: fErrors) {
+            e.printStackTrace(s);
+        }
+    }
+    
+    @Override
+    public void printStackTrace(PrintWriter s) {
+        for (Throwable e: fErrors) {
+            e.printStackTrace(s);
+        }
+    }
+    
     /**
      * Asserts that a list of throwables is empty. If it isn't empty,
      * will throw {@link MultipleFailureException} (if there are

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/model/RunnerBuilder.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/model/RunnerBuilder.java Changed

@@ -6,7 +6,11 @@
 import java.util.Set;
 
 import org.junit.internal.runners.ErrorReportingRunner;
+import org.junit.runner.Description;
+import org.junit.runner.OrderWith;
 import org.junit.runner.Runner;
+import org.junit.runner.manipulation.InvalidOrderingException;
+import org.junit.runner.manipulation.Ordering;
 
 /**
  * A RunnerBuilder is a strategy for constructing runners for classes.
@@ -49,19 +53,39 @@
     public abstract Runner runnerForClass(Class<?> testClass) throws Throwable;
 
     /**
-     * Always returns a runner, even if it is just one that prints an error instead of running tests.
+     * Always returns a runner for the given test class.
+     *
+     * <p>In case of an exception a runner will be returned that prints an error instead of running
+     * tests.
+     *
+     * <p>Note that some of the internal JUnit implementations of RunnerBuilder will return
+     * {@code null} from this method, but no RunnerBuilder passed to a Runner constructor will
+     * return {@code null} from this method.
      *
      * @param testClass class to be run
      * @return a Runner
      */
     public Runner safeRunnerForClass(Class<?> testClass) {
         try {
-            return runnerForClass(testClass);
+            Runner runner = runnerForClass(testClass);
+            if (runner != null) {
+                configureRunner(runner);
+            }
+            return runner;
         } catch (Throwable e) {
             return new ErrorReportingRunner(testClass, e);
         }
     }
 
+    private void configureRunner(Runner runner) throws InvalidOrderingException {
+        Description description = runner.getDescription();
+        OrderWith orderWith = description.getAnnotation(OrderWith.class);
+        if (orderWith != null) {
+            Ordering ordering = Ordering.definedBy(orderWith.value(), description);
+            ordering.apply(runner);
+        }
+    }
+
     Class<?> addParent(Class<?> parent) throws InitializationError {
         if (!parents.add(parent)) {
             throw new InitializationError(String.format("class '%s' (possibly indirectly) contains itself as a SuiteClass", parent.getName()));
@@ -96,7 +120,7 @@
     }
 
     private List<Runner> runners(Class<?> children) {
-        ArrayList<Runner> runners = new ArrayList<Runner>();
+        List<Runner> runners = new ArrayList<Runner>();
         for (Class<?> each : children) {
             Runner childRunner = safeRunnerForClass(each);
             if (childRunner != null) {

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/model/TestClass.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/model/TestClass.java Changed

@@ -84,20 +84,21 @@
         for (Annotation each : member.getAnnotations()) {
             Class<? extends Annotation> type = each.annotationType();
             List<T> members = getAnnotatedMembers(map, type, true);
-            if (member.isShadowedBy(members)) {
+            T memberToAdd = member.handlePossibleBridgeMethod(members);
+            if (memberToAdd == null) {
                 return;
             }
             if (runsTopToBottom(type)) {
-                members.add(0, member);
+                members.add(0, memberToAdd);
             } else {
-                members.add(member);
+                members.add(memberToAdd);
             }
         }
     }
 
     private static <T extends FrameworkMember<T>> Map<Class<? extends Annotation>, List<T>>
             makeDeeplyUnmodifiable(Map<Class<? extends Annotation>, List<T>> source) {
-        LinkedHashMap<Class<? extends Annotation>, List<T>> copy =
+        Map<Class<? extends Annotation>, List<T>> copy =
                 new LinkedHashMap<Class<? extends Annotation>, List<T>>();
         for (Map.Entry<Class<? extends Annotation>, List<T>> entry : source.entrySet()) {
             copy.put(entry.getKey(), Collections.unmodifiableList(entry.getValue()));
@@ -168,7 +169,7 @@
     }
 
     private static List<Class<?>> getSuperClasses(Class<?> testClass) {
-        ArrayList<Class<?>> results = new ArrayList<Class<?>>();
+        List<Class<?>> results = new ArrayList<Class<?>>();
         Class<?> current = testClass;
         while (current != null) {
             results.add(current);
@@ -224,24 +225,59 @@
 
     public <T> List<T> getAnnotatedFieldValues(Object test,
             Class<? extends Annotation> annotationClass, Class<T> valueClass) {
-        List<T> results = new ArrayList<T>();
+        final List<T> results = new ArrayList<T>();
+        collectAnnotatedFieldValues(test, annotationClass, valueClass,
+                new MemberValueConsumer<T>() {
+                    public void accept(FrameworkMember<?> member, T value) {
+                        results.add(value);
+                    }
+                });
+        return results;
+    }
+
+    /**
+     * Finds the fields annotated with the specified annotation and having the specified type,
+     * retrieves the values and passes those to the specified consumer.
+     *
+     * @since 4.13
+     */
+    public <T> void collectAnnotatedFieldValues(Object test,
+            Class<? extends Annotation> annotationClass, Class<T> valueClass,
+            MemberValueConsumer<T> consumer) {
         for (FrameworkField each : getAnnotatedFields(annotationClass)) {
             try {
                 Object fieldValue = each.get(test);
                 if (valueClass.isInstance(fieldValue)) {
-                    results.add(valueClass.cast(fieldValue));
+                    consumer.accept(each, valueClass.cast(fieldValue));
                 }
             } catch (IllegalAccessException e) {
                 throw new RuntimeException(
                         "How did getFields return a field we couldn't access?", e);
             }
         }
-        return results;
     }
 
     public <T> List<T> getAnnotatedMethodValues(Object test,
             Class<? extends Annotation> annotationClass, Class<T> valueClass) {
-        List<T> results = new ArrayList<T>();
+        final List<T> results = new ArrayList<T>();
+        collectAnnotatedMethodValues(test, annotationClass, valueClass,
+                new MemberValueConsumer<T>() {
+                    public void accept(FrameworkMember<?> member, T value) {
+                        results.add(value);
+                    }
+                });
+        return results;
+    }
+
+    /**
+     * Finds the methods annotated with the specified annotation and returning the specified type,
+     * invokes it and pass the return value to the specified consumer.
+     *
+     * @since 4.13
+     */
+    public <T> void collectAnnotatedMethodValues(Object test,
+            Class<? extends Annotation> annotationClass, Class<T> valueClass,
+            MemberValueConsumer<T> consumer) {
         for (FrameworkMethod each : getAnnotatedMethods(annotationClass)) {
             try {
                 /*
@@ -254,14 +290,13 @@
                  */
                 if (valueClass.isAssignableFrom(each.getReturnType())) {
                     Object fieldValue = each.invokeExplosively(test);
-                    results.add(valueClass.cast(fieldValue));
+                    consumer.accept(each, valueClass.cast(fieldValue));
                 }
             } catch (Throwable e) {
                 throw new RuntimeException(
                         "Exception in " + each.getName(), e);
             }
         }
-        return results;
     }
 
     public boolean isPublic() {

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/parameterized/BlockJUnit4ClassRunnerWithParameters.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/parameterized/BlockJUnit4ClassRunnerWithParameters.java Changed

@@ -4,8 +4,12 @@
 import java.lang.reflect.Field;
 import java.util.List;
 
+import org.junit.internal.runners.statements.RunAfters;
+import org.junit.internal.runners.statements.RunBefores;
+import org.junit.runner.RunWith;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.model.FrameworkField;
 import org.junit.runners.model.FrameworkMethod;
@@ -18,13 +22,17 @@
  */
 public class BlockJUnit4ClassRunnerWithParameters extends
         BlockJUnit4ClassRunner {
+    private enum InjectionType {
+        CONSTRUCTOR, FIELD
+    }
+
     private final Object parameters;
 
     private final String name;
 
     public BlockJUnit4ClassRunnerWithParameters(TestWithParameters test)
             throws InitializationError {
-        super(test.getTestClass().getJavaClass());
+        super(test.getTestClass());
         parameters = test.getParameters().toArray(
                 new Objecttest.getParameters().size());
         name = test.getName();
@@ -32,10 +40,15 @@
 
     @Override
     public Object createTest() throws Exception {
-        if (fieldsAreAnnotated()) {
-            return createTestUsingFieldInjection();
-        } else {
-            return createTestUsingConstructorInjection();
+        InjectionType injectionType = getInjectionType();
+        switch (injectionType) {
+            case CONSTRUCTOR:
+                return createTestUsingConstructorInjection();
+            case FIELD:
+                return createTestUsingFieldInjection();
+            default:
+                throw new IllegalStateException("The injection type "
+                        + injectionType + " is not supported.");
         }
     }
 
@@ -60,6 +73,13 @@
             int index = annotation.value();
             try {
                 field.set(testClassInstance, parametersindex);
+            } catch (IllegalAccessException e) {
+                IllegalAccessException wrappedException = new IllegalAccessException(
+                        "Cannot set parameter '" + field.getName()
+                                + "'. Ensure that the field '" + field.getName()
+                                + "' is public.");
+                wrappedException.initCause(e);
+                throw wrappedException;
             } catch (IllegalArgumentException iare) {
                 throw new Exception(getTestClass().getName()
                         + ": Trying to set " + field.getName()
@@ -86,7 +106,7 @@
     @Override
     protected void validateConstructor(List<Throwable> errors) {
         validateOnlyOneConstructor(errors);
-        if (fieldsAreAnnotated()) {
+        if (getInjectionType() != InjectionType.CONSTRUCTOR) {
             validateZeroArgConstructor(errors);
         }
     }
@@ -94,7 +114,7 @@
     @Override
     protected void validateFields(List<Throwable> errors) {
         super.validateFields(errors);
-        if (fieldsAreAnnotated()) {
+        if (getInjectionType() == InjectionType.FIELD) {
             List<FrameworkField> annotatedFieldsByParameter = getAnnotatedFieldsByParameter();
             int usedIndices = new intannotatedFieldsByParameter.size();
             for (FrameworkField each : annotatedFieldsByParameter) {
@@ -125,18 +145,74 @@
 
     @Override
     protected Statement classBlock(RunNotifier notifier) {
-        return childrenInvoker(notifier);
+        Statement statement = childrenInvoker(notifier);
+        statement = withBeforeParams(statement);
+        statement = withAfterParams(statement);
+        return statement;
+    }
+
+    private Statement withBeforeParams(Statement statement) {
+        List<FrameworkMethod> befores = getTestClass()
+                .getAnnotatedMethods(Parameterized.BeforeParam.class);
+        return befores.isEmpty() ? statement : new RunBeforeParams(statement, befores);
+    }
+
+    private class RunBeforeParams extends RunBefores {
+        RunBeforeParams(Statement next, List<FrameworkMethod> befores) {
+            super(next, befores, null);
+        }
+
+        @Override
+        protected void invokeMethod(FrameworkMethod method) throws Throwable {
+            int paramCount = method.getMethod().getParameterTypes().length;
+            method.invokeExplosively(null, paramCount == 0 ? (Object) null : parameters);
+        }
+    }
+
+    private Statement withAfterParams(Statement statement) {
+        List<FrameworkMethod> afters = getTestClass()
+                .getAnnotatedMethods(Parameterized.AfterParam.class);
+        return afters.isEmpty() ? statement : new RunAfterParams(statement, afters);
+    }
+
+    private class RunAfterParams extends RunAfters {
+        RunAfterParams(Statement next, List<FrameworkMethod> afters) {
+            super(next, afters, null);
+        }
+
+        @Override
+        protected void invokeMethod(FrameworkMethod method) throws Throwable {
+            int paramCount = method.getMethod().getParameterTypes().length;
+            method.invokeExplosively(null, paramCount == 0 ? (Object) null : parameters);
+        }
     }
 
     @Override
     protected Annotation getRunnerAnnotations() {
-        return new Annotation0;
+        Annotation allAnnotations = super.getRunnerAnnotations();
+        Annotation annotationsWithoutRunWith = new AnnotationallAnnotations.length - 1;
+        int i = 0;
+        for (Annotation annotation: allAnnotations) {
+            if (!annotation.annotationType().equals(RunWith.class)) {
+                annotationsWithoutRunWithi = annotation;
+                ++i;
+            }
+        }
+        return annotationsWithoutRunWith;
     }
 
     private List<FrameworkField> getAnnotatedFieldsByParameter() {
         return getTestClass().getAnnotatedFields(Parameter.class);
     }
 
+    private InjectionType getInjectionType() {
+        if (fieldsAreAnnotated()) {
+            return InjectionType.FIELD;
+        } else {
+            return InjectionType.CONSTRUCTOR;
+        }
+    }
+
     private boolean fieldsAreAnnotated() {
         return !getAnnotatedFieldsByParameter().isEmpty();
     }

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/parameterized/ParametersRunnerFactory.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/parameterized/ParametersRunnerFactory.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/runners/parameterized/TestWithParameters.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/runners/parameterized/TestWithParameters.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/validator/AnnotationValidatorFactory.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/validator/AnnotationValidatorFactory.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/validator/AnnotationsValidator.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/validator/AnnotationsValidator.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/validator/TestClassValidator.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/validator/TestClassValidator.java Changed

_service:tar_scm:r4.12.tar.gz/src/main/java/org/junit/validator/ValidateWith.java -> _service:tar_scm:r4.13.2.tar.gz/src/main/java/org/junit/validator/ValidateWith.java Changed

_service:tar_scm:r4.12.tar.gz/src/site/fml/faq.fml -> _service:tar_scm:r4.13.2.tar.gz/src/site/fml/faq.fml Changed

@@ -35,11 +35,11 @@
             <question>Where do I get the latest version of this
       FAQ?</question>
             <answer>
-                <p>The master copy of this FAQ is available
+                <p>The latest copy of this FAQ is available
       at 
                     
-                    <a href="http://junit.sourceforge.net/doc/faq/faq.htm">
-                        http://junit.sourceforge.net/doc/faq/faq.htm</a>.</p>
+                    <a href="https://junit.org/junit4/faq.html">
+                        https://junit.org/junit4/faq.html</a>.</p>
                 <p>The JUnit distribution also includes this FAQ in
       the 
                     
@@ -129,24 +129,6 @@
     </ul>
 </answer>
 </faq>
-<faq id="overview_5"><question>Where can I find articles on
-      JUnit?</question><answer>
-    <p>
-      The JUnit home page maintains a list
-      of <a href="http://www.junit.org/news/article/index.htm">JUnit
-      articles</a>.
-    </p>
-</answer>
-</faq>
-  <faq id="overview_6"><question>What's the latest news on JUnit?</question>
-  <answer>
-    <p>
-      The JUnit home page publishes
-      the <a href="http://www.junit.org/news/index.htm">latest JUnit
-      news</a>.
-    </p>
-</answer>
-</faq>
       <faq id="overview_7"><question>How is JUnit licensed?</question>
       <answer>
     <p>
@@ -324,7 +306,7 @@
     <p>
       Please stick to technical issues on the discussion forum and
       mailing lists. Keep in mind that these are public, so
-      do <b>not</b> include any confidental information in your
+      do <b>not</b> include any confidential information in your
       questions!
     </p>
     <p>
@@ -355,7 +337,7 @@
     <p>
       JUnit is hosted
       on <a
-      href="http://github/junit-team/junit">GitHub</a>.
+      href="https://github.com/junit-team/junit4">GitHub</a>.
       Please use the tools provided by GitHub for your
       submissions.
     </p>
@@ -721,6 +703,12 @@
       read <a
       href="http://www.onjava.com/pub/a/onjava/2003/11/12/reflection.html">this
       article</a>.
+    </p>
+    <p>
+      If you are using JDK 1.6 or higher and you annotate your tests with @Test,
+      you can use <a href="http://dp4j.com">Dp4j</a> to inject reflection in your
+      test methods. For details on how to use it, see <a href="http://dp4j.com/testscript">
+      this test script</a>.
     </p></answer></faq>
       <faq id="#tests_12"><question>Why does JUnit only report the first
       failure in a single test?</question><answer><p>
@@ -1063,7 +1051,7 @@
       <i>(Submitted by: Eric Armstrong)</i>
     </p>
     <p>
-      To run your JUnit tests, you'll need the following elemements in
+      To run your JUnit tests, you'll need the following elements in
       your CLASSPATH:
     </p>
     <ul>
@@ -1255,7 +1243,7 @@
     </p>
     <pre class="prettyprint">-DparameterName=parameterValue</pre>
     <p>
-      If the number of parameters on the command line gets unweildy,
+      If the number of parameters on the command line gets unwieldy,
       pass in the location of a property file that defines a set of
       parameters. Alternatively, the <a
       href="http://junit-addons.sf.net">JUnit-addons package</a>
@@ -1378,7 +1366,7 @@
       now you can have the reverse problem where the JUnit loader will
       load a host of <code>org.w3c.dom</code>/<code>org.xml.sax</code>
       classes, and then the system loader violates the loader
-      contraints at some point when it tries to do exactly what I
+      constraints at some point when it tries to do exactly what I
       described above with JAXP because it doesn't ever delegate to
       its logical child (the JUnit loader). Inevitably, if your test
       cases use many JAXP and related XML classes, one or the other
@@ -1464,7 +1452,7 @@
           Idiomatic naming patterns for unit tests
           are <code>Test*.java</code> and <code>*Test.java</code>.
           Documentation and examples are at <a
-                                               href="http://ant.apache.org/manual/OptionalTasks/junit.html">http://ant.apache.org/manual/OptionalTasks/junit.html</a>.
+                                               href="https://ant.apache.org/manual/Tasks/junit.html">https://ant.apache.org/manual/Tasks/junit.html</a>.
         </p>
       </li>
       <li>
@@ -1475,7 +1463,7 @@
         </p>
 <pre class="prettyprint linenums">DirectorySuiteBuilder builder = new DirectorySuiteBuilder();
 builder.setSuffix("Test");
-Test suite = builer.suite("/home/project/myproject/tests");</pre>
+Test suite = builder.suite("/home/project/myproject/tests");</pre>
         <p>
           Documentation and examples are at <a
                                                href="http://junit-addons.sourceforge.net/">http://junit-addons.sourceforge.net</a>.
@@ -1711,14 +1699,6 @@
    </part>
     <part id="misc">
         <title>Miscellaneous</title>
-        <faq id="misc_1">
-            <question>How do I integrate JUnit with my IDE?</question>
-            <answer><p>
-      The JUnit home page maintains a list of <a
-      href="http://www.junit.org/news/ide/index.htm">IDE integration
-      instructions</a>.
-    </p></answer>
-        </faq>
         <faq id="misc_2">
             <question>How do I launch a debugger when a test fails?</question>
             <answer>    <p>
@@ -1740,10 +1720,10 @@
             <question>Where can I find unit testing frameworks
       similar to JUnit for other languages?</question>
             <answer><p>
-      XProgramming.com maintains a complete list of available <a
-      href="http://www.xprogramming.com/software.htm">xUnit testing
+      Wikipedia maintains a list of available <a
+      href="https://en.wikipedia.org/wiki/List_of_unit_testing_frameworks">xUnit testing
       frameworks</a>.
     </p></answer>
         </faq>
     </part>
-</faqs>
\ No newline at end of file
+</faqs>

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/css/carousel.css Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/css/junit-lambda.css Added

@@ -0,0 +1,69 @@
+ul.inline {
+    margin-left: 0;
+    list-style: none;
+}
+.inline li {
+  display: inline-block;
+	margin-right: 10px;
+	margin-bottom: 10px;
+}
+
+.sponsors li {
+	border: 1px solid #e3e3e3;
+	-webkit-border-radius: 4px;
+	   -moz-border-radius: 4px;
+	        border-radius: 4px;
+}
+.sponsors li:hover {
+	border-color: #c5c5c5;
+}
+.sponsors li {
+	text-align: center;
+	padding: 0;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+	   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+	        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.sponsors li a {
+	display: block;
+	padding: 0 10px !important;
+}
+
+.sponsors-small li a img {
+  max-height: 100px;
+  max-width: 200px;
+}
+
+.sponsors-small li a {
+	width: 200px;
+	height: 120px;
+	line-height: 120px;
+}
+.sponsors-medium li a {
+	width: 278px;
+	height: 141px;
+	line-height: 141px;
+}
+.sponsors-large li a {
+	width: 435px;
+	height: 237px;
+	line-height: 237px;
+}
+
+ul.people {
+	margin-left: 7px;
+	margin-right: 7px;
+}
+.people li {
+	display: block;
+	width: 170px;
+	margin: 0;
+	padding: 0 15px 0 0;
+	float: left;
+	text-align: center;
+}
+.people img.avatar {
+	display: block;
+	width: 100%;
+	margin: 0 0 10px 0;
+}

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/background.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/42talents.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/adnovum.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/arcbees.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/autotrader.jpg Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/bol.jpg Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/bouvet.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/devnexus.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/diffplug.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/disy.jpg Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/eclipse.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/ergon.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/gradle.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/intellijidea.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/klarna.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/klosebrothers.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/msgsystems.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/murex.jpg Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/netcetera.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/novatec.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/ociweb.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/oio.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/red6-es.jpg Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/samuraism.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/siili.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/sipgate.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/six.gif Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/sonrisa.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/squeed.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/structure101.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/synyx.jpg Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/tng.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/topdesk.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/vaddy.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/contributors/zenika.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/junit-lambda-logo.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/sponsors Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/sponsors/amex.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/sponsors/andrena.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/sponsors/heidelberg-mobil.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/sponsors/namics.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit-lambda/sponsors/pivotal.png Added

_service:tar_scm:r4.13.2.tar.gz/src/site/resources/images/junit5-banner.png Added

_service:tar_scm:r4.12.tar.gz/src/site/resources/scripts/index.js -> _service:tar_scm:r4.13.2.tar.gz/src/site/resources/scripts/index.js Changed

_service:tar_scm:r4.12.tar.gz/src/site/site.xml -> _service:tar_scm:r4.13.2.tar.gz/src/site/site.xml Changed

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd">
   <bannerLeft>
     <name>${project.name}</name>
-    <src>http://junit.org/images/junit-logo.png</src>
+    <src>./images/junit-logo.png</src>
     <href>http://junit.org/</href>
   </bannerLeft>
 
@@ -12,7 +12,6 @@
 
   <poweredBy>
     <logo name="Built by Maven" href="http://maven.apache.org/" img="images/logos/maven-feather.png" />
-    <logo name="Built on CloudBees" href="https://junit.ci.cloudbees.com/" img="http://www.cloudbees.com/sites/default/files/Button-Built-on-CB-1.png" />
   </poweredBy>
 
   <skin>
@@ -24,18 +23,20 @@
   <body>
     <head>
       <link rel="stylesheet" href="@relativePath@/css/plain-links.css" />
+      <link rel="stylesheet" href="@relativePath@/css/carousel.css" />
+      <link rel="stylesheet" href="@relativePath@/css/junit-lambda.css" />
     </head>
     <breadcrumbs>
-      <item name="JUnit" href="http://junit.org/" />
+      <item name="JUnit 4" href="http://junit.org/" />
     </breadcrumbs>
 
-    <menu name="Overview">
+    <menu name="JUnit 4">
       <item name="Introduction" href="index.html"/>
       <item name="Frequently asked questions" href="faq.html"/>
       <item name="Cookbook" href="cookbook.html"/>
     </menu>
 
-    <menu ref="reports" inherit="bottom" />
+    <menu name="Project Documentation" ref="reports" inherit="bottom" />
 
   </body>
 
@@ -45,7 +46,7 @@
       <sideBarEnabled>false</sideBarEnabled>
       <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
       <gitHub>
-        <projectId>junit-team/junit</projectId>
+        <projectId>junit-team/junit4</projectId>
         <ribbonOrientation>right</ribbonOrientation>
       </gitHub>
     </fluidoSkin>

_service:tar_scm:r4.12.tar.gz/src/site/xdoc/index.xml -> _service:tar_scm:r4.13.2.tar.gz/src/site/xdoc/index.xml Changed

@@ -14,17 +14,26 @@
      <div id="carousel-main">
         <div id="main-carousel" class="carousel slide">
           <div class="carousel-inner">
-            <div class="item active">
-              <div style="height:20em" >
+	          <div class="item active">
+	            <div class="carousel-content" id="junit-lambda-teaser">
+								<p><a href="http://junit.org/junit5/"><img src="images/junit5-banner.png" alt="JUnit 5" style="height:120px; margin-top:20px" /></a></p>
+	            </div>
+	            <div class="carousel-caption">
+	              <p><strong><a href="http://junit.org/junit5/">JUnit 5 is released:</a></strong></p>
+	              <p><a href="http://junit.org/junit5/">Explore the new release!</a></p>
+	            </div>
+	          </div>
+            <div class="item">
+              <div class="carousel-content">
               <pre class="prettyprint">
     @Test
     public void newArrayListsHaveNoElements() {
-        assertThat(new ArrayList().size(), is(0));
+        assertThat(new ArrayList&lt;Integer&gt;().size(), is(0));
     }
 
     @Test
     public void sizeReturnsNumberOfElements() {
-        List instance = new ArrayList();
+        List&lt;Object&gt; instance = new ArrayList&lt;Object&gt;();
         instance.add(new Object());
         instance.add(new Object());
         assertThat(instance.size(), is(2));
@@ -38,12 +47,12 @@
               </div>
             </div>
             <div class="item">
-              <div style="height:20em">
+              <div class="carousel-content">
               <pre class="prettyprint lang-java">
     @Test
     public void lookupEmailAddresses() {
         assertThat(new CartoonCharacterEmailLookupService().getResults("looney"), allOf(
-            not(empty()), 
+            not(empty()),
             containsInAnyOrder(
                 allOf(instanceOf(Map.class), hasEntry("id", "56"), hasEntry("email", "roadrunner@fast.org")),
                 allOf(instanceOf(Map.class), hasEntry("id", "76"), hasEntry("email", "wiley@acme.com"))
@@ -74,59 +83,62 @@
         <div class="span4" id="welcome-section">
           <p><b>Welcome</b></p>
           <ul>
-            <li><a href="https://github.com/junit-team/junit/wiki/Download-and-Install">Download and install</a></li>
-            <li><a href="https://github.com/junit-team/junit/wiki/Getting-started">Getting started</a></li>
+            <li><a href="https://github.com/junit-team/junit4/wiki/Download-and-Install">Download and install</a></li>
+            <li><a href="https://github.com/junit-team/junit4/wiki/Getting-started">Getting started</a></li>
             <li>Release Notes
               <ul>
-<li><a href="https://github.com/junit-team/junit/blob/master/doc/ReleaseNotes4.12.md">4.12</a></li>
-<li><a href="https://github.com/junit-team/junit/blob/master/doc/ReleaseNotes4.11.md">4.11</a></li>
-<li><a href="https://github.com/junit-team/junit/blob/master/doc/ReleaseNotes4.10.md">4.10</a></li>
-<li><a href="https://github.com/junit-team/junit/blob/master/doc/ReleaseNotes4.9.1.md">4.9.1</a></li>
-<li><a href="https://github.com/junit-team/junit/blob/master/doc/ReleaseNotes4.9.md">4.9</a></li>
+<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.13.1.md">4.13.1</a></li>
+<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.13.md">4.13</a></li>
+<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.12.md">4.12</a></li>
+<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.11.md">4.11</a></li>
+<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.10.md">4.10</a></li>
+<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.9.1.md">4.9.1</a></li>
+<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.9.md">4.9</a></li>
               </ul>
             </li>
-            <li><a href="https://github.com/junit-team/junit/wiki/Maintainer-documentation">Maintainer Documentation</a></li>
-            <li><a href="https://github.com/junit-team/junit/wiki/I-want-to-help%21">I want to help!</a></li>
+            <li><a href="https://github.com/junit-team/junit4/wiki/Maintainer-documentation">Maintainer Documentation</a></li>
+            <li><a href="https://github.com/junit-team/junit4/wiki/I-want-to-help%21">I want to help!</a></li>
             <li><a href="http://stackoverflow.com/questions/tagged/junit">Latest JUnit Questions on StackOverflow</a></li>
             <li><a href="javadoc/latest/index.html">JavaDocs</a></li>
             <li><a href="./faq.html">Frequently asked questions</a></li>
-            <li><a href="https://github.com/junit-team/junit/wiki">Wiki</a></li>
+            <li><a href="https://github.com/junit-team/junit4/wiki">Wiki</a></li>
+            <li><a href="./license.html">License</a></li>
           </ul>
         </div>
         <div class="span4" id="concepts-section">
           <p><b>Usage and Idioms</b></p>
           <ul>
-<li><a href="https://github.com/junit-team/junit/wiki/Assertions">Assertions</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Test-runners">Test Runners</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Aggregating-tests-in-suites">Aggregating tests in Suites</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Test-execution-order">Test Execution Order</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Exception-testing">Exception Testing</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Matchers-and-assertthat">Matchers and assertThat</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Ignoring-tests">Ignoring Tests</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Timeout-for-tests">Timeout for Tests</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Parameterized-tests">Parameterized Tests</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Assumptions-with-assume">Assumptions with Assume</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Rules">Rules</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Theories">Theories</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Test-fixtures">Test Fixtures</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Categories">Categories</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Use-with-Maven">Use with Maven</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Multithreaded-code-and-concurrency">Multithreaded code and Concurrency</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Java-contract-test-helpers">Java contract test helpers</a></li>
-<li><a href="https://github.com/junit-team/junit/wiki/Continuous-testing">Continuous Testing</a></li>          </ul>
+<li><a href="https://github.com/junit-team/junit4/wiki/Assertions">Assertions</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Test-runners">Test Runners</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Aggregating-tests-in-suites">Aggregating tests in Suites</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Test-execution-order">Test Execution Order</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Exception-testing">Exception Testing</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Matchers-and-assertthat">Matchers and assertThat</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Ignoring-tests">Ignoring Tests</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Timeout-for-tests">Timeout for Tests</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Parameterized-tests">Parameterized Tests</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Assumptions-with-assume">Assumptions with Assume</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Rules">Rules</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Theories">Theories</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Test-fixtures">Test Fixtures</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Categories">Categories</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Use-with-Maven">Use with Maven</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Multithreaded-code-and-concurrency">Multithreaded code and Concurrency</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Java-contract-test-helpers">Java contract test helpers</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Continuous-testing">Continuous Testing</a></li>          </ul>
         </div>
         <div class="span4" id="thirdparty-section">
           <p><b>Third-party extensions</b></p>
           <ul>
-<li><a href="https://github.com/junit-team/junit/wiki/Custom-runners">Custom Runners</a></li>
+<li><a href="https://github.com/junit-team/junit4/wiki/Custom-runners">Custom Runners</a></li>
 <li>
 <a href="http://site.trajano.net/commons-testing/">net.trajano.commons:commons-testing for UtilityClassTestUtil</a> per #646</li>
 <li>
 <a href="http://stefanbirkner.github.io/system-rules">System Rules</a> – A collection of JUnit rules for testing code that uses java.lang.System.</li>
 <li>
-<a href="https://junit-toolbox.googlecode.com/">JUnit Toolbox</a> - Provides runners for parallel testing, a <code>PoolingWait</code> class to ease asynchronous testing, and a <code>WildcardPatternSuite</code> which allow you to specify wildcard patterns instead of explicitly listing all classes when you create a suite class.</li>
+<a href="https://github.com/MichaelTamm/junit-toolbox">JUnit Toolbox</a> - Provides runners for parallel testing, a <code>PoolingWait</code> class to ease asynchronous testing, and a <code>WildcardPatternSuite</code> which allow you to specify wildcard patterns instead of explicitly listing all classes when you create a suite class.</li>
 <li>
-<a href="https://github.com/pholser/junit-quickcheck">junit-quickcheck</a> - QuickCheck-style parameter suppliers for JUnit theories. Uses <a href="https://github.com/junit-team/junit.contrib/tree/master/theories">junit.contrib's version of the theories machinery</a>, which respects generics on theory parameters.</li>          </ul>
+<a href="https://github.com/pholser/junit-quickcheck">junit-quickcheck</a> - QuickCheck-style parameter suppliers for JUnit theories. Uses <a href="https://github.com/junit-team/junit.contrib/tree/HEAD/theories">junit.contrib's version of the theories machinery</a>, which respects generics on theory parameters.</li>          </ul>
         </div>
       </div>
     </div>
@@ -149,7 +161,7 @@
               content: "Don't forget that the documentation generated by Maven is hiding up here"
             },
             {
-              target: $('body ahref="http://github.com/junit-team/junit" img')0,
+              target: $('body ahref="http://github.com/junit-team/junit4" img')0,
               placement: "left",
               title: "Source code",
               content: "The source code for JUnit is hosted on GitHub"

_service:tar_scm:r4.13.2.tar.gz/src/site/xhtml Added

_service:tar_scm:r4.13.2.tar.gz/src/site/xhtml/junit-lambda-campaign.xhtml Added

@@ -0,0 +1,67 @@
+<html>
+  <head>
+    <title>JUnit Lambda Crowdfunding Campaign</title>
+  </head>
+  <body>
+		<h1>Crowdfunding JUnit Lambda <small>#fundJUnit</small></h1>
+		<div>
+		<iframe style="display:block; margin: 0 auto;" width="940" height="529" src="https://www.youtube-nocookie.com/embed/Ai6M5G90Mlg?rel=0" frameborder="0" allowfullscreen="true"></iframe>
+		</div>
+    <hr />
+    <h2 align="center" class="muted">The crowdfunding campaign has successfully ended.<br/> Thank you all!</h2>
+    <p align="center" style="font-size:150%">
+			<a class="btn btn-large btn-success" href="https://www.indiegogo.com/projects/junit-lambda" role="button" style="font-size:100%">Campaign page on Indiegogo</a>
+			<a class="btn btn-large btn-default" href="junit-lambda-contributors.html" role="button" style="font-size:100%">Campaign Contributors</a>
+			<a class="btn btn-large btn-default" href="http://twitter.com/junitteam" role="button" style="font-size:100%">Follow @junitteam on Twitter</a>
+		</p>
+		<hr />
+		<h2>Main Sponsors</h2>
+		<p>Each of these companies will fund a developer for 6 weeks. They will not receive any money collected through the campaign.</p>
+		<ul class="inline sponsors sponsors-large">
+			<li><a href="http://www.andrena.de" title="andrena objects ag, Germany"><img src="images/junit-lambda/sponsors/andrena.png" /></a></li>
+			<li><a href="http://www.heidelberg-mobil.com" title="Heidelberg Mobil International GmbH, Germany"><img src="images/junit-lambda/sponsors/heidelberg-mobil.png" /></a></li>
+			<li><a href="http://www.namics.com" title="Namics (Deutschland) GmbH, Germany"><img src="images/junit-lambda/sponsors/namics.png" /></a></li>
+			<li><a href="http://pivotal.io/" title="Pivotal Software, Inc., U.S.A."><img src="images/junit-lambda/sponsors/pivotal.png" /></a></li>
+		</ul>
+		<h2>Main Campaign Sponsor</h2>
+		<p>This company will fund JUnit Lambda through the Main Sponsor campaign perk.</p>
+		<ul class="inline sponsors sponsors-large">
+			<li><a href="http://www.americanexpress.com/" title="American Express Company"><img src="images/junit-lambda/sponsors/amex.png" /></a></li>
+		</ul>
+		<h2>Campaign Contributors</h2>
+		<p>Thank you to all other people, companies, and organizations that have contributed already! Please check out our <a href="junit-lambda-contributors.html">contributors page</a>.</p>
+    <hr />
+    <h2>Why JUnit needs your support</h2>
+		<p>With 43 million downloads from Maven Central in 2014 <strong>JUnit</strong> still is the default testing library for Java. Millions of projects rely on it being both stable and allowing to test the latest features of the latest JDK. Moreover, many other testing libraries hook into JUnit as a way to enable IDE and build tool integration. Keeping JUnit in shape is a major task for those maintaining and evolving the library.</p>
+		<p>As of today, none of the active JUnit maintainers are payed by their employer to do this work. Not surprisingly many unresolved issues have piled up and, what’s worse, there is no hope to get JUnit to support and make use of all the features in Java 8 any time soon. Since <i>Lambdas</i> are the most prominent of those features, we borrowed their name for the campaign.</p>
+		<p>This campaign will allow a team of long-time JUnit committers, backed by a few experienced Java developers, to focus on getting JUnit ready for the years—and JDKs—to come.</p>
+		<h2>Obstacles for evolving JUnit</h2>
+		<p>A major design goal of JUnit has always been simplicity. JUnit 4 was released 10 years ago and has served its purpose very well. Since then many things have changed: Java got a couple of new versions and many new testing frameworks and ideas about testing have popped up.</p>
+		<p>The basic design of JUnit, however, has remained the same since 2005. Some constructs like Rules were added, but at the same time backwards compatibility has always been and will continue to be the major goal of evolving JUnit. A number of issues have increasingly slowed down its evolution:</p>
+		<ul>
+			<li>
+				<p><i>Runners</i> have found a widespread use and become a crucial concept to extend JUnit. Writing a custom runner is a very powerful way to customize how a test class is instantiated, how its children are collected, how they are run, reported, and so on. However, you can only have a single runner for each test class. For example, combining <i>SpringJUnit4ClassRunner</i> and <i>Parameterized</i> is not possible at the moment. We want to separate the different concerns, for which the runner is currently responsible, into separated interfaces.</p>
+			</li>
+			<li>
+				<p>The current execution model requires all test cases to be known a-priori. This prevents the dynamic creation of test cases as response to observed behaviour during test execution. This also means that you cannot use Streams (Java 8), e.g. in combination with <i>@Parameters</i>, to create your test data.</p>
+			</li>
+			<li>
+				<p>All IDEs and build tools include support for JUnit. While that makes it really easy to execute JUnit tests, on the flip side the IDEs and build tools are tightly coupled to JUnit internals. Some IDEs and build tools use internal JUnit classes or even reflection to circumvent the absence of a JUnit API that does what they want. For example, there is no extensible way to link to a test location in case it is not a Java method. Those “tricks” complicate the evolution of JUnit tremendously, and even render some changes virtually impossible. Therefore, we want to closely work with IDE and build tool developers to add features their users need in an extensible way.</p>
+			</li>
+		</ul>
+    <h2>The Vision</h2>
+		<p>We’ve identified two main areas to focus on during the upcoming JUnit overhaul:</p>
+		<ul>
+			<li>
+				<p><strong>Decouple test execution and reporting from test definition and provisioning</strong>: This will greatly simplify further evolution of JUnit and allow users to mix test specifications from different test libraries—like JUnit, Spock, ScalaTest and so on—more easily. Other testing libraries should only depend on the test execution/reporting API of JUnit, not on the test definition API (e.g. Runner).</p>
+			</li>
+			<li>
+				<p><strong>Rethinking the JUnit’s extensibility story</strong>: Runners, Rules, subclassing and other techniques will be revamped into a cohesive set of constructs to enhance JUnit and to allow—if possible—the seamless combination of individual extensions.</p>
+			</li>
+			<li>
+				<p><strong>Making use of Java 8 features (Lambdas, Streams, Interface default methods) for better assertions, generating test cases, formulating test hierarchies, testing asynchronous code and other stuff</strong>: We will provide those extensions in additional libraries to keep the JUnit core compatible with older JDKs.</p>
+			</li>
+		</ul>
+		<p>All development will happen openly on <a href="https://github.com/junit-team/junit5">GitHub</a> in order to foster early feedback and detect problems as soon as possible.</p>
+  </body>
+</html>

_service:tar_scm:r4.13.2.tar.gz/src/site/xhtml/junit-lambda-contributors.xhtml Added

@@ -0,0 +1,326 @@
+<html>
+  <head>
+    <title>JUnit Lambda</title>
+  </head>
+  <body>
+		<h1>Crowdfunding Campaign Contributors <small>#fundJUnit</small></h1>
+		<p>The following individuals, companies, and organizations have made substantial contributions to the <a href="https://www.indiegogo.com/projects/junit-lambda">JUnit Lambda crowdfunding campaign on Indiegogo</a>. Thank you from the JUnit team!</p>
+		<p>Depending on the perk they have chosen, they are listed with a large logo, a small one, or by their name.</p>
+		<ul class="inline sponsors sponsors-large">
+			<li><a href="http://www.ociweb.com" title="Object Computing, Inc. (OCI), U.S."><img src="images/junit-lambda/contributors/ociweb.png" /></a></li>
+			<li><a href="http://devnexus.com" title="DevNexus"><img src="images/junit-lambda/contributors/devnexus.png" /></a></li>
+			<li><a href="http://about-us.autotrader.co.uk/" title="Auto Trader Ltd, U.K."><img src="images/junit-lambda/contributors/autotrader.jpg" /></a></li>
+			<li><a href="https://www.ergon.ch/" title="Ergon Informatik AG, Switzerland"><img src="images/junit-lambda/contributors/ergon.png" /></a></li>
+			<li><a href="http://www.sipgate.de/" title="Sipgate, Germany"><img src="images/junit-lambda/contributors/sipgate.png" /></a></li>
+			<li><a href="http://www.adnovum.ch/" title="AdNovum Informatik AG, Switzerland"><img src="images/junit-lambda/contributors/adnovum.png" /></a></li>
+			<li><a href="https://www.jetbrains.com/idea/" title="IntelliJ IDEA by JetBrains"><img src="images/junit-lambda/contributors/intellijidea.png" /></a></li>
+			<li><a href="http://pivotal.io/" title="Pivotal Software, Inc., U.S.A."><img src="images/junit-lambda/sponsors/pivotal.png" /></a></li>
+			<li><a href="http://samuraism.com/" title="Samuraism Inc."><img src="images/junit-lambda/contributors/samuraism.png" /></a></li>
+      <li><a href="http://www.msg-systems.com/" title="msg systems AG, Germany"><img src="images/junit-lambda/contributors/msgsystems.png" /></a></li>
+      <li><a href="https://gradle.org/" title="Gradle"><img src="images/junit-lambda/contributors/gradle.png" /></a></li>
+      <li><a href="http://www.klarna.com/" title="Klarna AB, Sweden"><img src="images/junit-lambda/contributors/klarna.png" /></a></li>
+		</ul>
+		<ul class="inline sponsors sponsors-small">
+			<li><a href="http://www.tngtech.com" title="TNG Technology Consulting, Germany"><img src="images/junit-lambda/contributors/tng.png" /></a></li>
+			<li><a href="http://www.bouvet.no/en/" title="Bouvet, Norway"><img src="images/junit-lambda/contributors/bouvet.png" /></a></li>
+			<li><a href="http://netcetera.com/" title="Netcetera AG, Switzerland"><img src="images/junit-lambda/contributors/netcetera.png" /></a></li>
+			<li><a href="http://www.diffplug.com/" title="DiffPlug LLC, U.S."><img src="images/junit-lambda/contributors/diffplug.png" /></a></li>
+			<li><a href="http://www.disy.net/" title="Disy, Germany"><img src="images/junit-lambda/contributors/disy.jpg" /></a></li>
+			<li><a href="http://www.braintime.de/methoden/ueberblick-extreme-programming-beratung/xp-schulung-beratung/" title="OiO, Germany"><img src="images/junit-lambda/contributors/oio.png" /></a></li>
+			<li><a href="http://www.squeed.com" title="Squeed, Sweden"><img src="images/junit-lambda/contributors/squeed.png" /></a></li>
+			<li><a href="http://bit.ly/1EXgtwv" title="42talents GmbH, Switzerland"><img src="images/junit-lambda/contributors/42talents.png" /></a></li>
+			<li><a href="http://www.bol.com/" title="bol.com, The Netherlands"><img src="images/junit-lambda/contributors/bol.jpg" /></a></li>
+			<li><a href="http://www.murex.com/" title="Murex, France"><img src="images/junit-lambda/contributors/murex.jpg" /></a></li>
+			<li><a href="http://www.zenika.com/" title="Zenika, France"><img src="images/junit-lambda/contributors/zenika.png" /></a></li>
+			<li><a href="http://www.six-group.com/en/home.html" title="SIX, Switzerland"><img src="images/junit-lambda/contributors/six.gif" /></a></li>
+      <li><a href="http://vaddy.net/" title="VAddy"><img src="images/junit-lambda/contributors/vaddy.png" /></a></li>
+      <li><a href="http://www.arcbees.com/" title="Arcbees"><img src="images/junit-lambda/contributors/arcbees.png" /></a></li>
+      <li><a href="http://www.red6-es.de/" title="Red Enterprise Software, Germany"><img src="images/junit-lambda/contributors/red6-es.jpg" /></a></li>
+      <li><a href="http://www.klosebrothers.de/" title="klose brothers gmbh, Germany"><img src="images/junit-lambda/contributors/klosebrothers.png" /></a></li>
+      <li><a href="http://structure101.com/" title="structure101"><img src="images/junit-lambda/contributors/structure101.png" /></a></li>
+      <li><a href="http://www.siili.com/campaign/junit-lambda" title="Siili Solutions Oyj, Finland"><img src="images/junit-lambda/contributors/siili.png" /></a></li>
+      <li><a href="http://www.eclipse.org/" title="Eclipse Foundation, U.S.A."><img src="images/junit-lambda/contributors/eclipse.png" /></a></li>
+      <li><a href="http://www.novatec-gmbh.de/en/" title="NovaTec Consulting GmbH, Germany"><img src="images/junit-lambda/contributors/novatec.png" /></a></li>
+      <li><a href="http://www.synyx.de/" title="synyx GmbH &amp; Co. KG, Germany"><img src="images/junit-lambda/contributors/synyx.jpg" /></a></li>
+      <li><a href="http://careers.stackoverflow.com/company/TOPdesk" title="TOPdesk"><img src="images/junit-lambda/contributors/topdesk.png" /></a></li>
+      <li><a href="http://www.sonrisa.hu/" title="s:)nrisa, Hungary"><img src="images/junit-lambda/contributors/sonrisa.png" /></a></li>
+		</ul>
+		<ul class="inline">
+			<li>Hans Sowa</li>
+			<li>Jens Schauder</li>
+			<li>Tobias Ahlers</li>
+			<li>Daniel Zappold</li>
+			<li>Kai-Marian Pukall</li>
+			<li>Julien Jakubowski</li>
+			<li>Dmitry Karlinsky</li>
+			<li>Mark Munson</li>
+			<li>Andrew Janke</li>
+			<li>Eric Lefevre-Ardant</li>
+			<li>Brett Tucker</li>
+			<li>Andi Scharfstein</li>
+			<li>Oyvind Horneland</li>
+			<li><a href="http://code-mentor.com/">Görge Albrecht</a></li>
+			<li>Justin Ryan</li>
+			<li>Maria Savela</li>
+			<li>Eugen Parasachiv</li>
+			<li>Stefan Domnanovits</li>
+			<li>Nils Wloka</li>
+			<li>Eduardo Ucha Tortuero</li>
+			<li>Mark Crossfield</li>
+			<li>Benjamin Murray</li>
+			<li>MinGyoo Jung</li>
+			<li>Hadrien Zalek</li>
+			<li>Khaled Sinno</li>
+			<li>Chadi El Masri</li>
+			<li>Davide Fucci</li>
+			<li>Frederik Hahne</li>
+			<li>Benjamin Murray</li>
+			<li>Erik Severinsen</li>
+			<li>Anna-Pitschna Kunz</li>
+			<li>Daniel Baldes</li>
+			<li>Stefan Ferstl</li>
+			<li>Jonathan Gray</li>
+			<li>Seb Heglmeier</li>
+			<li>Bruno Girin</li>
+			<li>Steve Ash</li>
+			<li>Yves Geissbuehler</li>
+			<li>Jacques Stadler</li>
+			<li>Bernard D'Havé</li>
+			<li>Monica Granbois</li>
+			<li>Florian Hopf</li>
+			<li>Erich Oswald</li>
+			<li>Joe Schmetzer</li>
+			<li>Sebastian Hempel</li>
+			<li>Christoph Pater</li>
+			<li>Klaus Unger</li>
+			<li>Martijn Dashorst</li>
+			<li>Alexey Kornev</li>
+			<li>Timo Kockert</li>
+			<li>Michael Prieß</li>
+			<li>Joseph Moore</li>
+			<li>Richard Capraro</li>
+			<li><a href="http://www.jbrains.ca/">J. B. Rainsberger</a></li>
+			<li>Marcel Körtgen</li>
+			<li>Tim Yates</li>
+			<li>Evan Porter</li>
+			<li>Jeroen Ingelbrecht</li>
+			<li>Mustafa Ulu</li>
+			<li>Daniel Wellman</li>
+			<li>Juan Llado</li>
+			<li>Michał Bendowski</li>
+			<li>Samir Talwar</li>
+			<li><a href="http://davidtanzer.net">David Tanzer</a></li>
+			<li>Siv Midtun Hollup</li>
+			<li>Alexander Schwartz</li>
+			<li><a href="http://www.code-project.org/">Oliver Paulus</a></li>
+			<li>Micael Gallego</li>
+			<li>Johannes Seitz</li>
+			<li>Tristan Mills</li>
+			<li>Henk van Voorthuijsen</li>
+			<li>Dennis Hunziker</li>
+			<li>Stefan Odendahl</li>
+			<li>Gregor Trefs</li>
+			<li>Steve Moyer</li>
+			<li>Björn Kimminich</li>
+			<li>Fabrice Sznajderman</li>
+			<li>Nikita Makarov</li>
+			<li>Carsten Otto</li>
+			<li>Markus Decke</li>
+			<li>Henrik Steudel</li>
+			<li>Matt Newell</li>
+			<li>Thomas Michael</li>
+			<li>Robert Klaus</li>
+			<li>Martin Dürrmeier</li>
+			<li><a href="http://www.petrikainulainen.net/blog/">Petri Kainulainen</a></li>
+			<li>Jean-Christophe Sirot</li>
+      <li>Max Schwaab</li>
+      <li>Brian Clozel</li>
+      <li>Per-Ingemar Andersson</li>
+      <li>Henry Voyer</li>
+      <li><a href="http://www.groodt.info/">Greg Roodt</a></li>
+      <li>Java User Group Frankfurt</li>
+      <li>Adrian McMichael</li>
+      <li>Björn Darri Sigurðsson</li>
+      <li>Chris Williams</li>
+      <li><a href="http://agilepainrelief.com/">Agile Pain Relief Consulting</a></li>
+      <li>Andrew Beussink</li>
+      <li>Per Arnold Blaasmo</li>
+      <li>Ian Mayo</li>
+      <li>Doyle Young</li>
+      <li>Wolfgang Werner</li>
+      <li>Daniel Kunz</li>
+      <li><a href="http://www.herbert.cc/">Benjamin Herbert</a></li>
+      <li>Axel Schüssler</li>
+      <li>Matthias Lünemann</li>
+      <li>Christophe Taret</li>
+      <li><a href="http://coreagile.co/">Stephen Starkey</a></li>
+      <li>Michael Dörsam</li>
+      <li>Matt Bertolini</li>
+      <li>Jun Yong Chong</li>
+      <li>Svante Kumlien</li>
+      <li><a href="http://www.boothen.co.uk/">Matt Garner</a></li>
+      <li>Patrick Podbregar</li>
+      <li>Alessandro Proscia</li>
+      <li>David Burkhart</li>
+      <li>Matthias Grund</li>
+      <li>Tomas Michalec</li>
+      <li>Tadaya Tsuyukubo</li>
+      <li><a href="http://www.codeaffine.com/author/fappel/">Frank Appel</a></li>
+      <li>Paul Holser</li>
+      <li>Patrick Baumgartner</li>
+      <li>Emmanuel Chavane</li>
+      <li>Kini</li>
+      <li>Robert-Jan Regout</li>
+      <li>Bastian Spanneberg</li>
+      <li>Jérémie Bresson</li>
+      <li><a href="http://brabenetz.net/">Harald Brabenetz</a></li>
+      <li>Nacho Cougil</li>
+      <li>Martin Schröder</li>
+      <li>Thorsten Brunzendorf</li>
+      <li><a href="https://hubesco.com/">Paolo Escobar</a></li>
+      <li>Brad Milne</li>
+      <li>Bill Chen</li>
+      <li>Craig Doremus</li>
+      <li>Jean-Michel Bea</li>
+      <li><a href="http://www.goeckeler.com/">Thorsten Göckeler</a></li>
+      <li>Ben Romberg</li>
+      <li>Sixto Cantolla Sánchez</li>
+      <li><a href="http://www.altiria.com/">Altiria</a></li>
+      <li>Andres Rodriguez</li>
+      <li>Romain Rocès</li>
+      <li>Ivan Caspeta</li>
+      <li><a href="http://olivergierke.de">Oliver Gierke</a></li>
+      <li>Pierre Marguerite</li>
+      <li>Dmitry Spikhalskiy</li>
+      <li>Francisco Javier Jiménez Sáez</li>
+      <li>Ivo Smid</li>
+      <li>Sargon</li>
+      <li>Balázs Sándor Mracskó</li>
+      <li>Marco Fritschi</li>
+      <li>Matthias 'Yolgie' Holzinger</li>
+      <li>Christian Schubert</li>
+      <li>Rémy Francillette</li>
+      <li>Martin Klose</li>
+      <li><a href="https://www.tennisoff.net/">tennisoff.net</a></li>
+      <li>Yoshio Terada</li>
+      <li>Oleg Lavorskyi</li>
+      <li>Marvin Lillehaug</li>
+      <li>y.ono</li>
+      <li>Kouji Nomura</li>
+      <li><a href="https://github.com/twada">Takuto Wada</a></li>
+      <li>Teruaki Kanamori</li>
+      <li>Keita Kita</li>
+      <li>Manabu Matsuzaki</li>
+      <li><a href="http://blog.satotaichi.info/">Sato Taichi</a></li>
+      <li>Koji Hasegawa</li>
+      <li>Lukas Hinsch</li>
+      <li>Hirofumi Nakagawa</li>
+      <li>Chanwook</li>
+      <li>Masashi Yoshida</li>
+      <li>Yusuke Ikeda</li>
+      <li>Takafumi Yoshida</li>
+      <li>Iwao Harada</li>
+      <li>Daisuke Nakagome</li>
+      <li>Yasushi Hagai</li>
+      <li>Takuya Kawabe</li>
+      <li>Oohara Kazutaka</li>
+      <li>Itsuo Okamoto</li>
+      <li>Shigeyuki Azuchi</li>
+      <li>Shinya Kamijo</li>
+      <li>Noritaka Ishizumi</li>
+      <li>Cagatay Kavukcuoglu</li>
+      <li>Lars Vogel</li>
+      <li>Koji LIn</li>
+      <li>Elmar Fasel</li>
+      <li>Behrang Saeedzadeh</li>
+      <li>Paul Naranja</li>
+      <li><a href="https://twitter.com/windish4649">Naoko Yamazaki</a></li>
+      <li>Kouta Imanaka</li>
+      <li>Takahiro Yano</li>
+      <li>Minoru Yokomichi</li>
+      <li>Yuki Matsumura</li>
+      <li>Kazutoshi Tanaka</li>
+      <li>Itsuki Kuroda</li>
+      <li><a href="https://github.com/golonzovsky">Alexander Golonzovsky</a></li>
+      <li>Ryo Uchino</li>
+      <li>Shingo Ishimura</li>
+      <li>Yamamoto Masaki</li>
+      <li>幸田英隆</li>
+      <li>Hiroyuki Ohnaka</li>
+      <li>Ito Sho</li>
+      <li>Yu Asano</li>
+      <li>Takeshi Hagikura</li>
+      <li>Shigeki Yamato</li>
+      <li>Shinya Yoshida</li>
+      <li><a href="https://dimitrisli.wordpress.com/">Dimitrios Liapis</a></li>
+      <li>Kohei Yamamoto</li>
+      <li>Hiroto Kusuda</li>
+      <li>Jonas Lindholm</li>
+      <li>Takumi Endo</li>
+      <li>Gabi Merten</li>
+      <li>Ben Hale</li>
+      <li>Eiji Hachiya</li>
+      <li>Hideyuki Kikuma</li>
+      <li>Park Sungchul</li>
+      <li>Eiji Yamane</li>
+      <li>Akinori Ikeda</li>
+      <li>Jun Nakamura</li>
+      <li>Takuya Shimabukuro</li>
+      <li>Setsu Fujita</li>
+      <li>Jochen Winzen</li>
+      <li>Yousuke Tezuka</li>
+      <li>Shimizu  Yasuhiro</li>
+      <li><a href="https://twitter.com/kabao">Satoshi Okano</a></li>
+      <li>Yasuyuki Fukai</li>
+      <li>Charles Goddard</li>
+      <li>Tiarê Balbi Bonamini</li>
+      <li>Kazumune Katagiri</li>
+      <li>Masahiro Wakame</li>
+      <li>Kazutaka Ogaki</li>
+      <li>Taizo Nakatani</li>
+      <li>Yoshitaka Kawaji</li>
+      <li>Akihiro Kitada</li>
+      <li>Kozaki Tsuneaki</li>
+      <li>Takehiro Inoue</li>
+      <li>Shigeki Shoji</li>
+      <li>Junya Suzuki</li>
+      <li>Tomoharu Nagasawa</li>
+      <li>Toby Lee</li>
+      <li>Yuichiro Mukai</li>
+      <li>Hiroyuki Yamaoka</li>
+      <li>Jun Sagawa</li>
+      <li>Soma Kuwabara</li>
+      <li>Yui Iwamatsu</li>
+      <li>Michael Schlechter</li>
+      <li><a href="https://twitter.com/itohiro73">Hiroshi Ito</a></li>
+      <li>Tae-jun Jin</li>
+      <li>Dennis Rippinger</li>
+      <li>Dejan Janosevic</li>
+      <li>Dbj Shrestha</li>
+      <li>Hideaki Takahashi</li>
+      <li><a href="http://www.knightso.co.jp/">Daigo Ikeda</a></li>
+      <li>Teppei Yamaguchi</li>
+      <li>Pierre Templier</li>
+      <li>TDD Base Camp</li>
+      <li>Hirofumi Nozaki</li>
+      <li>Takayuki Hayashi</li>
+      <li>Steven Christou</li>
+      <li>Kostadin Golev</li>
+      <li>Ricardo Gladwell</li>
+      <li>Thorsten Hoeger</li>
+      <li><a href="http://www.shino.de/blog">Markus Gärtner</a></li>
+      <li>Hiroyuki Aoki</li>
+      <li>Gary Fleming</li>
+      <li>Samuel Eickelberg</li>
+      <li>Marcel Berschneider</li>
+      <li>Frank Jakop</li>
+      <li>Dominik Lange</li>
+      <li>Stefan Matzdorf</li>
+      <li>Suzanne Hamilton</li>
+      <li>Satoru Kimura</li>
+      <li>今井一幾</li>
+      <li>Yasuharu Nakano</li>
+      <li>Takatoshi Kawamura</li>
+		</ul>
+  </body>
+</html>

_service:tar_scm:r4.13.2.tar.gz/src/site/xhtml/junit-lambda-spending.xhtml Added

@@ -0,0 +1,29 @@
+<html>
+  <head>
+    <title>JUnit Lambda - Campaign Spending</title>
+  </head>
+  <body>
+		<h1>JUnit Lambda - Spending</h1>
+    <p>
+      Since all the money is going through the books of a company (andrena objects ag),
+      the exact amount for taxes cannot be calculated. We will fill in details and
+      exact amounts for other positions as soon as we have them.
+    </p>
+    <table>
+      <tr><th>What</th><th style="text-align: right">Credit/EUR</th><th style="text-align: right">Debit/EUR</th><th style="text-align: right">Balance/EUR</th></tr>
+      <tr><td>Indiegogo Sum</td><td style="text-align: right">€53,937.00</td><td></td><td style="text-align: right">€53,937.00</td></tr>
+      <tr><td>Indiegogo Fees (5%)</td><td></td><td style="text-align: right">€2,696.85</td><td style="text-align: right">€51,240.15</td></tr>
+      <tr><td>Paypal Fees</td><td></td><td style="text-align: right">€2,270.06</td><td style="text-align: right">€48,970.09</td></tr>
+      <tr><td>German VAT (estimated)</td><td></td><td style="text-align: right">€7,666.49</td><td style="text-align: right">€41,303.60</td></tr>
+      <tr><td>Kick-off Expenses, Travel and Food</td><td></td><td style="text-align: right">€3,011.32</td><td style="text-align: right">€38,292.28</td></tr>
+      <tr><td>Development October 2015</td><td></td><td style="text-align: right">€14,000.00</td><td style="text-align: right">€24,292.28</td></tr>
+      <tr><td>Development November 2015</td><td></td><td style="text-align: right">€7,600.00</td><td style="text-align: right">€16,692.28</td></tr>
+      <tr><td>Development December 2015</td><td></td><td style="text-align: right">€5,400.00</td><td style="text-align: right">€11,292.28</td></tr>
+      <tr><td>Travel Expenses December 2015</td><td></td><td style="text-align: right">€749.69</td><td style="text-align: right">€10,542.59</td></tr>
+      <tr><td>Development January 2016</td><td></td><td style="text-align: right">€6,000.00</td><td style="text-align: right">€4,542.59</td></tr>
+      <tr><td>Travel Expenses January 2016</td><td></td><td style="text-align: right">€1,001.13</td><td style="text-align: right">€3,541.46</td></tr>
+      <tr><td>Development April 2016</td><td></td><td style="text-align: right">€1,200.00</td><td style="text-align: right">€2,341.46</td></tr>
+      <tr><td>Development August 2016</td><td></td><td style="text-align: right">€2,341.46</td><td style="text-align: right">€0.00</td></tr>
+    </table>
+  </body>
+</html>

_service:tar_scm:r4.13.2.tar.gz/src/site/xhtml/junit-lambda.xhtml Added

@@ -0,0 +1,30 @@
+<html>
+  <head>
+    <title>JUnit Lambda</title>
+  </head>
+  <body>
+		<h1>JUnit Lambda</h1>
+    <p>
+      <em>JUnit Lambda</em> was the working title for
+      what has now become <a href="http://junit.org/junit5/">JUnit 5</a>.
+    </p>
+    <p>
+      The initial phases of this work <a href="junit-lambda-campaign.html">were enabled by a crowdfunding campaign on Indiegogo</a>.
+    </p>
+    <hr />
+    <h2>Campaign Spending</h2>
+    <p>
+      As part of our accountability we agreed to make <a href="junit-lambda-spending.html">all campaign spending transparent</a>.
+    </p>
+		<hr />
+		<h2>Main Sponsors and Campaign Sponsor</h2>
+		<p>Without sponsoring JUnit Lambda would not exist. We're especially grateful to the companies below:</p>
+		<ul class="inline sponsors sponsors-large">
+			<li><a href="http://www.andrena.de" title="andrena objects ag, Germany"><img src="images/junit-lambda/sponsors/andrena.png" /></a></li>
+			<li><a href="http://www.heidelberg-mobil.com" title="Heidelberg Mobil International GmbH, Germany"><img src="images/junit-lambda/sponsors/heidelberg-mobil.png" /></a></li>
+			<li><a href="http://www.namics.com" title="Namics (Deutschland) GmbH, Germany"><img src="images/junit-lambda/sponsors/namics.png" /></a></li>
+			<li><a href="http://pivotal.io/" title="Pivotal Software, Inc., U.S.A."><img src="images/junit-lambda/sponsors/pivotal.png" /></a></li>
+			<li><a href="http://www.americanexpress.com/" title="American Express Company"><img src="images/junit-lambda/sponsors/amex.png" /></a></li>
+		</ul>
+  </body>
+</html>

_service:tar_scm:r4.13.2.tar.gz/src/site/xhtml/junit5.xhtml Added

_service:tar_scm:r4.12.tar.gz/src/test/java/junit/samples/ListTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/junit/samples/ListTest.java Changed

@@ -11,20 +11,17 @@
  * A sample test case, testing {@link java.util.ArrayList}.
  */
 public class ListTest extends TestCase {
-    protected List<Integer> fEmpty;
-    protected List<Integer> fFull;
+    private List<Integer> emptyList;
+    private List<Integer> fullList;
 
-    public static void main(String args) {
-        junit.textui.TestRunner.run(suite());
-    }
 
     @Override
     protected void setUp() {
-        fEmpty = new ArrayList<Integer>();
-        fFull = new ArrayList<Integer>();
-        fFull.add(1);
-        fFull.add(2);
-        fFull.add(3);
+        emptyList = new ArrayList<Integer>();
+        fullList = new ArrayList<Integer>();
+        fullList.add(1);
+        fullList.add(2);
+        fullList.add(3);
     }
 
     public static Test suite() {
@@ -32,24 +29,24 @@
     }
 
     public void testCapacity() {
-        int size = fFull.size();
+        int size = fullList.size();
         for (int i = 0; i < 100; i++) {
-            fFull.add(new Integer(i));
+            fullList.add(i);
         }
-        assertTrue(fFull.size() == 100 + size);
+        assertTrue(fullList.size() == 100 + size);
     }
 
     public void testContains() {
-        assertTrue(fFull.contains(1));
-        assertTrue(!fEmpty.contains(1));
+        assertTrue(fullList.contains(1));
+        assertFalse(emptyList.contains(1));
     }
 
     public void testElementAt() {
-        int i = fFull.get(0);
-        assertTrue(i == 1);
+        int i = fullList.get(0);
+        assertEquals(1,i);
 
         try {
-            fFull.get(fFull.size());
+            fullList.get(fullList.size());
         } catch (IndexOutOfBoundsException e) {
             return;
         }
@@ -57,14 +54,14 @@
     }
 
     public void testRemoveAll() {
-        fFull.removeAll(fFull);
-        fEmpty.removeAll(fEmpty);
-        assertTrue(fFull.isEmpty());
-        assertTrue(fEmpty.isEmpty());
+        fullList.removeAll(fullList);
+        emptyList.removeAll(emptyList);
+        assertTrue(fullList.isEmpty());
+        assertTrue(emptyList.isEmpty());
     }
 
     public void testRemoveElement() {
-        fFull.remove(new Integer(3));
-        assertTrue(!fFull.contains(3));
+        fullList.remove(Integer.valueOf(3));
+        assertFalse(fullList.contains(3));
     }
 }
\ No newline at end of file

_service:tar_scm:r4.13.2.tar.gz/src/test/java/junit/tests/SampleJUnit3Tests.java Added

@@ -0,0 +1,51 @@
+package junit.tests;
+
+import junit.framework.TestCase;
+
+/**
+ * Container for sample JUnit3-style tests used in integration tests.
+ */
+public class SampleJUnit3Tests {
+
+    public static class TestWithOneThrowingTestMethod extends TestCase {
+
+        public void testAlwaysThrows() {
+            new FakeClassUnderTest().throwsExceptionWithoutCause();
+        }
+    }
+
+    public static class TestWithThrowingSetUpMethod extends TestCase {
+
+        @Override
+        protected void setUp() throws Exception {
+            super.setUp();
+            new FakeClassUnderTest().throwsExceptionWithoutCause();
+        }
+
+        public void testAlwaysPasses() {
+        }
+    }
+
+    private static class FakeClassUnderTest {
+
+        public void throwsExceptionWithCause() {
+            doThrowExceptionWithCause();
+        }
+
+        public void throwsExceptionWithoutCause() {
+            doThrowExceptionWithoutCause();
+        }
+
+        private void doThrowExceptionWithCause() {
+            try {
+                throwsExceptionWithoutCause();
+            } catch (Exception e) {
+                throw new RuntimeException("outer", e);
+            }
+        }
+
+        private void doThrowExceptionWithoutCause() {
+            throw new RuntimeException("cause");
+        }
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/test/java/junit/tests/extensions/ExtensionTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/junit/tests/extensions/ExtensionTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/junit/tests/framework/DoublePrecisionAssertTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/junit/tests/framework/DoublePrecisionAssertTest.java Changed

@@ -11,17 +11,19 @@
     public void testAssertEqualsNaNFails() {
         try {
             assertEquals(1.234, Double.NaN, 0.0);
-            fail();
         } catch (AssertionFailedError e) {
+            return;
         }
+        fail();
     }
 
     public void testAssertNaNEqualsFails() {
         try {
             assertEquals(Double.NaN, 1.234, 0.0);
-            fail();
         } catch (AssertionFailedError e) {
+            return;
         }
+        fail();
     }
 
     public void testAssertNaNEqualsNaN() {
@@ -31,17 +33,19 @@
     public void testAssertPosInfinityNotEqualsNegInfinity() {
         try {
             assertEquals(Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY, 0.0);
-            fail();
         } catch (AssertionFailedError e) {
+            return;
         }
+        fail();
     }
 
     public void testAssertPosInfinityNotEquals() {
         try {
             assertEquals(Double.POSITIVE_INFINITY, 1.23, 0.0);
-            fail();
         } catch (AssertionFailedError e) {
+            return;
         }
+        fail();
     }
 
     public void testAssertPosInfinityEqualsInfinity() {

_service:tar_scm:r4.12.tar.gz/src/test/java/junit/tests/framework/FloatAssertTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/junit/tests/framework/FloatAssertTest.java Changed

@@ -11,17 +11,19 @@
     public void testAssertEqualsNaNFails() {
         try {
             assertEquals(1.234f, Float.NaN, 0.0);
-            fail();
         } catch (AssertionFailedError e) {
+            return;
         }
+        fail();
     }
 
     public void testAssertNaNEqualsFails() {
         try {
             assertEquals(Float.NaN, 1.234f, 0.0);
-            fail();
         } catch (AssertionFailedError e) {
+            return;
         }
+        fail();
     }
 
     public void testAssertNaNEqualsNaN() {
@@ -31,17 +33,19 @@
     public void testAssertPosInfinityNotEqualsNegInfinity() {
         try {
             assertEquals(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY, 0.0);
-            fail();
         } catch (AssertionFailedError e) {
+            return;
         }
+        fail();
     }
 
     public void testAssertPosInfinityNotEquals() {
         try {
             assertEquals(Float.POSITIVE_INFINITY, 1.23f, 0.0);
-            fail();
         } catch (AssertionFailedError e) {
+            return;
         }
+        fail();
     }
 
     public void testAssertPosInfinityEqualsInfinity() {
@@ -53,11 +57,7 @@
     }
 
     public void testAllInfinities() {
-        try {
-            assertEquals(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY);
-            fail();
-        } catch (AssertionFailedError e) {
-        }
+        assertEquals(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY);
     }
 
 }

_service:tar_scm:r4.12.tar.gz/src/test/java/junit/tests/runner/ResultTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/junit/tests/runner/ResultTest.java Changed

@@ -10,6 +10,7 @@
 
 import junit.framework.TestCase;
 import junit.tests.framework.Success;
+import org.junit.Test;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
@@ -17,32 +18,89 @@
 
 public class ResultTest extends TestCase {
 
+    private Result fromStream;
+
     public void testRunFailureResultCanBeSerialised() throws Exception {
         JUnitCore runner = new JUnitCore();
         Result result = runner.run(AnnotationTest.FailureTest.class);
         assertResultSerializable(result);
     }
 
+    public void testRunFailureResultCanBeReserialised_v4_12() throws Exception {
+        JUnitCore runner = new JUnitCore();
+        Result result = runner.run(AnnotationTest.FailureTest.class);
+        assertResultReserializable(result, SerializationFormat.V4_12);
+    }
+
+    public void testRunAssumptionFailedResultCanBeSerialised() throws Exception {
+        JUnitCore runner = new JUnitCore();
+        Result result = runner.run(AssumptionFailedTest.class);
+        assertResultSerializable(result);
+    }
+
+    public void testRunAssumptionFailedResultCanBeReserialised_v4_12() throws Exception {
+        JUnitCore runner = new JUnitCore();
+        Result result = runner.run(AssumptionFailedTest.class);
+        assertResultReserializable(result, SerializationFormat.V4_12);
+    }
+
+    public void testRunAssumptionFailedResultCanBeReserialised_v4_13() throws Exception {
+        JUnitCore runner = new JUnitCore();
+        Result result = runner.run(AssumptionFailedTest.class);
+        assertResultReserializable(result, SerializationFormat.V4_13);
+    }
+
     public void testRunSuccessResultCanBeSerialised() throws Exception {
         JUnitCore runner = new JUnitCore();
         Result result = runner.run(Success.class);
         assertResultSerializable(result);
     }
 
+    public void testRunSuccessResultCanBeReserialised_v4_12() throws Exception {
+        JUnitCore runner = new JUnitCore();
+        Result result = runner.run(Success.class);
+        assertResultReserializable(result, SerializationFormat.V4_12);
+    }
+
+    public void testRunSuccessResultCanBeReserialised_v4_13() throws Exception {
+        JUnitCore runner = new JUnitCore();
+        Result result = runner.run(Success.class);
+        assertResultReserializable(result, SerializationFormat.V4_13);
+    }
+
+    private enum SerializationFormat {
+        V4_12,
+        V4_13
+    }
+
     private void assertResultSerializable(Result result) throws IOException, ClassNotFoundException {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        new ObjectOutputStream(byteArrayOutputStream).writeObject(result);
+        ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
+        objectOutputStream.writeObject(result);
+        objectOutputStream.flush();
         byte bytes = byteArrayOutputStream.toByteArray();
         ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(bytes));
         Result fromStream = (Result) objectInputStream.readObject();
-        assertSerializedCorrectly(result, fromStream);
-
-        InputStream resource = getClass().getResourceAsStream(getName());
-        assertNotNull("Could not read resource " + getName(), resource);
-        objectInputStream = new ObjectInputStream(resource);
+        assertSerializedCorrectly(result, fromStream, SerializationFormat.V4_13);
+    }
+ 
+    private void assertResultReserializable(Result result, SerializationFormat resourceSerializationFormat)
+            throws IOException, ClassNotFoundException {
+        String resourceName = getName();
+        InputStream resource = getClass().getResourceAsStream(resourceName);
+        assertNotNull("Could not read resource " + resourceName, resource);
+        ObjectInputStream objectInputStream = new ObjectInputStream(resource);
         fromStream = (Result) objectInputStream.readObject();
-        
-        assertSerializedCorrectly(new ResultWithFixedRunTime(result), fromStream);
+
+        assertSerializedCorrectly(new ResultWithFixedRunTime(result),
+                fromStream, resourceSerializationFormat);
+    }
+
+    public static class AssumptionFailedTest {
+        @Test
+        public void assumptionFailed() throws Exception {
+            org.junit.Assume.assumeTrue(false);
+        }
     }
 
     /**
@@ -50,6 +108,9 @@
      * This makes values returned by the methods deterministic.
      */
     private static class ResultWithFixedRunTime extends Result {
+
+        private static final long serialVersionUID = 1L;
+
         private final Result delegate;
 
         public ResultWithFixedRunTime(Result delegate) {
@@ -80,14 +141,35 @@
         public int getIgnoreCount() {
             return delegate.getIgnoreCount();
         }
+
+        @Override
+        public int getAssumptionFailureCount() {
+            return delegate.getAssumptionFailureCount();
+        }
     }
 
-    private void assertSerializedCorrectly(Result result, Result fromStream) {
+    private void assertSerializedCorrectly(
+            Result result, Result fromStream, SerializationFormat serializationFormat) {
         assertNotNull(fromStream);
 
         // Exceptions don't implement equals() so we need to compare field by field
         assertEquals("failureCount", result.getFailureCount(), fromStream.getFailureCount());
         assertEquals("ignoreCount", result.getIgnoreCount(), fromStream.getIgnoreCount());
+
+        if (serializationFormat == SerializationFormat.V4_13) {
+            // assumption failures are serialized
+            assertEquals("assumptionFailureCount",
+                    result.getAssumptionFailureCount(),
+                    fromStream.getAssumptionFailureCount());
+        } else {
+            // assumption failures were not serialized
+            try {
+                fromStream.getAssumptionFailureCount();
+                fail("UnsupportedOperationException expected");
+            } catch (UnsupportedOperationException expected) {
+            }
+        }
+
         assertEquals("runTime", result.getRunTime(), fromStream.getRunTime());
         assertEquals("failures", result.getFailures().size(), fromStream.getFailures().size());
         int index = 0;

_service:tar_scm:r4.12.tar.gz/src/test/java/junit/tests/runner/StackFilterTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/junit/tests/runner/StackFilterTest.java Changed

@@ -15,28 +15,28 @@
         StringWriter swin = new StringWriter();
         PrintWriter pwin = new PrintWriter(swin);
         pwin.println("junit.framework.AssertionFailedError");
-        pwin.println("	at junit.framework.Assert.fail(Assert.java:144)");
-        pwin.println("	at junit.framework.Assert.assert(Assert.java:19)");
-        pwin.println("	at junit.framework.Assert.assert(Assert.java:26)");
-        pwin.println("	at MyTest.f(MyTest.java:13)");
-        pwin.println("	at MyTest.testStackTrace(MyTest.java:8)");
-        pwin.println("	at java.lang.reflect.Method.invoke(Native Method)");
-        pwin.println("	at junit.framework.TestCase.runTest(TestCase.java:156)");
-        pwin.println("	at junit.framework.TestCase.runBare(TestCase.java:130)");
-        pwin.println("	at junit.framework.TestResult$1.protect(TestResult.java:100)");
-        pwin.println("	at junit.framework.TestResult.runProtected(TestResult.java:118)");
-        pwin.println("	at junit.framework.TestResult.run(TestResult.java:103)");
-        pwin.println("	at junit.framework.TestCase.run(TestCase.java:121)");
-        pwin.println("	at junit.framework.TestSuite.runTest(TestSuite.java:157)");
-        pwin.println("	at junit.framework.TestSuite.run(TestSuite.java, Compiled Code)");
-        pwin.println("	at junit.swingui.TestRunner$17.run(TestRunner.java:669)");
+        pwin.println("\tat junit.framework.Assert.fail(Assert.java:144)");
+        pwin.println("\tat junit.framework.Assert.assert(Assert.java:19)");
+        pwin.println("\tat junit.framework.Assert.assert(Assert.java:26)");
+        pwin.println("\tat MyTest.f(MyTest.java:13)");
+        pwin.println("\tat MyTest.testStackTrace(MyTest.java:8)");
+        pwin.println("\tat java.lang.reflect.Method.invoke(Native Method)");
+        pwin.println("\tat junit.framework.TestCase.runTest(TestCase.java:156)");
+        pwin.println("\tat junit.framework.TestCase.runBare(TestCase.java:130)");
+        pwin.println("\tat junit.framework.TestResult$1.protect(TestResult.java:100)");
+        pwin.println("\tat junit.framework.TestResult.runProtected(TestResult.java:118)");
+        pwin.println("\tat junit.framework.TestResult.run(TestResult.java:103)");
+        pwin.println("\tat junit.framework.TestCase.run(TestCase.java:121)");
+        pwin.println("\tat junit.framework.TestSuite.runTest(TestSuite.java:157)");
+        pwin.println("\tat junit.framework.TestSuite.run(TestSuite.java, Compiled Code)");
+        pwin.println("\tat junit.swingui.TestRunner$17.run(TestRunner.java:669)");
         fUnfiltered = swin.toString();
 
         StringWriter swout = new StringWriter();
         PrintWriter pwout = new PrintWriter(swout);
         pwout.println("junit.framework.AssertionFailedError");
-        pwout.println("	at MyTest.f(MyTest.java:13)");
-        pwout.println("	at MyTest.testStackTrace(MyTest.java:8)");
+        pwout.println("\tat MyTest.f(MyTest.java:13)");
+        pwout.println("\tat MyTest.testStackTrace(MyTest.java:8)");
         fFiltered = swout.toString();
     }

_service:tar_scm:r4.12.tar.gz/src/test/java/junit/tests/runner/TextRunnerTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/junit/tests/runner/TextRunnerTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/AssumptionViolatedExceptionTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/AssumptionViolatedExceptionTest.java Changed

@@ -3,14 +3,28 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assume.assumeThat;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
 import org.junit.experimental.theories.DataPoint;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
+import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
 
 @RunWith(Theories.class)
@@ -24,6 +38,14 @@
     @DataPoint
     public static Matcher<Integer> NULL = null;
 
+    @Rule
+    public TestName name = new TestName();
+
+    private static final String MESSAGE = "Assumption message";
+    private static Matcher<Integer> SERIALIZABLE_IS_THREE = new SerializableIsThreeMatcher<Integer>();
+    private static final UnserializableClass UNSERIALIZABLE_VALUE = new UnserializableClass();
+    private static final Matcher<UnserializableClass> UNSERIALIZABLE_MATCHER = not(is(UNSERIALIZABLE_VALUE));
+
     @Theory
     public void toStringReportsMatcher(Integer actual, Matcher<Integer> matcher) {
         assumeThat(matcher, notNullValue());
@@ -93,4 +115,93 @@
       AssumptionViolatedException e = new AssumptionViolatedException("invalid number", cause);
       assertThat(e.getCause(), is(cause));
     }
+
+    @Test
+    public void assumptionViolatedExceptionWithoutValueAndMatcherCanBeReserialized_v4_13()
+            throws IOException, ClassNotFoundException {
+        assertReserializable(new AssumptionViolatedException(MESSAGE));
+    }
+
+    @Test
+    public void assumptionViolatedExceptionWithValueAndMatcherCanBeReserialized_v4_13()
+            throws IOException, ClassNotFoundException {
+        assertReserializable(new AssumptionViolatedException(MESSAGE, TWO, SERIALIZABLE_IS_THREE));
+    }
+
+    @Test
+    public void unserializableValueAndMatcherCanBeSerialized() throws IOException, ClassNotFoundException {
+        AssumptionViolatedException exception = new AssumptionViolatedException(MESSAGE,
+                UNSERIALIZABLE_VALUE, UNSERIALIZABLE_MATCHER);
+
+        assertCanBeSerialized(exception);
+    }
+
+    @Test
+    public void nullValueAndMatcherCanBeSerialized() throws IOException, ClassNotFoundException {
+        AssumptionViolatedException exception = new AssumptionViolatedException(MESSAGE);
+
+        assertCanBeSerialized(exception);
+    }
+
+    @Test
+    public void serializableValueAndMatcherCanBeSerialized() throws IOException, ClassNotFoundException {
+        AssumptionViolatedException exception = new AssumptionViolatedException(MESSAGE,
+                TWO, SERIALIZABLE_IS_THREE);
+
+        assertCanBeSerialized(exception);
+    }
+
+    private void assertCanBeSerialized(AssumptionViolatedException exception)
+            throws IOException, ClassNotFoundException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(baos);
+        oos.writeObject(exception);
+
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        ObjectInputStream ois = new ObjectInputStream(bais);
+        AssumptionViolatedException fromStream = (AssumptionViolatedException) ois.readObject();
+
+        assertSerializedCorrectly(exception, fromStream);
+    }
+
+    private void assertReserializable(AssumptionViolatedException expected)
+            throws IOException, ClassNotFoundException {
+        String resourceName = name.getMethodName();
+        InputStream resource = getClass().getResourceAsStream(resourceName);
+        assertNotNull("Could not read resource " + resourceName, resource);
+        ObjectInputStream objectInputStream = new ObjectInputStream(resource);
+        AssumptionViolatedException fromStream = (AssumptionViolatedException) objectInputStream.readObject();
+
+        assertSerializedCorrectly(expected, fromStream);
+    }
+
+    private void assertSerializedCorrectly(
+            AssumptionViolatedException expected, AssumptionViolatedException fromStream) {
+        assertNotNull(fromStream);
+
+        // Exceptions don't implement equals() so we need to compare field by field
+        assertEquals("message", expected.getMessage(), fromStream.getMessage());
+        assertEquals("description", StringDescription.asString(expected), StringDescription.asString(fromStream));
+        // We don't check the stackTrace as that will be influenced by how the test was started
+        // (e.g. by maven or directly from IDE)
+        // We also don't check the cause as that should already be serialized correctly by the superclass
+    }
+
+    private static class SerializableIsThreeMatcher<T> extends BaseMatcher<T> implements Serializable {
+
+        public boolean matches(Object item) {
+            return IS_THREE.matches(item);
+        }
+
+        public void describeTo(Description description) {
+            IS_THREE.describeTo(description);
+        }
+    }
+
+    private static class UnserializableClass {
+        @Override
+        public String toString() {
+            return "I'm not serializable";
+        }
+    }
 }

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/experimental/categories/AllCategoriesTests.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/experimental/categories/CategoriesAndParameterizedTest.java Added

@@ -0,0 +1,127 @@
+package org.junit.experimental.categories;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Categories.IncludeCategory;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Suite.SuiteClasses;
+
+public class CategoriesAndParameterizedTest {
+    public static class Token {
+
+    }
+
+    @RunWith(Parameterized.class)
+    public static class ParameterizedTestWithoutCategory {
+        @Parameters
+        public static Iterable<String> getParameters() {
+            return Arrays.asList("first", "second");
+        }
+
+        @Parameterized.Parameter
+        public String value;
+
+        @Test
+        public void testSomething() {
+            Assert.assertTrue(true);
+        }
+    }
+
+    @Category(Token.class)
+    public static class TestThatAvoidsNoTestRemainsException {
+        @Test
+        public void testSomething() {
+            Assert.assertTrue(true);
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(Token.class)
+    @SuiteClasses({ TestThatAvoidsNoTestRemainsException.class,
+            ParameterizedTestWithoutCategory.class })
+    public static class SuiteWithParameterizedTestWithoutCategory {
+    }
+
+    @Test
+    public void doesNotRunTestsWithoutCategory() {
+        Result result = new JUnitCore()
+                .run(SuiteWithParameterizedTestWithoutCategory.class);
+        assertEquals(1, result.getRunCount());
+        assertEquals(0, result.getFailureCount());
+    }
+
+    @RunWith(Parameterized.class)
+    @Category(Token.class)
+    public static class ParameterizedTestWithCategory {
+        @Parameters
+        public static Iterable<String> getParameters() {
+            return Arrays.asList("first", "second");
+        }
+
+        @Parameterized.Parameter
+        public String value;
+
+        @Test
+        public void testSomething() {
+            Assert.assertTrue(true);
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(Token.class)
+    @SuiteClasses({ ParameterizedTestWithCategory.class })
+    public static class SuiteWithParameterizedTestWithCategory {
+    }
+
+    @Test
+    public void runsTestsWithoutCategory() {
+        Result result = new JUnitCore()
+                .run(SuiteWithParameterizedTestWithCategory.class);
+        assertEquals(2, result.getRunCount());
+        assertEquals(0, result.getFailureCount());
+    }
+
+    @RunWith(Parameterized.class)
+    public static class ParameterizedTestWithMethodWithCategory {
+        @Parameters
+        public static Iterable<String> getParameters() {
+            return Arrays.asList("first", "second");
+        }
+
+        @Parameterized.Parameter
+        public String value;
+
+        @Test
+        @Category(Token.class)
+        public void testSomething() {
+            Assert.assertTrue(true);
+        }
+
+        @Test
+        public void testThatIsNotExecuted() {
+            Assert.assertTrue(true);
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(Token.class)
+    @SuiteClasses({ ParameterizedTestWithMethodWithCategory.class })
+    public static class SuiteWithParameterizedTestWithMethodWithCategory {
+    }
+
+    @Test
+    public void runsTestMethodWithCategory() {
+        Result result = new JUnitCore()
+                .run(SuiteWithParameterizedTestWithMethodWithCategory.class);
+        assertEquals(2, result.getRunCount());
+        assertEquals(0, result.getFailureCount());
+    }
+}
\ No newline at end of file

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/experimental/categories/CategoryTest.java Added

@@ -0,0 +1,574 @@
+package org.junit.experimental.categories;
+
+import static java.lang.String.format;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.AnyOf.anyOf;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.failureCountIs;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Categories.CategoryFilter;
+import org.junit.experimental.categories.Categories.ExcludeCategory;
+import org.junit.experimental.categories.Categories.IncludeCategory;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Request;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runner.manipulation.NoTestsRemainException;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.junit.runners.model.InitializationError;
+
+public class CategoryTest {
+    public interface FastTests {
+        // category marker
+    }
+
+    public interface SlowTests {
+        // category marker
+    }
+
+    public interface ReallySlowTests {
+        // category marker
+    }
+
+    public static class OneOfEach {
+
+        @Category(FastTests.class)
+        @Test
+        public void a() {
+        }
+
+        @Category(SlowTests.class)
+        @Test
+        public void b() {
+        }
+
+        @Category(ReallySlowTests.class)
+        @Test
+        public void c() {
+        }
+    }
+
+    public static class A {
+        @Test
+        public void a() {
+            fail();
+        }
+
+        @Category(SlowTests.class)
+        @Test
+        public void b() {
+        }
+    }
+
+    @Category(SlowTests.class)
+    public static class B {
+        @Test
+        public void c() {
+
+        }
+    }
+
+    public static class C {
+        @Test
+        public void d() {
+            fail();
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(SlowTests.class)
+    @SuiteClasses({A.class, B.class, C.class})
+    public static class SlowTestSuite {
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(SlowTests.class)
+    @SuiteClasses({A.class})
+    public static class JustA {
+    }
+
+    @Test
+    public void testCountOnJustA() {
+        assertThat(testResult(JustA.class), isSuccessful());
+    }
+
+    @Test
+    public void testCount() {
+        assertThat(testResult(SlowTestSuite.class), isSuccessful());
+    }
+
+    public static class Category1 {
+    }
+
+    public static class Category2 {
+    }
+
+    public static class SomeAreSlow {
+        @Test
+        public void noCategory() {
+        }
+
+        @Category(Category1.class)
+        @Test
+        public void justCategory1() {
+        }
+
+        @Category(Category2.class)
+        @Test
+        public void justCategory2() {
+        }
+
+        @Category({Category1.class, Category2.class})
+        @Test
+        public void both() {
+        }
+
+        @Category({Category2.class, Category1.class})
+        @Test
+        public void bothReversed() {
+        }
+    }
+
+    @RunWith(Categories.class)
+    @ExcludeCategory(Category1.class)
+    @SuiteClasses({SomeAreSlow.class})
+    public static class SomeAreSlowSuite {
+    }
+
+    @Test
+    public void testCountOnAWithoutSlowTests() {
+        Result result = JUnitCore.runClasses(SomeAreSlowSuite.class);
+        assertThat(testResult(SomeAreSlowSuite.class), isSuccessful());
+        assertEquals(2, result.getRunCount());
+        assertTrue(result.wasSuccessful());
+    }
+
+    @RunWith(Categories.class)
+    @ExcludeCategory(Category1.class)
+    @IncludeCategory(Category2.class)
+    @SuiteClasses({SomeAreSlow.class})
+    public static class IncludeAndExcludeSuite {
+    }
+
+    @Test
+    public void testsThatAreBothIncludedAndExcludedAreExcluded() {
+        Result result = JUnitCore.runClasses(IncludeAndExcludeSuite.class);
+        assertEquals(1, result.getRunCount());
+        assertTrue(result.wasSuccessful());
+    }
+
+    @RunWith(Suite.class)
+    @SuiteClasses({A.class, B.class, C.class})
+    public static class TestSuiteWithNoCategories {
+    }
+
+    @Test
+    public void testCountWithExplicitIncludeFilter() throws Throwable {
+        CategoryFilter include = CategoryFilter.include(SlowTests.class);
+        Request baseRequest = Request.aClass(TestSuiteWithNoCategories.class);
+        Result result = new JUnitCore().run(baseRequest.filterWith(include));
+        assertTrue(result.wasSuccessful());
+        assertEquals(2, result.getRunCount());
+    }
+
+    @Test
+    public void testCountWithExplicitExcludeFilter() throws Throwable {
+        CategoryFilter include = CategoryFilter.exclude(SlowTests.class);
+        Request baseRequest = Request.aClass(TestSuiteWithNoCategories.class);
+        Result result = new JUnitCore().run(baseRequest.filterWith(include));
+        assertEquals(2, result.getFailureCount());
+        assertEquals(2, result.getRunCount());
+    }
+
+    @Test
+    public void testCountWithExplicitExcludeFilter_usingConstructor() throws Throwable {
+        CategoryFilter include = new CategoryFilter(null, SlowTests.class);
+        Request baseRequest = Request.aClass(TestSuiteWithNoCategories.class);
+        Result result = new JUnitCore().run(baseRequest.filterWith(include));
+        assertEquals(2, result.getFailureCount());
+        assertEquals(2, result.getRunCount());
+    }
+
+    @Test
+    public void categoryFilterLeavesOnlyMatchingMethods()
+            throws InitializationError, NoTestsRemainException {
+        CategoryFilter filter = CategoryFilter.include(SlowTests.class);
+        BlockJUnit4ClassRunner runner = new BlockJUnit4ClassRunner(A.class);
+        filter.apply(runner);
+        assertEquals(1, runner.testCount());
+    }
+
+    @Test
+    public void categoryFilterLeavesOnlyMatchingMethods_usingConstructor()
+            throws InitializationError, NoTestsRemainException {
+        CategoryFilter filter = new CategoryFilter(SlowTests.class, null);
+        BlockJUnit4ClassRunner runner = new BlockJUnit4ClassRunner(A.class);
+        filter.apply(runner);
+        assertEquals(1, runner.testCount());
+    }
+
+    public static class OneFastOneSlow {
+        @Category(FastTests.class)
+        @Test
+        public void a() {
+
+        }
+
+        @Category(SlowTests.class)
+        @Test
+        public void b() {
+
+        }
+    }
+
+    @Test
+    public void categoryFilterRejectsIncompatibleCategory()
+            throws InitializationError, NoTestsRemainException {
+        CategoryFilter filter = CategoryFilter.include(SlowTests.class);
+        BlockJUnit4ClassRunner runner = new BlockJUnit4ClassRunner(
+                OneFastOneSlow.class);
+        filter.apply(runner);
+        assertEquals(1, runner.testCount());
+    }
+
+    public static class OneFast {
+        @Category(FastTests.class)
+        @Test
+        public void a() {
+
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(SlowTests.class)
+    @SuiteClasses({OneFast.class})
+    public static class OneFastSuite {
+    }
+
+    @Test
+    public void ifNoTestsToRunUseErrorRunner() {
+        Result result = JUnitCore.runClasses(OneFastSuite.class);
+        assertEquals(1, result.getRunCount());
+        assertEquals(1, result.getFailureCount());
+        assertFalse(result.wasSuccessful());
+    }
+
+    @Test
+    public void describeACategoryFilter() {
+        CategoryFilter filter = CategoryFilter.include(SlowTests.class);
+        assertEquals("categories " + SlowTests.class + "", filter.describe());
+    }
+
+    @Test
+    public void describeMultipleCategoryFilter() {
+        CategoryFilter filter= CategoryFilter.include(FastTests.class, SlowTests.class);
+        String d1= format("categories %s, %s", FastTests.class, SlowTests.class);
+        String d2= format("categories %s, %s", SlowTests.class, FastTests.class);
+        assertThat(filter.describe(), is(anyOf(equalTo(d1), equalTo(d2))));
+    }
+
+
+    public static class OneThatIsBothFastAndSlow {
+        @Category({FastTests.class, SlowTests.class})
+        @Test
+        public void a() {
+
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(SlowTests.class)
+    @SuiteClasses({OneThatIsBothFastAndSlow.class})
+    public static class ChooseSlowFromBoth {
+    }
+
+    @Test
+    public void runMethodWithTwoCategories() {
+        assertThat(testResult(ChooseSlowFromBoth.class), isSuccessful());
+    }
+
+    public interface VerySlowTests extends SlowTests {
+
+    }
+
+    public static class OneVerySlowTest {
+        @Category(VerySlowTests.class)
+        @Test
+        public void a() {
+
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(SlowTests.class)
+    @SuiteClasses({OneVerySlowTest.class})
+    public static class RunSlowFromVerySlow {
+    }
+
+    @Test
+    public void subclassesOfIncludedCategoriesAreRun() {
+        assertThat(testResult(RunSlowFromVerySlow.class), isSuccessful());
+    }
+
+    public interface MultiA {
+    }
+
+    public interface MultiB {
+    }
+
+    public interface MultiC {
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(value= {MultiA.class, MultiB.class}, matchAny= false)
+    @SuiteClasses(AllIncludedMustMatched.class)
+    public static class AllIncludedMustBeMatchedSuite {
+    }
+
+    public static class AllIncludedMustMatched {
+        @Test
+        @Category({MultiA.class, MultiB.class})
+        public void a() {
+        }
+
+        @Test
+        @Category(MultiB.class)
+        public void b() {
+            fail("When multiple categories are included in a Suite, " +
+                    "@Test method must match all include categories");
+        }
+    }
+
+    @Test
+    public void allIncludedSuiteCategoriesMustBeMatched() {
+        Result result= JUnitCore.runClasses(AllIncludedMustBeMatchedSuite.class);
+        assertEquals(1, result.getRunCount());
+        assertEquals(0, result.getFailureCount());
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory({MultiA.class, MultiB.class})
+    @ExcludeCategory(MultiC.class)
+    @SuiteClasses(MultipleIncludesAndExcludeOnMethod.class)
+    public static class MultiIncludeWithExcludeCategorySuite {
+    }
+
+    public static class MultipleIncludesAndExcludeOnMethod {
+        @Test
+        @Category({MultiA.class, MultiB.class})
+        public void a() {
+        }
+
+        @Test
+        @Category({ MultiA.class, MultiB.class, MultiC.class })
+        public void b() {
+            fail("When multiple categories are included and excluded in a Suite, " +
+                    "@Test method must match all include categories and contain non of the excluded");
+        }
+    }
+
+    @Test
+    public void anyMethodWithExcludedCategoryWillBeExcluded() {
+        Result result= JUnitCore.runClasses(MultiIncludeWithExcludeCategorySuite.class);
+        assertEquals(1, result.getRunCount());
+        assertEquals(0, result.getFailureCount());
+    }
+
+    public static class ClassAsCategory {
+    }
+
+    public static class OneMoreTest {
+        @Category(ClassAsCategory.class)
+        @Test
+        public void a() {
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(ClassAsCategory.class)
+    @SuiteClasses({OneMoreTest.class})
+    public static class RunClassAsCategory {
+    }
+
+    @Test
+    public void classesCanBeCategories() {
+        assertThat(testResult(RunClassAsCategory.class), isSuccessful());
+    }
+
+    @Category(SlowTests.class)
+    public abstract static class Ancestor{}
+
+    public static class Inherited extends Ancestor {
+        @Test
+        public void a(){
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(SlowTests.class)
+    @SuiteClasses(Inherited.class)
+    public interface InheritanceSuite {}
+
+    @Test
+    public void testInheritance() {
+        Result result = JUnitCore.runClasses(InheritanceSuite.class);
+        assertEquals(1, result.getRunCount());
+        assertTrue(result.wasSuccessful());
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(Runnable.class)
+    @ExcludeCategory(Runnable.class)
+    @SuiteClasses({})
+    public static class EmptyCategoriesSuite {
+    }
+
+    @Test public void emptyCategoriesSuite() {
+        assertThat(testResult(EmptyCategoriesSuite.class), failureCountIs(1));
+    }
+
+    @Category(Runnable.class)
+    public static class NoTest {
+    }
+
+    @Category(Runnable.class)
+    public static class IgnoredTest {
+
+        @Ignore
+        @Test
+        public void test() {
+            fail();
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory(Runnable.class)
+    @SuiteClasses({NoTest.class, IgnoredTest.class})
+    public static class IgnoredTestCategoriesSuite {
+    }
+
+    @Test
+    public void ignoredTest() {// behaves same as Suite
+        Result result= JUnitCore.runClasses(IgnoredTestCategoriesSuite.class);
+        assertFalse(result.wasSuccessful());
+        assertThat(result.getRunCount(), is(1));
+        assertThat(result.getFailureCount(), is(1));
+        assertThat(result.getIgnoreCount(), is(1));
+    }
+
+    @Category(Runnable.class)
+    public static class ExcludedTest1 {
+
+        @Test
+        public void test() {
+            fail();
+        }
+    }
+
+    @Category(Runnable.class)
+    public static class ExcludedTest2 {
+
+        @Test
+        @Category(Runnable.class)
+        public void test() {
+            fail();
+        }
+    }
+
+    public static class IncludedTest {
+
+        @Test
+        @Category(Object.class)
+        public void test() {
+        }
+    }
+
+    @RunWith(Categories.class)
+    @IncludeCategory({Runnable.class, Object.class})
+    @ExcludeCategory(Runnable.class)
+    @SuiteClasses({ExcludedTest1.class, ExcludedTest2.class, IncludedTest.class})
+    public static class IncludedExcludedSameSuite {
+    }
+
+    @Test
+    public void oneRunnableOthersAvoided() {
+        Result result= JUnitCore.runClasses(IncludedExcludedSameSuite.class);
+        assertEquals(1, result.getRunCount());
+        assertTrue(result.wasSuccessful());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCountWithMultipleExcludeFilter() throws Throwable {
+        Set<Class<?>> exclusions= new HashSet<Class<?>>(2);
+        Collections.addAll(exclusions, SlowTests.class, FastTests.class);
+        CategoryFilter exclude = CategoryFilter.categoryFilter(true, null, true, exclusions);
+        Request baseRequest= Request.aClass(OneOfEach.class);
+        Result result= new JUnitCore().run(baseRequest.filterWith(exclude));
+        assertTrue(result.wasSuccessful());
+        assertEquals(1, result.getRunCount());
+    }
+
+    @Test
+    public void testCountWithMultipleIncludeFilter() throws Throwable {
+        CategoryFilter exclude = CategoryFilter.include(true, SlowTests.class, FastTests.class);
+        Request baseRequest= Request.aClass(OneOfEach.class);
+        Result result= new JUnitCore().run(baseRequest.filterWith(exclude));
+        assertTrue(result.wasSuccessful());
+        assertEquals(2, result.getRunCount());
+    }
+
+    @RunWith(Categories.class)
+    @Categories.ExcludeCategory(String.class)
+    @Suite.SuiteClasses(NoIncludeCategoryAnnotationTest.class)
+    public static class NoIncludeCategoryAnnotationSuite {
+    }
+
+    @Category(CharSequence.class)
+    public static class NoIncludeCategoryAnnotationTest {
+
+        @Test
+        public void test2() {
+        }
+
+        @Test
+        @Category(String.class) public void test1() {
+        }
+    }
+
+    @Test
+    public void noIncludeCategoryAnnotation() {
+        Result testResult= JUnitCore.runClasses(NoIncludeCategoryAnnotationSuite.class);
+        assertTrue(testResult.wasSuccessful());
+        assertEquals(1, testResult.getRunCount());
+    }
+
+    @RunWith(Categories.class)
+    @Categories.IncludeCategory(CharSequence.class)
+    @Categories.ExcludeCategory(String.class)
+    @Suite.SuiteClasses(NoIncludeCategoryAnnotationTest.class)
+    public static class SameAsNoIncludeCategoryAnnotationSuite {
+    }
+
+    @Test
+    public void sameAsNoIncludeCategoryAnnotation() {
+        Result testResult= JUnitCore.runClasses(SameAsNoIncludeCategoryAnnotationSuite.class);
+        assertTrue(testResult.wasSuccessful());
+        assertEquals(1, testResult.getRunCount());
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/experimental/categories/CategoryValidatorTest.java Added

@@ -0,0 +1,86 @@
+package org.junit.experimental.categories;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.TestClass;
+
+public class CategoryValidatorTest {
+
+    public static class SampleCategory {
+    }
+
+    public static class CategoryTest {
+        @BeforeClass
+        @Category(value = SampleCategory.class)
+        public static void methodWithCategoryAndBeforeClass() {
+        }
+
+        @AfterClass
+        @Category(value = SampleCategory.class)
+        public static void methodWithCategoryAndAfterClass() {
+        }
+
+        @Before
+        @Category(value = SampleCategory.class)
+        public static void methodWithCategoryAndBefore() {
+        }
+
+        @After
+        @Category(value = SampleCategory.class)
+        public static void methodWithCategoryAndAfter() {
+        }
+
+        @Category(value = SampleCategory.class)
+        public static void methodWithCategory() {
+        }
+    }
+
+    @Test
+    public void errorIsAddedWhenCategoryIsUsedWithBeforeClass() {
+        FrameworkMethod method = new TestClass(CategoryTest.class).getAnnotatedMethods(BeforeClass.class).get(0);
+        testAndAssertErrorMessage(method, "@BeforeClass can not be combined with @Category");
+    }
+
+    @Test
+    public void errorIsAddedWhenCategoryIsUsedWithAfterClass() {
+        FrameworkMethod method = new TestClass(CategoryTest.class).getAnnotatedMethods(AfterClass.class).get(0);
+        testAndAssertErrorMessage(method, "@AfterClass can not be combined with @Category");
+    }
+
+    @Test
+    public void errorIsAddedWhenCategoryIsUsedWithBefore() {
+        FrameworkMethod method = new TestClass(CategoryTest.class).getAnnotatedMethods(Before.class).get(0);
+        testAndAssertErrorMessage(method, "@Before can not be combined with @Category");
+    }
+
+    @Test
+    public void errorIsAddedWhenCategoryIsUsedWithAfter() {
+        FrameworkMethod method = new TestClass(CategoryTest.class).getAnnotatedMethods(After.class).get(0);
+        testAndAssertErrorMessage(method, "@After can not be combined with @Category");
+    }
+
+    private void testAndAssertErrorMessage(FrameworkMethod method, String expectedErrorMessage) {
+        List<Exception> errors = new CategoryValidator().validateAnnotatedMethod(method);
+
+        assertThat(errors.size(), is(1));
+        Exception exception = errors.get(0);
+        assertThat(exception.getMessage(), is(expectedErrorMessage));
+    }
+
+    @Test
+    public void errorIsNotAddedWhenCategoryIsNotCombinedWithIllegalCombination() throws NoSuchMethodException {
+        FrameworkMethod method = new FrameworkMethod(CategoryTest.class.getMethod("methodWithCategory"));
+        List<Exception> errors = new CategoryValidator().validateAnnotatedMethod(method);
+
+        assertThat(errors.size(), is(0));
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/experimental/categories/JavadocTest.java Added

@@ -0,0 +1,76 @@
+package org.junit.experimental.categories;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author tibor17
+ * @version 4.12
+ * @since 4.12
+ */
+public class JavadocTest {
+    public static interface FastTests {}
+    public static interface SlowTests {}
+    public static interface SmokeTests {}
+
+    public static class A {
+        public void a() {
+            fail();
+        }
+
+        @Category(SlowTests.class)
+        @Test
+        public void b() {
+        }
+
+        @Category({FastTests.class, SmokeTests.class})
+        @Test
+        public void c() {
+        }
+    }
+
+    @Category({SlowTests.class, FastTests.class})
+    public static class B {
+        @Test
+        public void d() {
+        }
+    }
+
+    @RunWith(Categories.class)
+    @Categories.IncludeCategory(SlowTests.class)
+    @Suite.SuiteClasses({A.class, B.class})
+    public static class SlowTestSuite {
+        // Will run A.b and B.d, but not A.a and A.c
+    }
+
+    @RunWith(Categories.class)
+    @Categories.IncludeCategory({FastTests.class, SmokeTests.class})
+    @Suite.SuiteClasses({A.class, B.class})
+    public static class FastOrSmokeTestSuite {
+        // Will run A.c and B.d, but not A.b because it is not any of FastTests or SmokeTests
+    }
+
+    @Test
+    public void slowTests() {
+        Result testResult= JUnitCore.runClasses(SlowTestSuite.class);
+        assertTrue(testResult.wasSuccessful());
+        assertThat("unexpected run count", testResult.getRunCount(), is(2));
+        assertThat("unexpected failure count", testResult.getFailureCount(), is(0));
+    }
+
+    @Test
+    public void fastSmokeTests() {
+        Result testResult= JUnitCore.runClasses(FastOrSmokeTestSuite.class);
+        assertTrue(testResult.wasSuccessful());
+        assertThat("unexpected run count", testResult.getRunCount(), is(2));
+        assertThat("unexpected failure count", testResult.getFailureCount(), is(0));
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/experimental/categories/MultiCategoryTest.java Added

@@ -0,0 +1,169 @@
+package org.junit.experimental.categories;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author tibor17
+ * @version 4.12
+ * @since 4.12
+ */
+public final class MultiCategoryTest {
+    public interface A {}
+    public interface B {}
+    public interface C {}
+
+    /**
+     * This test is mentioned in {@code Categories} and any changes
+     * must be reflected.
+     */
+    @Test
+    public void runSuite() {
+        // Targeting Test:
+        Result testResult= JUnitCore.runClasses(MultiCategorySuite.class);
+
+        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(2)));
+        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(0)));
+        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
+    }
+
+    @RunWith(Categories.class)
+    @Categories.IncludeCategory({A.class, B.class})
+    @Categories.ExcludeCategory(C.class)
+    @Suite.SuiteClasses({CategoriesTest.class})
+    public static final class MultiCategorySuite {}
+
+    public static final class CategoriesTest {
+
+        @Test
+        @Category(A.class)
+        public void a() {}
+
+        @Test
+        @Category(B.class)
+        public void b() {}
+
+        @Test
+        @Category(C.class)
+        public void c() {
+            fail();
+        }
+
+        @Test
+        public void anything() {
+            fail();
+        }
+    }
+
+    @Test
+    public void inheritanceAnyIncluded() {
+        Result testResult= JUnitCore.runClasses(InheritanceAny.class);
+        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(3)));
+        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(0)));
+        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
+    }
+
+    @Test
+    public void inheritanceAllIncluded() {
+        Result testResult= JUnitCore.runClasses(InheritanceAll.class);
+        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(1)));
+        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(0)));
+        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
+    }
+
+    @Test
+    public void inheritanceAnyAll() {//any included, all excluded
+        Result testResult= JUnitCore.runClasses(InheritanceAnyAll.class);
+        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(3)));
+        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(0)));
+        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
+    }
+
+    @Test
+    public void inheritanceAllAny() {//all included, any excluded
+        Result testResult= JUnitCore.runClasses(InheritanceAllAny.class);
+        assertThat("unexpected run count", testResult.getRunCount(), is(equalTo(1)));
+        assertThat("unexpected failure count", testResult.getFailureCount(), is(equalTo(1)));
+        assertThat("unexpected failure count", testResult.getIgnoreCount(), is(equalTo(0)));
+        assertFalse(testResult.wasSuccessful());
+    }
+
+    public static class X implements A {}
+    public static class Y implements B {}
+    public static class Z implements A, B {}
+    public static class W implements A, B, C {}
+    public static class Q implements A, C {}
+
+    @RunWith(Categories.class)
+    @Categories.IncludeCategory({A.class, B.class})
+    @Categories.ExcludeCategory(C.class)
+    @Suite.SuiteClasses({InheritanceAnyTest.class})
+    public static final class InheritanceAny {}
+
+    @RunWith(Categories.class)
+    @Categories.IncludeCategory(value= {A.class, B.class}, matchAny= false)
+    @Categories.ExcludeCategory(C.class)
+    @Suite.SuiteClasses({InheritanceAllTest.class})
+    public static final class InheritanceAll {}
+
+    @RunWith(Categories.class)
+    @Categories.IncludeCategory({A.class, B.class})
+    @Categories.ExcludeCategory(value= {A.class, C.class}, matchAny= false)
+    @Suite.SuiteClasses({InheritanceAnyAllTest.class})
+    public static final class InheritanceAnyAll {}
+
+    @RunWith(Categories.class)
+    @Categories.IncludeCategory(value= {A.class, B.class}, matchAny= false)
+    @Categories.ExcludeCategory({A.class, C.class})
+    @Suite.SuiteClasses({InheritanceAllAnyTest.class})
+    public static final class InheritanceAllAny {}
+
+    public static final class InheritanceAnyTest {
+        @Test @Category(X.class) public void x() {}
+        @Test @Category(Y.class) public void y() {}
+        @Test @Category(Z.class) public void z() {}
+        @Test @Category(W.class) public void w() { fail(); }
+        @Test @Category(Q.class) public void q() { fail(); }
+        @Test @Category(Runnable.class) public void runnable() { fail(); }
+        @Test public void t() { fail(); }
+    }
+
+    public static final class InheritanceAllTest {
+        @Test @Category(X.class) public void x() { fail(); }
+        @Test @Category(Y.class) public void y() { fail(); }
+        @Test @Category(Z.class) public void z() {}
+        @Test @Category(W.class) public void w() { fail(); }
+        @Test @Category(Q.class) public void q() { fail(); }
+        @Test @Category(Runnable.class) public void runnable() { fail(); }
+        @Test public void t() { fail(); }
+    }
+
+    public static final class InheritanceAnyAllTest {
+        @Test @Category(X.class) public void x() {}
+        @Test @Category(Y.class) public void y() {}
+        @Test @Category(Z.class) public void z() {}
+        @Test @Category(W.class) public void w() { fail(); }
+        @Test @Category(Q.class) public void q() { fail(); }
+        @Test @Category(Runnable.class) public void runnable() { fail(); }
+        @Test public void t() { fail(); }
+    }
+
+    public static final class InheritanceAllAnyTest {
+        @Test @Category(X.class) public void x() { fail(); }
+        @Test @Category(Y.class) public void y() { fail(); }
+        @Test @Category(Z.class) public void z() { fail(); }
+        @Test @Category(W.class) public void w() { fail(); }
+        @Test @Category(Q.class) public void q() { fail(); }
+        @Test @Category(Runnable.class) public void runnable() { fail(); }
+        @Test public void t() { fail(); }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/AllInternalTests.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/ArrayComparisonFailureTest.java Added

@@ -0,0 +1,68 @@
+package org.junit.internal;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+public class ArrayComparisonFailureTest {
+
+    private static final String ARRAY_COMPARISON_FAILURE_411 = "arrayComparisonFailure_411";
+    private static final String ARRAY_COMPARISON_FAILURE_412 = "arrayComparisonFailure_412";
+
+    /*
+        Test compatibility of older versions of ArrayComparisonFailure
+        Setup:
+        - checkout prior versions of the codebase (r4.11, r4.12 in this case)
+        - catch the exception resulting from:
+            assertArrayEquals(new int{0, 1}, new int{0, 5});
+        - serialize the resulting exception to a file, moving into the test/resources path
+            Ex., for v4.11's resulting exception {@link org/junit/internal/arrayComparisonFailure_411}
+        Current unit test:
+        - deserialize the above files casting it to the current version of the class
+            (catches any forward incompatibility with missing fields)
+        - assert the results from existing methods: getCause(), toString() -> getMessage()
+            (catches incompatible usages of fields)
+
+        This does not test if an instance of the current version of the class is able to deserialize to a previous ver.
+     */
+
+    @Test
+    public void classShouldAccept411Version() throws Exception {
+        assertFailureSerializableFromOthers(ARRAY_COMPARISON_FAILURE_411);
+    }
+
+    @Test
+    public void classShouldAccept412Version() throws Exception {
+        assertFailureSerializableFromOthers(ARRAY_COMPARISON_FAILURE_412);
+    }
+
+    private void assertFailureSerializableFromOthers(String failureFileName) throws IOException,
+            ClassNotFoundException {
+        try {
+            assertArrayEquals(new int{0, 1}, new int{0, 5});
+            fail();
+        } catch (ArrayComparisonFailure e) {
+            ArrayComparisonFailure arrayComparisonFailureFromFile = deserializeFailureFromFile(failureFileName);
+            assertNotNull("ArrayComparisonFailure.getCause() should fallback to the deprecated fCause field"
+                            + " for compatibility with older versions of junit4 that didn't use Throwable.initCause().",
+                    arrayComparisonFailureFromFile.getCause());
+            assertEquals(e.getCause().toString(), arrayComparisonFailureFromFile.getCause().toString());
+            assertEquals(e.toString(), arrayComparisonFailureFromFile.toString());
+        }
+    }
+
+    private ArrayComparisonFailure deserializeFailureFromFile(String fileName) throws IOException,
+            ClassNotFoundException {
+        InputStream resource = getClass().getResourceAsStream(fileName);
+        ObjectInputStream objectInputStream = new ObjectInputStream(resource);
+        return (ArrayComparisonFailure) objectInputStream.readObject();
+    }
+
+}
\ No newline at end of file

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/ChecksTest.java Added

@@ -0,0 +1,60 @@
+package org.junit.internal;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+import static org.junit.internal.Checks.notNull;
+import org.junit.Test;
+
+/** Tests for {@link Checks}. */
+public class ChecksTest {
+
+    @Test
+    public void notNullShouldReturnNonNullValues() {
+        Double value = Double.valueOf(3.14);
+
+        Double result = notNull(value);
+
+        assertSame(value, result);
+    }
+
+    @Test
+    public void notNullShouldThrowOnNullValues() {
+        try {
+            notNull(null);
+            fail("NullPointerException expected");
+        } catch (NullPointerException e) {
+            assertNull("message should be null", e.getMessage());
+        }
+    }
+
+    @Test
+    public void notNullWithMessageShouldReturnNonNullValues() {
+        Float value = Float.valueOf(3.14f);
+
+        Float result = notNull(value, "woops");
+
+        assertSame(value, result);
+    }
+
+    @Test
+    public void notNullWithMessageShouldThrowOnNullValues() {
+        try {
+            notNull(null, "woops");
+            fail("NullPointerException expected");
+        } catch (NullPointerException e) {
+            assertEquals("message does not match", "woops", e.getMessage());
+        }
+    }
+
+    @Test
+    public void notNullWithNullMessageShouldThrowOnNullValues() {
+        try {
+            notNull(null, null);
+            fail("NullPointerException expected");
+        } catch (NullPointerException e) {
+            assertNull("message should be null", e.getMessage());
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/StackTracesTest.java Added

@@ -0,0 +1,332 @@
+package org.junit.internal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.regex.Pattern;
+
+import junit.tests.SampleJUnit3Tests;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.tests.SampleJUnit4Tests.*;
+
+public class StackTracesTest {
+    private static final String EOL = System.getProperty("line.separator", "\n");
+    private static ExecutorService executorService;
+
+    @BeforeClass
+    public static void startExecutorService() {
+        executorService = Executors.newFixedThreadPool(1);
+    }
+
+    @AfterClass
+    public static void shutDownExecutorService() {
+        executorService.shutdown();
+        executorService = null;
+    } 
+
+    @Test
+    public void getTrimmedStackForJUnit4TestFailingInTestMethod() {
+        Result result = runTest(TestWithOneThrowingTestMethod.class);
+        assertEquals("Should run the test", 1, result.getRunCount());
+        assertEquals("One test should fail", 1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+
+        assertHasTrimmedTrace(failure,
+                message("java.lang.RuntimeException: cause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.doThrowExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.throwsExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$TestWithOneThrowingTestMethod.alwaysThrows"));
+        assertNotEquals(failure.getTrace(), failure.getTrimmedTrace());
+    }
+
+    @Test
+    public void getTrimmedStackForJUnit4TestFailingInTestMethodWithCause() {
+        Result result = runTest(TestWithOneThrowingTestMethodWithCause.class);
+        assertEquals("Should run the test", 1, result.getRunCount());
+        assertEquals("One test should fail", 1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+
+        assertHasTrimmedTrace(failure,
+                message("java.lang.RuntimeException: outer"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.doThrowExceptionWithCause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.throwsExceptionWithCause"),
+                at("org.junit.tests.SampleJUnit4Tests$TestWithOneThrowingTestMethodWithCause.alwaysThrows"),
+                framesTrimmed(),
+                message("Caused by: java.lang.RuntimeException: cause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.doThrowExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.throwsExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.doThrowExceptionWithCause"),
+                framesInCommon());
+        assertNotEquals(failure.getTrace(), failure.getTrimmedTrace());
+    }
+
+    @Test
+    public void getTrimmedStackForJUnit4TestFailingInBeforeMethod() {
+        Result result = runTest(TestWithThrowingBeforeMethod.class);
+        assertEquals("Should run the test", 1, result.getRunCount());
+        assertEquals("One test should fail", 1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+
+        assertHasTrimmedTrace(failure,
+                message("java.lang.RuntimeException: cause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.doThrowExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.throwsExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$TestWithThrowingBeforeMethod.alwaysThrows"));
+        assertNotEquals(failure.getTrace(), failure.getTrimmedTrace());
+    }
+
+    @Test
+    public void getTrimmedStackForJUnit3TestFailingInTestMethod() {
+        Result result = runTest(SampleJUnit3Tests.TestWithOneThrowingTestMethod.class);
+        assertEquals("Should run the test", 1, result.getRunCount());
+        assertEquals("One test should fail", 1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+
+        assertHasTrimmedTrace(failure,
+                message("java.lang.RuntimeException: cause"),
+                at("junit.tests.SampleJUnit3Tests$FakeClassUnderTest.doThrowExceptionWithoutCause"),
+                at("junit.tests.SampleJUnit3Tests$FakeClassUnderTest.throwsExceptionWithoutCause"),
+                at("junit.tests.SampleJUnit3Tests$TestWithOneThrowingTestMethod.testAlwaysThrows"));
+        assertNotEquals(failure.getTrace(), failure.getTrimmedTrace());
+    }
+    
+    @Test
+    public void getTrimmedStackForJUnit3TestFailingInSetupMethod() {
+        Result result = runTest(SampleJUnit3Tests.TestWithThrowingSetUpMethod.class);
+        assertEquals("Should run the test", 1, result.getRunCount());
+        assertEquals("One test should fail", 1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+
+        assertHasTrimmedTrace(failure,
+                message("java.lang.RuntimeException: cause"),
+                at("junit.tests.SampleJUnit3Tests$FakeClassUnderTest.doThrowExceptionWithoutCause"),
+                at("junit.tests.SampleJUnit3Tests$FakeClassUnderTest.throwsExceptionWithoutCause"),
+                at("junit.tests.SampleJUnit3Tests$TestWithThrowingSetUpMethod.setUp"));
+        assertNotEquals(failure.getTrace(), failure.getTrimmedTrace());
+    }
+
+    @Test
+    public void getTrimmedStackForJUnit4TestFailingInTestRule() {
+        Result result = runTest(TestWithThrowingTestRule.class);
+        assertEquals("Should run the test", 1, result.getRunCount());
+        assertEquals("One test should fail", 1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+
+        assertHasTrimmedTrace(failure,
+                message("java.lang.RuntimeException: cause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.doThrowExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.throwsExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$ThrowingTestRule.apply"));
+        assertNotEquals(failure.getTrace(), failure.getTrimmedTrace());
+    }
+
+    @Test
+    public void getTrimmedStackForJUnit4TestFailingInClassRule() {
+        Result result = runTest(TestWithThrowingClassRule.class);
+        assertEquals("No tests were executed", 0, result.getRunCount());
+        assertEquals("One failure", 1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+
+        assertHasTrimmedTrace(failure,
+                message("java.lang.RuntimeException: cause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.doThrowExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.throwsExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$ThrowingTestRule.apply"));
+        assertNotEquals(failure.getTrace(), failure.getTrimmedTrace());
+    }
+
+    @Test
+    public void getTrimmedStackForJUnit4TestFailingInMethodRule() {
+        Result result = runTest(TestWithThrowingMethodRule.class);
+        assertEquals("Should run the test", 1, result.getRunCount());
+        assertEquals("One test should fail", 1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+
+        assertHasTrimmedTrace(failure,
+                message("java.lang.RuntimeException: cause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.doThrowExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$FakeClassUnderTest.throwsExceptionWithoutCause"),
+                at("org.junit.tests.SampleJUnit4Tests$ThrowingMethodRule.apply"));
+        assertNotEquals(failure.getTrace(), failure.getTrimmedTrace());
+    }
+
+    @Test
+    public void getTrimmedStackWithSuppressedExceptions() {
+        assumeTrue("Running on 1.7+", TestWithSuppressedException.addSuppressed != null);
+        Result result = runTest(TestWithSuppressedException.class);
+        assertEquals("Should run the test", 1, result.getRunCount());
+        assertEquals("One test should fail", 1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+
+        assertHasTrimmedTrace(failure,
+                message("java.lang.RuntimeException: error"),
+                at("org.junit.tests.SampleJUnit4Tests$TestWithSuppressedException.alwaysThrows"),
+                message("\tSuppressed: java.lang.RuntimeException: suppressed"),
+                at("org.junit.tests.SampleJUnit4Tests$TestWithSuppressedException.alwaysThrows"),
+                framesInCommon());
+        assertNotEquals(failure.getTrace(), failure.getTrimmedTrace());
+    }
+
+    private abstract static class StringMatcher extends TypeSafeMatcher<String> {
+    }
+
+    /**
+     * A matcher that matches the exception message in a stack trace.
+     */
+    private static class ExceptionMessageMatcher extends StringMatcher {
+        private final Matcher<String> matcher;
+
+        public ExceptionMessageMatcher(String message) {
+            matcher = CoreMatchers.equalTo(message);
+        }
+
+        public void describeTo(Description description) {
+            matcher.describeTo(description);
+        }
+
+        @Override
+        protected boolean matchesSafely(String line) {
+            return matcher.matches(line);
+        }
+    }
+
+    /** Returns a matcher that matches the message line in a stack trace. */
+    private static StringMatcher message(String message) {
+        return new ExceptionMessageMatcher(message);
+    }
+
+    /**
+     * A matcher that matches the "at ..." line in a stack trace.
+     */
+    private static class StackTraceLineMatcher extends StringMatcher {
+        private static final Pattern PATTERN
+                = Pattern.compile("\t*at (a-zA-Z0-9.$+)\$a-zA-Z0-9+\\.java:0-9+\$");
+
+        private final String method;
+
+        public StackTraceLineMatcher(String method) {
+            this.method = method;
+        }
+
+        public void describeTo(Description description) {
+            description.appendText("A stack trace line for method " + method);
+        }
+
+        @Override
+        protected boolean matchesSafely(String line) {
+            if (!line.startsWith("\t")) {
+                return false;
+            }
+
+            line = line.substring(1);
+            java.util.regex.Matcher matcher = PATTERN.matcher(line);
+            if (!matcher.matches()) {
+                fail("Line does not look like a stack trace line: " + line);
+            }
+            String matchedMethod = matcher.group(1);
+            return method.equals(matchedMethod);
+        }
+    }
+
+    /** Returns a matcher that matches the "at ..." line in a stack trace. */
+    private static StringMatcher at(String method) {
+        return new StackTraceLineMatcher(method);
+    }
+
+    /**
+     * A matcher that matches the line printed when frames were removed from a stack trace.
+     */
+    private static class FramesRemovedMatcher extends StringMatcher {
+        private static final Pattern PATTERN
+                = Pattern.compile("\t*\\.\\.\\. 0-9+ (a-z+)");
+
+        private final String suffix;
+
+        public FramesRemovedMatcher(String suffix) {
+            this.suffix = suffix;
+        }
+
+        public void describeTo(Description description) {
+            description.appendText("A line matching \"..x " + suffix + "\"");
+        }
+
+        @Override
+        protected boolean matchesSafely(String line) {
+            if (!line.startsWith("\t")) {
+                return false;
+            }
+            line = line.substring(1);
+
+            java.util.regex.Matcher matcher = PATTERN.matcher(line);
+            if (!matcher.matches()) {
+                fail("Line does not look like a stack trace line: " + line);
+            }
+            return suffix.equals(matcher.group(1));
+        }
+    }
+
+    /** Returns a matcher that matches the "\t...x more" line in a stack trace. */
+    private static StringMatcher framesInCommon() {
+        return new FramesRemovedMatcher("more");
+    }
+
+    /** Returns a matcher that matches the "\t...x trimmed" line in a stack trace. */
+    private static StringMatcher framesTrimmed() {
+        return new FramesRemovedMatcher("trimmed");
+    }
+
+    private static Result runTest(final Class<?> testClass) {
+        Future<Result> future = executorService.submit(new Callable<Result>() {
+            public Result call() throws Exception {
+                JUnitCore core = new JUnitCore();
+                return core.run(testClass);
+            }
+        });
+
+        try {
+            return future.get();
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Could not run test " + testClass, e);
+        } catch (ExecutionException e) {
+            throw new RuntimeException("Could not run test " + testClass, e);
+        }
+    }
+    
+    private static void assertHasTrimmedTrace(Failure failure, StringMatcher... matchers) {
+        String trimmedTrace = failure.getTrimmedTrace();
+        String lines = trimmedTrace.split(EOL);
+
+        int index = 0;
+        for (; index < lines.length && index < matchers.length; index++) {
+            String line = linesindex;
+            StringMatcher matcher = matchersindex;
+            assertThat(line, matcher);
+        }
+        if (index < lines.length) {
+            String extraLine = linesindex;
+            fail("Extra line in trimmed trace: " + extraLine);
+        } else if (index < matchers.length) {
+            StringDescription description = new StringDescription();
+            matchersindex.describeTo(description);
+            fail("Missing line in trimmed trace: " + description.toString());
+        }
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/internal/builders/AnnotatedBuilderTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/builders/AnnotatedBuilderTest.java Changed

@@ -1,5 +1,9 @@
 package org.junit.internal.builders;
 
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.Runner;
@@ -7,12 +11,6 @@
 import org.junit.runners.model.RunnerBuilder;
 import org.junit.runners.model.RunnerBuilderStub;
 
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-
 public class AnnotatedBuilderTest {
     private AnnotatedBuilder builder = new AnnotatedBuilder(new RunnerBuilderStub());
 
@@ -28,7 +26,7 @@
         assertThat(runner, is(instanceOf(RunnerSpy.class)));
 
         RunnerSpy runnerSpy = (RunnerSpy) runner;
-        assertThat(runnerSpy.getInvokedTestClass(), is(equalTo((Class) OuterClass.class)));
+        assertThat(runnerSpy.getInvokedTestClass(), is((Object) OuterClass.class));
     }
 
     @Test
@@ -37,7 +35,7 @@
         assertThat(runner, is(instanceOf(RunnerSpy.class)));
 
         RunnerSpy runnerSpy = (RunnerSpy) runner;
-        assertThat(runnerSpy.getInvokedTestClass(), is(equalTo((Class) OuterClass.InnerClassWithoutOwnRunWith.class)));
+        assertThat(runnerSpy.getInvokedTestClass(), is((Object) OuterClass.InnerClassWithoutOwnRunWith.class));
     }
 
     @Test
@@ -46,7 +44,7 @@
         assertThat(runner, is(instanceOf(RunnerSpy.class)));
 
         RunnerSpy runnerSpy = (RunnerSpy) runner;
-        assertThat(runnerSpy.getInvokedTestClass(), is(equalTo((Class) OuterClass.InnerClassWithoutOwnRunWith.MostInnerClass.class)));
+        assertThat(runnerSpy.getInvokedTestClass(), is((Object) OuterClass.InnerClassWithoutOwnRunWith.MostInnerClass.class));
     }
 
     @Test
@@ -55,7 +53,7 @@
         assertThat(runner, is(instanceOf(InnerRunner.class)));
 
         RunnerSpy runnerSpy = (RunnerSpy) runner;
-        assertThat(runnerSpy.getInvokedTestClass(), is(equalTo((Class) OuterClass.InnerClassWithOwnRunWith.class)));
+        assertThat(runnerSpy.getInvokedTestClass(), is((Object) OuterClass.InnerClassWithOwnRunWith.class));
     }
 
     @Test
@@ -64,7 +62,7 @@
         assertThat(runner, is(instanceOf(InnerRunner.class)));
 
         RunnerSpy runnerSpy = (RunnerSpy) runner;
-        assertThat(runnerSpy.getInvokedTestClass(), is(equalTo((Class) OuterClass.InnerClassWithOwnRunWith.MostInnerClass.class)));
+        assertThat(runnerSpy.getInvokedTestClass(), is((Object) OuterClass.InnerClassWithOwnRunWith.MostInnerClass.class));
     }
 
     @RunWith(RunnerSpy.class)
@@ -96,11 +94,11 @@
     }
 
     public static class InnerRunner extends RunnerSpy {
-        public InnerRunner(Class testClass) {
+        public InnerRunner(Class<?> testClass) {
             super(testClass);
         }
 
-        public InnerRunner(Class testClass, RunnerBuilder runnerBuilder) {
+        public InnerRunner(Class<?> testClass, RunnerBuilder runnerBuilder) {
             super(testClass, runnerBuilder);
         }
     }

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/internal/matchers/StacktracePrintingMatcherTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/matchers/StacktracePrintingMatcherTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/internal/matchers/ThrowableCauseMatcherTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/matchers/ThrowableCauseMatcherTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/runners Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/runners/ErrorReportingRunnerTest.java Added

@@ -0,0 +1,88 @@
+package org.junit.internal.runners;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.model.InvalidTestClassError;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class ErrorReportingRunnerTest {
+    
+    @Test(expected = NullPointerException.class)
+    public void cannotCreateWithNullClass() {
+        new ErrorReportingRunner(null, new RuntimeException());
+    }
+    
+    @Test(expected = NullPointerException.class)
+    public void cannotCreateWithNullClass2() {
+        new ErrorReportingRunner(new RuntimeException(), (Class<?>) null);
+    }
+    
+    @Test(expected = NullPointerException.class)
+    public void cannotCreateWithNullClasses() {
+        new ErrorReportingRunner(new RuntimeException(), (Class<?>) null);
+    }
+    
+    @Test(expected = NullPointerException.class)
+    public void cannotCreateWithoutClass() {
+        new ErrorReportingRunner(new RuntimeException());
+    }
+
+    @Test
+    public void givenInvalidTestClassErrorAsCause() {
+        final List<Failure> firedFailures = new ArrayList<Failure>();
+        InvalidTestClassError testClassError = new InvalidTestClassError(TestClassWithErrors.class,
+                Arrays.asList(new Throwable("validation error 1"), new Throwable("validation error 2")));
+        ErrorReportingRunner sut = new ErrorReportingRunner(TestClassWithErrors.class, testClassError);
+
+        sut.run(new RunNotifier() {
+            @Override
+            public void fireTestFailure(Failure failure) {
+                super.fireTestFailure(failure);
+                firedFailures.add(failure);
+            }
+        });
+
+        assertThat(firedFailures.size(), is(1));
+        Throwable exception = firedFailures.get(0).getException();
+        assertThat(exception, instanceOf(InvalidTestClassError.class));
+        assertThat(((InvalidTestClassError) exception), is(testClassError));
+    }
+
+    @Test
+    public void givenInvalidTestClass_integrationTest() {
+        Result result = JUnitCore.runClasses(TestClassWithErrors.class);
+
+        assertThat(result.getFailureCount(), is(1));
+        Throwable failure = result.getFailures().get(0).getException();
+        assertThat(failure, instanceOf(InvalidTestClassError.class));
+        assertThat(failure.getMessage(), allOf(
+                startsWith("Invalid test class '" + TestClassWithErrors.class.getName() + "'"),
+                containsString("\n  1. "),
+                containsString("\n  2. ")
+        ));
+    }
+
+    private static class TestClassWithErrors {
+        @Before public static void staticBeforeMethod() {}
+        @After public static void staticAfterMethod() {}
+
+        @Test public String testMethodReturningString() {
+            return "this should not be allowed";
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/runners/statements Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/runners/statements/ExpectExceptionTest.java Added

@@ -0,0 +1,88 @@
+package org.junit.internal.runners.statements;
+
+import org.junit.Test;
+import org.junit.internal.AssumptionViolatedException;
+import org.junit.runners.model.Statement;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+/**
+ * Integration tests can be found in {@link org.junit.tests.running.methods.ExpectedTest}.
+ * See e.g. {@link org.junit.tests.running.methods.ExpectedTest#expectsAssumptionViolatedException()}
+ */
+public class ExpectExceptionTest {
+
+    @Test
+    public void whenExpectingAssumptionViolatedExceptionStatementsThrowingItShouldPass() {
+        Statement delegate = new Fail(new AssumptionViolatedException("expected"));
+        ExpectException expectException = new ExpectException(delegate, AssumptionViolatedException.class);
+
+        try {
+            expectException.evaluate();
+            // then AssumptionViolatedException should not be thrown
+        } catch (Throwable e) { // need to explicitly catch and re-throw as an AssertionError or it might be skipped
+            fail("should not throw anything, but was thrown: " + e);
+        }
+    }
+
+    @Test
+    public void whenExpectingAssumptionViolatedExceptionStatementsThrowingSubclassShouldPass() {
+        Statement delegate = new Fail(new AssumptionViolatedExceptionSubclass("expected"));
+        ExpectException expectException = new ExpectException(delegate, AssumptionViolatedException.class);
+
+        try {
+            expectException.evaluate();
+            // then no exception should be thrown
+        } catch (Throwable e) {
+            fail("should not throw anything, but was thrown: " + e);
+        }
+    }
+
+    @Test
+    public void whenExpectingAssumptionViolatedExceptionStatementsThrowingDifferentExceptionShouldFail() {
+        Statement delegate = new Fail(new SomeException("not expected"));
+        ExpectException expectException = new ExpectException(delegate, AssumptionViolatedException.class);
+
+        try {
+            expectException.evaluate();
+            fail("should throw 'Unexpected exception' when statement throws an exception which is not the one expected");
+        } catch (Exception e) {
+            assertThat(e.getMessage(), equalTo("Unexpected exception, expected<org.junit.internal.AssumptionViolatedException> " +
+                    "but was<org.junit.internal.runners.statements.ExpectExceptionTest$SomeException>"));
+        }
+    }
+
+    @Test
+    public void whenExpectingAssumptionViolatedExceptionStatementsPassingShouldFail() throws Exception {
+        ExpectException expectException = new ExpectException(new PassingStatement(), AssumptionViolatedException.class);
+
+        try {
+            expectException.evaluate();
+        } catch (AssertionError e) {
+            assertThat(e.getMessage(), containsString("Expected exception: " + AssumptionViolatedException.class.getName()));
+            return;
+        }
+        fail("ExpectException should throw when the given statement passes");
+    }
+
+    private static class PassingStatement extends Statement {
+        public void evaluate() throws Throwable {
+            // nop
+        }
+    }
+
+    private static class SomeException extends RuntimeException {
+        public SomeException(String message) {
+            super(message);
+        }
+    }
+
+    private static class AssumptionViolatedExceptionSubclass extends AssumptionViolatedException {
+        public AssumptionViolatedExceptionSubclass(String assumption) {
+            super(assumption);
+        }
+    }
+}
\ No newline at end of file

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java Added

@@ -0,0 +1,271 @@
+package org.junit.internal.runners.statements;
+
+import static java.lang.Long.MAX_VALUE;
+import static java.lang.Math.atan;
+import static java.lang.System.currentTimeMillis;
+import static java.lang.Thread.currentThread;
+import static java.lang.Thread.interrupted;
+import static java.lang.Thread.sleep;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.model.Statement;
+import org.junit.runners.model.TestTimedOutException;
+
+
+/**
+ * @author Asaf Ary, Stefan Birkner
+ */
+@RunWith(Parameterized.class)
+public class FailOnTimeoutTest {
+
+    @Parameters(name = "lookingForStuckThread = {0}")
+    public static Iterable<Boolean> getParameters() {
+        return Arrays.asList(Boolean.TRUE, Boolean.FALSE);
+    }
+
+    @Parameter
+    public boolean lookingForStuckThread;
+
+    @Test
+    public void noExceptionIsThrownWhenWrappedStatementFinishesBeforeTimeoutWithoutThrowingException()
+            throws Throwable {
+        FailOnTimeout failOnTimeout = failAfter50Ms(new FastStatement());
+
+        failOnTimeout.evaluate();
+
+        // test is successful when no exception is thrown
+    }
+
+    @Test
+    public void throwsTestTimedOutExceptionWithMeaningfulMessage() {
+        Exception e = assertThrows(
+                TestTimedOutException.class,
+                run(failAfter50Ms(new RunForASecond())));
+        assertEquals("test timed out after 50 milliseconds", e.getMessage());
+    }
+
+    @Test
+    public void sendUpExceptionThrownByStatement() {
+        Exception exception = new RuntimeException();
+        Exception e = assertThrows(
+                Exception.class,
+                run(failAfter50Ms(new Fail(exception))));
+        assertSame(exception, e);
+    }
+
+    @Test
+    public void throwExceptionIfTheSecondCallToEvaluateNeedsTooMuchTime()
+            throws Throwable {
+        DelegatingStatement statement = new DelegatingStatement();
+        FailOnTimeout failOnTimeout = failAfter50Ms(statement);
+
+        statement.delegate = new FastStatement();
+        failOnTimeout.evaluate();
+
+        statement.delegate = new RunForASecond();
+        assertThrows(
+                TestTimedOutException.class,
+                run(failOnTimeout));
+    }
+
+    @Test
+    public void throwTimeoutExceptionOnSecondCallAlthoughFirstCallThrowsException() {
+        DelegatingStatement statement = new DelegatingStatement();
+        FailOnTimeout failOnTimeout = failAfter50Ms(statement);
+
+        statement.delegate = new Fail(new AssertionError("first execution failed"));
+        assertThrows(
+                AssertionError.class,
+                run(failOnTimeout)
+        );
+
+        statement.delegate = new RunForASecond();
+        assertThrows(
+                TestTimedOutException.class,
+                run(failOnTimeout));
+    }
+
+    @Test
+    public void throwsExceptionWithTimeoutValueAndTimeUnitSet() {
+        TestTimedOutException e = assertThrows(
+                TestTimedOutException.class,
+                run(failAfter50Ms(new RunForASecond())));
+        assertEquals(50, e.getTimeout());
+        assertEquals(MILLISECONDS, e.getTimeUnit());
+    }
+
+    @Test
+    public void statementThatCanBeInterruptedIsStoppedAfterTimeout() throws Throwable {
+        // RunForASecond can be interrupted because it checks the Thread's
+        // interrupted flag.
+        RunForASecond runForASecond = new RunForASecond();
+        assertThrows(
+                TestTimedOutException.class,
+                run(failAfter50Ms(runForASecond)));
+
+        // Thread is explicitly stopped if it finishes faster than its
+        // pre-defined execution time of one second.
+        boolean stopped = runForASecond.finished.await(50, MILLISECONDS);
+        assertTrue("Thread has not been stopped.", stopped);
+    }
+
+    @Test
+    public void stackTraceContainsRealCauseOfTimeout() {
+        TestTimedOutException timedOutException = assertThrows(
+                TestTimedOutException.class,
+                run(failAfter50Ms(new StuckStatement())));
+
+        StackTraceElement stackTrace = timedOutException.getStackTrace();
+        boolean stackTraceContainsTheRealCauseOfTheTimeout = false;
+        boolean stackTraceContainsOtherThanTheRealCauseOfTheTimeout = false;
+        for (StackTraceElement element : stackTrace) {
+            String methodName = element.getMethodName();
+            if ("theRealCauseOfTheTimeout".equals(methodName)) {
+                stackTraceContainsTheRealCauseOfTheTimeout = true;
+            }
+            if ("notTheRealCauseOfTheTimeout".equals(methodName)) {
+                stackTraceContainsOtherThanTheRealCauseOfTheTimeout = true;
+            }
+        }
+        assertTrue(
+                "Stack trace does not contain the real cause of the timeout",
+                stackTraceContainsTheRealCauseOfTheTimeout);
+        assertFalse(
+                "Stack trace contains other than the real cause of the timeout, which can be very misleading",
+                stackTraceContainsOtherThanTheRealCauseOfTheTimeout);
+    }
+
+    private static final class StuckStatement extends Statement {
+
+        @Override
+        public void evaluate() throws Throwable {
+            try {
+                // Must show up in stack trace
+                theRealCauseOfTheTimeout();
+            } catch (InterruptedException e) {
+            } finally {
+                // Must _not_ show up in stack trace
+                notTheRealCauseOfTheTimeout();
+            }
+        }
+
+        private void theRealCauseOfTheTimeout() throws InterruptedException {
+            sleep(MAX_VALUE);
+        }
+
+        private void notTheRealCauseOfTheTimeout() {
+            for (long now = currentTimeMillis(), eta = now + 1000L; now < eta; now = currentTimeMillis()) {
+                // Doesn't matter, just pretend to be busy
+                atan(now);
+            }
+        }
+    }
+
+    @Test
+    public void lookingForStuckThread_threadGroupNotLeaked() throws Throwable {
+        assumeTrue(lookingForStuckThread);
+        final AtomicReference<ThreadGroup> innerThreadGroup = new AtomicReference<ThreadGroup>();
+        final AtomicReference<Thread> innerThread = new AtomicReference<Thread>();
+        final ThreadGroup outerThreadGroup = currentThread().getThreadGroup();
+        FailOnTimeout failOnTimeout = failAfter50Ms(new Statement() {
+            @Override
+            public void evaluate() {
+                innerThread.set(currentThread());
+                ThreadGroup group = currentThread().getThreadGroup();
+                assertNotSame("inner thread should use a different thread group",
+                        outerThreadGroup, group);
+                innerThreadGroup.set(group);
+                assertTrue("the 'FailOnTimeoutGroup' thread group should be a daemon thread group",
+                        group.isDaemon());
+            }
+        });
+
+        failOnTimeout.evaluate();
+
+        assertNotNull("the Statement was never run", innerThread.get());
+        innerThread.get().join();
+        assertTrue("the 'FailOnTimeoutGroup' thread group should be destroyed after running the test",
+                innerThreadGroup.get().isDestroyed());
+    }
+
+    @Test
+    public void notLookingForStuckThread_usesSameThreadGroup() throws Throwable {
+        assumeFalse(lookingForStuckThread);
+        final AtomicBoolean statementWasExecuted = new AtomicBoolean();
+        final ThreadGroup outerThreadGroup = currentThread().getThreadGroup();
+        FailOnTimeout failOnTimeout = failAfter50Ms(new Statement() {
+            @Override
+            public void evaluate() {
+                statementWasExecuted.set(true);
+                ThreadGroup group = currentThread().getThreadGroup();
+                assertSame("inner thread should use the same thread group", outerThreadGroup, group);
+            }
+        });
+
+        failOnTimeout.evaluate();
+
+        assertTrue("the Statement was never run", statementWasExecuted.get());
+    }
+
+    private FailOnTimeout failAfter50Ms(Statement statement) {
+        return FailOnTimeout.builder()
+                .withTimeout(50, MILLISECONDS)
+                .withLookingForStuckThread(lookingForStuckThread)
+                .build(statement);
+    }
+
+    private ThrowingRunnable run(final FailOnTimeout failOnTimeout) {
+        return new ThrowingRunnable() {
+            public void run() throws Throwable {
+                failOnTimeout.evaluate();
+            }
+        };
+    }
+
+    private static class DelegatingStatement extends Statement {
+        volatile Statement delegate;
+
+        @Override
+        public void evaluate() throws Throwable {
+            delegate.evaluate();
+        }
+    }
+
+    private static class FastStatement extends Statement {
+        @Override
+        public void evaluate() throws Throwable {
+        }
+    }
+
+    private static final class RunForASecond extends Statement {
+        final CountDownLatch finished = new CountDownLatch(1);
+
+        @Override
+        public void evaluate() throws Throwable {
+            long timeout = currentTimeMillis() + 1000L;
+            while (!interrupted() && currentTimeMillis() < timeout) {
+            }
+            finished.countDown();
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/AllRulesTests.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/BlockJUnit4ClassRunnerOverrideTest.java Added

@@ -0,0 +1,175 @@
+package org.junit.rules;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+public class BlockJUnit4ClassRunnerOverrideTest {
+    public static class FlipBitRule implements MethodRule {
+        public Statement apply(final Statement base, FrameworkMethod method,
+                final Object target) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    target.getClass().getField("flipBit").set(target, true);
+                    base.evaluate();
+                }
+            };
+        }
+
+    }
+
+    public static class OverrideRulesRunner extends BlockJUnit4ClassRunner {
+        public OverrideRulesRunner(Class<?> klass) throws InitializationError {
+            super(klass);
+        }
+
+        @Override
+        protected List<MethodRule> rules(Object test) {
+            final LinkedList<MethodRule> methodRules = new LinkedList<MethodRule>(
+                    super.rules(test));
+            methodRules.add(new FlipBitRule());
+            return methodRules;
+        }
+    }
+
+    @RunWith(OverrideRulesRunner.class)
+    public static class OverrideRulesTest {
+        public boolean flipBit = false;
+
+        @Test
+        public void testFlipBit() {
+            assertTrue(flipBit);
+        }
+    }
+
+    @Test
+    public void overrideRulesMethod() {
+        assertThat(testResult(OverrideTestRulesTest.class), isSuccessful());
+    }
+
+    public static class OverrideTestRulesRunner extends BlockJUnit4ClassRunner {
+        public OverrideTestRulesRunner(Class<?> klass)
+                throws InitializationError {
+            super(klass);
+        }
+
+        @Override
+        protected List<TestRule> getTestRules(final Object test) {
+            final LinkedList<TestRule> methodRules = new LinkedList<TestRule>(
+                    super.getTestRules(test));
+            methodRules.add(new TestRule() {
+                public Statement apply(Statement base, Description description) {
+                    return new FlipBitRule().apply(base, null, test);
+                }
+            });
+            return methodRules;
+        }
+    }
+
+    @RunWith(OverrideTestRulesRunner.class)
+    public static class OverrideTestRulesTest extends OverrideRulesTest {
+    }
+
+    @Test
+    public void overrideTestRulesMethod() {
+        assertThat(testResult(OverrideRulesTest.class), isSuccessful());
+    }
+
+
+    /**
+     * Runner for testing override of {@link org.junit.runners.BlockJUnit4ClassRunner#createTest(org.junit.runners.model.FrameworkMethod)}
+     * by setting the {@link org.junit.runners.model.FrameworkMethod} in a field
+     * of the test class so it can be compared with the test method that is being
+     * executed.
+     */
+    public static class OverrideCreateTestRunner extends BlockJUnit4ClassRunner {
+        public OverrideCreateTestRunner(final Class<?> klass) throws InitializationError {
+            super(klass);
+
+            assert(klass.equals(OverrideCreateTest.class));
+        }
+
+        @Override
+        protected Object createTest(FrameworkMethod method) {
+            final OverrideCreateTest obj = new OverrideCreateTest();
+
+            obj.method = method;
+
+            return obj;
+        }
+    }
+
+    @RunWith(OverrideCreateTestRunner.class)
+    public static class OverrideCreateTest {
+        public FrameworkMethod method;
+
+        @Test
+        public void testMethodA() {
+            assertEquals("testMethodA", method.getMethod().getName());
+        }
+
+        @Test
+        public void testMethodB() {
+            assertEquals("testMethodB", method.getMethod().getName());
+        }
+    }
+
+    @Test
+    public void overrideCreateTestMethod() {
+        assertThat(testResult(OverrideCreateTest.class), isSuccessful());
+    }
+
+
+    /**
+     * Runner for testing override of {@link org.junit.runners.BlockJUnit4ClassRunner#createTest()}
+     * is still called by default if no other {@code createTest} method override
+     * is in place. This is tested by setting a boolean flag in a field of the
+     * test class so it can be checked to confirm that the createTest method was
+     * called.
+     */
+    public static class CreateTestDefersToNoArgCreateTestRunner extends BlockJUnit4ClassRunner {
+        public CreateTestDefersToNoArgCreateTestRunner(final Class<?> klass) throws InitializationError {
+            super(klass);
+
+            assert(klass.equals(CreateTestDefersToNoArgCreateTestTest.class));
+        }
+
+        @Override
+        protected Object createTest() {
+            final CreateTestDefersToNoArgCreateTestTest obj = new CreateTestDefersToNoArgCreateTestTest();
+
+            obj.createTestCalled = true;
+
+            return obj;
+        }
+    }
+
+    @RunWith(CreateTestDefersToNoArgCreateTestRunner.class)
+    public static class CreateTestDefersToNoArgCreateTestTest {
+        public boolean createTestCalled = false;
+
+        @Test
+        public void testCreateTestCalled() {
+            assertEquals(true, createTestCalled);
+        }
+    }
+
+    @Test
+    public void createTestDefersToNoArgCreateTest() {
+        assertThat(testResult(CreateTestDefersToNoArgCreateTestTest.class), isSuccessful());
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/ClassRulesTest.java Added

@@ -0,0 +1,366 @@
+/*
+ * Created Oct 19, 2009
+ */
+package org.junit.rules;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.ClassRule;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.MethodSorters;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+/**
+ * Tests to exercise class-level rules.
+ */
+public class ClassRulesTest {
+    public static class Counter extends ExternalResource {
+        public int count = 0;
+
+        @Override
+        protected void before() throws Throwable {
+            count++;
+        }
+    }
+
+    public static class ExampleTestWithClassRule {
+        @ClassRule
+        public static Counter counter = new Counter();
+
+        @Test
+        public void firstTest() {
+            assertEquals(1, counter.count);
+        }
+
+        @Test
+        public void secondTest() {
+            assertEquals(1, counter.count);
+        }
+    }
+
+    @Test
+    public void ruleIsAppliedOnce() {
+        ExampleTestWithClassRule.counter.count = 0;
+        JUnitCore.runClasses(ExampleTestWithClassRule.class);
+        assertEquals(1, ExampleTestWithClassRule.counter.count);
+    }
+
+    public static class SubclassOfTestWithClassRule extends
+            ExampleTestWithClassRule {
+
+    }
+
+    @Test
+    public void ruleIsIntroducedAndEvaluatedOnSubclass() {
+        ExampleTestWithClassRule.counter.count = 0;
+        JUnitCore.runClasses(SubclassOfTestWithClassRule.class);
+        assertEquals(1, ExampleTestWithClassRule.counter.count);
+    }
+
+    public static class CustomCounter implements TestRule {
+        public int count = 0;
+
+        public Statement apply(final Statement base, Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    count++;
+                    base.evaluate();
+                }
+            };
+        }
+    }
+
+    public static class ExampleTestWithCustomClassRule {
+        @ClassRule
+        public static CustomCounter counter = new CustomCounter();
+
+        @Test
+        public void firstTest() {
+            assertEquals(1, counter.count);
+        }
+
+        @Test
+        public void secondTest() {
+            assertEquals(1, counter.count);
+        }
+    }
+
+
+    @Test
+    public void customRuleIsAppliedOnce() {
+        ExampleTestWithCustomClassRule.counter.count = 0;
+        Result result = JUnitCore.runClasses(ExampleTestWithCustomClassRule.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(1, ExampleTestWithCustomClassRule.counter.count);
+    }
+
+    private static final List<String> orderList = new LinkedList<String>();
+
+    private static class OrderTestRule implements TestRule {
+        private String name;
+
+        public OrderTestRule(String name) {
+            this.name = name;
+        }
+
+        public Statement apply(final Statement base, final Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    orderList.add(name);
+                    base.evaluate();
+                }
+            };
+        }
+    }
+
+    public static class UsesFieldAndMethodRule {
+        @ClassRule
+        public static OrderTestRule orderMethod() {
+            return new OrderTestRule("orderMethod");
+        }
+
+        @ClassRule
+        public static OrderTestRule orderField = new OrderTestRule("orderField");
+
+        @Test
+        public void foo() {
+            assertEquals("orderField", orderList.get(0));
+            assertEquals("orderMethod", orderList.get(1));
+        }
+    }
+
+    @Test
+    public void usesFieldAndMethodRule() {
+        orderList.clear();
+        assertThat(testResult(UsesFieldAndMethodRule.class), isSuccessful());
+    }
+
+
+    public static class MethodExampleTestWithClassRule {
+        private static Counter counter = new Counter();
+
+        @ClassRule
+        public static Counter getCounter() {
+            return counter;
+        }
+
+        @Test
+        public void firstTest() {
+            assertEquals(1, counter.count);
+        }
+
+        @Test
+        public void secondTest() {
+            assertEquals(1, counter.count);
+        }
+    }
+
+    @Test
+    public void methodRuleIsAppliedOnce() {
+        MethodExampleTestWithClassRule.counter.count = 0;
+        JUnitCore.runClasses(MethodExampleTestWithClassRule.class);
+        assertEquals(1, MethodExampleTestWithClassRule.counter.count);
+    }
+
+    public static class MethodSubclassOfTestWithClassRule extends
+            MethodExampleTestWithClassRule {
+
+    }
+
+    @Test
+    public void methodRuleIsIntroducedAndEvaluatedOnSubclass() {
+        MethodExampleTestWithClassRule.counter.count = 0;
+        JUnitCore.runClasses(MethodSubclassOfTestWithClassRule.class);
+        assertEquals(1, MethodExampleTestWithClassRule.counter.count);
+    }
+
+    public static class MethodExampleTestWithCustomClassRule {
+        private static CustomCounter counter = new CustomCounter();
+
+        @ClassRule
+        public static CustomCounter getCounter() {
+            return counter;
+        }
+
+        @Test
+        public void firstTest() {
+            assertEquals(1, counter.count);
+        }
+
+        @Test
+        public void secondTest() {
+            assertEquals(1, counter.count);
+        }
+    }
+
+
+    @Test
+    public void methodCustomRuleIsAppliedOnce() {
+        MethodExampleTestWithCustomClassRule.counter.count = 0;
+        Result result = JUnitCore.runClasses(MethodExampleTestWithCustomClassRule.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(1, MethodExampleTestWithCustomClassRule.counter.count);
+    }
+
+    public static class CallMethodOnlyOnceRule {
+        static int countOfMethodCalls = 0;
+
+        private static class Dummy implements TestRule {
+            public Statement apply(final Statement base, Description description) {
+                return new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        base.evaluate();
+                    }
+                };
+            }
+        }
+
+        @ClassRule
+        public static Dummy both() {
+            countOfMethodCalls++;
+            return new Dummy();
+        }
+
+        @Test
+        public void onlyOnce() {
+            assertEquals(1, countOfMethodCalls);
+        }
+    }
+
+    @Test
+    public void testCallMethodOnlyOnceRule() {
+        CallMethodOnlyOnceRule.countOfMethodCalls = 0;
+        assertTrue(JUnitCore.runClasses(CallMethodOnlyOnceRule.class).wasSuccessful());
+    }
+
+    private static final StringBuilder log = new StringBuilder();
+
+    @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+    public static class ClassRuleOrdering {
+        @ClassRule(order = 1)
+        public static TestRule a() {
+            return new LoggingTestRule(log, "outer");
+        }
+
+        @ClassRule(order = 2)
+        public static TestRule z() {
+            return new LoggingTestRule(log, "inner");
+        }
+
+        @Test
+        public void foo() {
+            log.append(" foo");
+        }
+
+        @Test
+        public void bar() {
+            log.append(" bar");
+        }
+    }
+
+    @Test
+    public void classRuleOrdering() {
+        log.setLength(0);
+        Result result = JUnitCore.runClasses(ClassRuleOrdering.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(" outer.begin inner.begin bar foo inner.end outer.end", log.toString());
+    }
+
+    @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+    public static class ClassRuleOrderingDefault {
+        @ClassRule
+        public static TestRule a() {
+            return new LoggingTestRule(log, "outer");
+        }
+
+        @ClassRule
+        public static TestRule b() {
+            return new LoggingTestRule(log, "inner");
+        }
+
+        @Test
+        public void foo() {
+            log.append(" foo");
+        }
+
+        @Test
+        public void bar() {
+            log.append(" bar");
+        }
+    }
+
+    @Test
+    public void classRuleOrderingDefault() {
+        log.setLength(0);
+        Result result = JUnitCore.runClasses(ClassRuleOrderingDefault.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(" inner.begin outer.begin bar foo outer.end inner.end", log.toString());
+    }
+
+    public static class RunnerWithClassRuleAddedProgrammatically extends BlockJUnit4ClassRunner {
+        public RunnerWithClassRuleAddedProgrammatically(Class testClass) throws InitializationError {
+            super(testClass);
+        }
+
+        @Override
+        protected List<TestRule> classRules() {
+            final List<TestRule> rules = super.classRules();
+            rules.add(new LoggingTestRule(log, "fromCode"));
+            return rules;
+        }
+    }
+
+    @RunWith(RunnerWithClassRuleAddedProgrammatically.class)
+    public static class ClassRulesModifiableListEmpty {
+        @Test
+        public void test() {
+            log.append(" test");
+        }
+    }
+
+    @Test
+    public void classRulesModifiableListEmpty() {
+        log.setLength(0);
+        Result result = JUnitCore.runClasses(ClassRulesModifiableListEmpty.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(" fromCode.begin test fromCode.end", log.toString());
+    }
+
+    @RunWith(RunnerWithClassRuleAddedProgrammatically.class)
+    public static class ClassRulesModifiableList {
+        @ClassRule
+        public static TestRule classRule() {
+            return new LoggingTestRule(log, "classRule");
+        }
+
+        @Test
+        public void test() {
+            log.append(" test");
+        }
+    }
+
+    @Test
+    public void classRulesModifiableList() {
+        log.setLength(0);
+        Result result = JUnitCore.runClasses(ClassRulesModifiableList.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(" fromCode.begin classRule.begin test classRule.end fromCode.end", log.toString());
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/rules/DisableOnDebugTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/DisableOnDebugTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/ErrorCollectorTest.java Added

@@ -0,0 +1,327 @@
+package org.junit.rules;
+
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
+import org.junit.internal.AssumptionViolatedException;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.concurrent.Callable;
+
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+import static org.junit.rules.EventCollector.*;
+
+@RunWith(Parameterized.class)
+public class ErrorCollectorTest {
+
+    @Parameters(name= "{0}")
+    public static Object testsWithEventMatcher() {
+        return new Object{
+                {
+                    AddSingleError.class,
+                        hasSingleFailureWithMessage("message")},
+                {
+                    AddTwoErrors.class,
+                        hasNumberOfFailures(2)},
+                {
+                    AddInternalAssumptionViolatedException.class,
+                        allOf(hasSingleFailure(), hasNoAssumptionFailure())},
+                {
+                    CheckMatcherThatDoesNotFailWithoutProvidedReason.class,
+                        everyTestRunSuccessful()},
+                {
+                    CheckMatcherThatDoesNotFailWithProvidedReason.class,
+                        everyTestRunSuccessful()},
+                {
+                    CheckMatcherThatFailsWithoutProvidedReason.class,
+                        hasSingleFailureWithMessage(Matchers.<String>allOf(
+                            containsString("Expected: is <4>"),
+                            containsString("but: was <3>")))},
+                {
+                    CheckMatcherThatFailsWithProvidedReason.class,
+                        hasSingleFailureWithMessage(Matchers.<String>allOf(
+                            containsString("reason"),
+                            containsString("Expected: is <4>"),
+                            containsString("but: was <3>")))},
+                {
+                    CheckTwoMatchersThatFail.class,
+                        hasNumberOfFailures(2)},
+                {
+                    CheckCallableThatThrowsAnException.class,
+                        hasSingleFailureWithMessage("first!")},
+                {
+                    CheckTwoCallablesThatThrowExceptions.class,
+                        hasNumberOfFailures(2)},
+                {
+                    CheckCallableThatThrowsInternalAssumptionViolatedException.class,
+                        allOf(hasSingleFailure(), hasNoAssumptionFailure())},
+                {
+                    CheckCallableWithFailingAssumption.class,
+                        allOf(hasSingleFailure(), hasNoAssumptionFailure())},
+                {
+                    CheckCallableThatDoesNotThrowAnException.class,
+                        everyTestRunSuccessful()},
+                {
+                    CheckRunnableThatThrowsExpectedTypeOfException.class,
+                        everyTestRunSuccessful()},
+                {
+                    CheckRunnableThatThrowsUnexpectedTypeOfException.class,
+                        hasSingleFailureWithMessage("unexpected exception type thrown; expected:<java.lang.IllegalArgumentException> but was:<java.lang.NullPointerException>")},
+                {
+                    CheckRunnableThatThrowsNoExceptionAlthoughOneIsExpected.class,
+                        hasSingleFailureWithMessage("expected java.lang.IllegalArgumentException to be thrown, but nothing was thrown")},
+                {
+                    ErrorCollectorNotCalledBySuccessfulTest.class,
+                        everyTestRunSuccessful()},
+                {
+                    ErrorCollectorNotCalledByFailingTest.class,
+                        hasSingleFailure()},
+        };
+    }
+
+    @Parameter(0)
+    public Class<?> classUnderTest;
+
+    @Parameter(1)
+    public Matcher<EventCollector> matcher;
+
+    @Test
+    public void runTestClassAndVerifyEvents() {
+        EventCollector collector = new EventCollector();
+        JUnitCore core = new JUnitCore();
+        core.addListener(collector);
+        core.run(classUnderTest);
+        assertThat(collector, matcher);
+    }
+
+    public static class AddSingleError {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.addError(new Throwable("message"));
+        }
+    }
+
+    public static class AddTwoErrors {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.addError(new Throwable("first thing went wrong"));
+            collector.addError(new Throwable("second thing went wrong"));
+        }
+    }
+
+    public static class AddInternalAssumptionViolatedException {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.addError(new AssumptionViolatedException("message"));
+        }
+    }
+
+    public static class CheckMatcherThatDoesNotFailWithProvidedReason {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkThat("dummy reason", 3, is(3));
+        }
+    }
+
+    public static class CheckMatcherThatDoesNotFailWithoutProvidedReason {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkThat(3, is(3));
+        }
+    }
+
+    public static class CheckMatcherThatFailsWithoutProvidedReason {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkThat(3, is(4));
+        }
+    }
+
+    public static class CheckMatcherThatFailsWithProvidedReason {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkThat("reason", 3, is(4));
+        }
+    }
+
+    public static class CheckTwoMatchersThatFail {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkThat(3, is(4));
+            collector.checkThat("reason", 7, is(8));
+        }
+    }
+
+    public static class CheckCallableThatThrowsAnException {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkSucceeds(new Callable<Object>() {
+                public Object call() throws Exception {
+                    throw new RuntimeException("first!");
+                }
+            });
+        }
+    }
+
+    public static class CheckTwoCallablesThatThrowExceptions {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkSucceeds(new Callable<Object>() {
+                public Object call() throws Exception {
+                    throw new RuntimeException("first!");
+                }
+            });
+            collector.checkSucceeds(new Callable<Integer>() {
+                public Integer call() throws Exception {
+                    throw new RuntimeException("second!");
+                }
+            });
+        }
+    }
+
+    public static class CheckCallableThatThrowsInternalAssumptionViolatedException {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkSucceeds(new Callable<Object>() {
+                public Object call() throws Exception {
+                    throw new AssumptionViolatedException("message");
+                }
+            });
+        }
+    }
+
+    public static class CheckCallableWithFailingAssumption {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkSucceeds(new Callable<Object>() {
+                public Object call() throws Exception {
+                    assumeTrue(false);
+                    return null;
+                }
+            });
+        }
+    }
+
+    public static class CheckCallableThatDoesNotThrowAnException {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            Object result = collector.checkSucceeds(new Callable<Object>() {
+                public Object call() throws Exception {
+                    return 3;
+                }
+            });
+            assertEquals(3, result);
+        }
+    }
+
+    public static class CheckRunnableThatThrowsExpectedTypeOfException {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+                public void run() throws Throwable {
+                    throw new IllegalArgumentException();
+                }
+            });
+        }
+    }
+
+    public static class CheckRunnableThatThrowsUnexpectedTypeOfException {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+                public void run() throws Throwable {
+                    throw new NullPointerException();
+                }
+            });
+        }
+    }
+
+    public static class CheckRunnableThatThrowsNoExceptionAlthoughOneIsExpected {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            collector.checkThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+                public void run() throws Throwable {
+                }
+            });
+        }
+    }
+
+    public static class ErrorCollectorNotCalledBySuccessfulTest {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+        }
+    }
+
+    public static class ErrorCollectorNotCalledByFailingTest {
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Test
+        public void example() {
+            fail();
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/EventCollector.java Added

@@ -0,0 +1,191 @@
+package org.junit.rules;
+
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+public class EventCollector extends RunListener {
+    static Matcher<EventCollector> everyTestRunSuccessful() {
+        return allOf(hasNoFailure(), hasNoAssumptionFailure());
+    }
+
+    static Matcher<EventCollector> hasNumberOfFailures(
+            final int numberOfFailures) {
+        return new TypeSafeMatcher<EventCollector>() {
+            @Override
+            public boolean matchesSafely(EventCollector item) {
+                return item.fFailures.size() == numberOfFailures;
+            }
+
+            public void describeTo(org.hamcrest.Description description) {
+                description.appendText("has ");
+                description.appendValue(numberOfFailures);
+                description.appendText(" failures");
+            }
+
+            @Override
+            protected void describeMismatchSafely(EventCollector item,
+                    org.hamcrest.Description description) {
+                description.appendValue(item.fFailures.size());
+                description.appendText(" failures");
+            }
+        };
+    }
+
+    static Matcher<EventCollector> hasSingleFailure() {
+        return hasNumberOfFailures(1);
+    }
+
+    static Matcher<EventCollector> hasNoFailure() {
+        return hasNumberOfFailures(0);
+    }
+
+    private static Matcher<EventCollector> hasNumberOfAssumptionFailures(
+            final int numberOfFailures) {
+        return new TypeSafeMatcher<EventCollector>() {
+            @Override
+            public boolean matchesSafely(EventCollector item) {
+                return item.fAssumptionFailures.size() == numberOfFailures;
+            }
+
+            public void describeTo(org.hamcrest.Description description) {
+                description.appendText("has ");
+                description.appendValue(numberOfFailures);
+                description.appendText(" assumption failures");
+            }
+        };
+    }
+
+    static Matcher<EventCollector> hasSingleAssumptionFailure() {
+        return hasNumberOfAssumptionFailures(1);
+    }
+
+    static Matcher<EventCollector> hasNoAssumptionFailure() {
+        return hasNumberOfAssumptionFailures(0);
+    }
+
+    public static Matcher<EventCollector> hasSingleFailureWithMessage(String message) {
+        return hasSingleFailureWithMessage(equalTo(message));
+    }
+
+    static Matcher<EventCollector> hasSingleFailureWithMessage(
+            final Matcher<String> messageMatcher) {
+        return new TypeSafeMatcher<EventCollector>() {
+            @Override
+            public boolean matchesSafely(EventCollector item) {
+                return hasSingleFailure().matches(item)
+                        && messageMatcher.matches(item.fFailures.get(0)
+                        .getMessage());
+            }
+
+            public void describeTo(org.hamcrest.Description description) {
+                description.appendText("has single failure with message ");
+                messageMatcher.describeTo(description);
+            }
+
+            @Override
+            protected void describeMismatchSafely(EventCollector item,
+                    org.hamcrest.Description description) {
+                description.appendText("was ");
+                hasSingleFailure().describeMismatch(item, description);
+                description.appendText(": ");
+                boolean first= true;
+                for (Failure f : item.fFailures) {
+                    if (!first) {
+                        description.appendText(" ,");
+                    }
+                    description.appendText("'");
+                    description.appendText(f.getMessage());
+                    description.appendText("'");
+                    first= false;
+                }
+            }
+        };
+    }
+
+    static Matcher<EventCollector> failureIs(final Matcher<? super Throwable> exceptionMatcher) {
+        return new TypeSafeMatcher<EventCollector>() {
+            @Override
+            public boolean matchesSafely(EventCollector item) {
+                for (Failure f : item.fFailures) {
+                    return exceptionMatcher.matches(f.getException());
+                }
+                return false;
+            }
+
+            public void describeTo(org.hamcrest.Description description) {
+                description.appendText("failure is ");
+                exceptionMatcher.describeTo(description);
+            }
+        };
+    }
+
+    private final List<Description> fTestRunsStarted = new ArrayList<Description>();
+
+    private final List<Result> fTestRunsFinished = new ArrayList<Result>();
+
+    private final List<Description> fTestsStarted = new ArrayList<Description>();
+
+    private final List<Description> fTestsFinished = new ArrayList<Description>();
+
+    private final List<Failure> fFailures = new ArrayList<Failure>();
+
+    private final List<Failure> fAssumptionFailures = new ArrayList<Failure>();
+
+    private final List<Description> fTestsIgnored = new ArrayList<Description>();
+
+    @Override
+    public void testRunStarted(Description description) throws Exception {
+        fTestRunsStarted.add(description);
+    }
+
+    @Override
+    public void testRunFinished(Result result) throws Exception {
+        fTestRunsFinished.add(result);
+    }
+
+    @Override
+    public void testStarted(Description description) throws Exception {
+        fTestsStarted.add(description);
+    }
+
+    @Override
+    public void testFinished(Description description) throws Exception {
+        fTestsFinished.add(description);
+    }
+
+    @Override
+    public void testFailure(Failure failure) throws Exception {
+        fFailures.add(failure);
+    }
+
+    @Override
+    public void testAssumptionFailure(Failure failure) {
+        fAssumptionFailures.add(failure);
+    }
+
+    @Override
+    public void testIgnored(Description description) throws Exception {
+        fTestsIgnored.add(description);
+    }
+
+    @Override
+    public String toString() {
+        return fTestRunsStarted.size() + " test runs started, "
+            + fTestRunsFinished.size() + " test runs finished, "
+            + fTestsStarted.size() + " tests started, "
+            + fTestsFinished.size() + " tests finished, "
+            + fFailures.size() + " failures, "
+            + fAssumptionFailures.size() + " assumption failures, "
+            + fTestsIgnored.size() + " tests ignored";
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/ExpectedExceptionTest.java Added

@@ -0,0 +1,386 @@
+package org.junit.rules;
+
+import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.any;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+import static org.junit.rules.ExpectedException.none;
+import static org.junit.rules.EventCollector.everyTestRunSuccessful;
+import static org.junit.rules.EventCollector.hasSingleAssumptionFailure;
+import static org.junit.rules.EventCollector.hasSingleFailure;
+import static org.junit.rules.EventCollector.hasSingleFailureWithMessage;
+
+import java.util.Collection;
+
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matcher;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class ExpectedExceptionTest {
+    private static final String ARBITRARY_MESSAGE = "arbitrary message";
+
+    @Parameters(name= "{0}")
+    public static Collection<Object> testsWithEventMatcher() {
+        return asList(new Object{
+                {EmptyTestExpectingNoException.class, everyTestRunSuccessful()},
+                {ThrowExceptionWithExpectedType.class,
+                        everyTestRunSuccessful()},
+                {ThrowExceptionWithExpectedPartOfMessage.class,
+                        everyTestRunSuccessful()},
+                {
+                        ThrowExceptionWithWrongType.class,
+                        hasSingleFailureWithMessage(startsWith("\nExpected: an instance of java.lang.NullPointerException"))},
+                {
+                        HasWrongMessage.class,
+                        hasSingleFailureWithMessage(startsWith("\nExpected: exception with message a string containing \"expectedMessage\"\n"
+                                + "     but: message was \"actualMessage\""))},
+                {
+                        ThrowNoExceptionButExpectExceptionWithType.class,
+                        hasSingleFailureWithMessage("Expected test to throw an instance of java.lang.NullPointerException")},
+                {WronglyExpectsExceptionMessage.class, hasSingleFailure()},
+                {ExpectsSubstring.class, everyTestRunSuccessful()},
+                {
+                        ExpectsSubstringNullMessage.class,
+                        hasSingleFailureWithMessage(startsWith("\nExpected: exception with message a string containing \"anything!\""))},
+                {ExpectsMessageMatcher.class, everyTestRunSuccessful()},
+                {
+                        ExpectedMessageMatcherFails.class,
+                        hasSingleFailureWithMessage(startsWith("\nExpected: exception with message \"Wrong start\""))},
+                {ExpectsMatcher.class, everyTestRunSuccessful()},
+                {ExpectAssertionErrorWhichIsNotThrown.class, hasSingleFailure()},
+                {FailedAssumptionAndExpectException.class,
+                        hasSingleAssumptionFailure()},
+                {FailBeforeExpectingException.class,
+                        hasSingleFailureWithMessage(ARBITRARY_MESSAGE)},
+                {
+                        ExpectsMultipleMatchers.class,
+                        hasSingleFailureWithMessage(startsWith("\nExpected: (an instance of java.lang.IllegalArgumentException and exception with message a string containing \"Ack!\")"))},
+                {ThrowExceptionWithMatchingCause.class, everyTestRunSuccessful()},
+                {ThrowExpectedNullCause.class, everyTestRunSuccessful()},
+                {
+                        ThrowUnexpectedCause.class,
+                        hasSingleFailureWithMessage(CoreMatchers.<String>allOf(
+                                startsWith("\nExpected: ("),
+                                containsString("exception with cause is <java.lang.NullPointerException: expected cause>"),
+                                containsString("cause was <java.lang.NullPointerException: an unexpected cause>"),
+                                containsString("Stacktrace was: java.lang.IllegalArgumentException: Ack!"),
+                                containsString("Caused by: java.lang.NullPointerException: an unexpected cause")))},
+                {
+                        UseNoCustomMessage.class,
+                        hasSingleFailureWithMessage("Expected test to throw an instance of java.lang.IllegalArgumentException") },
+                {
+                        UseCustomMessageWithoutPlaceHolder.class,
+                        hasSingleFailureWithMessage(ARBITRARY_MESSAGE) },
+                {
+                        UseCustomMessageWithPlaceHolder.class,
+                        hasSingleFailureWithMessage(ARBITRARY_MESSAGE
+                                + " - an instance of java.lang.IllegalArgumentException") },
+                {
+                        ErrorCollectorShouldFailAlthoughExpectedExceptionDoesNot.class,
+                        hasSingleFailureWithMessage(ARBITRARY_MESSAGE) }
+        });
+    }
+
+    private final Class<?> classUnderTest;
+
+    private final Matcher<EventCollector> matcher;
+
+    public ExpectedExceptionTest(Class<?> classUnderTest,
+            Matcher<EventCollector> matcher) {
+        this.classUnderTest = classUnderTest;
+        this.matcher = matcher;
+    }
+
+    @Test
+    public void runTestAndVerifyResult() {
+        EventCollector collector = new EventCollector();
+        JUnitCore core = new JUnitCore();
+        core.addListener(collector);
+        core.run(classUnderTest);
+        assertThat(collector, matcher);
+    }
+
+    public static class EmptyTestExpectingNoException {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsNothing() {
+        }
+    }
+
+    public static class ThrowExceptionWithExpectedType {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsNullPointerException() {
+            thrown.expect(NullPointerException.class);
+            throw new NullPointerException();
+        }
+    }
+
+    public static class ThrowExceptionWithExpectedPartOfMessage {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsNullPointerExceptionWithMessage() {
+            thrown.expect(NullPointerException.class);
+            thrown.expectMessage(ARBITRARY_MESSAGE);
+            throw new NullPointerException(ARBITRARY_MESSAGE + "something else");
+        }
+    }
+
+    public static class ThrowExceptionWithWrongType {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsNullPointerException() {
+            thrown.expect(NullPointerException.class);
+            throw new IllegalArgumentException();
+        }
+    }
+
+    public static class HasWrongMessage {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsNullPointerException() {
+            thrown.expectMessage("expectedMessage");
+            throw new IllegalArgumentException("actualMessage");
+        }
+    }
+
+    public static class ThrowNoExceptionButExpectExceptionWithType {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void doesntThrowNullPointerException() {
+            thrown.expect(NullPointerException.class);
+        }
+    }
+
+    public static class WronglyExpectsExceptionMessage {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void doesntThrowAnything() {
+            thrown.expectMessage("anything!");
+        }
+    }
+
+    public static class ExpectsSubstring {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsMore() {
+            thrown.expectMessage("anything!");
+            throw new NullPointerException(
+                    "This could throw anything! (as long as it has the right substring)");
+        }
+    }
+
+    public static class ExpectsSubstringNullMessage {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsMore() {
+            thrown.expectMessage("anything!");
+            throw new NullPointerException();
+        }
+    }
+
+    public static class ExpectsMessageMatcher {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsMore() {
+            thrown.expectMessage(startsWith(ARBITRARY_MESSAGE));
+            throw new NullPointerException(ARBITRARY_MESSAGE + "!");
+        }
+    }
+
+    public static class ExpectedMessageMatcherFails {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsMore() {
+            thrown.expectMessage(equalTo("Wrong start"));
+            throw new NullPointerException("Back!");
+        }
+    }
+
+    public static class ExpectsMatcher {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsMore() {
+            thrown.expect(any(Exception.class));
+            throw new NullPointerException("Ack!");
+        }
+    }
+
+    public static class ExpectsMultipleMatchers {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwsMore() {
+            thrown.expect(IllegalArgumentException.class);
+            thrown.expectMessage("Ack!");
+            throw new NullPointerException("Ack!");
+        }
+    }
+
+    //https://github.com/junit-team/junit4/pull/583
+    public static class ExpectAssertionErrorWhichIsNotThrown {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void fails() {
+            thrown.expect(AssertionError.class);
+        }
+    }
+
+    public static class FailBeforeExpectingException {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void fails() {
+            fail(ARBITRARY_MESSAGE);
+            thrown.expect(IllegalArgumentException.class);
+        }
+    }
+
+    public static class FailedAssumptionAndExpectException {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void failedAssumption() {
+            assumeTrue(false);
+            thrown.expect(NullPointerException.class);
+        }
+    }
+
+    public static class ThrowExceptionWithMatchingCause {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwExceptionWithMatchingCause() {
+            NullPointerException expectedCause = new NullPointerException("expected cause");
+
+            thrown.expect(IllegalArgumentException.class);
+            thrown.expectMessage("Ack!");
+            thrown.expectCause(is(expectedCause));
+
+            throw new IllegalArgumentException("Ack!", expectedCause);
+        }
+    }
+
+    public static class ThrowExpectedNullCause {
+        @Rule
+        public ExpectedException thrown = none();
+
+        @Test
+        public void throwExpectedNullCause() {
+            thrown.expect(IllegalArgumentException.class);
+            thrown.expectMessage("Ack!");
+            thrown.expectCause(nullValue(Throwable.class));
+
+            throw new IllegalArgumentException("Ack!");
+        }
+    }
+
+    public static class ThrowUnexpectedCause {
+
+        @Rule
+        public ExpectedException thrown = ExpectedException.none();
+
+        @Test
+        public void throwWithCause() {
+            thrown.expect(IllegalArgumentException.class);
+            thrown.expectMessage("Ack!");
+            thrown.expectCause(is(new NullPointerException("expected cause")));
+
+            throw new IllegalArgumentException("Ack!", new NullPointerException("an unexpected cause"));
+        }
+    }
+    
+    public static class UseNoCustomMessage {
+
+        @Rule
+        public ExpectedException thrown= ExpectedException.none();
+
+        @Test
+        public void noThrow() {
+            thrown.expect(IllegalArgumentException.class);
+        }
+    }
+
+    public static class UseCustomMessageWithPlaceHolder {
+
+        @Rule
+        public ExpectedException thrown = ExpectedException.none();
+
+        @Test
+        public void noThrow() {
+            thrown.expect(IllegalArgumentException.class);
+            thrown.reportMissingExceptionWithMessage(ARBITRARY_MESSAGE
+                    + " - %s");
+        }
+    }
+
+    public static class UseCustomMessageWithoutPlaceHolder {
+
+        @Rule
+        public ExpectedException thrown= ExpectedException.none();
+
+        @Test
+        public void noThrow() {
+            thrown.expect(IllegalArgumentException.class);
+            thrown.reportMissingExceptionWithMessage(ARBITRARY_MESSAGE);
+        }
+    }
+
+    public static class ErrorCollectorShouldFailAlthoughExpectedExceptionDoesNot {
+
+        @Rule
+        public ErrorCollector collector = new ErrorCollector();
+
+        @Rule(order = Integer.MAX_VALUE)
+        public ExpectedException thrown = ExpectedException.none();
+
+        @Test
+        public void test() {
+            collector.addError(new AssertionError(ARBITRARY_MESSAGE));
+            thrown.expect(Exception.class);
+            throw new RuntimeException();
+        }
+    }
+}
\ No newline at end of file

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/ExternalResourceRuleTest.java Added

@@ -0,0 +1,168 @@
+package org.junit.rules;
+
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
+import static org.junit.internal.matchers.ThrowableCauseMatcher.hasCause;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matcher;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.TestCouldNotBeSkippedException;
+import org.junit.internal.AssumptionViolatedException;
+import org.junit.internal.runners.statements.Fail;
+import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runners.model.MultipleFailureException;
+import org.junit.runners.model.Statement;
+
+public class ExternalResourceRuleTest {
+    private static String callSequence;
+
+    public static class UsesExternalResource {
+        @Rule
+        public ExternalResource resource = new ExternalResource() {
+            @Override
+            protected void before() throws Throwable {
+                callSequence += "before ";
+            }
+
+            @Override
+            protected void after() {
+                callSequence += "after ";
+            }
+        };
+
+        @Test
+        public void testFoo() {
+            callSequence += "test ";
+        }
+    }
+
+    @Test
+    public void externalResourceGeneratesCorrectSequence() {
+        callSequence = "";
+        assertThat(testResult(UsesExternalResource.class), isSuccessful());
+        assertEquals("before test after ", callSequence);
+    }
+
+    @Test
+    public void shouldThrowMultipleFailureExceptionWhenTestFailsAndClosingResourceFails() throws Throwable {
+        // given
+        ExternalResource resourceRule = new ExternalResource() {
+            @Override
+            protected void after() {
+                throw new RuntimeException("simulating resource tear down failure");
+            }
+        };
+        Statement failingTest = new Fail(new RuntimeException("simulated test failure"));
+        Description dummyDescription = Description.createTestDescription(
+                "dummy test class name", "dummy test name");
+
+        try {
+            resourceRule.apply(failingTest, dummyDescription).evaluate();
+            fail("ExternalResource should throw");
+        } catch (MultipleFailureException e) {
+            assertThat(e.getMessage(), allOf(
+                    containsString("simulated test failure"),
+                    containsString("simulating resource tear down failure")
+            ));
+        }
+    }
+
+    public static class TestFailsAndTwoClosingResourcesFail {
+        @Rule
+        public ExternalResource resourceRule1 = new ExternalResource() {
+            @Override
+            protected void after() {
+                throw new RuntimeException("simulating resource1 tear down failure");
+            }
+        };
+
+        @Rule
+        public ExternalResource resourceRule2 = new ExternalResource() {
+            @Override
+            protected void after() {
+                throw new RuntimeException("simulating resource2 tear down failure");
+            }
+        };
+
+        @Test
+        public void failingTest() {
+            throw new RuntimeException("simulated test failure");
+        }
+    }
+
+    @Test
+    public void shouldThrowMultipleFailureExceptionWhenTestFailsAndTwoClosingResourcesFail() {
+        Result result = JUnitCore.runClasses(TestFailsAndTwoClosingResourcesFail.class);
+        assertEquals(3, result.getFailures().size());
+        List<String> messages = new ArrayList<String>();
+        for (Failure failure : result.getFailures()) {
+            messages.add(failure.getMessage());
+        }
+        assertThat(messages, CoreMatchers.hasItems(
+                "simulated test failure",
+                "simulating resource1 tear down failure",
+                "simulating resource2 tear down failure"
+        ));
+    }
+
+    @Test
+    public void shouldWrapAssumptionFailuresWhenClosingResourceFails() throws Throwable {
+        // given
+        final AtomicReference<Throwable> externalResourceException = new AtomicReference<Throwable>();
+        ExternalResource resourceRule = new ExternalResource() {
+            @Override
+            protected void after() {
+                RuntimeException runtimeException = new RuntimeException("simulating resource tear down failure");
+                externalResourceException.set(runtimeException);
+                throw runtimeException;
+            }
+        };
+        final AtomicReference<Throwable> assumptionViolatedException = new AtomicReference<Throwable>();
+        Statement skippedTest = new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                AssumptionViolatedException assumptionFailure = new AssumptionViolatedException("skip it");
+                assumptionViolatedException.set(assumptionFailure);
+                throw assumptionFailure;
+            }
+        };
+        Description dummyDescription = Description.createTestDescription(
+                "dummy test class name", "dummy test name");
+
+        try {
+            resourceRule.apply(skippedTest, dummyDescription).evaluate();
+            fail("ExternalResource should throw");
+        } catch (MultipleFailureException e) {
+            assertThat(e.getFailures(), hasItems(
+                    instanceOf(TestCouldNotBeSkippedException.class),
+                    sameInstance(externalResourceException.get())
+            ));
+            assertThat(e.getFailures(), hasItems(
+                    hasCause(sameInstance(assumptionViolatedException.get())),
+                    sameInstance(externalResourceException.get())
+            ));
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Matcher<? super List<Throwable>> hasItems(
+            Matcher<? super Throwable> one, Matcher<? super Throwable> two) {
+        return CoreMatchers.hasItems(one, two);
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/LoggingMethodRule.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/LoggingStatement.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/LoggingTestRule.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/LoggingTestWatcher.java Added

@@ -0,0 +1,42 @@
+package org.junit.rules;
+
+import org.junit.AssumptionViolatedException;
+import org.junit.runner.Description;
+
+class LoggingTestWatcher extends TestWatcher {
+    private final StringBuilder log;
+
+    LoggingTestWatcher(StringBuilder log) {
+        this.log = log;
+    }
+
+    @Override
+    protected void succeeded(Description description) {
+        log.append("succeeded ");
+    }
+
+    @Override
+    protected void failed(Throwable e, Description description) {
+        log.append("failed ");
+    }
+
+    @Override
+    protected void skipped(AssumptionViolatedException e, Description description) {
+        log.append("skipped ");
+    }
+
+    @Override
+    protected void skipped(org.junit.internal.AssumptionViolatedException e, Description description) {
+        log.append("deprecated skipped ");
+    }
+
+    @Override
+    protected void starting(Description description) {
+        log.append("starting ");
+    }
+
+    @Override
+    protected void finished(Description description) {
+        log.append("finished ");
+    }
+}
\ No newline at end of file

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/MethodRulesTest.java Added

@@ -0,0 +1,420 @@
+package org.junit.rules;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.failureCountIs;
+import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+@SuppressWarnings("deprecation")
+public class MethodRulesTest {
+    private static boolean ruleWasEvaluated;
+
+    private static class TestMethodRule implements MethodRule {
+
+        public Statement apply(final Statement base, FrameworkMethod method, Object target) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    ruleWasEvaluated = true;
+                    base.evaluate();
+                }
+            };
+        }
+    }
+
+    public static class ExampleTest {
+        @Rule
+        public MethodRule example = new TestMethodRule();
+
+        @Test
+        public void nothing() {
+        }
+    }
+
+    abstract static class NonPublicExampleTest {
+        @Rule
+        public MethodRule example = new TestMethodRule();
+
+        @Test
+        public void nothing() {
+        }
+    }
+
+    @Test
+    public void ruleIsIntroducedAndEvaluated() {
+        ruleWasEvaluated = false;
+        assertThat(testResult(ExampleTest.class), isSuccessful());
+        assertTrue(ruleWasEvaluated);
+    }
+
+    public static class SonOfExampleTest extends ExampleTest {
+
+    }
+
+    @Test
+    public void ruleIsIntroducedAndEvaluatedOnSubclass() {
+        ruleWasEvaluated = false;
+        assertThat(testResult(SonOfExampleTest.class), isSuccessful());
+        assertTrue(ruleWasEvaluated);
+    }
+
+    public static class SonOfNonPublicExampleTest extends NonPublicExampleTest {
+
+    }
+
+    @Test
+    public void ruleIsIntroducedAndEvaluatedOnSubclassOfNonPublicClass() {
+        ruleWasEvaluated = false;
+        assertThat(testResult(SonOfNonPublicExampleTest.class), isSuccessful());
+        assertTrue(ruleWasEvaluated);
+    }
+
+    private static int runCount;
+
+    private static class Increment implements MethodRule {
+        public Statement apply(final Statement base,
+                FrameworkMethod method, Object target) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    runCount++;
+                    base.evaluate();
+                }
+            };
+        }
+    }
+    
+    public static class MultipleRuleTest {
+
+        @Rule
+        public MethodRule incrementor1 = new Increment();
+
+        @Rule
+        public MethodRule incrementor2 = new Increment();
+
+        @Test
+        public void nothing() {
+
+        }
+    }
+
+    @Test
+    public void multipleRulesAreRun() {
+        runCount = 0;
+        assertThat(testResult(MultipleRuleTest.class), isSuccessful());
+        assertEquals(2, runCount);
+    }
+
+    public static class NoRulesTest {
+        public int x;
+
+        @Test
+        public void nothing() {
+
+        }
+    }
+
+    @Test
+    public void ignoreNonRules() {
+        assertThat(testResult(NoRulesTest.class), isSuccessful());
+    }
+
+    private static String log;
+
+    public static class OnFailureTest {
+        @Rule
+        public MethodRule watchman = new TestWatchman() {
+            @Override
+            public void failed(Throwable e, FrameworkMethod method) {
+                log += method.getName() + " " + e.getClass().getSimpleName();
+            }
+        };
+
+        @Test
+        public void nothing() {
+            fail();
+        }
+    }
+
+    @Test
+    public void onFailure() {
+        log = "";
+        assertThat(testResult(OnFailureTest.class), failureCountIs(1));
+        assertEquals("nothing AssertionError", log);
+    }
+
+    public static class WatchmanTest {
+        private static String watchedLog;
+
+        @Rule
+        public MethodRule watchman = new TestWatchman() {
+            @Override
+            public void failed(Throwable e, FrameworkMethod method) {
+                watchedLog += method.getName() + " "
+                        + e.getClass().getSimpleName() + "\n";
+            }
+
+            @Override
+            public void succeeded(FrameworkMethod method) {
+                watchedLog += method.getName() + " " + "success!\n";
+            }
+        };
+
+        @Test
+        public void fails() {
+            fail();
+        }
+
+        @Test
+        public void succeeds() {
+        }
+    }
+
+    @Test
+    public void succeeded() {
+        WatchmanTest.watchedLog = "";
+        assertThat(testResult(WatchmanTest.class), failureCountIs(1));
+        assertThat(WatchmanTest.watchedLog, containsString("fails AssertionError"));
+        assertThat(WatchmanTest.watchedLog, containsString("succeeds success!"));
+    }
+
+    public static class BeforesAndAfters {
+        private static String watchedLog;
+
+        @Before
+        public void before() {
+            watchedLog += "before ";
+        }
+
+        @Rule
+        public MethodRule watchman = new TestWatchman() {
+            @Override
+            public void starting(FrameworkMethod method) {
+                watchedLog += "starting ";
+            }
+
+            @Override
+            public void finished(FrameworkMethod method) {
+                watchedLog += "finished ";
+            }
+
+            @Override
+            public void succeeded(FrameworkMethod method) {
+                watchedLog += "succeeded ";
+            }
+        };
+
+        @After
+        public void after() {
+            watchedLog += "after ";
+        }
+
+        @Test
+        public void succeeds() {
+            watchedLog += "test ";
+        }
+    }
+
+    @Test
+    public void beforesAndAfters() {
+        BeforesAndAfters.watchedLog = "";
+        assertThat(testResult(BeforesAndAfters.class), isSuccessful());
+        assertThat(BeforesAndAfters.watchedLog, is("starting before test after succeeded finished "));
+    }
+
+    public static class WrongTypedField {
+        @Rule
+        public int x = 5;
+
+        @Test
+        public void foo() {
+        }
+    }
+
+    @Test
+    public void validateWrongTypedField() {
+        assertThat(testResult(WrongTypedField.class),
+                hasSingleFailureContaining("must implement MethodRule"));
+    }
+
+    public static class SonOfWrongTypedField extends WrongTypedField {
+
+    }
+
+    @Test
+    public void validateWrongTypedFieldInSuperclass() {
+        assertThat(testResult(SonOfWrongTypedField.class),
+                hasSingleFailureContaining("must implement MethodRule"));
+    }
+
+    public static class PrivateRule {
+        @Rule
+        private TestRule rule = new TestName();
+
+        @Test
+        public void foo() {
+        }
+    }
+
+    @Test
+    public void validatePrivateRule() {
+        assertThat(testResult(PrivateRule.class),
+                hasSingleFailureContaining("must be public"));
+    }
+
+    public static class CustomTestName implements TestRule {
+        public String name = null;
+
+        public Statement apply(final Statement base, final Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    name = description.getMethodName();
+                    base.evaluate();
+                }
+            };
+        }
+    }
+
+    public static class UsesCustomMethodRule {
+        @Rule
+        public CustomTestName counter = new CustomTestName();
+
+        @Test
+        public void foo() {
+            assertEquals("foo", counter.name);
+        }
+    }
+
+    @Test
+    public void useCustomMethodRule() {
+        assertThat(testResult(UsesCustomMethodRule.class), isSuccessful());
+    }
+    
+    public static class HasMethodReturningMethodRule {
+        private MethodRule methodRule = new MethodRule() {
+            public Statement apply(final Statement base, FrameworkMethod method, Object target) {
+                return new Statement() {
+                    
+                    @Override
+                    public void evaluate() throws Throwable {
+                        ruleWasEvaluated = true;
+                        base.evaluate();
+                    }
+                };
+            }
+        };
+        
+        @Rule
+        public MethodRule methodRule() {
+            return methodRule;
+        }
+        
+        @Test
+        public void doNothing() {
+            
+        }
+    }
+
+    /**
+     * If there are any public methods annotated with @Rule returning a {@link MethodRule}
+     * then it should also be run.
+     * 
+     * <p>This case has been added with 
+     * <a href="https://github.com/junit-team/junit4/issues/589">Issue #589</a> - 
+     * Support @Rule for methods works only for TestRule but not for MethodRule
+     */
+    @Test
+    public void runsMethodRuleThatIsReturnedByMethod() {
+        ruleWasEvaluated = false;
+        assertThat(testResult(HasMethodReturningMethodRule.class), isSuccessful());
+        assertTrue(ruleWasEvaluated);
+    }
+    
+    public static class HasMultipleMethodsReturningMethodRule {
+        @Rule
+        public Increment methodRule1() {
+            return new Increment();
+        }
+        
+        @Rule
+        public Increment methodRule2() {
+            return new Increment();
+        }
+        
+        @Test
+        public void doNothing() {
+            
+        }
+    }
+
+    /**
+     * If there are multiple public methods annotated with @Rule returning a {@link MethodRule}
+     * then all the rules returned should be run.
+     * 
+     * <p>This case has been added with 
+     * <a href="https://github.com/junit-team/junit4/issues/589">Issue #589</a> - 
+     * Support @Rule for methods works only for TestRule but not for MethodRule
+     */
+    @Test
+    public void runsAllMethodRulesThatAreReturnedByMethods() {
+        runCount = 0;
+        assertThat(testResult(HasMultipleMethodsReturningMethodRule.class), isSuccessful());
+        assertEquals(2, runCount);
+    }
+    
+    
+    public static class CallsMethodReturningRuleOnlyOnce {
+        int callCount = 0;
+        
+        private static class Dummy implements MethodRule {
+            public Statement apply(final Statement base, FrameworkMethod method, Object target) {
+                return new Statement() {
+                    
+                    @Override
+                    public void evaluate() throws Throwable {
+                        base.evaluate();
+                    }
+                };
+            }
+        }
+       
+        
+        @Rule
+        public MethodRule methodRule() {
+            callCount++;
+            return new Dummy();
+        }
+        
+        @Test
+        public void doNothing() {
+            assertEquals(1, callCount);
+        }
+    }
+
+    /**
+     * If there are any public methods annotated with @Rule returning a {@link MethodRule}
+     * then method should be called only once.
+     * 
+     * <p>This case has been added with 
+     * <a href="https://github.com/junit-team/junit4/issues/589">Issue #589</a> - 
+     * Support @Rule for methods works only for TestRule but not for MethodRule
+     */
+    @Test
+    public void callsMethodReturningRuleOnlyOnce() {
+        assertThat(testResult(CallsMethodReturningRuleOnlyOnce.class), isSuccessful());
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/NameRulesTest.java Added

@@ -0,0 +1,50 @@
+package org.junit.rules;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+@RunWith(Enclosed.class)
+public class NameRulesTest {
+    public static class TestNames {
+        @Rule
+        public TestName name = new TestName();
+
+        @Test
+        public void testA() {
+            assertEquals("testA", name.getMethodName());
+        }
+
+        @Test
+        public void testB() {
+            assertEquals("testB", name.getMethodName());
+        }
+    }
+
+    public static class BeforeAndAfterTest {
+        @Rule
+        public TestName name = new TestName();
+
+        private final String expectedName = "x";
+
+        @Before
+        public void setUp() {
+            assertEquals(expectedName, name.getMethodName());
+        }
+
+        @Test
+        public void x() {
+            assertEquals(expectedName, name.getMethodName());
+        }
+
+        @After
+        public void tearDown() {
+            assertEquals(expectedName, name.getMethodName());
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/RuleChainTest.java Added

@@ -0,0 +1,94 @@
+package org.junit.rules;
+
+import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.rules.RuleChain.outerRule;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.internal.Throwables;
+import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+
+public class RuleChainTest {
+    private static final List<String> LOG = new ArrayList<String>();
+
+    private static class LoggingRule extends TestWatcher {
+        private final String label;
+
+        public LoggingRule(String label) {
+            this.label = label;
+        }
+
+        @Override
+        protected void starting(Description description) {
+            LOG.add("starting " + label);
+        }
+
+        @Override
+        protected void finished(Description description) {
+            LOG.add("finished " + label);
+        }
+    }
+
+    public static class UseRuleChain {
+        @Rule
+        public final RuleChain chain = outerRule(new LoggingRule("outer rule"))
+                .around(new LoggingRule("middle rule")).around(
+                        new LoggingRule("inner rule"));
+
+        @Test
+        public void example() {
+            assertTrue(true);
+        }
+    }
+
+    @Test
+    public void executeRulesInCorrectOrder() throws Exception {
+        testResult(UseRuleChain.class);
+        List<String> expectedLog = asList("starting outer rule",
+                "starting middle rule", "starting inner rule",
+                "finished inner rule", "finished middle rule",
+                "finished outer rule");
+        assertEquals(expectedLog, LOG);
+    }
+
+    @Test
+    public void aroundShouldNotAllowNullRules() {
+        RuleChain chain = RuleChain.emptyRuleChain();
+        try {
+            chain.around(null);
+            fail("around() should not allow null rules");
+        } catch (NullPointerException e) {
+            assertThat(e.getMessage(), equalTo("The enclosed rule must not be null"));
+        }
+    }
+
+    public static class RuleChainWithNullRules {
+        @Rule
+        public final RuleChain chain = outerRule(new LoggingRule("outer rule"))
+                .around(null);
+
+        @Test
+        public void example() {}
+    }
+
+    @Test
+    public void whenRuleChainHasNullRuleTheStacktraceShouldPointToIt() {
+        Result result = JUnitCore.runClasses(RuleChainWithNullRules.class);
+
+        assertThat(result.getFailures().size(), equalTo(1));
+        String stacktrace = Throwables.getStacktrace(result.getFailures().get(0).getException());
+        assertThat(stacktrace, containsString("\tat org.junit.rules.RuleChainTest$RuleChainWithNullRules.<init>(RuleChainTest.java:"));
+    }
+}
\ No newline at end of file

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/RuleMemberValidatorTest.java Added

@@ -0,0 +1,356 @@
+package org.junit.rules;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.internal.runners.rules.RuleMemberValidator.CLASS_RULE_METHOD_VALIDATOR;
+import static org.junit.internal.runners.rules.RuleMemberValidator.CLASS_RULE_VALIDATOR;
+import static org.junit.internal.runners.rules.RuleMemberValidator.RULE_METHOD_VALIDATOR;
+import static org.junit.internal.runners.rules.RuleMemberValidator.RULE_VALIDATOR;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+import org.junit.runners.model.TestClass;
+
+public class RuleMemberValidatorTest {
+    private final List<Throwable> errors = new ArrayList<Throwable>();
+
+    @Test
+    public void rejectProtectedClassRule() {
+        TestClass target = new TestClass(TestWithProtectedClassRule.class);
+        CLASS_RULE_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @ClassRule 'temporaryFolder' must be public.");
+    }
+
+    public static class TestWithProtectedClassRule {
+        @ClassRule
+        protected static TestRule temporaryFolder = new TemporaryFolder();
+    }
+
+    @Test
+    public void rejectNonStaticClassRule() {
+        TestClass target = new TestClass(TestWithNonStaticClassRule.class);
+        CLASS_RULE_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @ClassRule 'temporaryFolder' must be static.");
+    }
+
+    public static class TestWithNonStaticClassRule {
+        @ClassRule
+        public TestRule temporaryFolder = new TemporaryFolder();
+    }
+
+    @Test
+    public void acceptStaticTestRuleThatIsAlsoClassRule() {
+        TestClass target = new TestClass(TestWithStaticClassAndTestRule.class);
+        CLASS_RULE_VALIDATOR.validate(target, errors);
+        assertNumberOfErrors(0);
+    }
+
+    public static class TestWithStaticClassAndTestRule {
+        @ClassRule
+        @Rule
+        public static TestRule temporaryFolder = new TemporaryFolder();
+    }
+
+    @Test
+    public void rejectClassRuleInNonPublicClass() {
+        TestClass target = new TestClass(NonPublicTestWithClassRule.class);
+        CLASS_RULE_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @ClassRule 'temporaryFolder' must be declared in a public class.");
+    }
+
+    static class NonPublicTestWithClassRule {
+        @ClassRule
+        public static TestRule temporaryFolder = new TemporaryFolder();
+    }
+    
+    /**
+     * If there is any property annotated with @ClassRule then it must implement
+     * {@link TestRule}
+     * 
+     * <p>This case has been added with 
+     * <a href="https://github.com/junit-team/junit4/issues/1019">Issue #1019</a>
+     */
+    @Test
+    public void rejectClassRuleThatIsImplementationOfMethodRule() {
+        TestClass target = new TestClass(TestWithClassRuleIsImplementationOfMethodRule.class);
+        CLASS_RULE_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @ClassRule 'classRule' must implement TestRule.");
+    }
+    
+    public static class TestWithClassRuleIsImplementationOfMethodRule {
+        @ClassRule
+        public static MethodRule classRule = new MethodRule() {
+            
+            public Statement apply(Statement base, FrameworkMethod method, Object target) {
+                return base;
+            }
+        };
+    }
+
+    /**
+     * If there is any method annotated with @ClassRule then it must return an 
+     * implementation of {@link TestRule}
+     * 
+     * <p>This case has been added with 
+     * <a href="https://github.com/junit-team/junit4/issues/1019">Issue #1019</a>
+     */
+    @Test
+    public void rejectClassRuleThatReturnsImplementationOfMethodRule() {
+        TestClass target = new TestClass(TestWithClassRuleMethodThatReturnsMethodRule.class);
+        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @ClassRule 'methodRule' must return an implementation of TestRule.");
+    }
+
+    public static class TestWithClassRuleMethodThatReturnsMethodRule {
+        @ClassRule
+        public static MethodRule methodRule() {
+            return new MethodRule() {
+                
+                public Statement apply(Statement base, FrameworkMethod method, Object target) {
+                    return base;
+                }
+            };
+        }
+    }
+    
+    /**
+     * If there is any property annotated with @ClassRule then it must implement
+     * {@link TestRule}
+     * 
+     * <p>This case has been added with 
+     * <a href="https://github.com/junit-team/junit4/issues/1019">Issue #1019</a>
+     */
+    @Test
+    public void rejectClassRuleIsAnArbitraryObject() throws Exception {
+        TestClass target = new TestClass(TestWithClassRuleIsAnArbitraryObject.class);
+        CLASS_RULE_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @ClassRule 'arbitraryObject' must implement TestRule.");
+    }
+
+    public static class TestWithClassRuleIsAnArbitraryObject {
+        @ClassRule
+        public static Object arbitraryObject = 1;
+    }
+    
+    /**
+     * If there is any method annotated with @ClassRule then it must return an 
+     * implementation of {@link TestRule}
+     * 
+     * <p>This case has been added with 
+     * <a href="https://github.com/junit-team/junit4/issues/1019">Issue #1019</a> 
+     */
+    @Test
+    public void rejectClassRuleMethodReturnsAnArbitraryObject() throws Exception {
+        TestClass target = new TestClass(TestWithClassRuleMethodReturnsAnArbitraryObject.class);
+        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @ClassRule 'arbitraryObject' must return an implementation of TestRule.");
+    }
+
+    public static class TestWithClassRuleMethodReturnsAnArbitraryObject {
+        @ClassRule
+        public static Object arbitraryObject() {
+            return 1;
+        }
+    }
+    
+    @Test
+    public void acceptNonStaticTestRule() {
+        TestClass target = new TestClass(TestWithNonStaticTestRule.class);
+        RULE_VALIDATOR.validate(target, errors);
+        assertNumberOfErrors(0);
+    }
+
+    public static class TestWithNonStaticTestRule {
+        @Rule
+        public TestRule temporaryFolder = new TemporaryFolder();
+    }
+
+    @Test
+    public void rejectStaticTestRule() {
+        TestClass target = new TestClass(TestWithStaticTestRule.class);
+        RULE_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @Rule 'temporaryFolder' must not be static or it must be annotated with @ClassRule.");
+    }
+
+    public static class TestWithStaticTestRule {
+        @Rule
+        public static TestRule temporaryFolder = new TemporaryFolder();
+    }
+
+    @Test
+    public void rejectStaticMethodRule() {
+        TestClass target = new TestClass(TestWithStaticMethodRule.class);
+        RULE_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @Rule 'someMethodRule' must not be static.");
+    }
+
+    public static class TestWithStaticMethodRule {
+        @Rule
+        public static MethodRule someMethodRule = new SomeMethodRule();
+    }
+    
+    @Test
+    public void acceptMethodRule() throws Exception {
+        TestClass target = new TestClass(TestWithMethodRule.class);
+        RULE_VALIDATOR.validate(target, errors);
+        assertNumberOfErrors(0);
+    }
+
+    public static class TestWithMethodRule {
+        @Rule
+        public MethodRule temporaryFolder = new MethodRule() {
+            public Statement apply(Statement base, FrameworkMethod method,
+                    Object target) {
+                return null;
+            }
+        };
+    }
+
+    @Test
+    public void rejectArbitraryObjectWithRuleAnnotation() throws Exception {
+        TestClass target = new TestClass(TestWithArbitraryObjectWithRuleAnnotation.class);
+        RULE_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @Rule 'arbitraryObject' must implement MethodRule or TestRule.");
+    }
+
+    public static class TestWithArbitraryObjectWithRuleAnnotation {
+        @Rule
+        public Object arbitraryObject = 1;
+    }
+
+    @Test
+    public void methodRejectProtectedClassRule() {
+        TestClass target = new TestClass(MethodTestWithProtectedClassRule.class);
+        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @ClassRule 'getTemporaryFolder' must be public.");
+    }
+
+    public static class MethodTestWithProtectedClassRule {
+        @ClassRule
+        protected static TestRule getTemporaryFolder() {
+            return new TemporaryFolder();
+        }
+    }
+
+    @Test
+    public void methodRejectNonStaticClassRule() {
+        TestClass target = new TestClass(MethodTestWithNonStaticClassRule.class);
+        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @ClassRule 'getTemporaryFolder' must be static.");
+    }
+
+    public static class MethodTestWithNonStaticClassRule {
+        @ClassRule
+        public TestRule getTemporaryFolder() {
+            return new TemporaryFolder();
+        }
+    }
+
+    @Test
+    public void acceptMethodStaticTestRuleThatIsAlsoClassRule() {
+        TestClass target = new TestClass(MethodTestWithStaticClassAndTestRule.class);
+        CLASS_RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertNumberOfErrors(0);
+    }
+
+    public static class MethodTestWithStaticClassAndTestRule {
+        @ClassRule
+        @Rule
+        public static TestRule getTemporaryFolder() {
+            return new TemporaryFolder();
+        }
+    }
+
+    @Test
+    public void acceptMethodNonStaticTestRule() {
+        TestClass target = new TestClass(TestMethodWithNonStaticTestRule.class);
+        RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertNumberOfErrors(0);
+    }
+
+    public static class TestMethodWithNonStaticTestRule {
+        @Rule
+        public TestRule getTemporaryFolder() {
+            return new TemporaryFolder();
+        }
+    }
+
+    @Test
+    public void rejectMethodStaticTestRule() {
+        TestClass target = new TestClass(TestMethodWithStaticTestRule.class);
+        RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @Rule 'getTemporaryFolder' must not be static or it must be annotated with @ClassRule.");
+    }
+
+    public static class TestMethodWithStaticTestRule {
+        @Rule
+        public static TestRule getTemporaryFolder() {
+            return new TemporaryFolder();
+        }
+    }
+
+    @Test
+    public void rejectMethodStaticMethodRule() {
+        TestClass target = new TestClass(TestMethodWithStaticMethodRule.class);
+        RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @Rule 'getSomeMethodRule' must not be static.");
+    }
+
+    public static class TestMethodWithStaticMethodRule {
+        @Rule
+        public static MethodRule getSomeMethodRule() { return new SomeMethodRule(); }
+    }
+
+    @Test
+    public void methodAcceptMethodRuleMethod() throws Exception {
+        TestClass target = new TestClass(MethodTestWithMethodRule.class);
+        RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertNumberOfErrors(0);
+    }
+
+    public static class MethodTestWithMethodRule {
+        @Rule
+        public MethodRule getTemporaryFolder() {
+            return new MethodRule() {
+                public Statement apply(Statement base, FrameworkMethod method,
+                        Object target) {
+                    return null;
+                }
+            };
+        }
+    }
+
+    @Test
+    public void methodRejectArbitraryObjectWithRuleAnnotation() throws Exception {
+        TestClass target = new TestClass(MethodTestWithArbitraryObjectWithRuleAnnotation.class);
+        RULE_METHOD_VALIDATOR.validate(target, errors);
+        assertOneErrorWithMessage("The @Rule 'getArbitraryObject' must return an implementation of MethodRule or TestRule.");
+    }
+
+    public static class MethodTestWithArbitraryObjectWithRuleAnnotation {
+        @Rule
+        public Object getArbitraryObject() {
+            return 1;
+        }
+    }
+
+    private void assertOneErrorWithMessage(String message) {
+        assertNumberOfErrors(1);
+        assertEquals("Wrong error message:", message, errors.get(0).getMessage());
+    }
+
+    private void assertNumberOfErrors(int numberOfErrors) {
+        assertEquals("Wrong number of errors:", numberOfErrors, errors.size());
+    }
+    
+    private static final class SomeMethodRule implements MethodRule {
+        public Statement apply(Statement base, FrameworkMethod method, Object target) {
+            return base;
+        }
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/rules/StopwatchTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/StopwatchTest.java Changed

@@ -1,24 +1,23 @@
 package org.junit.rules;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
 import java.util.concurrent.TimeUnit;
 
 import org.junit.AssumptionViolatedException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.Stopwatch;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
 import org.junit.runner.Result;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeTrue;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotEquals;
 
 /**
  * @author tibor17
@@ -50,7 +49,7 @@
         }
     }
 
-    public static abstract class AbstractStopwatchTest {
+    public abstract static class AbstractStopwatchTest {
 
         /**
          * Fake implementation of {@link Stopwatch.Clock} that increments the time

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/TempFolderRuleTest.java Added

@@ -0,0 +1,281 @@
+package org.junit.rules;
+
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.failureCountIs;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.junit.After;
+import org.junit.AssumptionViolatedException;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class TempFolderRuleTest {
+    private static File createdFiles = new File20;
+
+    public static class HasTempFolder {
+        @Rule
+        public TemporaryFolder folder = new TemporaryFolder();
+
+        @Test
+        public void testUsingTempFolder() throws IOException {
+            createdFiles0 = folder.newFile("myfile.txt");
+            assertTrue(createdFiles0.exists());
+        }
+
+        @Test
+        public void testTempFolderLocation() throws IOException {
+            File folderRoot = folder.getRoot();
+            String tmpRoot = System.getProperty("java.io.tmpdir");
+            assertTrue(folderRoot.toString().startsWith(tmpRoot));
+        }
+    }
+
+    @Test
+    public void tempFolderIsDeleted() {
+        assertThat(testResult(HasTempFolder.class), isSuccessful());
+        assertFalse(createdFiles0.exists());
+    }
+
+    public static class CreatesSubFolder {
+        @Rule
+        public TemporaryFolder folder = new TemporaryFolder();
+
+        @Test
+        public void testUsingTempFolderStringReflection() throws Exception {
+            String subfolder = "subfolder";
+            String filename = "a.txt";
+            // force usage of folder.newFolder(String),
+            // check is available and works, to avoid a potential NoSuchMethodError with non-recompiled code.
+            Method method = folder.getClass().getMethod("newFolder", new Class<?>{String.class});
+            createdFiles0 = (File) method.invoke(folder, subfolder);
+            new File(createdFiles0, filename).createNewFile();
+
+            File expectedFile = new File(folder.getRoot(), join(subfolder, filename));
+
+            assertTrue(expectedFile.exists());
+        }
+
+        @Test
+        public void testUsingTempFolderString() throws IOException {
+            String subfolder = "subfolder";
+            String filename = "a.txt";
+            // this uses newFolder(String), ensure that a single String works
+            createdFiles0 = folder.newFolder(subfolder);
+            new File(createdFiles0, filename).createNewFile();
+
+            File expectedFile = new File(folder.getRoot(), join(subfolder, filename));
+
+            assertTrue(expectedFile.exists());
+        }
+
+        @Test
+        public void testUsingTempTreeFolders() throws IOException {
+            String subfolder = "subfolder";
+            String anotherfolder = "anotherfolder";
+            String filename = "a.txt";
+
+            createdFiles0 = folder.newFolder(subfolder, anotherfolder);
+            new File(createdFiles0, filename).createNewFile();
+
+            File expectedFile = new File(folder.getRoot(), join(subfolder, anotherfolder, filename));
+
+            assertTrue(expectedFile.exists());
+        }
+
+        private String join(String... folderNames) {
+            StringBuilder path = new StringBuilder();
+            for (String folderName : folderNames) {
+                path.append(File.separator).append(folderName);
+            }
+            return path.toString();
+        }
+    }
+
+    @Test
+    public void subFolderIsDeleted() {
+        assertThat(testResult(CreatesSubFolder.class), isSuccessful());
+        assertFalse(createdFiles0.exists());
+    }
+
+    public static class CreatesRandomSubFolders {
+        @Rule
+        public TemporaryFolder folder = new TemporaryFolder();
+
+        @Test
+        public void testUsingRandomTempFolders() throws IOException {
+            for (int i = 0; i < 20; i++) {
+                File newFolder = folder.newFolder();
+                assertThat(Arrays.asList(createdFiles), not(hasItem(newFolder)));
+                createdFilesi = newFolder;
+                new File(newFolder, "a.txt").createNewFile();
+                assertTrue(newFolder.exists());
+            }
+        }
+    }
+
+    @Test
+    public void randomSubFoldersAreDeleted() {
+        assertThat(testResult(CreatesRandomSubFolders.class), isSuccessful());
+        for (File f : createdFiles) {
+            assertFalse(f.exists());
+        }
+    }
+
+    public static class CreatesRandomFiles {
+        @Rule
+        public TemporaryFolder folder = new TemporaryFolder();
+
+        @Test
+        public void testUsingRandomTempFiles() throws IOException {
+            for (int i = 0; i < 20; i++) {
+                File newFile = folder.newFile();
+                assertThat(Arrays.asList(createdFiles), not(hasItem(newFile)));
+                createdFilesi = newFile;
+                assertTrue(newFile.exists());
+            }
+        }
+    }
+
+    @Test
+    public void randomFilesAreDeleted() {
+        assertThat(testResult(CreatesRandomFiles.class), isSuccessful());
+        for (File f : createdFiles) {
+            assertFalse(f.exists());
+        }
+    }
+
+    @Test
+    public void recursiveDeleteFolderWithOneElement() throws IOException {
+        TemporaryFolder folder = new TemporaryFolder();
+        folder.create();
+        File file = folder.newFile("a");
+        folder.delete();
+        assertFalse(file.exists());
+        assertFalse(folder.getRoot().exists());
+    }
+
+    @Test
+    public void recursiveDeleteFolderWithOneRandomElement() throws IOException {
+        TemporaryFolder folder = new TemporaryFolder();
+        folder.create();
+        File file = folder.newFile();
+        folder.delete();
+        assertFalse(file.exists());
+        assertFalse(folder.getRoot().exists());
+    }
+
+    @Test
+    public void recursiveDeleteFolderWithZeroElements() throws IOException {
+        TemporaryFolder folder = new TemporaryFolder();
+        folder.create();
+        folder.delete();
+        assertFalse(folder.getRoot().exists());
+    }
+
+    @Test
+    public void tempFolderIsOnlyAccessibleByOwner() throws IOException {
+        TemporaryFolder folder = new TemporaryFolder();
+        folder.create();
+
+        Set<String> expectedPermissions = new TreeSet<String>(Arrays.asList("OWNER_READ", "OWNER_WRITE", "OWNER_EXECUTE"));
+        Set<String> actualPermissions = getPosixFilePermissions(folder.getRoot());
+        assertEquals(expectedPermissions, actualPermissions);
+    }
+
+    private Set<String> getPosixFilePermissions(File root) {
+        try {
+            Class<?> pathClass = Class.forName("java.nio.file.Path");
+            Object linkOptionArray = Array.newInstance(Class.forName("java.nio.file.LinkOption"), 0);
+            Class<?> filesClass = Class.forName("java.nio.file.Files");
+            Object path = File.class.getDeclaredMethod("toPath").invoke(root);
+            Method posixFilePermissionsMethod = filesClass.getDeclaredMethod("getPosixFilePermissions", pathClass, linkOptionArray.getClass());
+            Set<?> permissions = (Set<?>) posixFilePermissionsMethod.invoke(null, path, linkOptionArray);
+            SortedSet<String> convertedPermissions = new TreeSet<String>();
+            for (Object item : permissions) {
+                convertedPermissions.add(item.toString());
+            }
+            return convertedPermissions;
+        } catch (Exception e) {
+            throw new AssumptionViolatedException("Test requires at least Java 1.7", e);
+        }
+    }
+
+    public static class NameClashes {
+        @Rule
+        public TemporaryFolder folder = new TemporaryFolder();
+
+        @Test
+        public void fileWithFileClash() throws IOException {
+            folder.newFile("something.txt");
+            folder.newFile("something.txt");
+        }
+
+        @Test
+        public void fileWithFolderTest() throws IOException {
+            folder.newFolder("dummy");
+            folder.newFile("dummy");
+        }
+    }
+
+    @Test
+    public void nameClashesResultInTestFailures() {
+        assertThat(testResult(NameClashes.class), failureCountIs(2));
+    }
+
+    private static final String GET_ROOT_DUMMY = "dummy-getRoot";
+
+    private static final String NEW_FILE_DUMMY = "dummy-newFile";
+
+    private static final String NEW_FOLDER_DUMMY = "dummy-newFolder";
+
+    public static class IncorrectUsage {
+        public TemporaryFolder folder = new TemporaryFolder();
+
+        @Test
+        public void testGetRoot() throws IOException {
+            new File(folder.getRoot(), GET_ROOT_DUMMY).createNewFile();
+        }
+
+        @Test
+        public void testNewFile() throws IOException {
+            folder.newFile(NEW_FILE_DUMMY);
+        }
+
+        @Test
+        public void testNewFolder() throws IOException {
+            folder.newFolder(NEW_FOLDER_DUMMY);
+        }
+    }
+
+    @Test
+    public void incorrectUsageWithoutApplyingTheRuleShouldNotPolluteTheCurrentWorkingDirectory() {
+        assertThat(testResult(IncorrectUsage.class), failureCountIs(3));
+        assertFalse("getRoot should have failed early", new File(GET_ROOT_DUMMY).exists());
+        assertFalse("newFile should have failed early", new File(NEW_FILE_DUMMY).exists());
+        assertFalse("newFolder should have failed early", new File(NEW_FOLDER_DUMMY).exists());
+    }
+
+    @After
+    public void cleanCurrentWorkingDirectory() {
+        new File(GET_ROOT_DUMMY).delete();
+        new File(NEW_FILE_DUMMY).delete();
+        new File(NEW_FOLDER_DUMMY).delete();
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/TemporaryFolderRuleAssuredDeletionTest.java Added

@@ -0,0 +1,45 @@
+package org.junit.rules;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.failureCountIs;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.results.PrintableResult;
+
+public class TemporaryFolderRuleAssuredDeletionTest {
+
+    public static class TestClass {
+        static TemporaryFolder injectedRule;
+
+        @Rule
+        public TemporaryFolder folder = injectedRule;
+
+        @Test
+        public void alwaysPassesButDeletesRootFolder() {
+            //we delete the folder in the test so that it cannot be deleted by
+            //the rule
+            folder.getRoot().delete();
+        }
+    }
+
+    @Test
+    public void testFailsWhenCreatedFolderCannotBeDeletedButDeletionIsAssured() {
+        TestClass.injectedRule = TemporaryFolder.builder()
+                .assureDeletion()
+                .build();
+        PrintableResult result = testResult(TestClass.class);
+        assertThat(result, failureCountIs(1));
+        assertThat(result.toString(), containsString("Unable to clean up temporary folder"));
+    }
+
+    @Test
+    public void byDefaultTestDoesNotFailWhenCreatedFolderCannotBeDeleted() {
+        TestClass.injectedRule = new TemporaryFolder();
+        PrintableResult result = testResult(TestClass.class);
+        assertThat(result, isSuccessful());
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/TemporaryFolderUsageTest.java Added

@@ -0,0 +1,302 @@
+package org.junit.rules;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * <tt>TemporaryFolderUsageTest</tt> provides tests for API usage correctness
+ * and ensure implementation symmetry of public methods against a root folder.
+ */
+public class TemporaryFolderUsageTest {
+
+    private TemporaryFolder tempFolder;
+
+    @Rule
+    public final ExpectedException thrown = ExpectedException.none();
+
+    @Before
+    public void setUp() {
+        tempFolder = new TemporaryFolder();
+    }
+
+    @After
+    public void tearDown() {
+        tempFolder.delete();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void getRootShouldThrowIllegalStateExceptionIfCreateWasNotInvoked() {
+        new TemporaryFolder().getRoot();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void newFileThrowsIllegalStateExceptionIfCreateWasNotInvoked()
+            throws IOException {
+        new TemporaryFolder().newFile();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void newFileWithGivenNameThrowsIllegalStateExceptionIfCreateWasNotInvoked()
+            throws IOException {
+        new TemporaryFolder().newFile("MyFile.txt");
+    }
+
+    @Test
+    public void newFileWithGivenFilenameThrowsIOExceptionIfFileExists() throws IOException {
+        tempFolder.create();
+        tempFolder.newFile("MyFile.txt");
+
+        thrown.expect(IOException.class);
+        thrown.expectMessage("a file with the name 'MyFile.txt' already exists in the test folder");
+        tempFolder.newFile("MyFile.txt");
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void newFolderThrowsIllegalStateExceptionIfCreateWasNotInvoked()
+            throws IOException {
+        new TemporaryFolder().newFolder();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void newFolderWithGivenPathThrowsIllegalStateExceptionIfCreateWasNotInvoked() throws IOException {
+        new TemporaryFolder().newFolder("level1", "level2", "level3");
+    }
+
+    @Test
+    public void newFolderWithGivenFolderThrowsIOExceptionIfFolderExists() throws IOException {
+        tempFolder.create();
+        tempFolder.newFolder("level1");
+
+        thrown.expect(IOException.class);
+        thrown.expectMessage("a folder with the path 'level1' already exists");
+        tempFolder.newFolder("level1");
+    }
+
+    @Test
+    public void newFolderWithGivenFolderThrowsIOExceptionIfFileExists() throws IOException {
+        tempFolder.create();
+        File file = new File(tempFolder.getRoot(), "level1");
+        assertTrue("Could not create" + file, file.createNewFile());
+
+        thrown.expect(IOException.class);
+        thrown.expectMessage("a file with the path 'level1' exists");
+        tempFolder.newFolder("level1");
+    }
+
+    @Test
+    public void newFolderWithGivenFolderThrowsIOExceptionWhenFolderCannotBeCreated() throws IOException {
+        tempFolder.create();
+        assumeTrue("Could not make folder " + tempFolder.getRoot() + " read only.",
+                tempFolder.getRoot().setReadOnly());
+
+        thrown.expect(IOException.class);
+        thrown.expectMessage("could not create a folder with the path 'level1'");
+        tempFolder.newFolder("level1");
+    }
+    
+    @Test
+    public void newFolderWithPathStartingWithFileSeparatorThrowsIOException()
+            throws IOException {
+        String fileAtRoot;
+        File roots = File.listRoots();
+        if (roots != null && roots.length > 0) {
+            fileAtRoot = roots0.getAbsolutePath() + "temp1";
+        } else {
+            fileAtRoot = File.separator + "temp1";
+        }
+        tempFolder.create();
+        thrown.expect(IOException.class);
+        thrown.expectMessage("folder path '" + fileAtRoot + "' is not a relative path");
+        tempFolder.newFolder(fileAtRoot);
+    }
+    
+    @Test
+    public void newFolderWithPathContainingFileSeparatorCreatesDirectories()
+            throws IOException {
+        tempFolder.create();
+        tempFolder.newFolder("temp1" + File.separator + "temp2");
+        File temp1 = new File(tempFolder.getRoot(), "temp1");
+        assertFileIsDirectory(temp1);
+        assertFileIsDirectory(new File(temp1, "temp2"));
+    }
+ 
+    @Test
+    public void newFolderWithPathContainingForwardSlashCreatesDirectories()
+            throws IOException {
+        tempFolder.create();
+        tempFolder.newFolder("temp1/temp2");
+        File temp1 = new File(tempFolder.getRoot(), "temp1");
+        assertFileIsDirectory(temp1);
+        assertFileIsDirectory(new File(temp1, "temp2"));
+    }
+    
+    @Test
+    public void newFolderWithGivenPathThrowsIOExceptionIfFolderExists() throws IOException {
+        tempFolder.create();
+        tempFolder.newFolder("level1", "level2", "level3");
+
+        thrown.expect(IOException.class);
+        String path = "level1" + File.separator + "level2" + File.separator + "level3";
+        thrown.expectMessage("a folder with the path '" + path + "' already exists");
+        tempFolder.newFolder("level1", "level2", "level3");
+    }
+
+    @Test
+    public void newFolderWithGivenEmptyArrayThrowsIllegalArgumentException() throws IOException {
+        tempFolder.create();
+
+        thrown.expect(IllegalArgumentException.class);
+        thrown.expectMessage("must pass at least one path");
+        tempFolder.newFolder(new String0);
+    }
+
+    @Test
+    public void newFolderWithPathsContainingForwardSlashCreatesFullPath()
+            throws IOException {
+        tempFolder.create();
+        tempFolder.newFolder("temp1", "temp2", "temp3/temp4");
+
+        File directory = new File(tempFolder.getRoot(), "temp1");
+        assertFileIsDirectory(directory);
+        directory = new File(directory, "temp2/temp3/temp4");
+        assertFileIsDirectory(directory);
+    }
+
+    @Test
+    public void newFolderWithPathsContainingFileSeparatorCreatesFullPath()
+            throws IOException {
+        tempFolder.create();
+        tempFolder.newFolder("temp1", "temp2", "temp3" + File.separator + "temp4");
+
+        File directory = new File(tempFolder.getRoot(), "temp1");
+        assertFileIsDirectory(directory);
+        directory = new File(directory, "temp2/temp3/temp4");
+        assertFileIsDirectory(directory);
+    }
+    
+    @Test
+    public void createInitializesRootFolder() throws IOException {
+        tempFolder.create();
+        assertFileIsDirectory(tempFolder.getRoot());
+    }
+
+    @Test
+    public void deleteShouldDoNothingIfRootFolderWasNotInitialized() {
+        tempFolder.delete();
+    }
+
+    @Test
+    public void deleteRemovesRootFolder() throws IOException {
+        tempFolder.create();
+        tempFolder.delete();
+        assertFileDoesNotExist(tempFolder.getRoot());
+    }
+
+    @Test
+    public void newRandomFileIsCreatedUnderRootFolder() throws IOException {
+        tempFolder.create();
+
+        File f = tempFolder.newFile();
+        assertFileExists(f);
+        assertFileCreatedUnderRootFolder("Random file", f);
+    }
+
+    @Test
+    public void newNamedFileIsCreatedUnderRootFolder() throws IOException {
+        final String fileName = "SampleFile.txt";
+        tempFolder.create();
+
+        File f = tempFolder.newFile(fileName);
+
+        assertFileExists(f);
+        assertFileCreatedUnderRootFolder("Named file", f);
+        assertThat("file name", f.getName(), equalTo(fileName));
+    }
+
+    @Test
+    public void newRandomFolderIsCreatedUnderRootFolder() throws IOException {
+        tempFolder.create();
+
+        File f = tempFolder.newFolder();
+        assertFileIsDirectory(f);
+        assertFileCreatedUnderRootFolder("Random folder", f);
+    }
+
+    @Test
+    public void newNestedFoldersCreatedUnderRootFolder() throws IOException {
+        tempFolder.create();
+
+        File f = tempFolder.newFolder("top", "middle", "bottom");
+        assertFileIsDirectory(f);
+        assertParentFolderForFileIs(f, new File(tempFolder.getRoot(),
+                "top/middle"));
+        assertParentFolderForFileIs(f.getParentFile(),
+                new File(tempFolder.getRoot(), "top"));
+        assertFileCreatedUnderRootFolder("top", f.getParentFile()
+                .getParentFile());
+    }
+
+    @Test
+    public void canSetTheBaseFileForATemporaryFolder() throws IOException {
+        File tempDir = createTemporaryFolder();
+
+        TemporaryFolder folder = new TemporaryFolder(tempDir);
+        folder.create();
+
+        assertThat(tempDir, is(folder.getRoot().getParentFile()));
+    }
+
+    private File createTemporaryFolder() throws IOException {
+        File tempDir = File.createTempFile("junit", "tempFolder");
+        assertTrue("Unable to delete temporary file", tempDir.delete());
+        assertTrue("Unable to create temp directory", tempDir.mkdir());
+        return tempDir;
+    }
+
+    private void assertFileDoesNotExist(File file) {
+        checkFileExists("exists", file, false);
+    }
+
+    private void checkFileExists(String msg, File file, boolean exists) {
+        assertThat("File is null", file, is(notNullValue()));
+        assertThat("File '" + file.getAbsolutePath() + "' " + msg,
+                file.exists(), is(exists));
+    }
+
+    private void checkFileIsDirectory(String msg, File file, boolean isDirectory) {
+        assertThat("File is null", file, is(notNullValue()));
+        assertThat("File '" + file.getAbsolutePath() + "' " + msg,
+                file.isDirectory(), is(isDirectory));
+    }
+
+    private void assertFileExists(File file) {
+        checkFileExists("does not exist", file, true);
+        checkFileIsDirectory("is a directory", file, false);
+    }
+
+    private void assertFileIsDirectory(File file) {
+        checkFileExists("does not exist", file, true);
+        checkFileIsDirectory("is not a directory", file, true);
+    }
+
+    private void assertFileCreatedUnderRootFolder(String msg, File f) {
+        assertParentFolderForFileIs(f, tempFolder.getRoot());
+    }
+
+    private void assertParentFolderForFileIs(File f, File parentFolder) {
+        assertThat("'" + f.getAbsolutePath() + "': not under root",
+                f.getParentFile(), is(parentFolder));
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/TestRuleTest.java Added

@@ -0,0 +1,610 @@
+package org.junit.rules;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+public class TestRuleTest {
+    private static boolean wasRun;
+
+    public static class ExampleTest {
+        @Rule
+        public TestRule example = new TestRule() {
+            public Statement apply(final Statement base, Description description) {
+                return new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        wasRun = true;
+                        base.evaluate();
+                    }
+                };
+            }
+        };
+
+        @Test
+        public void nothing() {
+
+        }
+    }
+
+    @Test
+    public void ruleIsIntroducedAndEvaluated() {
+        wasRun = false;
+        JUnitCore.runClasses(ExampleTest.class);
+        assertTrue(wasRun);
+    }
+
+    public static class BothKindsOfRule implements TestRule, org.junit.rules.MethodRule {
+        public int applications = 0;
+
+        public Statement apply(Statement base, FrameworkMethod method,
+                Object target) {
+            applications++;
+            return base;
+        }
+
+        public Statement apply(Statement base, Description description) {
+            applications++;
+            return base;
+        }
+    }
+
+    public static class OneFieldTwoKindsOfRule {
+        @Rule
+        public BothKindsOfRule both = new BothKindsOfRule();
+
+        @Test
+        public void onlyOnce() {
+            assertEquals(1, both.applications);
+        }
+    }
+
+
+    @Test
+    public void onlyApplyOnceEvenIfImplementsBothInterfaces() {
+        assertTrue(JUnitCore.runClasses(OneFieldTwoKindsOfRule.class).wasSuccessful());
+    }
+
+    public static class SonOfExampleTest extends ExampleTest {
+
+    }
+
+    @Test
+    public void ruleIsIntroducedAndEvaluatedOnSubclass() {
+        wasRun = false;
+        JUnitCore.runClasses(SonOfExampleTest.class);
+        assertTrue(wasRun);
+    }
+
+    private static int runCount;
+
+    public static class MultipleRuleTest {
+        private static class Increment implements TestRule {
+            public Statement apply(final Statement base, Description description) {
+                return new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        runCount++;
+                        base.evaluate();
+                    }
+                };
+            }
+        }
+
+        @Rule
+        public TestRule incrementor1 = new Increment();
+
+        @Rule
+        public TestRule incrementor2 = new Increment();
+
+        @Test
+        public void nothing() {
+
+        }
+    }
+
+    @Test
+    public void multipleRulesAreRun() {
+        runCount = 0;
+        JUnitCore.runClasses(MultipleRuleTest.class);
+        assertEquals(2, runCount);
+    }
+
+    public static class NoRulesTest {
+        public int x;
+
+        @Test
+        public void nothing() {
+
+        }
+    }
+
+    @Test
+    public void ignoreNonRules() {
+        Result result = JUnitCore.runClasses(NoRulesTest.class);
+        assertEquals(0, result.getFailureCount());
+    }
+
+    private static String log;
+
+    public static class BeforesAndAfters {
+        private static StringBuilder watchedLog = new StringBuilder();
+
+        @Before
+        public void before() {
+            watchedLog.append("before ");
+        }
+
+        @Rule
+        public TestRule watcher = new LoggingTestWatcher(watchedLog);
+
+        @After
+        public void after() {
+            watchedLog.append("after ");
+        }
+
+        @Test
+        public void succeeds() {
+            watchedLog.append("test ");
+        }
+    }
+
+    @Test
+    public void beforesAndAfters() {
+        BeforesAndAfters.watchedLog = new StringBuilder();
+        JUnitCore.runClasses(BeforesAndAfters.class);
+        assertThat(BeforesAndAfters.watchedLog.toString(),
+                is("starting before test after succeeded finished "));
+    }
+
+    public static class WrongTypedField {
+        @Rule
+        public int x = 5;
+
+        @Test
+        public void foo() {
+        }
+    }
+
+    @Test
+    public void validateWrongTypedField() {
+        assertThat(testResult(WrongTypedField.class),
+                hasSingleFailureContaining("must implement MethodRule"));
+    }
+
+    public static class SonOfWrongTypedField extends WrongTypedField {
+
+    }
+
+    @Test
+    public void validateWrongTypedFieldInSuperclass() {
+        assertThat(testResult(SonOfWrongTypedField.class),
+                hasSingleFailureContaining("must implement MethodRule"));
+    }
+
+    public static class PrivateRule {
+        @Rule
+        private TestRule rule = new TestName();
+
+        @Test
+        public void foo() {
+        }
+    }
+
+    @Test
+    public void validatePrivateRule() {
+        assertThat(testResult(PrivateRule.class),
+                hasSingleFailureContaining("must be public"));
+    }
+
+    public static class CustomTestName implements TestRule {
+        public String name = null;
+
+        public Statement apply(final Statement base, final Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    name = description.getMethodName();
+                    base.evaluate();
+                }
+            };
+        }
+    }
+
+    public static class UsesCustomMethodRule {
+        @Rule
+        public CustomTestName counter = new CustomTestName();
+
+        @Test
+        public void foo() {
+            assertEquals("foo", counter.name);
+        }
+    }
+
+    @Test
+    public void useCustomMethodRule() {
+        assertThat(testResult(UsesCustomMethodRule.class), isSuccessful());
+    }
+
+    public static class MethodExampleTest {
+        private TestRule example = new TestRule() {
+            public Statement apply(final Statement base, Description description) {
+                return new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        wasRun = true;
+                        base.evaluate();
+                    }
+                };
+            }
+        };
+
+        @Rule
+        public TestRule getExample() {
+            return example;
+        }
+
+        @Test
+        public void nothing() {
+
+        }
+    }
+
+    @Test
+    public void methodRuleIsIntroducedAndEvaluated() {
+        wasRun = false;
+        JUnitCore.runClasses(MethodExampleTest.class);
+        assertTrue(wasRun);
+    }
+
+    public static class MethodBothKindsOfRule implements TestRule, org.junit.rules.MethodRule {
+        public int applications = 0;
+
+        public Statement apply(Statement base, FrameworkMethod method,
+                Object target) {
+            applications++;
+            return base;
+        }
+
+        public Statement apply(Statement base, Description description) {
+            applications++;
+            return base;
+        }
+    }
+
+    public static class MethodOneFieldTwoKindsOfRule {
+        private MethodBothKindsOfRule both = new MethodBothKindsOfRule();
+
+        @Rule
+        public MethodBothKindsOfRule getBoth() {
+            return both;
+        }
+
+        @Test
+        public void onlyOnce() {
+            assertEquals(1, both.applications);
+        }
+    }
+
+
+    @Test
+    public void methodOnlyApplyOnceEvenIfImplementsBothInterfaces() {
+        assertTrue(JUnitCore.runClasses(MethodOneFieldTwoKindsOfRule.class).wasSuccessful());
+    }
+
+    public static class MethodSonOfExampleTest extends MethodExampleTest {
+
+    }
+
+    @Test
+    public void methodRuleIsIntroducedAndEvaluatedOnSubclass() {
+        wasRun = false;
+        JUnitCore.runClasses(MethodSonOfExampleTest.class);
+        assertTrue(wasRun);
+    }
+
+    public static class MethodMultipleRuleTest {
+        private static class Increment implements TestRule {
+            public Statement apply(final Statement base, Description description) {
+                return new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        runCount++;
+                        base.evaluate();
+                    }
+                };
+            }
+        }
+
+        private TestRule incrementor1 = new Increment();
+
+        @Rule
+        public TestRule getIncrementor1() {
+            return incrementor1;
+        }
+
+        private TestRule incrementor2 = new Increment();
+
+        @Rule
+        public TestRule getIncrementor2() {
+            return incrementor2;
+        }
+
+        @Test
+        public void nothing() {
+
+        }
+    }
+
+    @Test
+    public void methodMultipleRulesAreRun() {
+        runCount = 0;
+        JUnitCore.runClasses(MethodMultipleRuleTest.class);
+        assertEquals(2, runCount);
+    }
+
+    public static class MethodNoRulesTest {
+        public int x;
+
+        @Test
+        public void nothing() {
+
+        }
+    }
+
+    @Test
+    public void methodIgnoreNonRules() {
+        Result result = JUnitCore.runClasses(MethodNoRulesTest.class);
+        assertEquals(0, result.getFailureCount());
+    }
+
+    public static class BeforesAndAftersAreEnclosedByRule {
+        private static StringBuilder log;
+
+        @Rule
+        public TestRule watcher = new LoggingTestWatcher(log);
+
+        @Before
+        public void before() {
+            log.append("before ");
+        }
+
+        @After
+        public void after() {
+            log.append("after ");
+        }
+
+        @Test
+        public void succeeds() {
+            log.append("test ");
+        }
+    }
+
+    @Test
+    public void beforesAndAftersAreEnclosedByRule() {
+        BeforesAndAftersAreEnclosedByRule.log = new StringBuilder();
+        JUnitCore.runClasses(BeforesAndAftersAreEnclosedByRule.class);
+        assertEquals("starting before test after succeeded finished ",
+                BeforesAndAftersAreEnclosedByRule.log.toString());
+    }
+
+    public static class MethodWrongTypedField {
+        @Rule
+        public int getX() {
+            return 5;
+        }
+
+        @Test
+        public void foo() {
+        }
+    }
+
+    @Test
+    public void methodValidateWrongTypedField() {
+        assertThat(testResult(MethodWrongTypedField.class),
+                hasSingleFailureContaining("must return an implementation of MethodRule"));
+    }
+
+    public static class MethodSonOfWrongTypedField extends MethodWrongTypedField {
+
+    }
+
+    @Test
+    public void methodValidateWrongTypedFieldInSuperclass() {
+        assertThat(testResult(MethodSonOfWrongTypedField.class),
+                hasSingleFailureContaining("must return an implementation of MethodRule"));
+    }
+
+    public static class MethodPrivateRule {
+        @Rule
+        private TestRule getRule() {
+            return new TestName();
+        }
+
+        @Test
+        public void foo() {
+        }
+    }
+
+    @Test
+    public void methodValidatePrivateRule() {
+        assertThat(testResult(MethodPrivateRule.class),
+                hasSingleFailureContaining("must be public"));
+    }
+
+    public static class MethodUsesCustomMethodRule {
+        private CustomTestName counter = new CustomTestName();
+
+        @Rule
+        public CustomTestName getCounter() {
+            return counter;
+        }
+
+        @Test
+        public void foo() {
+            assertEquals("foo", counter.name);
+        }
+    }
+
+    @Test
+    public void methodUseCustomMethodRule() {
+        assertThat(testResult(MethodUsesCustomMethodRule.class), isSuccessful());
+    }
+
+    private static final List<String> orderList = new LinkedList<String>();
+
+    private static class OrderTestRule implements TestRule {
+        private String name;
+
+        public OrderTestRule(String name) {
+            this.name = name;
+        }
+
+        public Statement apply(final Statement base, final Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    orderList.add(name);
+                    base.evaluate();
+                }
+            };
+        }
+    }
+
+    public static class UsesFieldAndMethodRule {
+        @Rule
+        public OrderTestRule orderMethod() {
+            return new OrderTestRule("orderMethod");
+        }
+
+        @Rule
+        public OrderTestRule orderField = new OrderTestRule("orderField");
+
+        @Test
+        public void foo() {
+            assertEquals("orderField", orderList.get(0));
+            assertEquals("orderMethod", orderList.get(1));
+        }
+    }
+
+    @Test
+    public void usesFieldAndMethodRule() {
+        orderList.clear();
+        assertThat(testResult(UsesFieldAndMethodRule.class), isSuccessful());
+    }
+
+    public static class CallMethodOnlyOnceRule {
+        int countOfMethodCalls = 0;
+
+        private static class Dummy implements TestRule {
+            public Statement apply(final Statement base, Description description) {
+                return new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        base.evaluate();
+                    }
+                };
+            }
+        }
+
+        @Rule
+        public Dummy both() {
+            countOfMethodCalls++;
+            return new Dummy();
+        }
+
+        @Test
+        public void onlyOnce() {
+            assertEquals(1, countOfMethodCalls);
+        }
+    }
+
+    @Test
+    public void testCallMethodOnlyOnceRule() {
+        assertTrue(JUnitCore.runClasses(CallMethodOnlyOnceRule.class).wasSuccessful());
+    }
+
+    private static final StringBuilder ruleLog = new StringBuilder();
+
+    public static class TestRuleIsAroundMethodRule {
+        @Rule
+        public final MethodRule z = new LoggingMethodRule(ruleLog, "methodRule");
+
+        @Rule
+        public final TestRule a = new LoggingTestRule(ruleLog, "testRule");
+
+        @Test
+        public void foo() {
+            ruleLog.append(" foo");
+        }
+    }
+
+    @Test
+    public void testRuleIsAroundMethodRule() {
+        ruleLog.setLength(0);
+        Result result = JUnitCore.runClasses(TestRuleIsAroundMethodRule.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(" testRule.begin methodRule.begin foo methodRule.end testRule.end",
+                ruleLog.toString());
+    }
+
+    public static class TestRuleOrdering {
+        @Rule(order = 1)
+        public final TestRule a = new LoggingTestRule(ruleLog, "outer");
+
+        @Rule(order = 2)
+        public final TestRule z = new LoggingTestRule(ruleLog, "inner");
+
+        @Test
+        public void foo() {
+            ruleLog.append(" foo");
+        }
+    }
+
+    @Test
+    public void testRuleOrdering() {
+        ruleLog.setLength(0);
+        Result result = JUnitCore.runClasses(TestRuleOrdering.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(" outer.begin inner.begin foo inner.end outer.end", ruleLog.toString());
+    }
+
+    public static class TestRuleOrderingWithMethodRule {
+        @Rule(order = 1)
+        public final MethodRule z = new LoggingMethodRule(ruleLog, "methodRule");
+
+        @Rule(order = 2)
+        public final TestRule a = new LoggingTestRule(ruleLog, "testRule");
+
+        @Test
+        public void foo() {
+            ruleLog.append(" foo");
+        }
+    }
+
+    @Test
+    public void testRuleOrderingWithMethodRule() {
+        ruleLog.setLength(0);
+        Result result = JUnitCore.runClasses(TestRuleOrderingWithMethodRule.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(" methodRule.begin testRule.begin foo testRule.end methodRule.end",
+                ruleLog.toString());
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/TestWatcherTest.java Added

@@ -0,0 +1,397 @@
+package org.junit.rules;
+
+import static java.util.Arrays.asList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.failureCountIs;
+import static org.junit.experimental.results.ResultMatchers.hasFailureContaining;
+import static org.junit.rules.ExpectedException.none;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.results.PrintableResult;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.internal.AssumptionViolatedException;
+import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.model.Statement;
+
+import java.util.List;
+
+@RunWith(Enclosed.class)
+public class TestWatcherTest {
+
+    @RunWith(Parameterized.class)
+    public static class Callbacks {
+
+        @Parameters(name = "{0}")
+        public static Object parameters() {
+            return new Object {
+                    {
+                        FailingTest.class,
+                        "starting failed finished ",
+                        asList("starting failed", "test failed", "failed failed", "finished failed") },
+                    {
+                        InternalViolatedAssumptionTest.class,
+                        "starting deprecated skipped finished ",
+                        asList("starting failed", "don't run", "deprecated skipped failed", "finished failed") },
+                    {
+                        SuccessfulTest.class,
+                        "starting succeeded finished ",
+                        asList("starting failed", "succeeded failed", "finished failed") },
+                    {
+                        ViolatedAssumptionTest.class,
+                        "starting skipped finished ",
+                        asList("starting failed", "Test could not be skipped due to other failures", "skipped failed", "finished failed") }
+            };
+        }
+
+        @Parameter(0)
+        public Class<?> testClass;
+
+        @Parameter(1)
+        public String expectedCallbacks;
+
+        @Parameter(2)
+        public List<String> expectedFailures;
+
+        private static TestRule selectedRule; //for injecting rule into test classes
+
+        @Test
+        public void correctCallbacksCalled() {
+            StringBuilder log = new StringBuilder();
+            selectedRule = new LoggingTestWatcher(log);
+            JUnitCore.runClasses(testClass);
+            assertEquals(expectedCallbacks, log.toString());
+        }
+
+        @Test
+        public void resultHasAllFailuresThrownByCallbacks() {
+            selectedRule = new ErroneousTestWatcher();
+            PrintableResult result = testResult(testClass);
+            assertThat(result, failureCountIs(expectedFailures.size()));
+            for (String expectedFailure: expectedFailures) {
+                assertThat(result, hasFailureContaining(expectedFailure));
+            }
+        }
+
+        @Test
+        public void testWatcherDoesNotModifyResult() {
+            selectedRule = new NoOpRule();
+            Result resultNoOpRule = JUnitCore.runClasses(testClass);
+            selectedRule = new LoggingTestWatcher(new StringBuilder());
+            Result resultTestWatcher = JUnitCore.runClasses(testClass);
+            assertEquals(
+                    "was successful",
+                    resultNoOpRule.wasSuccessful(),
+                    resultTestWatcher.wasSuccessful());
+            assertEquals(
+                    "failure count",
+                    resultNoOpRule.getFailureCount(),
+                    resultTestWatcher.getFailureCount());
+            assertEquals(
+                    "ignore count",
+                    resultNoOpRule.getIgnoreCount(),
+                    resultTestWatcher.getIgnoreCount());
+            assertEquals(
+                    "run count",
+                    resultNoOpRule.getRunCount(),
+                    resultTestWatcher.getRunCount());
+        }
+
+        private static class NoOpRule implements TestRule {
+            public Statement apply(Statement base, Description description) {
+                return base;
+            }
+        }
+
+        private static class ErroneousTestWatcher extends TestWatcher {
+            @Override
+            protected void succeeded(Description description) {
+                throw new RuntimeException("succeeded failed");
+            }
+
+            @Override
+            protected void failed(Throwable e, Description description) {
+                throw new RuntimeException("failed failed");
+            }
+
+            @Override
+            protected void skipped(org.junit.AssumptionViolatedException e, Description description) {
+                throw new RuntimeException("skipped failed");
+            }
+
+            @Override
+            @SuppressWarnings("deprecation")
+            protected void skipped(AssumptionViolatedException e, Description description) {
+                throw new RuntimeException("deprecated skipped failed");
+            }
+
+            @Override
+            protected void starting(Description description) {
+                throw new RuntimeException("starting failed");
+            }
+
+            @Override
+            protected void finished(Description description) {
+                throw new RuntimeException("finished failed");
+            }
+        }
+
+        public static class FailingTest {
+            @Rule
+            public TestRule rule = selectedRule;
+
+            @Test
+            public void test() {
+                fail("test failed");
+            }
+        }
+
+        public static class InternalViolatedAssumptionTest {
+            @Rule
+            public TestRule watcher = selectedRule;
+
+            @SuppressWarnings("deprecation")
+            @Test
+            public void test() {
+                throw new AssumptionViolatedException("don't run");
+            }
+        }
+
+        public static class SuccessfulTest {
+            @Rule
+            public TestRule watcher = selectedRule;
+
+            @Test
+            public void test() {
+            }
+        }
+
+        public static class ViolatedAssumptionTest {
+            @Rule
+            public TestRule watcher = selectedRule;
+
+            @Test
+            public void test() {
+                assumeTrue(false);
+            }
+        }
+    }
+
+    public static class CallbackArguments {
+
+        public static class Succeeded {
+            private static Description catchedDescription;
+
+            @Rule
+            public final TestRule watcher = new TestWatcher() {
+                @Override
+                protected void succeeded(Description description) {
+                    catchedDescription = description;
+                }
+            };
+
+            @Test
+            public void test() {
+            }
+        }
+
+        @Test
+        public void succeeded() {
+            JUnitCore.runClasses(Succeeded.class);
+            assertEquals("test(org.junit.rules.TestWatcherTest$CallbackArguments$Succeeded)",
+                    Succeeded.catchedDescription.getDisplayName());
+        }
+
+        public static class Failed {
+            private static Description catchedDescription;
+            private static Throwable catchedThrowable;
+
+            @Rule
+            public final TestRule watcher = new TestWatcher() {
+                @Override
+                protected void failed(Throwable e, Description description) {
+                    catchedDescription = description;
+                    catchedThrowable = e;
+                }
+            };
+
+            @Test
+            public void test() {
+                fail("test failed");
+            }
+        }
+
+        @Test
+        public void failed() {
+            JUnitCore.runClasses(Failed.class);
+            assertEquals("test failed", Failed.catchedThrowable.getMessage());
+            assertEquals(AssertionError.class, Failed.catchedThrowable.getClass());
+            assertEquals("test(org.junit.rules.TestWatcherTest$CallbackArguments$Failed)",
+                    Failed.catchedDescription.getDisplayName());
+        }
+
+        public static class Skipped {
+            private static Description catchedDescription;
+            private static org.junit.AssumptionViolatedException catchedException;
+
+            @Rule
+            public final TestRule watcher = new TestWatcher() {
+                @Override
+                protected void skipped(org.junit.AssumptionViolatedException e, Description description) {
+                    catchedDescription = description;
+                    catchedException = e;
+                }
+            };
+
+            @Test
+            public void test() {
+                assumeTrue("test skipped", false);
+            }
+        }
+
+        @Test
+        public void skipped() {
+            JUnitCore.runClasses(Skipped.class);
+            assertEquals("test skipped", Skipped.catchedException.getMessage());
+            assertEquals(org.junit.AssumptionViolatedException.class, Skipped.catchedException.getClass());
+            assertEquals("test(org.junit.rules.TestWatcherTest$CallbackArguments$Skipped)",
+                    Skipped.catchedDescription.getDisplayName());
+        }
+
+        public static class DeprecatedSkipped {
+            private static Description catchedDescription;
+            private static AssumptionViolatedException catchedException;
+
+            @Rule
+            public final TestRule watcher = new TestWatcher() {
+                @Override
+                @SuppressWarnings("deprecation")
+                protected void skipped(AssumptionViolatedException e, Description description) {
+                    catchedDescription = description;
+                    catchedException = e;
+                }
+            };
+
+            @SuppressWarnings("deprecation")
+            @Test
+            public void test() {
+                throw new AssumptionViolatedException("test skipped");
+            }
+        }
+
+        @Test
+        public void deprecatedSkipped() {
+            JUnitCore.runClasses(DeprecatedSkipped.class);
+            assertEquals("test skipped", DeprecatedSkipped.catchedException.getMessage());
+            assertEquals(AssumptionViolatedException.class, DeprecatedSkipped.catchedException.getClass());
+            assertEquals("test(org.junit.rules.TestWatcherTest$CallbackArguments$DeprecatedSkipped)",
+                    DeprecatedSkipped.catchedDescription.getDisplayName());
+        }
+
+        public static class Starting {
+            private static Description catchedDescription;
+
+            @Rule
+            public final TestRule watcher = new TestWatcher() {
+                @Override
+                protected void starting(Description description) {
+                    catchedDescription = description;
+                }
+            };
+
+            @Test
+            public void test() {
+            }
+        }
+
+        @Test
+        public void starting() {
+            JUnitCore.runClasses(Starting.class);
+            assertEquals("test(org.junit.rules.TestWatcherTest$CallbackArguments$Starting)",
+                    Starting.catchedDescription.getDisplayName());
+        }
+
+        public static class Finished {
+            private static Description catchedDescription;
+
+            @Rule
+            public final TestRule watcher = new TestWatcher() {
+                @Override
+                protected void finished(Description description) {
+                    catchedDescription = description;
+                }
+            };
+
+            @Test
+            public void test() {
+            }
+        }
+
+        @Test
+        public void finished() {
+            JUnitCore.runClasses(Finished.class);
+            assertEquals("test(org.junit.rules.TestWatcherTest$CallbackArguments$Finished)",
+                    Finished.catchedDescription.getDisplayName());
+        }
+    }
+
+    //The following tests check the information in TestWatcher's Javadoc
+    //regarding interplay with other rules.
+    public static class InterplayWithOtherRules {
+        private static StringBuilder log;
+
+        public static class ExpectedExceptionTest {
+            @Rule(order = Integer.MIN_VALUE)
+            //the field name must be alphabetically lower than "thrown" in order
+            //to make the test failing if order is not set
+            public final TestRule a = new LoggingTestWatcher(log);
+
+            @Rule
+            public final ExpectedException thrown = none();
+
+            @Test
+            public void testWithExpectedException() {
+                thrown.expect(RuntimeException.class);
+                throw new RuntimeException("expected exception");
+            }
+        }
+
+        @Test
+        public void expectedExceptionIsSeenAsSuccessfulTest() {
+            log = new StringBuilder();
+            JUnitCore.runClasses(ExpectedExceptionTest.class);
+            assertEquals("starting succeeded finished ", log.toString());
+        }
+
+        public static class ErrorCollectorTest {
+            @Rule(order = Integer.MIN_VALUE)
+            //the field name must be alphabetically lower than "collector" in
+            //order to make the test failing if order is not set
+            public final TestRule a = new LoggingTestWatcher(log);
+
+            @Rule
+            public final ErrorCollector collector = new ErrorCollector();
+
+            @Test
+            public void test() {
+                collector.addError(new RuntimeException("expected exception"));
+            }
+        }
+
+        @Test
+        public void testIsSeenAsFailedBecauseOfCollectedError() {
+            log = new StringBuilder();
+            JUnitCore.runClasses(ErrorCollectorTest.class);
+            assertEquals("starting failed finished ", log.toString());
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/TestWatchmanTest.java Added

@@ -0,0 +1,90 @@
+package org.junit.rules;
+
+import static junit.framework.Assert.fail;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assume.assumeTrue;
+import static org.junit.runner.JUnitCore.runClasses;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runners.model.FrameworkMethod;
+
+@SuppressWarnings("deprecation")
+public class TestWatchmanTest {
+    public static class ViolatedAssumptionTest {
+        static StringBuilder log;
+
+        @BeforeClass
+        public static void initLog() {
+            log = new StringBuilder();
+        }
+
+        @Rule
+        public LoggingTestWatchman watchman = new LoggingTestWatchman(log);
+
+        @Test
+        public void succeeds() {
+            assumeTrue(false);
+        }
+    }
+
+    @Test
+    public void neitherLogSuccessNorFailedForViolatedAssumption() {
+        runClasses(ViolatedAssumptionTest.class);
+        assertThat(ViolatedAssumptionTest.log.toString(),
+                is("starting finished "));
+    }
+
+    public static class FailingTest {
+        static StringBuilder log;
+
+        @BeforeClass
+        public static void initLog() {
+            log = new StringBuilder();
+        }
+
+        @Rule
+        public LoggingTestWatchman watchman = new LoggingTestWatchman(log);
+
+        @Test
+        public void succeeds() {
+            fail();
+        }
+    }
+
+    @Test
+    public void logFailingTest() {
+        runClasses(FailingTest.class);
+        assertThat(FailingTest.log.toString(),
+                is("starting failed finished "));
+    }
+
+    private static class LoggingTestWatchman extends TestWatchman {
+        private final StringBuilder log;
+
+        private LoggingTestWatchman(StringBuilder log) {
+            this.log = log;
+        }
+
+        @Override
+        public void succeeded(FrameworkMethod method) {
+            log.append("succeeded ");
+        }
+
+        @Override
+        public void failed(Throwable e, FrameworkMethod method) {
+            log.append("failed ");
+        }
+
+        @Override
+        public void starting(FrameworkMethod method) {
+            log.append("starting ");
+        }
+
+        @Override
+        public void finished(FrameworkMethod method) {
+            log.append("finished ");
+        }
+    }
+}
\ No newline at end of file

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/TimeoutRuleTest.java Added

@@ -0,0 +1,162 @@
+package org.junit.rules;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+
+public class TimeoutRuleTest {
+    private static final ReentrantLock run1Lock = new ReentrantLock();
+
+    private static volatile boolean run4done = false;
+
+    public abstract static class AbstractTimeoutTest {
+        public static final StringBuffer logger = new StringBuffer();
+
+        @Rule
+        public final TemporaryFolder tmpFile = new TemporaryFolder();
+
+        @Test
+        public void run1() throws InterruptedException {
+            logger.append("run1");
+            TimeoutRuleTest.run1Lock.lockInterruptibly();
+            TimeoutRuleTest.run1Lock.unlock();
+        }
+
+        @Test
+        public void run2() throws InterruptedException {
+            logger.append("run2");
+            Thread.currentThread().join();
+        }
+
+        @Test
+        public synchronized void run3() throws InterruptedException {
+            logger.append("run3");
+            wait();
+        }
+
+        @Test
+        public void run4() {
+            logger.append("run4");
+            while (!run4done) {
+            }
+        }
+
+        @Test
+        public void run5() throws IOException {
+            logger.append("run5");
+            Random rnd = new Random();
+            byte data = new byte1024;
+            File tmp = tmpFile.newFile();
+            while (true) {
+                RandomAccessFile randomAccessFile = new RandomAccessFile(tmp, "rw");
+                try {
+                    FileChannel channel = randomAccessFile.getChannel();
+                    rnd.nextBytes(data);
+                    ByteBuffer buffer = ByteBuffer.wrap(data);
+                    // Interrupted thread closes channel and throws ClosedByInterruptException.
+                    channel.write(buffer);
+                } finally {
+                    randomAccessFile.close();
+                }
+                tmp.delete();
+            }
+        }
+
+        @Test
+        public void run6() throws InterruptedIOException {
+            logger.append("run6");
+            // Java IO throws InterruptedIOException only on SUN machines.
+            throw new InterruptedIOException();
+        }
+    }
+
+    public static class HasGlobalLongTimeout extends AbstractTimeoutTest {
+
+        @Rule
+        public final TestRule globalTimeout = Timeout.millis(200);
+    }
+
+    public static class HasGlobalTimeUnitTimeout extends AbstractTimeoutTest {
+
+        @Rule
+        public final TestRule globalTimeout = new Timeout(200, TimeUnit.MILLISECONDS);
+    }
+    
+    public static class HasNullTimeUnit {
+
+        @Rule
+        public final TestRule globalTimeout = new Timeout(200, null);
+        
+        @Test
+        public void wouldPass() {
+        }
+    }
+
+    @Before
+    public void before() {
+        run4done = false;
+        run1Lock.lock();
+    }
+
+    @After
+    public void after() {
+        // set run4done to make sure that the thread won't continue at run4()
+        run4done = true;
+        run1Lock.unlock();
+    }
+
+    @Test
+    public void timeUnitTimeout() {
+        HasGlobalTimeUnitTimeout.logger.setLength(0);
+        Result result = JUnitCore.runClasses(HasGlobalTimeUnitTimeout.class);
+        assertEquals(6, result.getFailureCount());
+        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run1"));
+        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run2"));
+        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run3"));
+        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run4"));
+        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run5"));
+        assertThat(HasGlobalTimeUnitTimeout.logger.toString(), containsString("run6"));
+    }
+
+    @Test
+    public void longTimeout() {
+        HasGlobalLongTimeout.logger.setLength(0);
+        Result result = JUnitCore.runClasses(HasGlobalLongTimeout.class);
+        assertEquals(6, result.getFailureCount());
+        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run1"));
+        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run2"));
+        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run3"));
+        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run4"));
+        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run5"));
+        assertThat(HasGlobalLongTimeout.logger.toString(), containsString("run6"));
+    }
+
+    @Test
+    public void nullTimeUnit() {
+        Result result = JUnitCore.runClasses(HasNullTimeUnit.class);
+        assertEquals(1, result.getFailureCount());
+        Failure failure = result.getFailures().get(0);
+        assertThat(failure.getException().getMessage(),
+                containsString("Invalid parameters for Timeout"));
+        Throwable cause = failure.getException().getCause();
+        assertThat(cause.getMessage(), containsString("TimeUnit cannot be null"));
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/rules/VerifierRuleTest.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runner/AllRunnerTests.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runner/OrderWithValidatorTest.java Added

@@ -0,0 +1,50 @@
+package org.junit.runner;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.List;
+
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.manipulation.Alphanumeric;
+import org.junit.runners.JUnit4;
+import org.junit.runners.MethodSorters;
+import org.junit.runners.model.TestClass;
+
+public class OrderWithValidatorTest {
+    private final OrderWithValidator validator = new OrderWithValidator();
+
+    @RunWith(JUnit4.class)
+    @OrderWith(Alphanumeric.class)
+    public static class TestWithNoValidationErrors {
+        @Test
+        public void passes() {}
+    }
+
+    @RunWith(JUnit4.class)
+    @OrderWith(Alphanumeric.class)
+    @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+    public static class TestAnnotatedWithFixMethodOrder {
+        @Test
+        public void passes() {}
+    }
+
+    @Test
+    public void noErrorIsAddedForTestWithoutValdationErrors() {
+        List<Exception> errors = validator.validateAnnotatedClass(
+                new TestClass(TestWithNoValidationErrors.class));
+        
+        assertThat(errors.size(), is(0));
+    }
+ 
+    @Test
+    public void errorIsAddedWhenTestAnnotatedWithFixMethodOrder() {
+        List<Exception> errors = validator.validateAnnotatedClass(
+                new TestClass(TestAnnotatedWithFixMethodOrder.class));
+        
+        assertThat(errors.size(), is(1));
+        Exception exception = errors.get(0);
+        assertThat(exception.getMessage(), is("@FixMethodOrder cannot be combined with @OrderWith"));
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runner/RequestTest.java Added

@@ -0,0 +1,50 @@
+package org.junit.runner;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.rules.EventCollector.hasSingleFailureWithMessage;
+
+import org.junit.Test;
+import org.junit.rules.EventCollector;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.RunnerBuilder;
+
+public class RequestTest {
+
+    /**
+     * #1320 A root of a {@link Description} produced by
+     * {@link Request#classes(Class...)} should be named "classes"
+     */
+    @Test
+    public void createsADescriptionWithANameForClasses() {
+        Description description = Request
+                .classes(RequestTest.class, RequestTest.class).getRunner()
+                .getDescription();
+        assertThat(description.toString(), is("classes"));
+    }
+
+    @Test
+    public void reportsInitializationErrorThrownWhileCreatingSuite() {
+        EventCollector collector = new EventCollector();
+        JUnitCore core = new JUnitCore();
+        core.addListener(collector);
+
+        core.run(new FailingComputer(), FooTest.class, BarTest.class);
+
+        assertThat(collector, hasSingleFailureWithMessage("cannot create suite"));
+    }
+
+    private static class FailingComputer extends Computer {
+        @Override
+        public Runner getSuite(RunnerBuilder builder, Class<?> classes)
+                throws InitializationError {
+            throw new InitializationError("cannot create suite");
+        }
+    }
+
+    private static class FooTest {
+    }
+
+    private static class BarTest {
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/runner/RunnerSpy.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runner/RunnerSpy.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runner/notification/AllNotificationTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/runner/notification/ConcurrentRunNotifierTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runner/notification/ConcurrentRunNotifierTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/runner/notification/RunNotifierTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runner/notification/RunNotifierTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/AllRunnersTests.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/CustomBlockJUnit4ClassRunnerTest.java Added

@@ -0,0 +1,90 @@
+package org.junit.runners;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+/**
+ * Tests that verify proper behavior for custom runners that extend
+ * {@link BlockJUnit4ClassRunner}.
+ *
+ * @author Sam Brannen
+ * @since 4.13
+ */
+public class CustomBlockJUnit4ClassRunnerTest {
+
+	@Test
+	public void exceptionsFromMethodBlockMustNotResultInUnrootedTests() throws Exception {
+		TrackingRunListener listener = new TrackingRunListener();
+		RunNotifier notifier = new RunNotifier();
+		notifier.addListener(listener);
+
+		new CustomBlockJUnit4ClassRunner(CustomBlockJUnit4ClassRunnerTestCase.class).run(notifier);
+		assertEquals("tests started.", 2, listener.testStartedCount.get());
+		assertEquals("tests failed.", 1, listener.testFailureCount.get());
+		assertEquals("tests finished.", 2, listener.testFinishedCount.get());
+	}
+
+
+	public static class CustomBlockJUnit4ClassRunnerTestCase {
+		@Test public void shouldPass() { /* no-op */ }
+		@Test public void throwException() { /* no-op */ }
+	}
+
+	/**
+	 * Custom extension of {@link BlockJUnit4ClassRunner} that always throws
+	 * an exception from the {@code methodBlock()} if a test method is named
+	 * exactly {@code "throwException"}.
+	 */
+	private static class CustomBlockJUnit4ClassRunner extends BlockJUnit4ClassRunner {
+
+		CustomBlockJUnit4ClassRunner(Class<?> testClass) throws InitializationError {
+			super(testClass);
+		}
+
+		@Override
+		protected Statement methodBlock(FrameworkMethod method) {
+			if ("throwException".equals(method.getName())) {
+				throw new RuntimeException("throwException() test method invoked");
+			}
+			return super.methodBlock(method);
+		}
+	}
+
+	/**
+	 * Simple {@link RunListener} that tracks the number of times that
+	 * certain callbacks are invoked.
+	 */
+	private static class TrackingRunListener extends RunListener {
+
+		final AtomicInteger testStartedCount = new AtomicInteger();
+		final AtomicInteger testFailureCount = new AtomicInteger();
+		final AtomicInteger testFinishedCount = new AtomicInteger();
+
+
+		@Override
+		public void testStarted(Description description) throws Exception {
+			testStartedCount.incrementAndGet();
+		}
+
+		@Override
+		public void testFailure(Failure failure) throws Exception {
+			testFailureCount.incrementAndGet();
+		}
+
+		@Override
+		public void testFinished(Description description) throws Exception {
+			testFinishedCount.incrementAndGet();
+		}
+	}
+
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/RuleContainerTest.java Added

@@ -0,0 +1,68 @@
+package org.junit.runners;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+public class RuleContainerTest {
+    private final RuleContainer container = new RuleContainer();
+
+    @Test
+    public void methodRulesOnly() {
+        container.add(MRule.M1);
+        container.add(MRule.M2);
+        assertEquals("M1, M2", container.getSortedRules().toString());
+        container.setOrder(MRule.M2, 1);
+        assertEquals("M2, M1", container.getSortedRules().toString());
+    }
+
+    @Test
+    public void testRuleAroundMethodRule() {
+        container.add(MRule.M1);
+        container.add(Rule.A);
+        assertEquals("M1, A", container.getSortedRules().toString());
+    }
+
+    @Test
+    public void ordering1() {
+        container.add(MRule.M1);
+        container.add(Rule.A);
+        container.setOrder(Rule.A, 1);
+        assertEquals("A, M1", container.getSortedRules().toString());
+    }
+
+    @Test
+    public void ordering2() {
+        container.add(Rule.A);
+        container.add(Rule.B);
+        container.add(Rule.C);
+        assertEquals("A, B, C", container.getSortedRules().toString());
+        container.setOrder(Rule.B, 1);
+        container.setOrder(Rule.C, 2);
+        assertEquals("C, B, A", container.getSortedRules().toString());
+    }
+
+    private enum Rule implements TestRule {
+        A,
+        B,
+        C;
+
+        public Statement apply(Statement base, Description description) {
+            return base;
+        }
+    }
+
+    private enum MRule implements MethodRule {
+        M1,
+        M2;
+
+        public Statement apply(Statement base, FrameworkMethod method, Object target) {
+            return base;
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/model/AllModelTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/runners/model/FrameworkFieldTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/model/FrameworkFieldTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/runners/model/FrameworkMethodTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/model/FrameworkMethodTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/model/InvalidTestClassErrorTest.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/runners/model/TestClassTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/model/TestClassTest.java Changed

@@ -1,14 +1,13 @@
 package org.junit.runners.model;
 
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.lang.annotation.Annotation;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Ignore;
@@ -132,26 +131,45 @@
         @Test
         public int methodB() {
             return 0;
-    	}
+        }
+
+        public int methodWithoutAnnotation() {
+            return 0;
+        }
     }
 
     @Test
     public void providesAnnotatedMethodsSortedByName() {
-    	TestClass tc = new TestClass(MethodsAnnotated.class);
-    	List<FrameworkMethod> annotatedMethods = tc.getAnnotatedMethods();
-    	assertThat("Wrong number of annotated methods.",
-    	    annotatedMethods.size(), is(3));
-    	assertThat("First annotated method is wrong.", annotatedMethods
-    	    .iterator().next().getName(), is("methodA"));
+        TestClass tc = new TestClass(MethodsAnnotated.class);
+        List<FrameworkMethod> annotatedMethods = tc.getAnnotatedMethods();
+        List<String> methodNames = extractNames(annotatedMethods);
+        assertThat(methodNames.indexOf("methodA"),
+            lessThan(methodNames.indexOf("methodB")));
+    }
+
+    @Test
+    public void getAnnotatedMethodsDoesNotReturnMethodWithoutAnnotation() {
+        TestClass tc = new TestClass(MethodsAnnotated.class);
+        List<FrameworkMethod> annotatedMethods = tc.getAnnotatedMethods();
+        List<String> methodNames = extractNames(annotatedMethods);
+        assertThat(methodNames, not(hasItem("methodWithoutAnnotation")));
+    }
+
+    private List<String> extractNames(List<FrameworkMethod> methods) {
+        List<String> names = new ArrayList<String>();
+        for (FrameworkMethod method: methods) {
+            names.add(method.getName());
+        }
+        return names;
     }
 
     @Test
     public void annotatedMethodValues() {
-    	TestClass tc = new TestClass(MethodsAnnotated.class);
-    	List<String> values = tc.getAnnotatedMethodValues(
-    	    new MethodsAnnotated(), Ignore.class, String.class);
-    	assertThat(values, hasItem("jupiter"));
-    	assertThat(values.size(), is(1));
+        TestClass tc = new TestClass(MethodsAnnotated.class);
+        List<String> values = tc.getAnnotatedMethodValues(
+            new MethodsAnnotated(), Ignore.class, String.class);
+        assertThat(values, hasItem("jupiter"));
+        assertThat(values.size(), is(1));
     }
 
     @Test

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/parameterized/AllParameterizedTests.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/parameterized/BlockJUnit4ClassRunnerWithParametersTest.java Added

@@ -0,0 +1,80 @@
+package org.junit.runners.parameterized;
+
+import static java.util.Collections.emptyList;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.rules.ExpectedException.none;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.model.TestClass;
+
+public class BlockJUnit4ClassRunnerWithParametersTest {
+    private static final List<Object> NO_PARAMETERS = emptyList();
+
+    @Rule
+    public final ExpectedException thrown = none();
+
+    @RunWith(Parameterized.class)
+    @DummyAnnotation
+    public static class ClassWithParameterizedAnnotation {
+        @Test
+        public void dummyTest() {
+        }
+    }
+
+    @Test
+    public void hasAllAnnotationsExceptRunWith() throws Exception {
+        TestWithParameters testWithParameters = new TestWithParameters(
+                "dummy name", new TestClass(
+                        ClassWithParameterizedAnnotation.class), NO_PARAMETERS);
+        BlockJUnit4ClassRunnerWithParameters runner = new BlockJUnit4ClassRunnerWithParameters(
+                testWithParameters);
+        Annotation annotations = runner.getRunnerAnnotations();
+        assertEquals(1, annotations.length);
+        assertEquals(annotations0.annotationType(), DummyAnnotation.class);
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.TYPE)
+    private static @interface DummyAnnotation {
+    }
+
+    @RunWith(Parameterized.class)
+    public static class ClassWithPrivateParameter {
+        @Parameterized.Parameter
+        private String parameter;
+
+        @Test
+        public void dummyTest() {
+        }
+    }
+
+    @Test
+    public void providesHelpfulMessageIfParameterFieldCannotBeSet()
+            throws Exception {
+        TestWithParameters testWithParameters = new TestWithParameters(
+                "dummy name",
+                new TestClass(ClassWithPrivateParameter.class),
+                Collections.<Object>singletonList("dummy parameter"));
+        BlockJUnit4ClassRunnerWithParameters runner = new BlockJUnit4ClassRunnerWithParameters(
+                testWithParameters);
+
+        thrown.expect(IllegalAccessException.class);
+        thrown.expectCause(instanceOf(IllegalAccessException.class));
+        thrown.expectMessage("Cannot set parameter 'parameter'. Ensure that the field 'parameter' is public.");
+
+        runner.createTest();
+    }
+}
\ No newline at end of file

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/runners/parameterized/ParameterizedNamesTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/runners/parameterized/ParameterizedNamesTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/samples/AllSamplesTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/samples/SimpleTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/samples/SimpleTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/AllTests.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/AllTests.java Changed

@@ -3,216 +3,44 @@
 import junit.framework.JUnit4TestAdapter;
 import junit.framework.Test;
 import org.junit.AssumptionViolatedExceptionTest;
-import org.junit.experimental.categories.CategoryFilterFactoryTest;
-import org.junit.internal.MethodSorterTest;
-import org.junit.internal.matchers.StacktracePrintingMatcherTest;
-import org.junit.internal.matchers.ThrowableCauseMatcherTest;
-import org.junit.rules.DisableOnDebugTest;
-import org.junit.rules.StopwatchTest;
-import org.junit.runner.FilterFactoriesTest;
-import org.junit.runner.FilterOptionIntegrationTest;
-import org.junit.runner.JUnitCommandLineParseResultTest;
-import org.junit.runner.JUnitCoreTest;
+import org.junit.internal.AllInternalTests;
+import org.junit.rules.AllRulesTests;
+import org.junit.runner.AllRunnerTests;
 import org.junit.runner.RunWith;
-import org.junit.runner.notification.ConcurrentRunNotifierTest;
-import org.junit.runner.notification.RunNotifierTest;
-import org.junit.runner.notification.SynchronizedRunListenerTest;
+import org.junit.runners.AllRunnersTests;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.junit.runners.model.FrameworkFieldTest;
-import org.junit.runners.model.FrameworkMethodTest;
-import org.junit.runners.model.TestClassTest;
-import org.junit.runners.parameterized.ParameterizedNamesTest;
-import org.junit.runners.parameterized.TestWithParametersTest;
-import org.junit.tests.assertion.AssertionTest;
-import org.junit.tests.assertion.ComparisonFailureTest;
-import org.junit.tests.assertion.MultipleFailureExceptionTest;
-import org.junit.tests.deprecated.JUnit4ClassRunnerTest;
-import org.junit.tests.description.AnnotatedDescriptionTest;
-import org.junit.tests.description.SuiteDescriptionTest;
-import org.junit.tests.description.TestDescriptionMethodNameTest;
-import org.junit.tests.description.TestDescriptionTest;
-import org.junit.tests.experimental.AssumptionTest;
-import org.junit.tests.experimental.ExperimentalTests;
-import org.junit.tests.experimental.MatcherTest;
-import org.junit.tests.experimental.categories.CategoriesAndParameterizedTest;
-import org.junit.tests.experimental.categories.CategoryTest;
-import org.junit.tests.experimental.categories.JavadocTest;
-import org.junit.tests.experimental.categories.MultiCategoryTest;
-import org.junit.tests.experimental.max.JUnit38SortingTest;
-import org.junit.tests.experimental.max.MaxStarterTest;
-import org.junit.tests.experimental.parallel.ParallelClassTest;
-import org.junit.tests.experimental.parallel.ParallelMethodTest;
-import org.junit.tests.experimental.rules.BlockJUnit4ClassRunnerOverrideTest;
-import org.junit.tests.experimental.rules.ClassRulesTest;
-import org.junit.tests.experimental.rules.ExpectedExceptionTest;
-import org.junit.tests.experimental.rules.ExternalResourceRuleTest;
-import org.junit.tests.experimental.rules.MethodRulesTest;
-import org.junit.tests.experimental.rules.NameRulesTest;
-import org.junit.tests.experimental.rules.RuleChainTest;
-import org.junit.tests.experimental.rules.RuleMemberValidatorTest;
-import org.junit.tests.experimental.rules.TempFolderRuleTest;
-import org.junit.tests.experimental.rules.TemporaryFolderUsageTest;
-import org.junit.tests.experimental.rules.TestRuleTest;
-import org.junit.tests.experimental.rules.TimeoutRuleTest;
-import org.junit.tests.experimental.rules.VerifierRuleTest;
-import org.junit.tests.experimental.theories.TestedOnSupplierTest;
-import org.junit.tests.experimental.theories.internal.AllMembersSupplierTest;
-import org.junit.tests.experimental.theories.internal.ParameterizedAssertionErrorTest;
-import org.junit.tests.experimental.theories.internal.SpecificDataPointsSupplierTest;
-import org.junit.tests.experimental.theories.runner.TheoriesPerformanceTest;
-import org.junit.tests.experimental.theories.runner.WithAutoGeneratedDataPoints;
-import org.junit.tests.experimental.theories.runner.WithDataPointMethod;
-import org.junit.tests.experimental.theories.runner.WithNamedDataPoints;
-import org.junit.tests.internal.runners.statements.FailOnTimeoutTest;
-import org.junit.tests.junit3compatibility.AllTestsTest;
-import org.junit.tests.junit3compatibility.ClassRequestTest;
-import org.junit.tests.junit3compatibility.ForwardCompatibilityTest;
-import org.junit.tests.junit3compatibility.InitializationErrorForwardCompatibilityTest;
-import org.junit.tests.junit3compatibility.JUnit38ClassRunnerTest;
-import org.junit.tests.junit3compatibility.OldTestClassAdaptingListenerTest;
-import org.junit.tests.junit3compatibility.OldTests;
-import org.junit.tests.junit3compatibility.SuiteMethodTest;
-import org.junit.tests.listening.ListenerTest;
-import org.junit.tests.listening.RunnerTest;
-import org.junit.tests.listening.TestListenerTest;
-import org.junit.tests.listening.TextListenerTest;
-import org.junit.tests.listening.UserStopTest;
-import org.junit.tests.manipulation.FilterTest;
-import org.junit.tests.manipulation.FilterableTest;
-import org.junit.tests.manipulation.SingleMethodTest;
-import org.junit.tests.manipulation.SortableTest;
-import org.junit.tests.running.classes.BlockJUnit4ClassRunnerTest;
-import org.junit.tests.running.classes.ClassLevelMethodsWithIgnoredTestsTest;
-import org.junit.tests.running.classes.EnclosedTest;
-import org.junit.tests.running.classes.IgnoreClassTest;
-import org.junit.tests.running.classes.ParameterizedTestTest;
-import org.junit.tests.running.classes.ParentRunnerFilteringTest;
-import org.junit.tests.running.classes.ParentRunnerTest;
-import org.junit.tests.running.classes.RunWithTest;
-import org.junit.tests.running.classes.SuiteTest;
-import org.junit.tests.running.classes.UseSuiteAsASuperclassTest;
-import org.junit.tests.running.core.CommandLineTest;
-import org.junit.tests.running.core.JUnitCoreReturnsCorrectExitCodeTest;
-import org.junit.tests.running.core.SystemExitTest;
-import org.junit.tests.running.methods.AnnotationTest;
-import org.junit.tests.running.methods.ExpectedTest;
-import org.junit.tests.running.methods.InheritedTestTest;
-import org.junit.tests.running.methods.ParameterizedTestMethodTest;
-import org.junit.tests.running.methods.TestMethodTest;
-import org.junit.tests.running.methods.TimeoutTest;
-import org.junit.tests.validation.BadlyFormedClassesTest;
-import org.junit.tests.validation.FailedConstructionTest;
-import org.junit.tests.validation.ValidationTest;
-import org.junit.validator.PublicClassValidatorTest;
+import org.junit.samples.AllSamplesTests;
+import org.junit.tests.assertion.AllAssertionTests;
+import org.junit.tests.deprecated.AllDeprecatedTests;
+import org.junit.tests.description.AllDescriptionTests;
+import org.junit.tests.experimental.AllExperimentalTests;
+import org.junit.tests.junit3compatibility.AllJUnit3CompatibilityTests;
+import org.junit.tests.listening.AllListeningTests;
+import org.junit.tests.manipulation.AllManipulationTests;
+import org.junit.tests.running.AllRunningTests;
+import org.junit.tests.validation.AllValidationTests;
+import org.junit.validator.AllValidatorTests;
 
-// These test files need to be cleaned. See
-// https://sourceforge.net/pm/task.php?func=detailtask&project_task_id=136507&group_id=15278&group_project_id=51407
-
-@SuppressWarnings("deprecation")
 @RunWith(Suite.class)
 @SuiteClasses({
-        AssumptionTest.class,
-        ClassRequestTest.class,
-        ListenerTest.class,
-        FailedConstructionTest.class,
-        TestDescriptionTest.class,
-        TestDescriptionMethodNameTest.class,
-        SuiteDescriptionTest.class,
-        AllTestsTest.class,
-        AnnotationTest.class,
-        AssertionTest.class,
-        CommandLineTest.class,
-        ExpectedTest.class,
-        ComparisonFailureTest.class,
-        MultipleFailureExceptionTest.class,
-        ForwardCompatibilityTest.class,
-        OldTests.class,
-        ParameterizedTestTest.class,
-        RunWithTest.class,
-        RunnerTest.class,
-        SuiteTest.class,
-        TestListenerTest.class,
-        TestMethodTest.class,
-        TextListenerTest.class,
-        TimeoutTest.class,
-        EnclosedTest.class,
-        ParameterizedTestMethodTest.class,
-        InitializationErrorForwardCompatibilityTest.class,
-        SingleMethodTest.class,
-        ClassLevelMethodsWithIgnoredTestsTest.class,
-        ValidationTest.class,
-        UserStopTest.class,
-        SortableTest.class,
-        JUnit38ClassRunnerTest.class,
-        SystemExitTest.class,
-        JUnitCoreReturnsCorrectExitCodeTest.class,
-        SuiteMethodTest.class,
-        BadlyFormedClassesTest.class,
-        IgnoreClassTest.class,
-        OldTestClassAdaptingListenerTest.class,
-        AnnotatedDescriptionTest.class,
+        AllAssertionTests.class,
+        AllDeprecatedTests.class,
+        AllDescriptionTests.class,
+        AllExperimentalTests.class,
+        AllInternalTests.class,
+        AllJUnit3CompatibilityTests.class,
+        AllListeningTests.class,
+        AllManipulationTests.class,
+        AllRulesTests.class,
+        AllRunnersTests.class,
+        AllRunnerTests.class,
+        AllRunningTests.class,
+        AllSamplesTests.class,
+        AllValidationTests.class,
+        AllValidatorTests.class,
         AssumptionViolatedExceptionTest.class,
-        ExperimentalTests.class,
-        InheritedTestTest.class,
-        TestClassTest.class,
-        AllMembersSupplierTest.class,
-        SpecificDataPointsSupplierTest.class,
-        ParameterizedAssertionErrorTest.class,
-        WithDataPointMethod.class,
-        WithNamedDataPoints.class,
-        WithAutoGeneratedDataPoints.class,
-        MatcherTest.class,
-        ObjectContractTest.class,
-        TheoriesPerformanceTest.class,
-        JUnit4ClassRunnerTest.class,
-        UseSuiteAsASuperclassTest.class,
-        FilterableTest.class,
-        FilterTest.class,
-        MaxStarterTest.class,
-        JUnit38SortingTest.class,
-        MethodRulesTest.class,
-        TestRuleTest.class,
-        TimeoutRuleTest.class,
-        ParallelClassTest.class,
-        ParallelMethodTest.class,
-        ParentRunnerTest.class,
-        NameRulesTest.class,
-        ClassRulesTest.class,
-        ExpectedExceptionTest.class,
-        TempFolderRuleTest.class,
-        TemporaryFolderUsageTest.class,
-        ExternalResourceRuleTest.class,
-        VerifierRuleTest.class,
-        CategoryTest.class,
-        CategoriesAndParameterizedTest.class,
-        MultiCategoryTest.class,
-        JavadocTest.class,
-        ParentRunnerFilteringTest.class,
-        BlockJUnit4ClassRunnerOverrideTest.class,
-        RuleMemberValidatorTest.class,
-        RuleChainTest.class,
-        BlockJUnit4ClassRunnerTest.class,
-        MethodSorterTest.class,
-        TestedOnSupplierTest.class,
-        StacktracePrintingMatcherTest.class,
-        StopwatchTest.class,
-        RunNotifierTest.class,
-        ConcurrentRunNotifierTest.class,
-        SynchronizedRunListenerTest.class,
-        FilterOptionIntegrationTest.class,
-        JUnitCommandLineParseResultTest.class,
-        FilterFactoriesTest.class,
-        CategoryFilterFactoryTest.class,
-        FrameworkFieldTest.class,
-        FrameworkMethodTest.class,
-        FailOnTimeoutTest.class,
-        JUnitCoreTest.class,
-        TestWithParametersTest.class,
-        ParameterizedNamesTest.class,
-        PublicClassValidatorTest.class,
-        DisableOnDebugTest.class,
-        ThrowableCauseMatcherTest.class
+        ObjectContractTest.class
 })
 public class AllTests {
     public static Test suite() {

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/ObjectContractTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/ObjectContractTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/SampleJUnit4Tests.java Added

@@ -0,0 +1,136 @@
+package org.junit.tests;
+
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+import java.lang.reflect.Method;
+
+/**
+ * Container for sample JUnit4-style tests used in integration tests.
+ */
+public class SampleJUnit4Tests {
+
+    public static class TestWithOneThrowingTestMethod {
+        
+        @Test
+        public void alwaysThrows() {
+            new FakeClassUnderTest().throwsExceptionWithoutCause();
+        }
+    }
+
+    public static class TestWithOneThrowingTestMethodWithCause {
+        
+        @Test
+        public void alwaysThrows() {
+            new FakeClassUnderTest().throwsExceptionWithCause();
+        }
+    }
+
+    public static class TestWithThrowingBeforeMethod {
+
+        @Before
+        public void alwaysThrows() {
+            new FakeClassUnderTest().throwsExceptionWithoutCause();
+        }
+
+        @Test
+        public void alwaysPasses() {
+        }
+    }
+
+    public static class ThrowingTestRule implements TestRule {
+
+        public Statement apply(
+                Statement base, org.junit.runner.Description description) {
+            new FakeClassUnderTest().throwsExceptionWithoutCause();
+            return base;
+        }
+    }
+
+    public static class TestWithThrowingTestRule {
+
+        @Rule
+        public final TestRule rule = new ThrowingTestRule();
+
+        @Test
+        public void alwaysPasses() {
+        }
+    }
+
+    public static class TestWithThrowingClassRule {
+
+        @ClassRule
+        public static final TestRule rule = new ThrowingTestRule();
+
+        @Test
+        public void alwaysPasses() {
+        }
+    }
+
+    public static class ThrowingMethodRule implements MethodRule {
+
+        public Statement apply(
+                Statement base, FrameworkMethod method, Object target) {
+            new FakeClassUnderTest().throwsExceptionWithoutCause();
+            return base;
+        }
+    }
+
+    public static class TestWithThrowingMethodRule {
+
+        @Rule
+        public final ThrowingMethodRule rule = new ThrowingMethodRule();
+
+        @Test
+        public void alwaysPasses() {
+        }
+    }
+
+    public static class TestWithSuppressedException {
+        public static final Method addSuppressed = initAddSuppressed();
+
+        static Method initAddSuppressed() {
+            try {
+                return Throwable.class.getMethod("addSuppressed", Throwable.class);
+            } catch (Throwable e) {
+                return null;
+            }
+        }
+
+        @Test
+        public void alwaysThrows() throws Exception {
+            final RuntimeException exception = new RuntimeException("error");
+            addSuppressed.invoke(exception, new RuntimeException("suppressed"));
+            throw exception;
+        }
+    }
+
+    private static class FakeClassUnderTest {
+        
+        public void throwsExceptionWithCause() {
+            doThrowExceptionWithCause();
+        }
+
+        public void throwsExceptionWithoutCause() {
+            doThrowExceptionWithoutCause();
+        }
+
+        private void doThrowExceptionWithCause() {
+            try {
+                throwsExceptionWithoutCause();
+            } catch (Exception e) {
+                throw new RuntimeException("outer", e);
+            }
+        }
+
+        private void doThrowExceptionWithoutCause() {
+            throw new RuntimeException("cause");
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/assertion/AllAssertionTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/assertion/AssertionTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/assertion/AssertionTest.java Changed

@@ -11,13 +11,16 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 
 import org.junit.Assert;
 import org.junit.ComparisonFailure;
 import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
 import org.junit.internal.ArrayComparisonFailure;
 
 /**
@@ -31,6 +34,8 @@
 //      assert false;
 //  }
 
+    private static final String ASSERTION_ERROR_EXPECTED = "AssertionError expected";
+
     @Test(expected = AssertionError.class)
     public void fails() {
         Assert.fail();
@@ -42,7 +47,9 @@
             Assert.fail();
         } catch (AssertionError exception) {
             assertEquals("java.lang.AssertionError", exception.toString());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -51,90 +58,122 @@
             Assert.fail("woops!");
         } catch (AssertionError exception) {
             assertEquals("java.lang.AssertionError: woops!", exception.toString());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
-    @Test(expected = AssertionError.class)
+    @Test
     public void arraysNotEqual() {
-        assertArrayEquals((new Object{new Object()}), (new Object{new Object()}));
+        assertArrayEqualsFailure(
+                new Object{"right"},
+                new Object{"wrong"},
+                "arrays first differed at element 0; expected:<right> but was:<wrong>");
     }
 
-    @Test(expected = AssertionError.class)
+    @Test
     public void arraysNotEqualWithMessage() {
-        assertArrayEquals("not equal", (new Object{new Object()}), (new Object{new Object()}));
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{"right"},
+                new Object{"wrong"},
+                "not equal: arrays first differed at element 0; expected:<right> but was:<wrong>");
     }
 
     @Test
     public void arraysExpectedNullMessage() {
         try {
-            assertArrayEquals("not equal", null, (new Object{new Object()}));
+            assertArrayEquals("not equal", null, new Object{new Object()});
         } catch (AssertionError exception) {
             assertEquals("not equal: expected array was null", exception.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
     public void arraysActualNullMessage() {
         try {
-            assertArrayEquals("not equal", (new Object{new Object()}), null);
+            assertArrayEquals("not equal", new Object{new Object()}, null);
         } catch (AssertionError exception) {
             assertEquals("not equal: actual array was null", exception.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
-    public void arraysDifferentLengthMessage() {
-        try {
-            assertArrayEquals("not equal", (new Object0), (new Object1));
-        } catch (AssertionError exception) {
-            assertEquals("not equal: array lengths differed, expected.length=0 actual.length=1", exception.getMessage());
-        }
+    public void arraysDifferentLengthDifferingAtStartMessage() {
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{true},
+                new Object{false, true},
+                "not equal: array lengths differed, expected.length=1 actual.length=2; arrays first differed at element 0; expected:<true> but was:<false>");
+    }
+
+    @Test
+    public void arraysDifferentLengthDifferingAtEndMessage() {
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{true},
+                new Object{true, false},
+                "not equal: array lengths differed, expected.length=1 actual.length=2; arrays first differed at element 1; expected:<end of array> but was:<false>");
     }
 
-    @Test(expected = ArrayComparisonFailure.class)
+    @Test
+    public void arraysDifferentLengthDifferingAtEndAndExpectedArrayLongerMessage() {
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{true, false},
+                new Object{true},
+                "not equal: array lengths differed, expected.length=2 actual.length=1; arrays first differed at element 1; expected:<false> but was:<end of array>");
+    }
+
+    @Test
     public void arraysElementsDiffer() {
-        assertArrayEquals("not equal", (new Object{"this is a very long string in the middle of an array"}), (new Object{"this is another very long string in the middle of an array"}));
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{"this is a very long string in the middle of an array"},
+                new Object{"this is another very long string in the middle of an array"},
+                "not equal: arrays first differed at element 0; expected:<this is a very long string in...> but was:<this is another very long string in...>");
     }
 
     @Test
     public void arraysDifferAtElement0nullMessage() {
-        try {
-            assertArrayEquals((new Object{true}), (new Object{false}));
-        } catch (AssertionError exception) {
-            assertEquals("arrays first differed at element 0; expected:<true> but was:<false>", exception
-                    .getMessage());
-        }
+        assertArrayEqualsFailure(
+                new Object{true},
+                new Object{false},
+                "arrays first differed at element 0; expected:<true> but was:<false>"
+        );
     }
 
     @Test
     public void arraysDifferAtElement1nullMessage() {
-        try {
-            assertArrayEquals((new Object{true, true}), (new Object{true,
-                    false}));
-        } catch (AssertionError exception) {
-            assertEquals("arrays first differed at element 1; expected:<true> but was:<false>", exception
-                    .getMessage());
-        }
+        assertArrayEqualsFailure(
+                new Object{true, true},
+                new Object{true, false},
+                "arrays first differed at element 1; expected:<true> but was:<false>"
+        );
     }
 
     @Test
     public void arraysDifferAtElement0withMessage() {
-        try {
-            assertArrayEquals("message", (new Object{true}), (new Object{false}));
-        } catch (AssertionError exception) {
-            assertEquals("message: arrays first differed at element 0; expected:<true> but was:<false>", exception
-                    .getMessage());
-        }
+        assertArrayEqualsFailure(
+                "message",
+                new Object{true},
+                new Object{false},
+                "message: arrays first differed at element 0; expected:<true> but was:<false>"
+        );
     }
 
     @Test
     public void arraysDifferAtElement1withMessage() {
-        try {
-            assertArrayEquals("message", (new Object{true, true}), (new Object{true, false}));
-            fail();
-        } catch (AssertionError exception) {
-            assertEquals("message: arrays first differed at element 1; expected:<true> but was:<false>", exception.getMessage());
-        }
+        assertArrayEqualsFailure(
+                "message",
+                new Object{true, true},
+                new Object{true, false},
+                "message: arrays first differed at element 1; expected:<true> but was:<false>"
+        );
     }
 
     @Test
@@ -170,7 +209,7 @@
     public void oneDimensionalFloatArraysAreNotEqual() {
         assertArrayEquals(new float{1.0f}, new float{2.5f}, 1.0f);
     }
-    
+
     @Test(expected = AssertionError.class)
     public void oneDimensionalBooleanArraysAreNotEqual() {
         assertArrayEquals(new boolean{true}, new boolean{false});
@@ -193,22 +232,134 @@
 
     @Test
     public void multiDimensionalArraysAreNotEqual() {
+        assertArrayEqualsFailure(
+                "message",
+                new Object{{true, true}, {false, false}},
+                new Object{{true, true}, {true, false}},
+                "message: arrays first differed at element 10; expected:<false> but was:<true>");
+    }
+
+    @Test
+    public void multiDimensionalArraysAreNotEqualNoMessage() {
+        assertArrayEqualsFailure(
+                new Object{{true, true}, {false, false}},
+                new Object{{true, true}, {true, false}},
+                "arrays first differed at element 10; expected:<false> but was:<true>");
+    }
+
+    @Test
+    public void twoDimensionalArraysDifferentOuterLengthNotEqual() {
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{{true}, {}},
+                new Object{{}},
+                "not equal: array lengths differed, expected.length=1 actual.length=0; arrays first differed at element 00; expected:<true> but was:<end of array>");
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{{}, {true}},
+                new Object{{}},
+                "not equal: array lengths differed, expected.length=2 actual.length=1; arrays first differed at element 1; expected:<java.lang.Object1> but was:<end of array>");
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{{}},
+                new Object{{true}, {}},
+                "not equal: array lengths differed, expected.length=0 actual.length=1; arrays first differed at element 00; expected:<end of array> but was:<true>");
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{{}},
+                new Object{{}, {true}},
+                "not equal: array lengths differed, expected.length=1 actual.length=2; arrays first differed at element 1; expected:<end of array> but was:<java.lang.Object1>");
+    }
+
+    @Test
+    public void primitiveArraysConvertedToStringCorrectly() {
+        assertArrayEqualsFailure(
+                "not equal",
+                new boolean{{}, {true}},
+                new boolean{{}},
+                "not equal: array lengths differed, expected.length=2 actual.length=1; arrays first differed at element 1; expected:<boolean1> but was:<end of array>");
+        assertArrayEqualsFailure(
+                "not equal",
+                new int{{}, {23}},
+                new int{{}},
+                "not equal: array lengths differed, expected.length=2 actual.length=1; arrays first differed at element 1; expected:<int1> but was:<end of array>");
+    }
+
+    @Test
+    public void twoDimensionalArraysConvertedToStringCorrectly() {
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{{}, {{true}}},
+                new Object{{}},
+                "not equal: array lengths differed, expected.length=2 actual.length=1; arrays first differed at element 1; expected:<java.lang.Object1> but was:<end of array>");
+    }
+
+    @Test
+    public void twoDimensionalArraysDifferentInnerLengthNotEqual() {
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{{true}, {}},
+                new Object{{}, {}},
+                "not equal: array lengths differed, expected.length=1 actual.length=0; arrays first differed at element 00; expected:<true> but was:<end of array>");
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{{}, {true}},
+                new Object{{}, {}},
+                "not equal: array lengths differed, expected.length=1 actual.length=0; arrays first differed at element 10; expected:<true> but was:<end of array>");
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{{}, {}},
+                new Object{{true}, {}},
+                "not equal: array lengths differed, expected.length=0 actual.length=1; arrays first differed at element 00; expected:<end of array> but was:<true>");
+        assertArrayEqualsFailure(
+                "not equal",
+                new Object{{}, {}},
+                new Object{{}, {true}},
+                "not equal: array lengths differed, expected.length=0 actual.length=1; arrays first differed at element 10; expected:<end of array> but was:<true>");
+    }
+
+    private void assertArrayEqualsFailure(Object expecteds, Object actuals, String expectedMessage) {
         try {
-            assertArrayEquals("message", (new Object{{true, true}, {false, false}}), (new Object{{true, true}, {true, false}}));
-            fail();
+            assertArrayEquals(expecteds, actuals);
+        } catch (ArrayComparisonFailure e) {
+            assertEquals(expectedMessage, e.getMessage());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    private void assertArrayEqualsFailure(String message, Object expecteds, Object actuals, String expectedMessage) {
+        try {
+            assertArrayEquals(message, expecteds, actuals);
+        } catch (ArrayComparisonFailure e) {
+            assertEquals(expectedMessage, e.getMessage());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    @Test
+    public void multiDimensionalArraysDifferentLengthMessage() {
+        try {
+            assertArrayEquals("message", new Object{{true, true}, {false, false}}, new Object{{true, true}, {false}});
         } catch (AssertionError exception) {
-            assertEquals("message: arrays first differed at element 10; expected:<false> but was:<true>", exception.getMessage());
+            assertEquals("message: array lengths differed, expected.length=2 actual.length=1; arrays first differed at element 11; expected:<false> but was:<end of array>", exception.getMessage());
+            return;
         }
+
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
-    public void multiDimensionalArraysAreNotEqualNoMessage() {
+    public void multiDimensionalArraysDifferentLengthNoMessage() {
         try {
-            assertArrayEquals((new Object{{true, true}, {false, false}}), (new Object{{true, true}, {true, false}}));
-            fail();
+            assertArrayEquals(new Object{{true, true}, {false, false}}, new Object{{true, true}, {false}});
         } catch (AssertionError exception) {
-            assertEquals("arrays first differed at element 10; expected:<false> but was:<true>", exception.getMessage());
+            assertEquals("array lengths differed, expected.length=2 actual.length=1; arrays first differed at element 11; expected:<false> but was:<end of array>", exception.getMessage());
+            return;
         }
+
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -222,9 +373,11 @@
     public void stringsDifferWithUserMessage() {
         try {
             assertEquals("not equal", "one", "two");
-        } catch (Throwable exception) {
+        } catch (ComparisonFailure exception) {
             assertEquals("not equal expected:<one> but was:<two>", exception.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -273,10 +426,11 @@
         Object o = new Object();
         try {
             assertEquals("message", null, o);
-            fail();
         } catch (AssertionError e) {
             assertEquals("message expected:<null> but was:<" + o.toString() + ">", e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -284,10 +438,11 @@
         Object o = new Object();
         try {
             assertEquals("message", o, null);
-            fail();
         } catch (AssertionError e) {
             assertEquals("message expected:<" + o.toString() + "> but was:<null>", e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test(expected = AssertionError.class)
@@ -366,24 +521,28 @@
         assertEquals(Double.NaN, Double.NaN, Double.POSITIVE_INFINITY);
     }
 
+    @SuppressWarnings("unused")
     @Test
     public void nullNullmessage() {
         try {
             assertNull("junit");
-            fail();
         } catch (AssertionError e) {
             assertEquals("expected null, but was:<junit>", e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
+    @SuppressWarnings("unused")
     @Test
     public void nullWithMessage() {
         try {
             assertNull("message", "hello");
-            fail();
         } catch (AssertionError exception) {
             assertEquals("message expected null, but was:<hello>", exception.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -414,21 +573,23 @@
     public void sameWithMessage() {
         try {
             assertSame("not same", "hello", "good-bye");
-            fail();
         } catch (AssertionError exception) {
             assertEquals("not same expected same:<hello> was not:<good-bye>",
                     exception.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
     public void sameNullMessage() {
         try {
             assertSame("hello", "good-bye");
-            fail();
         } catch (AssertionError exception) {
             assertEquals("expected same:<hello> was not:<good-bye>", exception.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -436,10 +597,11 @@
         Object o = new Object();
         try {
             assertNotSame("message", o, o);
-            fail();
         } catch (AssertionError exception) {
             assertEquals("message expected not same", exception.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -447,10 +609,11 @@
         Object o = new Object();
         try {
             assertNotSame(o, o);
-            fail();
         } catch (AssertionError exception) {
             assertEquals("expected not same", exception.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -460,27 +623,31 @@
         } catch (AssertionError exception) {
             // we used to expect getMessage() to return ""; see failWithNoMessageToString()
             assertNull(exception.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
     public void nullMessageDisappearsWithStringAssertEquals() {
         try {
             assertEquals(null, "a", "b");
-            fail();
         } catch (ComparisonFailure e) {
             assertEquals("expected:<a> but was:<b>", e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
     public void nullMessageDisappearsWithAssertEquals() {
         try {
             assertEquals(null, 1, 2);
-            fail();
         } catch (AssertionError e) {
             assertEquals("expected:<1> but was:<2>", e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test(expected = AssertionError.class)
@@ -514,7 +681,9 @@
             assertEquals("4", new Integer(4));
         } catch (AssertionError e) {
             assertEquals("expected: java.lang.String<4> but was: java.lang.Integer<4>", e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -528,7 +697,9 @@
             assertThat("identifier", actual, equalTo(expected));
         } catch (AssertionError e) {
             assertEquals(expectedMessage, e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -539,7 +710,9 @@
             assertThat("identifier", "actual", is(instanceOf(Integer.class)));
         } catch (AssertionError e) {
             assertEquals(expectedMessage, e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -553,7 +726,9 @@
             assertThat(actual, equalTo(expected));
         } catch (AssertionError e) {
             assertEquals(expectedMessage, e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -562,7 +737,9 @@
             assertEquals(null, "null");
         } catch (AssertionError e) {
             assertEquals("expected: null<null> but was: java.lang.String<null>", e.getMessage());
+            return;
         }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test(expected = AssertionError.class)
@@ -570,6 +747,27 @@
         assertEquals("null", null);
     }
 
+    private static class NullToString {
+        @Override
+        public String toString() {
+            return null;
+        }
+    }
+
+    @Test
+    public void nullToString() {
+        try {
+            assertEquals(new NullToString(), new NullToString());
+        } catch (AssertionError e) {
+            assertEquals("expected: org.junit.tests.assertion.AssertionTest$NullToString<null> but "
+                            + "was: org.junit.tests.assertion.AssertionTest$NullToString<null>",
+                    e.getMessage());
+            return;
+        }
+
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
     @Test(expected = AssertionError.class)
     public void compareBigDecimalAndInteger() {
         final BigDecimal bigDecimal = new BigDecimal("1.2");
@@ -584,7 +782,7 @@
     }
 
     @Test
-    public void objectsWithDiferentReferencesAreNotEqual() {
+    public void objectsWithDifferentReferencesAreNotEqual() {
         assertNotEquals(new Object(), new Object());
     }
 
@@ -601,7 +799,7 @@
             return;
         }
 
-        fail("Failed on assertion.");
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -616,7 +814,7 @@
             return;
         }
 
-        fail("Failed on assertion.");
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
     }
 
     @Test
@@ -648,4 +846,160 @@
     public void assertNotEqualsIgnoresFloatDeltaOnNaN() {
         assertNotEquals(Float.NaN, Float.NaN, 1f);
     }
+
+    @Test(expected = AssertionError.class)
+    public void assertThrowsRequiresAnExceptionToBeThrown() {
+        assertThrows(Throwable.class, nonThrowingRunnable());
+    }
+
+    @Test
+    public void assertThrowsIncludesAnInformativeDefaultMessage() {
+        try {
+            assertThrows(Throwable.class, nonThrowingRunnable());
+        } catch (AssertionError ex) {
+            assertEquals("expected java.lang.Throwable to be thrown, but nothing was thrown", ex.getMessage());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    @Test
+    public void assertThrowsIncludesTheSpecifiedMessage() {
+        try {
+            assertThrows("Foobar", Throwable.class, nonThrowingRunnable());
+        } catch (AssertionError ex) {
+            assertEquals(
+                    "Foobar: expected java.lang.Throwable to be thrown, but nothing was thrown",
+                    ex.getMessage());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    @Test
+    public void assertThrowsReturnsTheSameObjectThrown() {
+        NullPointerException npe = new NullPointerException();
+
+        Throwable throwable = assertThrows(Throwable.class, throwingRunnable(npe));
+
+        assertSame(npe, throwable);
+    }
+
+    @Test(expected = AssertionError.class)
+    public void assertThrowsDetectsTypeMismatchesViaExplicitTypeHint() {
+        NullPointerException npe = new NullPointerException();
+
+        assertThrows(IOException.class, throwingRunnable(npe));
+    }
+
+    @Test
+    public void assertThrowsWrapsAndPropagatesUnexpectedExceptions() {
+        NullPointerException npe = new NullPointerException("inner-message");
+
+        try {
+            assertThrows(IOException.class, throwingRunnable(npe));
+        } catch (AssertionError ex) {
+            assertSame(npe, ex.getCause());
+            assertEquals("inner-message", ex.getCause().getMessage());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    @Test
+    public void assertThrowsSuppliesACoherentErrorMessageUponTypeMismatch() {
+        NullPointerException npe = new NullPointerException();
+
+        try {
+            assertThrows(IOException.class, throwingRunnable(npe));
+        } catch (AssertionError error) {
+            assertEquals("unexpected exception type thrown; expected:<java.io.IOException> but was:<java.lang.NullPointerException>",
+                    error.getMessage());
+            assertSame(npe, error.getCause());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    @Test
+    public void assertThrowsSuppliesTheSpecifiedMessageUponTypeMismatch() {
+        NullPointerException npe = new NullPointerException();
+
+        try {
+            assertThrows("Foobar", IOException.class, throwingRunnable(npe));
+        } catch (AssertionError error) {
+            assertEquals("Foobar: unexpected exception type thrown; expected:<java.io.IOException> but was:<java.lang.NullPointerException>",
+                    error.getMessage());
+            assertSame(npe, error.getCause());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    @Test
+    public void assertThrowsUsesCanonicalNameUponTypeMismatch() {
+        NullPointerException npe = new NullPointerException();
+
+        try {
+            assertThrows(NestedException.class, throwingRunnable(npe));
+        } catch (AssertionError error) {
+            assertEquals(
+                    "unexpected exception type thrown; expected:<org.junit.tests.assertion.AssertionTest.NestedException>"
+                    + " but was:<java.lang.NullPointerException>",
+                    error.getMessage());
+            assertSame(npe, error.getCause());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    @Test
+    public void assertThrowsUsesNameUponTypeMismatchWithAnonymousClass() {
+        NullPointerException npe = new NullPointerException() {
+        };
+
+        try {
+            assertThrows(IOException.class, throwingRunnable(npe));
+        } catch (AssertionError error) {
+            assertEquals(
+                    "unexpected exception type thrown; expected:<java.io.IOException>"
+                    + " but was:<org.junit.tests.assertion.AssertionTest$1>",
+                    error.getMessage());
+            assertSame(npe, error.getCause());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    @Test
+    public void assertThrowsUsesCanonicalNameWhenRequiredExceptionNotThrown() {
+        try {
+            assertThrows(NestedException.class, nonThrowingRunnable());
+        } catch (AssertionError error) {
+            assertEquals(
+                    "expected org.junit.tests.assertion.AssertionTest.NestedException to be thrown,"
+                    + " but nothing was thrown", error.getMessage());
+            return;
+        }
+        throw new AssertionError(ASSERTION_ERROR_EXPECTED);
+    }
+
+    private static class NestedException extends RuntimeException {
+        private static final long serialVersionUID = 1L;
+    }
+
+    private static ThrowingRunnable nonThrowingRunnable() {
+        return new ThrowingRunnable() {
+            public void run() throws Throwable {
+            }
+        };
+    }
+
+    private static ThrowingRunnable throwingRunnable(final Throwable t) {
+        return new ThrowingRunnable() {
+            public void run() throws Throwable {
+                throw t;
+            }
+        };
+    }
 }

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/assertion/MultipleFailureExceptionTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/assertion/MultipleFailureExceptionTest.java Changed

@@ -1,8 +1,10 @@
 package org.junit.tests.assertion;
 
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -11,15 +13,20 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.Test;
+import org.junit.TestCouldNotBeSkippedException;
+import org.junit.internal.AssumptionViolatedException;
 import org.junit.runners.model.MultipleFailureException;
 
+
 /**
  * Tests for {@link org.junit.runners.model.MultipleFailureException}
  *
  * @author kcooney@google.com (Kevin Cooney)
  */
 public class MultipleFailureExceptionTest {
+    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
 
     @Test
     public void assertEmptyDoesNotThrowForEmptyList() throws Exception {
@@ -37,7 +44,7 @@
             assertSame(e, exception);
         }
     }
-    
+
     @Test
     public void assertEmptyRethrowsSingleError() throws Exception {
         Throwable exception= new AnnotationFormatError("changeo");
@@ -51,7 +58,7 @@
     }
 
     @Test
-    public void assertEmptyThrowsMutipleFailureExceptionForManyThrowables() throws Exception {
+    public void assertEmptyThrowsMultipleFailureExceptionForManyThrowables() throws Exception {
         List<Throwable> errors = new ArrayList<Throwable>();
         errors.add(new ExpectedException("basil"));
         errors.add(new RuntimeException("garlic"));
@@ -61,12 +68,45 @@
             fail();
         } catch (MultipleFailureException expected) {
             assertThat(expected.getFailures(), equalTo(errors));
-            assertTrue(expected.getMessage().startsWith("There were 2 errors:\n"));
-            assertTrue(expected.getMessage().contains("ExpectedException(basil)\n"));
+            assertTrue(expected.getMessage().startsWith("There were 2 errors:" + LINE_SEPARATOR));
+            assertTrue(expected.getMessage().contains("ExpectedException(basil)" + LINE_SEPARATOR));
             assertTrue(expected.getMessage().contains("RuntimeException(garlic)"));
         }
     }
 
+    @Test
+    public void assertEmptyErrorListConstructorFailure() {
+        try {
+            new MultipleFailureException(Collections.<Throwable>emptyList());
+            fail();
+        } catch (IllegalArgumentException expected) {
+            assertThat(expected.getMessage(),
+                    containsString("List of Throwables must not be empty"));
+        }
+    }
+
+    @Test
+    public void assertEmptyWrapsAssumptionFailuresForManyThrowables() throws Exception {
+        List<Throwable> errors = new ArrayList<Throwable>();
+        AssumptionViolatedException assumptionViolatedException = new AssumptionViolatedException("skip it");
+        errors.add(assumptionViolatedException);
+        errors.add(new RuntimeException("garlic"));
+
+        try {
+            MultipleFailureException.assertEmpty(errors);
+            fail();
+        } catch (MultipleFailureException expected) {
+            assertThat(expected.getFailures().size(), equalTo(2));
+            assertTrue(expected.getMessage().startsWith("There were 2 errors:" + LINE_SEPARATOR));
+            assertTrue(expected.getMessage().contains("TestCouldNotBeSkippedException(Test could not be skipped"));
+            assertTrue(expected.getMessage().contains("RuntimeException(garlic)"));
+            Throwable first = expected.getFailures().get(0);
+            assertThat(first, instanceOf(TestCouldNotBeSkippedException.class));
+            Throwable cause = ((TestCouldNotBeSkippedException) first).getCause();
+            assertThat(cause, instanceOf(AssumptionViolatedException.class));
+            assertThat((AssumptionViolatedException) cause, CoreMatchers.sameInstance(assumptionViolatedException));
+        }
+    }
 
     private static class ExpectedException extends RuntimeException {
         private static final long serialVersionUID = 1L;

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/deprecated/AllDeprecatedTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/deprecated/JUnit4ClassRunnerTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/deprecated/JUnit4ClassRunnerTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/description/AllDescriptionTests.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/AllExperimentalTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/AssumptionTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/AssumptionTest.java Changed

@@ -2,9 +2,9 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeNoException;
@@ -77,9 +77,14 @@
         assertThat(result.getFailureCount(), is(1));
     }
 
-    @Test(expected = AssumptionViolatedException.class)
+    @Test
     public void assumeThatWorks() {
-        assumeThat(1, is(2));
+        try {
+            assumeThat(1, is(2));
+            fail("should throw AssumptionViolatedException");
+        } catch (AssumptionViolatedException e) {
+            // expected
+        }
     }
 
     @Test
@@ -94,10 +99,25 @@
         assertCompletesNormally();
     }
 
-    @Test(expected = AssumptionViolatedException.class)
+    @Test
     public void assumeNotNullThrowsException() {
         Object objects = {1, 2, null};
-        assumeNotNull(objects);
+        try {
+            assumeNotNull(objects);
+            fail("should throw AssumptionViolatedException");
+        } catch (AssumptionViolatedException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void assumeNotNullThrowsExceptionForNullArray() {
+        try {
+            assumeNotNull((Object) null);
+            fail("should throw AssumptionViolatedException");
+        } catch (AssumptionViolatedException e) {
+            // expected
+        }
     }
 
     @Test
@@ -133,9 +153,24 @@
     private void assertCompletesNormally() {
     }
 
-    @Test(expected = AssumptionViolatedException.class)
+    @Test
     public void assumeTrueWorks() {
-        Assume.assumeTrue(false);
+        try {
+            Assume.assumeTrue(false);
+            fail("should throw AssumptionViolatedException");
+        } catch (AssumptionViolatedException e) {
+            assertEquals("got: <false>, expected: is <true>", e.getMessage());
+        }
+    }
+
+    @Test
+    public void assumeFalseWorks() {
+        try {
+            Assume.assumeFalse(true);
+            fail("should throw AssumptionViolatedException");
+        } catch (AssumptionViolatedException e) {
+            assertEquals("got: <true>, expected: is <false>", e.getMessage());
+        }
     }
 
     public static class HasFailingAssumeInBefore {
@@ -188,13 +223,22 @@
         assertThat(testResult(AssumptionFailureInConstructor.class), isSuccessful());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void assumeWithExpectedException() {
-        assumeTrue(false);
+    public static class TestClassWithAssumptionFailure {
+
+        @Test(expected = IllegalArgumentException.class)
+        public void assumeWithExpectedException() {
+            assumeTrue(false);
+        }
+    }
+
+    @Test
+    public void assumeWithExpectedExceptionShouldThrowAssumptionViolatedException() {
+        Result result = JUnitCore.runClasses(TestClassWithAssumptionFailure.class);
+        assertThat(result.getAssumptionFailureCount(), is(1));
     }
 
-    final static String message = "Some random message string.";
-    final static Throwable e = new Throwable();
+    static final String message = "Some random message string.";
+    static final Throwable e = new Throwable();
 
     /**
      * @see AssumptionTest#assumptionsWithMessage()
@@ -245,7 +289,7 @@
         final List<Failure> failures =
                 runAndGetAssumptionFailures(HasFailingAssumptionWithMessage.class);
 
-        assertEquals(failures.size(), 1);
+        assertEquals(1, failures.size());
         assertTrue(failures.get(0).getMessage().contains(message));
     }

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/MatcherTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/MatcherTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/max/AllMaxTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/max/DescriptionTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/max/DescriptionTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/max/MaxStarterTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/max/MaxStarterTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/parallel/AllParallelTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/parallel/ParallelClassTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/parallel/ParallelClassTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/parallel/ParallelMethodTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/parallel/ParallelMethodTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/results/AllResultsTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/results/PrintableResultTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/results/PrintableResultTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/results/ResultMatchersTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/results/ResultMatchersTest.java Changed

@@ -1,14 +1,21 @@
 package org.junit.tests.experimental.results;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Test;
+import org.junit.experimental.results.PrintableResult;
 import org.junit.experimental.results.ResultMatchers;
 import org.junit.experimental.theories.Theory;
+import org.junit.runner.Description;
+import org.junit.runner.notification.Failure;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class ResultMatchersTest {
+
     @Test
     public void hasFailuresHasGoodDescription() {
         assertThat(ResultMatchers.failureCountIs(3).toString(),
@@ -20,4 +27,20 @@
         assertThat(ResultMatchers.failureCountIs(i).toString(),
                 containsString("" + i));
     }
+
+    @Test
+    public void hasFailureContaining_givenResultWithNoFailures() {
+        PrintableResult resultWithNoFailures = new PrintableResult(new ArrayList<Failure>());
+
+        assertThat(ResultMatchers.hasFailureContaining("").matches(resultWithNoFailures), is(false));
+    }
+
+    @Test
+    public void hasFailureContaining_givenResultWithOneFailure() {
+        PrintableResult resultWithOneFailure = new PrintableResult(Collections.singletonList(
+                new Failure(Description.EMPTY, new RuntimeException("my failure"))));
+
+        assertThat(ResultMatchers.hasFailureContaining("my failure").matches(resultWithOneFailure), is(true));
+        assertThat(ResultMatchers.hasFailureContaining("his failure").matches(resultWithOneFailure), is(false));
+    }
 }

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/AllTheoriesTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/AssumingInTheoriesTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/AssumingInTheoriesTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/ParameterSignatureTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/ParameterSignatureTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/TestedOnSupplierTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/TestedOnSupplierTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/extendingwithstubs/StubbedTheoriesTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/extendingwithstubs/StubbedTheoriesTest.java Changed

@@ -1,1 +1,16 @@
-package org.junit.tests.experimental.theories.extendingwithstubs;

import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assume.assumeThat;

import org.junit.experimental.theories.Theory;
import org.junit.runner.RunWith;

@RunWith(StubbedTheories.class)
public class StubbedTheoriesTest {
    @Theory
    public void ask(@Stub
    Correspondent correspondent) {
        assumeThat(correspondent.getAnswer("What is five?", "four", "five"),
                is("five"));
    }
}
\ No newline at end of file
+package org.junit.tests.experimental.theories.extendingwithstubs;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeThat;
+
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
+
+@RunWith(StubbedTheories.class)
+public class StubbedTheoriesTest {
+    @Theory
+    public void ask(@Stub Correspondent correspondent) {
+        assumeThat(correspondent.getAnswer("What is five?", "four", "five"),
+                is("five"));
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/internal/AllMembersSupplierTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/internal/AllMembersSupplierTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/internal/AllTheoriesInternalTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/internal/ParameterizedAssertionErrorTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/internal/ParameterizedAssertionErrorTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/internal/SpecificDataPointsSupplierTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/internal/SpecificDataPointsSupplierTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/AllTheoriesRunnerTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/FailingDataPointMethods.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/FailingDataPointMethods.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/SuccessfulWithDataPointFields.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/SuccessfulWithDataPointFields.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/TheoriesPerformanceTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/TheoriesPerformanceTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/TypeMatchingBetweenMultiDataPointsMethod.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/TypeMatchingBetweenMultiDataPointsMethod.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/UnsuccessfulWithDataPointFields.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/UnsuccessfulWithDataPointFields.java Changed

@@ -2,10 +2,8 @@
 
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.failureCountIs;
 import static org.junit.experimental.results.ResultMatchers.hasFailureContaining;
 import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining;
 import org.hamcrest.CoreMatchers;
@@ -121,11 +119,8 @@
     public void dataPointFieldsMustBeStatic() {
         assertThat(
                 testResult(DataPointFieldsMustBeStatic.class),
-                CoreMatchers.<PrintableResult>both(failureCountIs(2))
-                        .and(
-                                hasFailureContaining("DataPoint field THREE must be static"))
-                        .and(
-                                hasFailureContaining("DataPoint field FOURS must be static")));
+                CoreMatchers.<PrintableResult>both(hasFailureContaining("DataPoint field THREE must be static"))
+                        .and(hasFailureContaining("DataPoint field FOURS must be static")));
     }
     
     @RunWith(Theories.class)
@@ -150,8 +145,7 @@
     public void dataPointMethodsMustBeStatic() {
         assertThat(
                 testResult(DataPointMethodsMustBeStatic.class),
-                CoreMatchers.<PrintableResult>both(failureCountIs(2))
-                .and(
+                CoreMatchers.<PrintableResult>both(
                         hasFailureContaining("DataPoint method singleDataPointMethod must be static"))
                 .and(
                         hasFailureContaining("DataPoint method dataPointArrayMethod must be static")));
@@ -186,7 +180,6 @@
     @Test
     public void dataPointFieldsMustBePublic() {
         PrintableResult result = testResult(DataPointFieldsMustBePublic.class);        
-        assertEquals(6, result.failureCount());
 
         assertThat(result,
                 allOf(hasFailureContaining("DataPoint field THREE must be public"),
@@ -238,7 +231,6 @@
     @Test
     public void dataPointMethodsMustBePublic() {
         PrintableResult result = testResult(DataPointMethodsMustBePublic.class);        
-        assertEquals(6, result.failureCount());
 
         assertThat(result,
                 allOf(hasFailureContaining("DataPoint method three must be public"),

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WhenNoParametersMatch.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WhenNoParametersMatch.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithAutoGeneratedDataPoints.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithAutoGeneratedDataPoints.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithExtendedParameterSources.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithExtendedParameterSources.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithNamedDataPoints.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithNamedDataPoints.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithOnlyTestAnnotations.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithOnlyTestAnnotations.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithUnresolvedGenericTypeVariablesOnTheoryParms.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/experimental/theories/runner/WithUnresolvedGenericTypeVariablesOnTheoryParms.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/junit3compatibility/AllJUnit3CompatibilityTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java Changed

@@ -1,8 +1,8 @@
 package org.junit.tests.junit3compatibility;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import junit.framework.JUnit4TestAdapter;
@@ -24,7 +24,7 @@
 
     @RunWith(AllTests.class)
     public static class All {
-        static public junit.framework.Test suite() {
+        public static junit.framework.Test suite() {
             TestSuite suite = new TestSuite();
             suite.addTestSuite(OneTest.class);
             return suite;
@@ -60,7 +60,7 @@
 
     @RunWith(AllTests.class)
     public static class AllJUnit4 {
-        static public junit.framework.Test suite() {
+        public static junit.framework.Test suite() {
             TestSuite suite = new TestSuite();
             suite.addTest(new JUnit4TestAdapter(JUnit4Test.class));
             return suite;

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/junit3compatibility/ForwardCompatibilityTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/junit3compatibility/ForwardCompatibilityTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/junit3compatibility/JUnit38ClassRunnerTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/junit3compatibility/JUnit38ClassRunnerTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/junit3compatibility/JUnit4TestAdapterTest.java Added

@@ -0,0 +1,82 @@
+package org.junit.tests.junit3compatibility;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+public class JUnit4TestAdapterTest {
+
+    private static void doTest(Class<?> clazz) {
+        // JUnit 4 runner:
+        Result result = JUnitCore.runClasses(clazz);
+        assertEquals(1, result.getRunCount());
+        assertEquals(0, result.getFailureCount());
+        assertEquals(0, result.getIgnoreCount());
+
+        // JUnit 3 runner:
+        TestResult testResult = new TestResult();
+        new JUnit4TestAdapter(clazz).run(testResult);
+        assertEquals(1, testResult.runCount());
+        assertEquals(0, testResult.failureCount());
+        assertEquals(Collections.emptyList(), Collections.list(testResult.errors()));
+    }
+
+    public static class Test4 {
+        @Test
+        public void pass() throws Exception {
+            //pass
+        }
+    }
+
+    @RunWith(Suite.class)
+    @Suite.SuiteClasses(Test4.class)
+    public static class TestSuiteFor4 {
+    }
+
+    @Test
+    public void testJUnit4Suite() {
+        doTest(TestSuiteFor4.class);
+    }
+
+    public static class Test3 extends TestCase {
+        public void testPass() throws Exception {
+            //pass
+        }
+    }
+
+    @RunWith(Suite.class)
+    @Suite.SuiteClasses(Test3.class)
+    public static class TestSuiteFor3 {
+    }
+
+    @Test
+    public void testJUnit3Suite() {
+        doTest(TestSuiteFor3.class);
+    }
+
+    public static class TestSuite3 {
+        public static junit.framework.Test suite() {
+            return new TestSuite(Test3.class);
+        }
+    }
+
+    @RunWith(Suite.class)
+    @Suite.SuiteClasses(TestSuite3.class)
+    public static class TestSuite4ForTestSuite3 {
+    }
+
+    @Test
+    public void testJUnit4SuiteThatContainsJUnit3SuiteClass() {
+        doTest(TestSuite4ForTestSuite3.class);
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/junit3compatibility/OldTests.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/junit3compatibility/OldTests.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/junit3compatibility/SuiteMethodTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/junit3compatibility/SuiteMethodTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/listening/AllListeningTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/listening/ListenerTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/listening/ListenerTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/listening/TextListenerTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/listening/TextListenerTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/AllManipulationTests.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/AlphanumericOrdering.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/ComparatorBasedOrdering.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/Comparators.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/OrderWithTest.java Added

@@ -0,0 +1,268 @@
+package org.junit.tests.manipulation;
+
+import static org.junit.Assert.assertEquals;
+import junit.framework.JUnit4TestAdapter;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.OrderWith;
+import org.junit.runner.Request;
+import org.junit.runner.RunWith;
+import org.junit.runner.Runner;
+import org.junit.runner.manipulation.Alphanumeric;
+import org.junit.runner.notification.RunNotifier;
+
+@RunWith(Enclosed.class)
+public class OrderWithTest {
+ 
+    public static class TestClassRunnerIsOrderableViaOrderWith {
+        private static String log = "";
+
+        public static class Unordered {
+            @Test
+            public void a() {
+                log += "a";
+            }
+
+            @Test
+            public void b() {
+                log += "b";
+            }
+
+            @Test
+            public void c() {
+                log += "c";
+            }
+        }
+
+        @OrderWith(AlphanumericOrdering.class)
+        public static class OrderedAlphanumerically extends Unordered {
+        }
+
+        @OrderWith(ReverseAlphanumericOrdering.class)
+        public static class OrderedReverseAlphanumerically extends Unordered {
+        }
+
+        @Before
+        public void resetLog() {
+            log = "";
+        }
+
+        @Test
+        public void orderingForwardWorksOnTestClassRunner() {
+            Request forward = Request.aClass(OrderedAlphanumerically.class);
+
+            new JUnitCore().run(forward);
+            assertEquals("abc", log);
+        }
+
+        @Test
+        public void orderingBackwardWorksOnTestClassRunner() {
+            Request backward = Request.aClass(OrderedReverseAlphanumerically.class);
+
+            new JUnitCore().run(backward);
+            assertEquals("cba", log);
+        }
+
+        @RunWith(Enclosed.class)
+        public static class UnorderedSuite {
+            public static class A {
+                @Test
+                public void a() {
+                    log += "Aa";
+                }
+
+                @Test
+                public void b() {
+                    log += "Ab";
+                }
+
+                @Test
+                public void c() {
+                    log += "Ac";
+                }
+            }
+
+            public static class B {
+                @Test
+                public void a() {
+                    log += "Ba";
+                }
+
+                @Test
+                public void b() {
+                    log += "Bb";
+                }
+
+                @Test
+                public void c() {
+                    log += "Bc";
+                }
+            }
+        }
+
+        @OrderWith(AlphanumericOrdering.class)
+        public static class SuiteOrderedAlphanumerically extends UnorderedSuite {
+        }
+
+        @OrderWith(ReverseAlphanumericOrdering.class)
+        public static class SuiteOrderedReverseAlphanumerically extends UnorderedSuite {
+        }
+
+        @Test
+        public void orderingForwardWorksOnSuite() {
+            Request forward = Request.aClass(SuiteOrderedAlphanumerically.class);
+
+            new JUnitCore().run(forward);
+            assertEquals("AaAbAcBaBbBc", log);
+        }
+
+        @Test
+        public void orderingBackwardWorksOnSuite() {
+            Request backward = Request.aClass(SuiteOrderedReverseAlphanumerically.class);
+
+            new JUnitCore().run(backward);
+            assertEquals("BcBbBaAcAbAa", log);
+        }
+    }
+
+    public static class TestClassRunnerIsSortableViaOrderWith {
+        private static String log = "";
+
+        public static class Unordered {
+            @Test
+            public void a() {
+                log += "a";
+            }
+
+            @Test
+            public void b() {
+                log += "b";
+            }
+
+            @Test
+            public void c() {
+                log += "c";
+            }
+        }
+
+        @Before
+        public void resetLog() {
+            log = "";
+        }
+
+        @OrderWith(Alphanumeric.class)
+        public static class SortedAlphanumerically extends Unordered {
+        }
+
+        @OrderWith(ReverseAlphanumericSorter.class)
+        public static class SortedReverseAlphanumerically extends Unordered {
+        }
+ 
+        @Test
+        public void sortingForwardWorksOnTestClassRunner() {
+            Request forward = Request.aClass(SortedAlphanumerically.class);
+
+            new JUnitCore().run(forward);
+            assertEquals("abc", log);
+        }
+
+        @Test
+        public void sortingBackwardWorksOnTestClassRunner() {
+            Request backward = Request.aClass(SortedReverseAlphanumerically.class);
+
+            new JUnitCore().run(backward);
+            assertEquals("cba", log);
+        }
+    }
+
+    public static class TestClassRunnerIsOrderableWithSuiteMethod {
+        private static String log = "";
+
+        public static class Unordered {
+            @Test
+            public void a() {
+                log += "a";
+            }
+
+            @Test
+            public void b() {
+                log += "b";
+            }
+
+            @Test
+            public void c() {
+                log += "c";
+            }
+        }
+        
+        @OrderWith(AlphanumericOrdering.class)
+        public static class OrderedAlphanumerically extends Unordered {
+ 
+            public static junit.framework.Test suite() {
+                return new JUnit4TestAdapter(OrderedAlphanumerically.class);
+            }
+        }
+
+        @OrderWith(ReverseAlphanumericOrdering.class)
+        public static class OrderedReverseAlphanumerically extends Unordered {
+
+            public static junit.framework.Test suite() {
+                return new JUnit4TestAdapter(OrderedReverseAlphanumerically.class);
+            }
+        }
+
+        @Before
+        public void resetLog() {
+            log = "";
+        }
+
+        @Test
+        public void orderingForwardWorksOnTestClassRunner() {
+            Request forward = Request.aClass(OrderedAlphanumerically.class);
+
+            new JUnitCore().run(forward);
+            assertEquals("abc", log);
+        }
+
+        @Test
+        public void orderingBackwardWorksOnTestClassRunner() {
+            Request backward = Request.aClass(OrderedReverseAlphanumerically.class);
+
+            new JUnitCore().run(backward);
+            assertEquals("cba", log);
+        }
+    }
+
+    public static class UnOrderableRunnersAreHandledWithoutCrashing {
+        public static class UnOrderableRunner extends Runner {
+            public UnOrderableRunner(Class<?> klass) {
+            }
+
+            @Override
+            public Description getDescription() {
+                return Description.EMPTY;
+            }
+
+            @Override
+            public void run(RunNotifier notifier) {
+            }
+        }
+
+        @RunWith(UnOrderableRunner.class)
+        public static class UnOrderable {
+            @Test
+            public void a() {
+            }
+        }
+
+        @Test
+        public void unOrderablesAreHandledWithoutCrashing() {
+            Request unordered = Request.aClass(UnOrderable.class).orderWith(
+                    AlphanumericOrdering.INSTANCE);
+            new JUnitCore().run(unordered);
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/OrderableTest.java Added

@@ -0,0 +1,301 @@
+package org.junit.tests.manipulation;
+
+import static org.junit.Assert.assertEquals;
+import junit.framework.JUnit4TestAdapter;
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Request;
+import org.junit.runner.RunWith;
+import org.junit.runner.Runner;
+import org.junit.runner.manipulation.Orderer;
+import org.junit.runner.manipulation.InvalidOrderingException;
+import org.junit.runner.manipulation.Orderable;
+import org.junit.runner.manipulation.Sorter;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.MethodSorters;
+
+@RunWith(Enclosed.class)
+public class OrderableTest {
+ 
+    public static class TestClassRunnerIsOrderable {
+        private static String log = "";
+
+        public static class OrderMe {
+            @Test
+            public void a() {
+                log += "a";
+            }
+
+            @Test
+            public void b() {
+                log += "b";
+            }
+
+            @Test
+            public void c() {
+                log += "c";
+            }
+        }
+
+        @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+        public static class DoNotOrderMe {
+            @Test
+            public void a() {
+                log += "a";
+            }
+
+            @Test
+            public void b() {
+                log += "b";
+            }
+
+            @Test
+            public void c() {
+                log += "c";
+            }
+        }
+
+        @Before
+        public void resetLog() {
+            log = "";
+        }
+
+        @Test
+        public void orderingForwardWorksOnTestClassRunner() {
+            Request forward = Request.aClass(OrderMe.class).orderWith(
+                    AlphanumericOrdering.INSTANCE);
+
+            new JUnitCore().run(forward);
+            assertEquals("abc", log);
+        }
+
+        @Test
+        public void orderingBackwardWorksOnTestClassRunner() {
+            Request backward = Request.aClass(OrderMe.class).orderWith(
+                    new ReverseAlphanumericOrdering());
+
+            new JUnitCore().run(backward);
+            assertEquals("cba", log);
+        }
+        
+        @Test
+        public void orderingBackwardDoesNothingOnTestClassRunnerWithFixMethodOrder() {
+            Request backward = Request.aClass(DoNotOrderMe.class).orderWith(
+                    new ReverseAlphanumericOrdering());
+
+            new JUnitCore().run(backward);
+            assertEquals("abc", log);
+        }
+
+        @RunWith(Enclosed.class)
+        public static class Enclosing {
+            public static class A {
+                @Test
+                public void a() {
+                    log += "Aa";
+                }
+
+                @Test
+                public void b() {
+                    log += "Ab";
+                }
+
+                @Test
+                public void c() {
+                    log += "Ac";
+                }
+            }
+
+            public static class B {
+                @Test
+                public void a() {
+                    log += "Ba";
+                }
+
+                @Test
+                public void b() {
+                    log += "Bb";
+                }
+
+                @Test
+                public void c() {
+                    log += "Bc";
+                }
+            }
+        }
+
+        @Test
+        public void orderingForwardWorksOnSuite() {
+            Request forward = Request.aClass(Enclosing.class).orderWith(
+                    AlphanumericOrdering.INSTANCE);
+
+            new JUnitCore().run(forward);
+            assertEquals("AaAbAcBaBbBc", log);
+        }
+
+        @Test
+        public void orderingBackwardWorksOnSuite() {
+            Request backward = Request.aClass(Enclosing.class).orderWith(
+                    new ReverseAlphanumericOrdering());
+
+            new JUnitCore().run(backward);
+            assertEquals("BcBbBaAcAbAa", log);
+        }
+    }
+
+    public static class TestOrderableClassRunnerIsSortable {
+        private static String log = "";
+
+        /**
+         * A Runner that implements {@link Orderable}.
+         */
+        public static class OrderableRunner extends Runner implements Orderable {
+            private final BlockJUnit4ClassRunner delegate;
+
+            public OrderableRunner(Class<?> klass) throws Throwable {
+                delegate = new BlockJUnit4ClassRunner(klass);
+            }
+            
+            @Override
+            public void run(RunNotifier notifier) {
+                delegate.run(notifier);
+            }
+                
+            @Override
+            public Description getDescription() {
+                return delegate.getDescription();
+            }
+
+            public void order(Orderer orderer) throws InvalidOrderingException {
+                delegate.order(orderer);
+            }
+
+            public void sort(Sorter sorter) {
+                delegate.sort(sorter);
+            }
+        }
+
+        @RunWith(OrderableRunner.class)
+        public static class OrderMe {
+            @Test
+            public void a() {
+                log += "a";
+            }
+
+            @Test
+            public void b() {
+                log += "b";
+            }
+
+            @Test
+            public void c() {
+                log += "c";
+            }
+        }
+
+        @Before
+        public void resetLog() {
+            log = "";
+        }
+
+        @Test
+        public void orderingorwardWorksOnTestClassRunner() {
+            Request forward = Request.aClass(OrderMe.class).orderWith(
+                    AlphanumericOrdering.INSTANCE);
+
+            new JUnitCore().run(forward);
+            assertEquals("abc", log);
+        }
+
+        @Test
+        public void orderedBackwardWorksOnTestClassRunner() {
+            Request backward = Request.aClass(OrderMe.class).orderWith(
+                    new ReverseAlphanumericOrdering());
+
+            new JUnitCore().run(backward);
+            assertEquals("cba", log);
+        }
+    }
+
+    public static class TestClassRunnerIsOrderableWithSuiteMethod {
+        private static String log = "";
+
+        public static class OrderMe {
+            @Test
+            public void a() {
+                log += "a";
+            }
+
+            @Test
+            public void b() {
+                log += "b";
+            }
+
+            @Test
+            public void c() {
+                log += "c";
+            }
+
+            public static junit.framework.Test suite() {
+                return new JUnit4TestAdapter(OrderMe.class);
+            }
+        }
+
+        @Before
+        public void resetLog() {
+            log = "";
+        }
+
+        @Test
+        public void orderingForwardWorksOnTestClassRunner() {
+            Request forward = Request.aClass(OrderMe.class).orderWith(AlphanumericOrdering.INSTANCE);
+
+            new JUnitCore().run(forward);
+            assertEquals("abc", log);
+        }
+
+        @Test
+        public void orderingBackwardWorksOnTestClassRunner() {
+            Request backward = Request.aClass(OrderMe.class).orderWith(
+                    new ReverseAlphanumericOrdering());
+
+            new JUnitCore().run(backward);
+            assertEquals("cba", log);
+        }
+    }
+
+    public static class UnOrderableRunnersAreHandledWithoutCrashing {
+        public static class UnOrderableRunner extends Runner {
+            public UnOrderableRunner(Class<?> klass) {
+            }
+
+            @Override
+            public Description getDescription() {
+                return Description.EMPTY;
+            }
+
+            @Override
+            public void run(RunNotifier notifier) {
+            }
+        }
+
+        @RunWith(UnOrderableRunner.class)
+        public static class UnOrderable {
+            @Test
+            public void a() {
+            }
+        }
+
+        @Test
+        public void unOrderablesAreHandledWithoutCrashing() {
+            Request unordered = Request.aClass(UnOrderable.class).orderWith(
+                    AlphanumericOrdering.INSTANCE);
+            new JUnitCore().run(unordered);
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/ReverseAlphanumericOrdering.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/ReverseAlphanumericSorter.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/manipulation/SingleMethodTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/SingleMethodTest.java Changed

@@ -1,8 +1,8 @@
 package org.junit.tests.manipulation;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
@@ -27,7 +27,7 @@
 public class SingleMethodTest {
     public static int count;
 
-    static public class OneTimeSetup {
+    public static class OneTimeSetup {
         @BeforeClass
         public static void once() {
             count++;
@@ -53,7 +53,7 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class ParameterizedOneTimeSetup {
+    public static class ParameterizedOneTimeSetup {
         @Parameters
         public static List<Object> params() {
             return Arrays.asList(new Object{1}, new Object{2});
@@ -78,7 +78,7 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class ParameterizedOneTimeBeforeClass {
+    public static class ParameterizedOneTimeBeforeClass {
         @Parameters
         public static List<Object> params() {
             return Arrays.asList(new Object{1}, new Object{2});

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/manipulation/SortableTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/manipulation/SortableTest.java Changed

@@ -1,11 +1,13 @@
 package org.junit.tests.manipulation;
 
+import static java.util.Collections.reverseOrder;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Comparator;
 
 import junit.framework.JUnit4TestAdapter;
 import org.junit.Before;
+import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.Description;
@@ -13,24 +15,21 @@
 import org.junit.runner.Request;
 import org.junit.runner.RunWith;
 import org.junit.runner.Runner;
+import org.junit.runner.manipulation.Orderable;
+import org.junit.runner.manipulation.Sortable;
+import org.junit.runner.manipulation.Sorter;
 import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.MethodSorters;
 
 @RunWith(Enclosed.class)
 public class SortableTest {
     private static Comparator<Description> forward() {
-        return new Comparator<Description>() {
-            public int compare(Description o1, Description o2) {
-                return o1.getDisplayName().compareTo(o2.getDisplayName());
-            }
-        };
+        return Comparators.alphanumeric();
     }
 
     private static Comparator<Description> backward() {
-        return new Comparator<Description>() {
-            public int compare(Description o1, Description o2) {
-                return o2.getDisplayName().compareTo(o1.getDisplayName());
-            }
-        };
+        return reverseOrder(Comparators.alphanumeric());
     }
 
     public static class TestClassRunnerIsSortable {
@@ -53,6 +52,24 @@
             }
         }
 
+        @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+        public static class DoNotSortMe {
+            @Test
+            public void a() {
+                log += "a";
+            }
+
+            @Test
+            public void b() {
+                log += "b";
+            }
+
+            @Test
+            public void c() {
+                log += "c";
+            }
+        }
+
         @Before
         public void resetLog() {
             log = "";
@@ -74,6 +91,14 @@
             assertEquals("cba", log);
         }
 
+        @Test
+        public void sortingBackwardDoesNothingOnTestClassRunnerWithFixMethodOrder() {
+            Request backward = Request.aClass(DoNotSortMe.class).sortWith(backward());
+
+            new JUnitCore().run(backward);
+            assertEquals("abc", log);
+        }
+
         @RunWith(Enclosed.class)
         public static class Enclosing {
             public static class A {
@@ -202,4 +227,76 @@
             new JUnitCore().run(unsorted);
         }
     }
+
+    public static class TestOnlySortableClassRunnerIsSortable {
+        private static String log = "";
+
+        /**
+         * A Runner that implements {@link Sortable} but not {@link Orderable}.
+         */
+        public static class SortableRunner extends Runner implements Sortable {
+            private final BlockJUnit4ClassRunner delegate;
+
+            public SortableRunner(Class<?> klass) throws Throwable {
+                delegate = new BlockJUnit4ClassRunner(klass);
+            }
+
+            @Override
+            public void run(RunNotifier notifier) {
+                delegate.run(notifier);
+            }
+
+            @Override
+            public Description getDescription() {
+                return delegate.getDescription();
+            }
+
+            public void sort(Sorter sorter) {
+                delegate.sort(sorter);
+            }
+        }
+
+        @RunWith(SortableRunner.class)
+        public static class SortMe {
+            @Test
+            public void a() {
+                log += "a";
+            }
+
+            @Test
+            public void b() {
+                log += "b";
+            }
+
+            @Test
+            public void c() {
+                log += "c";
+            }
+
+            public static junit.framework.Test suite() {
+                return new JUnit4TestAdapter(SortMe.class);
+            }
+        }
+
+        @Before
+        public void resetLog() {
+            log = "";
+        }
+
+        @Test
+        public void sortingForwardWorksOnTestClassRunner() {
+            Request forward = Request.aClass(SortMe.class).sortWith(forward());
+
+            new JUnitCore().run(forward);
+            assertEquals("abc", log);
+        }
+
+        @Test
+        public void sortingBackwardWorksOnTestClassRunner() {
+            Request backward = Request.aClass(SortMe.class).sortWith(backward());
+
+            new JUnitCore().run(backward);
+            assertEquals("cba", log);
+        }
+    }
 }

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/AllRunningTests.java Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/AllClassesTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/classes/BlockJUnit4ClassRunnerTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/BlockJUnit4ClassRunnerTest.java Changed

@@ -5,6 +5,9 @@
 import java.util.List;
 
 import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.notification.RunListener;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.InitializationError;
 
@@ -30,4 +33,36 @@
                     causes.get(0).getMessage());
         }
     }
-}
\ No newline at end of file
+
+    private static String log;
+
+    public static class MethodBlockAfterFireTestStarted {
+        public MethodBlockAfterFireTestStarted() {
+            log += " init";
+        }
+
+        @Test
+        public void test() {
+            log += " test";
+        }
+    }
+
+    @Test
+    public void methodBlockAfterFireTestStarted() {
+        log = "";
+        JUnitCore junit = new JUnitCore();
+        junit.addListener(new RunListener() {
+            @Override
+            public void testStarted(Description description) throws Exception {
+                log += " testStarted(" + description.getMethodName() + ")";
+            }
+
+            @Override
+            public void testFinished(Description description) throws Exception {
+                log += " testFinished(" + description.getMethodName() + ")";
+            }
+        });
+        junit.run(MethodBlockAfterFireTestStarted.class);
+        assertEquals(" testStarted(test) init test testFinished(test)", log);
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/classes/EnclosedTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/EnclosedTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java Changed

@@ -1,19 +1,25 @@
 package org.junit.tests.running.classes;
 
 import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.experimental.results.PrintableResult.testResult;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
@@ -22,6 +28,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runner.Runner;
 import org.junit.runner.notification.Failure;
+import org.junit.runners.MethodSorters;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
@@ -32,62 +39,82 @@
 
 public class ParameterizedTestTest {
     @RunWith(Parameterized.class)
-    static public class FibonacciTest {
-        @Parameters(name = "{index}: fib({0})={1}")
+    public static class AdditionTest {
+        @Parameters(name = "{index}: {0} + {1} = {2}")
         public static Iterable<Object> data() {
-            return Arrays.asList(new Object{{0, 0}, {1, 1}, {2, 1},
-                    {3, 2}, {4, 3}, {5, 5}, {6, 8}});
+            return Arrays.asList(new Object { { 0, 0, 0 }, { 1, 1, 2 },
+                    { 3, 2, 5 }, { 4, 3, 7 } });
         }
 
-        private final int fInput;
+        private int firstSummand;
 
-        private final int fExpected;
+        private int secondSummand;
 
-        public FibonacciTest(int input, int expected) {
-            fInput = input;
-            fExpected = expected;
+        private int sum;
+
+        public AdditionTest(int firstSummand, int secondSummand, int sum) {
+            this.firstSummand = firstSummand;
+            this.secondSummand = secondSummand;
+            this.sum = sum;
         }
 
         @Test
         public void test() {
-            assertEquals(fExpected, fib(fInput));
-        }
-
-        private int fib(int x) {
-            return 0;
+            assertEquals(sum, firstSummand + secondSummand);
         }
     }
 
     @Test
-    public void count() {
-        Result result = JUnitCore.runClasses(FibonacciTest.class);
-        assertEquals(7, result.getRunCount());
-        assertEquals(6, result.getFailureCount());
-    }
-
-    @Test
-    public void failuresNamedCorrectly() {
-        Result result = JUnitCore.runClasses(FibonacciTest.class);
-        assertEquals(
-                "test1: fib(1)=1(" + FibonacciTest.class.getName() + ")",
-                result.getFailures().get(0).getTestHeader());
+    public void countsRuns() {
+        Result result = JUnitCore.runClasses(AdditionTest.class);
+        assertEquals(4, result.getRunCount());
     }
 
     @Test
     public void countBeforeRun() throws Exception {
-        Runner runner = Request.aClass(FibonacciTest.class).getRunner();
-        assertEquals(7, runner.testCount());
+        Runner runner = Request.aClass(AdditionTest.class).getRunner();
+        assertEquals(4, runner.testCount());
     }
 
     @Test
     public void plansNamedCorrectly() throws Exception {
-        Runner runner = Request.aClass(FibonacciTest.class).getRunner();
+        Runner runner = Request.aClass(AdditionTest.class).getRunner();
         Description description = runner.getDescription();
-        assertEquals("0: fib(0)=0", description.getChildren().get(0)
+        assertEquals("2: 3 + 2 = 5", description.getChildren().get(2)
                 .getDisplayName());
     }
 
     @RunWith(Parameterized.class)
+    public static class ThreeFailures {
+        @Parameters(name = "{index}: x={0}")
+        public static Collection<Integer> data() {
+            return Arrays.asList(1, 2, 3);
+        }
+
+        @Parameter(0)
+        public int unused;
+
+        @Test
+        public void testSomething() {
+            fail();
+        }
+    }
+
+    @Test
+    public void countsFailures() throws Exception {
+        Result result = JUnitCore.runClasses(ThreeFailures.class);
+        assertEquals(3, result.getFailureCount());
+    }
+
+    @Test
+    public void failuresNamedCorrectly() {
+        Result result = JUnitCore.runClasses(ThreeFailures.class);
+        assertEquals(
+                "testSomething0: x=1(" + ThreeFailures.class.getName() + ")",
+                result.getFailures().get(0).getTestHeader());
+    }
+
+    @RunWith(Parameterized.class)
     public static class ParameterizedWithoutSpecialTestname {
         @Parameters
         public static Collection<Object> data() {
@@ -111,59 +138,37 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class FibonacciWithParameterizedFieldTest {
-        @Parameters
-        public static Collection<Object> data() {
-            return Arrays.asList(new Object{{0, 0}, {1, 1}, {2, 1},
-                    {3, 2}, {4, 3}, {5, 5}, {6, 8}});
+    public static class AdditionTestWithAnnotatedFields {
+        @Parameters(name = "{index}: {0} + {1} = {2}")
+        public static Iterable<Object> data() {
+            return Arrays.asList(new Object { { 0, 0, 0 }, { 1, 1, 2 },
+                    { 3, 2, 5 }, { 4, 3, 7 } });
         }
 
         @Parameter(0)
-        public int fInput;
+        public int firstSummand;
 
         @Parameter(1)
-        public int fExpected;
+        public int secondSummand;
+
+        @Parameter(2)
+        public int sum;
 
         @Test
         public void test() {
-            assertEquals(fExpected, fib(fInput));
-        }
-
-        private int fib(int x) {
-            return 0;
+            assertEquals(sum, firstSummand + secondSummand);
         }
     }
 
     @Test
-    public void countWithParameterizedField() {
-        Result result = JUnitCore.runClasses(FibonacciWithParameterizedFieldTest.class);
-        assertEquals(7, result.getRunCount());
-        assertEquals(6, result.getFailureCount());
-    }
-
-    @Test
-    public void failuresNamedCorrectlyWithParameterizedField() {
-        Result result = JUnitCore.runClasses(FibonacciWithParameterizedFieldTest.class);
-        assertEquals(String
-                .format("test1(%s)", FibonacciWithParameterizedFieldTest.class.getName()), result
-                .getFailures().get(0).getTestHeader());
-    }
-
-    @Test
-    public void countBeforeRunWithParameterizedField() throws Exception {
-        Runner runner = Request.aClass(FibonacciWithParameterizedFieldTest.class).getRunner();
-        assertEquals(7, runner.testCount());
-    }
-
-    @Test
-    public void plansNamedCorrectlyWithParameterizedField() throws Exception {
-        Runner runner = Request.aClass(FibonacciWithParameterizedFieldTest.class).getRunner();
-        Description description = runner.getDescription();
-        assertEquals("0", description.getChildren().get(0).getDisplayName());
+    public void providesDataByAnnotatedFields() {
+        Result result = JUnitCore.runClasses(AdditionTestWithAnnotatedFields.class);
+        assertEquals(4, result.getRunCount());
+        assertEquals(0, result.getFailureCount());
     }
 
     @RunWith(Parameterized.class)
-    static public class BadIndexForAnnotatedFieldTest {
+    public static class BadIndexForAnnotatedFieldTest {
         @Parameters
         public static Collection<Object> data() {
             return Arrays.asList(new Object{{0}});
@@ -187,15 +192,15 @@
     @Test
     public void failureOnInitialization() {
         Result result = JUnitCore.runClasses(BadIndexForAnnotatedFieldTest.class);
-        assertEquals(2, result.getFailureCount());
+        assertEquals(1, result.getFailureCount());
         List<Failure> failures = result.getFailures();
-        assertEquals("Invalid @Parameter value: 2. @Parameter fields counted: 1. Please use an index between 0 and 0.",
-                failures.get(0).getException().getMessage());
-        assertEquals("@Parameter(0) is never used.", failures.get(1).getException().getMessage());
+        assertThat(failures.get(0).getException().getMessage(), allOf(
+                containsString("Invalid @Parameter value: 2. @Parameter fields counted: 1. Please use an index between 0 and 0."),
+                containsString("@Parameter(0) is never used.")));
     }
 
     @RunWith(Parameterized.class)
-    static public class BadNumberOfAnnotatedFieldTest {
+    public static class BadNumberOfAnnotatedFieldTest {
         @Parameters
         public static Collection<Object> data() {
             return Arrays.asList(new Object{{0, 0}});
@@ -227,7 +232,7 @@
     private static String fLog;
 
     @RunWith(Parameterized.class)
-    static public class BeforeAndAfter {
+    public static class BeforeAndAfter {
         @BeforeClass
         public static void before() {
             fLog += "before ";
@@ -260,7 +265,229 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class EmptyTest {
+    @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+    public static class BeforeParamAndAfterParam {
+        @BeforeClass
+        public static void before() {
+            fLog += "beforeClass ";
+        }
+
+        @Parameterized.BeforeParam
+        public static void beforeParam(String x) {
+            fLog += "before(" + x + ") ";
+        }
+
+        @Parameterized.AfterParam
+        public static void afterParam() {
+            fLog += "afterParam ";
+        }
+
+        @AfterClass
+        public static void after() {
+            fLog += "afterClass ";
+        }
+
+        private final String x;
+
+        public BeforeParamAndAfterParam(String x) {
+            this.x = x;
+        }
+
+        @Parameters
+        public static Collection<String> data() {
+            return Arrays.asList("A", "B");
+        }
+
+        @Test
+        public void first() {
+            fLog += "first(" + x + ") ";
+        }
+
+        @Test
+        public void second() {
+            fLog += "second(" + x + ") ";
+        }
+    }
+
+    @Test
+    public void beforeParamAndAfterParamAreRun() {
+        fLog = "";
+        Result result = JUnitCore.runClasses(BeforeParamAndAfterParam.class);
+        assertEquals(0, result.getFailureCount());
+        assertEquals("beforeClass before(A) first(A) second(A) afterParam "
+                + "before(B) first(B) second(B) afterParam afterClass ", fLog);
+    }
+
+    @RunWith(Parameterized.class)
+    @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+    public static class MultipleBeforeParamAndAfterParam {
+        @Parameterized.BeforeParam
+        public static void before1() {
+            fLog += "before1() ";
+        }
+
+        @Parameterized.BeforeParam
+        public static void before2(String x) {
+            fLog += "before2(" + x + ") ";
+        }
+
+        @Parameterized.AfterParam
+        public static void after2() {
+            fLog += "after2() ";
+        }
+
+        @Parameterized.AfterParam
+        public static void after1(String x) {
+            fLog += "after1(" + x + ") ";
+        }
+
+        private final String x;
+
+        public MultipleBeforeParamAndAfterParam(String x) {
+            this.x = x;
+        }
+
+        @Parameters
+        public static Collection<String> data() {
+            return Arrays.asList("A", "B");
+        }
+
+        @Test
+        public void first() {
+            fLog += "first(" + x + ") ";
+        }
+
+        @Test
+        public void second() {
+            fLog += "second(" + x + ") ";
+        }
+    }
+
+    @Test
+    public void multipleBeforeParamAndAfterParamAreRun() {
+        fLog = "";
+        Result result = JUnitCore.runClasses(MultipleBeforeParamAndAfterParam.class);
+        assertEquals(0, result.getFailureCount());
+        assertEquals("before1() before2(A) first(A) second(A) after1(A) after2() "
+                + "before1() before2(B) first(B) second(B) after1(B) after2() ", fLog);
+    }
+
+    @RunWith(Parameterized.class)
+    @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+    public static class MultipleParametersBeforeParamAndAfterParam {
+        @Parameterized.BeforeParam
+        public static void before(String x, int y) {
+            fLog += "before(" + x + "," + y + ") ";
+        }
+
+        @Parameterized.AfterParam
+        public static void after(String x, int y) {
+            fLog += "after(" + x + "," + y + ") ";
+        }
+
+        private final String x;
+        private final int y;
+
+        public MultipleParametersBeforeParamAndAfterParam(String x, int y) {
+            this.x = x;
+            this.y = y;
+        }
+
+        @Parameters
+        public static Collection<Object> data() {
+            return Arrays.asList(new Object{"A", 1}, new Object{"B", 2});
+        }
+
+        @Test
+        public void first() {
+            fLog += "first(" + x + "," + y + ") ";
+        }
+
+        @Test
+        public void second() {
+            fLog += "second(" + x + "," + y + ") ";
+        }
+    }
+
+    @Test
+    public void multipleParametersBeforeParamAndAfterParamAreRun() {
+        fLog = "";
+        Result result = JUnitCore.runClasses(MultipleParametersBeforeParamAndAfterParam.class);
+        assertEquals(0, result.getFailureCount());
+        assertEquals("before(A,1) first(A,1) second(A,1) after(A,1) "
+                + "before(B,2) first(B,2) second(B,2) after(B,2) ", fLog);
+    }
+
+    @RunWith(Parameterized.class)
+    public static class BeforeParamAndAfterParamError {
+        @Parameterized.BeforeParam
+        public void beforeParam(String x) {
+        }
+
+        @Parameterized.AfterParam
+        private static void afterParam() {
+        }
+
+        public BeforeParamAndAfterParamError(String x) {
+        }
+
+        @Parameters
+        public static Collection<String> data() {
+            return Arrays.asList("A", "B");
+        }
+
+        @Test
+        public void test() {
+        }
+    }
+
+    @Test
+    public void beforeParamAndAfterParamValidation() {
+        fLog = "";
+        Result result = JUnitCore.runClasses(BeforeParamAndAfterParamError.class);
+        assertEquals(1, result.getFailureCount());
+        List<Failure> failures = result.getFailures();
+        assertThat(failures.get(0).getMessage(), containsString("beforeParam() should be static"));
+        assertThat(failures.get(0).getMessage(), containsString("afterParam() should be public"));
+    }
+
+    @RunWith(Parameterized.class)
+    public static class BeforeParamAndAfterParamErrorNumberOfParameters {
+        @Parameterized.BeforeParam
+        public static void beforeParam(String x, String y) {
+        }
+
+        @Parameterized.AfterParam
+        public static void afterParam(String x, String y, String z) {
+        }
+
+        public BeforeParamAndAfterParamErrorNumberOfParameters(String x) {
+        }
+
+        @Parameters
+        public static Collection<String> data() {
+            return Arrays.asList("A", "B", "C", "D");
+        }
+
+        @Test
+        public void test() {
+        }
+    }
+
+    @Test
+    public void beforeParamAndAfterParamValidationNumberOfParameters() {
+        fLog = "";
+        Result result = JUnitCore.runClasses(BeforeParamAndAfterParamErrorNumberOfParameters.class);
+        assertEquals(1, result.getFailureCount());
+        List<Failure> failures = result.getFailures();
+        assertThat(failures.get(0).getMessage(),
+                containsString("Method beforeParam() should have 0 or 1 parameter(s)"));
+        assertThat(failures.get(0).getMessage(),
+                containsString("Method afterParam() should have 0 or 1 parameter(s)"));
+    }
+
+    @RunWith(Parameterized.class)
+    public static class EmptyTest {
         @BeforeClass
         public static void before() {
             fLog += "before ";
@@ -279,7 +506,7 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class IncorrectTest {
+    public static class IncorrectTest {
         @Test
         public int test() {
             return 0;
@@ -298,7 +525,7 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class ProtectedParametersTest {
+    public static class ProtectedParametersTest {
         @Parameters
         protected static Collection<Object> data() {
             return Collections.emptyList();
@@ -317,7 +544,7 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class ParametersNotIterable {
+    public static class ParametersNotIterable {
         @Parameters
         public static String data() {
             return "foo";
@@ -336,7 +563,7 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class PrivateConstructor {
+    public static class PrivateConstructor {
         private PrivateConstructor(int x) {
 
         }
@@ -357,40 +584,36 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class FibonacciTestWithArray {
-        @Parameters(name= "{index}: fib({0})={1}")
+    public static class AdditionTestWithArray {
+        @Parameters(name = "{index}: {0} + {1} = {2}")
         public static Object data() {
-            return new Object { { 0, 0 }, { 1, 1 }, { 2, 1 },
-                { 3, 2 }, { 4, 3 }, { 5, 5 }, { 6, 8 } };
+            return new Object { { 0, 0, 0 }, { 1, 1, 2 }, { 3, 2, 5 },
+                    { 4, 3, 7 } };
         }
 
-        private final int fInput;
+        @Parameter(0)
+        public int firstSummand;
 
-        private final int fExpected;
+        @Parameter(1)
+        public int secondSummand;
 
-        public FibonacciTestWithArray(int input, int expected) {
-            fInput= input;
-            fExpected= expected;
-        }
+        @Parameter(2)
+        public int sum;
 
         @Test
         public void test() {
-            assertEquals(fExpected, fib(fInput));
-        }
-
-        private int fib(int x) {
-            return 0;
+            assertEquals(sum, firstSummand + secondSummand);
         }
     }
 
     @Test
     public void runsEveryTestOfArray() {
-        Result result= JUnitCore.runClasses(FibonacciTestWithArray.class);
-        assertEquals(7, result.getRunCount());
+        Result result= JUnitCore.runClasses(AdditionTestWithArray.class);
+        assertEquals(4, result.getRunCount());
     }
 
     @RunWith(Parameterized.class)
-    static public class SingleArgumentTestWithArray {
+    public static class SingleArgumentTestWithArray {
         @Parameters
         public static Object data() {
             return new Object { "first test", "second test" };
@@ -411,10 +634,15 @@
     }
 
     @RunWith(Parameterized.class)
-    static public class SingleArgumentTestWithIterable {
+    public static class SingleArgumentTestWithIterable {
+        private static final AtomicBoolean dataCalled = new AtomicBoolean(false);
+
         @Parameters
         public static Iterable<? extends Object> data() {
-            return asList("first test", "second test");
+            if (!dataCalled.compareAndSet(false, true)) {
+                fail("Should not call @Parameters method more than once");
+            }
+            return new OneShotIterable<String>(asList("first test", "second test"));
         }
 
         public SingleArgumentTestWithIterable(Object argument) {
@@ -425,6 +653,22 @@
         }
   	}
 
+    private static class OneShotIterable<T> implements Iterable<T> {
+        private final Iterable<T> delegate;
+        private final AtomicBoolean iterated = new AtomicBoolean(false);
+
+        OneShotIterable(Iterable<T> delegate) {
+            this.delegate = delegate;
+        }
+
+        public Iterator<T> iterator() {
+            if (iterated.compareAndSet(false, true)) {
+                return delegate.iterator();
+            }
+            throw new IllegalStateException("Cannot call iterator() more than once");
+        }
+    }
+
     @Test
     public void runsForEverySingleArgumentOfIterable() {
         Result result= JUnitCore
@@ -432,7 +676,30 @@
         assertEquals(2, result.getRunCount());
     }
 
-    static public class ExceptionThrowingRunnerFactory implements
+    @RunWith(Parameterized.class)
+    public static class SingleArgumentTestWithCollection {
+        @Parameters
+        public static Iterable<? extends Object> data() {
+            return Collections.unmodifiableCollection(asList("first test", "second test"));
+        }
+
+        public SingleArgumentTestWithCollection(Object argument) {
+        }
+
+        @Test
+        public void aTest() {
+        }
+    }
+
+    @Test
+    public void runsForEverySingleArgumentOfCollection() {
+        Result result= JUnitCore
+                .runClasses(SingleArgumentTestWithCollection.class);
+        assertEquals(2, result.getRunCount());
+    }
+
+
+    public static class ExceptionThrowingRunnerFactory implements
             ParametersRunnerFactory {
         public Runner createRunnerForTestWithParameters(TestWithParameters test)
                 throws InitializationError {
@@ -443,7 +710,7 @@
 
     @RunWith(Parameterized.class)
     @UseParametersRunnerFactory(ExceptionThrowingRunnerFactory.class)
-    static public class TestWithUseParametersRunnerFactoryAnnotation {
+    public static class TestWithUseParametersRunnerFactoryAnnotation {
         @Parameters
         public static Iterable<? extends Object> data() {
             return asList("single test");
@@ -472,7 +739,7 @@
     
     @RunWith(Parameterized.class)
     @UseParametersRunnerFactory(ExceptionThrowingRunnerFactory.class)
-    public static abstract class UseParameterizedFactoryAbstractTest {
+    public abstract static class UseParameterizedFactoryAbstractTest {
         @Parameters
         public static Iterable<? extends Object> data() {
             return asList("single test");
@@ -497,4 +764,46 @@
                 UseParameterizedFactoryTest.class,
                 "Called ExceptionThrowingRunnerFactory.");
     }
-}
\ No newline at end of file
+
+    @RunWith(Parameterized.class)
+    public static class AssumptionInParametersMethod {
+        static boolean assumptionFails;
+
+        @Parameters
+        public static Iterable<String> data() {
+            assumeFalse(assumptionFails);
+            return Collections.singletonList("foobar");
+        }
+
+        public AssumptionInParametersMethod(String parameter) {
+        }
+
+        @Test
+        public void test1() {
+        }
+
+        @Test
+        public void test2() {
+        }
+    }
+
+    @Test
+    public void testsAreExecutedWhenAssumptionInParametersMethodDoesNotFail() {
+        AssumptionInParametersMethod.assumptionFails = false;
+        Result result = JUnitCore.runClasses(AssumptionInParametersMethod.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(0, result.getAssumptionFailureCount());
+        assertEquals(0, result.getIgnoreCount());
+        assertEquals(2, result.getRunCount());
+    }
+
+    @Test
+    public void testsAreNotExecutedWhenAssumptionInParametersMethodFails() {
+        AssumptionInParametersMethod.assumptionFails = true;
+        Result result = JUnitCore.runClasses(AssumptionInParametersMethod.class);
+        assertTrue(result.wasSuccessful());
+        assertEquals(1, result.getAssumptionFailureCount());
+        assertEquals(0, result.getIgnoreCount());
+        assertEquals(0, result.getRunCount());
+    }
+}

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/classes/ParentRunnerFilteringTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/ParentRunnerFilteringTest.java Changed

@@ -1,7 +1,7 @@
 package org.junit.tests.running.classes;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.experimental.results.PrintableResult.testResult;
 import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining;
@@ -95,9 +95,9 @@
         fail("Expected 'NoTestsRemainException' due to complete filtering");
     }
 
-    public static class SuiteWithUnmodifyableChildList extends Suite {
+    public static class SuiteWithUnmodifiableChildList extends Suite {
 
-        public SuiteWithUnmodifyableChildList(
+        public SuiteWithUnmodifiableChildList(
                 Class<?> klass, RunnerBuilder builder)
                 throws InitializationError {
             super(klass, builder);
@@ -109,14 +109,14 @@
         }
     }
 
-    @RunWith(SuiteWithUnmodifyableChildList.class)
+    @RunWith(SuiteWithUnmodifiableChildList.class)
     @SuiteClasses({ExampleTest.class})
-    public static class ExampleSuiteWithUnmodifyableChildList {
+    public static class ExampleSuiteWithUnmodifiableChildList {
     }
 
     @Test
-    public void testSuiteFilteringWithUnmodifyableChildList() throws Exception {
-        Runner runner = Request.aClass(ExampleSuiteWithUnmodifyableChildList.class)
+    public void testSuiteFilteringWithUnmodifiableChildList() throws Exception {
+        Runner runner = Request.aClass(ExampleSuiteWithUnmodifiableChildList.class)
                 .getRunner();
         Filter filter = notThisMethodName("test1");
         try {

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java Changed

@@ -1,9 +1,9 @@
 package org.junit.tests.running.classes;
 
-import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.util.List;
 
@@ -26,8 +26,8 @@
 import org.junit.runners.ParentRunner;
 import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.RunnerScheduler;
-import org.junit.tests.experimental.rules.RuleMemberValidatorTest.TestWithNonStaticClassRule;
-import org.junit.tests.experimental.rules.RuleMemberValidatorTest.TestWithProtectedClassRule;
+import org.junit.rules.RuleMemberValidatorTest.TestWithNonStaticClassRule;
+import org.junit.rules.RuleMemberValidatorTest.TestWithProtectedClassRule;
 
 public class ParentRunnerTest {
     public static String log = "";
@@ -136,6 +136,9 @@
     static class NonPublicTestClass {
         public NonPublicTestClass() {
         }
+
+        @Test
+        public void alwaysPasses() {}
     }
 
     @Test
@@ -149,9 +152,9 @@
         JUnitCore junitCore = new JUnitCore();
         Request request = Request.aClass(klass);
         Result result = junitCore.run(request);
-        assertThat(result.getFailureCount(), is(2)); //the second failure is no runnable methods
+        assertThat(result.getFailureCount(), is(1));
         assertThat(result.getFailures().get(0).getMessage(),
-                is(equalTo(message)));
+                containsString(message));
     }
 
     public static class AssertionErrorAtParentLevelTest {
@@ -167,14 +170,20 @@
     @Test
     public void assertionErrorAtParentLevelTest() throws InitializationError {
         CountingRunListener countingRunListener = runTestWithParentRunner(AssertionErrorAtParentLevelTest.class);
+        Assert.assertEquals(1, countingRunListener.testSuiteStarted);
+        Assert.assertEquals(1, countingRunListener.testSuiteFinished);
+        Assert.assertEquals(1, countingRunListener.testSuiteFailure);
+        Assert.assertEquals(0, countingRunListener.testSuiteAssumptionFailure);
+
         Assert.assertEquals(0, countingRunListener.testStarted);
         Assert.assertEquals(0, countingRunListener.testFinished);
-        Assert.assertEquals(1, countingRunListener.testFailure);
+        Assert.assertEquals(0, countingRunListener.testFailure);
         Assert.assertEquals(0, countingRunListener.testAssumptionFailure);
         Assert.assertEquals(0, countingRunListener.testIgnored);
     }
 
     public static class AssumptionViolatedAtParentLevelTest {
+        @SuppressWarnings("deprecation")
         @BeforeClass
         public static void beforeClass() {
             throw new AssumptionViolatedException("Thrown from @BeforeClass");
@@ -187,10 +196,15 @@
     @Test
     public void assumptionViolatedAtParentLevel() throws InitializationError {
         CountingRunListener countingRunListener = runTestWithParentRunner(AssumptionViolatedAtParentLevelTest.class);
+        Assert.assertEquals(1, countingRunListener.testSuiteStarted);
+        Assert.assertEquals(1, countingRunListener.testSuiteFinished);
+        Assert.assertEquals(0, countingRunListener.testSuiteFailure);
+        Assert.assertEquals(1, countingRunListener.testSuiteAssumptionFailure);
+
         Assert.assertEquals(0, countingRunListener.testStarted);
         Assert.assertEquals(0, countingRunListener.testFinished);
         Assert.assertEquals(0, countingRunListener.testFailure);
-        Assert.assertEquals(1, countingRunListener.testAssumptionFailure);
+        Assert.assertEquals(0, countingRunListener.testAssumptionFailure);
         Assert.assertEquals(0, countingRunListener.testIgnored);
     }
 
@@ -207,6 +221,7 @@
         @Test
         public void ignore() {}
 
+        @SuppressWarnings("deprecation")
         @Test
         public void assumptionFail() {
             throw new AssumptionViolatedException("Thrown from @Test");
@@ -216,6 +231,11 @@
     @Test
     public void parentRunnerTestMethods() throws InitializationError {
         CountingRunListener countingRunListener = runTestWithParentRunner(TestTest.class);
+        Assert.assertEquals(1, countingRunListener.testSuiteStarted);
+        Assert.assertEquals(1, countingRunListener.testSuiteFinished);
+        Assert.assertEquals(0, countingRunListener.testSuiteFailure);
+        Assert.assertEquals(0, countingRunListener.testSuiteAssumptionFailure);
+
         Assert.assertEquals(3, countingRunListener.testStarted);
         Assert.assertEquals(3, countingRunListener.testFinished);
         Assert.assertEquals(1, countingRunListener.testFailure);
@@ -227,12 +247,17 @@
         CountingRunListener listener = new CountingRunListener();
         RunNotifier runNotifier = new RunNotifier();
         runNotifier.addListener(listener);
-        ParentRunner runner = new BlockJUnit4ClassRunner(testClass);
+        ParentRunner<?> runner = new BlockJUnit4ClassRunner(testClass);
         runner.run(runNotifier);
         return listener;
     }
 
     private static class CountingRunListener extends RunListener {
+        private int testSuiteStarted = 0;
+        private int testSuiteFinished = 0;
+        private int testSuiteFailure = 0;
+        private int testSuiteAssumptionFailure = 0;
+
         private int testStarted = 0;
         private int testFinished = 0;
         private int testFailure = 0;
@@ -240,6 +265,16 @@
         private int testIgnored = 0;
 
         @Override
+        public void testSuiteStarted(Description description) throws Exception {
+            testSuiteStarted++;
+        }
+
+        @Override
+        public void testSuiteFinished(Description description) throws Exception {
+            testSuiteFinished++;
+        }
+
+        @Override
         public void testStarted(Description description) throws Exception {
             testStarted++;
         }
@@ -251,12 +286,20 @@
 
         @Override
         public void testFailure(Failure failure) throws Exception {
-            testFailure++;
+            if (failure.getDescription().isSuite()) {
+                testSuiteFailure++;
+            } else {
+                testFailure++;
+            }
         }
 
         @Override
         public void testAssumptionFailure(Failure failure) {
-            testAssumptionFailure++;
+            if (failure.getDescription().isSuite()) {
+                testSuiteAssumptionFailure++;
+            } else {
+                testAssumptionFailure++;
+            }
         }
 
         @Override

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/classes/SuiteTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/SuiteTest.java Changed

@@ -1,10 +1,11 @@
 package org.junit.tests.running.classes;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.experimental.results.PrintableResult.testResult;
 import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
 
 import java.util.List;
 
@@ -41,6 +42,18 @@
     public static class All {
     }
 
+    @RunWith(Suite.class)
+    @SuiteClasses(TestA.class)
+    static class NonPublicSuite {
+    }
+
+    @RunWith(Suite.class)
+    @SuiteClasses(TestA.class)
+    static class NonPublicSuiteWithBeforeClass {
+        @BeforeClass
+        public static void doesNothing() {}
+    }
+
     public static class InheritsAll extends All {
     }
 
@@ -67,6 +80,19 @@
     }
 
     @Test
+    public void suiteClassDoesNotNeedToBePublic() {
+        JUnitCore core = new JUnitCore();
+        Result result = core.run(NonPublicSuite.class);
+        assertEquals(1, result.getRunCount());
+        assertEquals(0, result.getFailureCount());
+    }
+
+    @Test
+    public void nonPublicSuiteClassWithBeforeClassPasses() {
+        assertThat(testResult(NonPublicSuiteWithBeforeClass.class), isSuccessful());
+    }
+
+    @Test
     public void ensureSuitesWorkWithForwardCompatibility() {
         junit.framework.Test test = new JUnit4TestAdapter(All.class);
         TestResult result = new TestResult();

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/ThreadsTest.java Added

@@ -0,0 +1,83 @@
+package org.junit.tests.running.classes;
+
+import org.junit.AfterClass;
+import org.junit.Test;
+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.notification.RunListener;
+import org.junit.runners.BlockJUnit4ClassRunner;
+
+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 List<Boolean> interruptedFlags = new ArrayList<Boolean>();
+    private JUnitCore core = new JUnitCore();
+
+    public static class TestWithInterrupt {
+
+        @Test
+        public void interruptCurrentThread() {
+            Thread.currentThread().interrupt();
+        }
+
+        @Test
+        public void otherTestCaseInterruptingCurrentThread() {
+            Thread.currentThread().interrupt();
+        }
+
+    }
+
+    @Test
+    public void currentThreadInterruptedStatusIsClearedAfterEachTestExecution() {
+        core.addListener(new RunListener() {
+            @Override
+            public void testFinished(Description description) {
+                interruptedFlags.add(Thread.currentThread().isInterrupted());
+            }
+        });
+
+        Result result = core.run(TestWithInterrupt.class);
+
+        assertEquals(0, result.getFailureCount());
+        assertEquals(asList(false, false), interruptedFlags);
+    }
+
+    @RunWith(BlockJUnit4ClassRunner.class)
+    public static class TestWithInterruptFromAfterClass {
+        @AfterClass
+        public static void interruptCurrentThread() {
+            Thread.currentThread().interrupt();
+        }
+
+        @Test
+        public void test() {
+            // no-op
+        }
+    }
+
+    @Test
+    public void currentThreadInterruptStatusIsClearedAfterSuiteExecution() {
+        core.addListener(new RunListener() {
+            @Override
+            public void testSuiteFinished(Description description) {
+                interruptedFlags.add(Thread.currentThread().isInterrupted());
+            }
+        });
+
+        Request request = Request.aClass(TestWithInterruptFromAfterClass.class);
+
+        Result result = core.run(request);
+
+        assertEquals(0, result.getFailureCount());
+        assertEquals(singletonList(false), interruptedFlags);
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/parent Added

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/parent/ParentRunnerClassLoaderTest.java Added

@@ -0,0 +1,94 @@
+package org.junit.tests.running.classes.parent;
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.ParentRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+
+public class ParentRunnerClassLoaderTest {
+    @Test
+    public void testClassRuleAccessToClassInAnotherClassLoader() throws Exception {
+        Class<?> testClassWithOwnClassLoader = wrapToClassLoader(TestWithClassRule.class);
+
+        runTestWithParentRunner(testClassWithOwnClassLoader);
+
+        Field fieldWithReference = testClassWithOwnClassLoader.getDeclaredField("applyTestClass");
+        Class<?> usedClass = (Class<?>) fieldWithReference.get(null);
+
+        assertEquals("JUnitRunner can be located in own classLoader, so, " +
+                        "Class.forName org.junit.runner.Description.getTestClass can not see " +
+                        "in current classloader by execute Class.forName",
+                testClassWithOwnClassLoader, usedClass
+        );
+    }
+
+    @Test
+    public void testDescriptionContainCorrectTestClass() throws Exception {
+        Class<?> testClassWithOwnClassLoader = wrapToClassLoader(TestWithClassRule.class);
+        ParentRunner<?> runner = new BlockJUnit4ClassRunner(testClassWithOwnClassLoader);
+
+        Description description = runner.getDescription();
+        assertEquals("ParentRunner accept already instantiate Class<?> with tests, if we lost it instance, and will " +
+                "use Class.forName we can not find test class again, because tests can be " +
+                "located in different ClassLoader",
+                description.getTestClass(), testClassWithOwnClassLoader
+        );
+    }
+
+    @Test
+    public void testBackwardCompatibilityWithOverrideGetName() throws Exception {
+        final Class<TestWithClassRule> originalTestClass = TestWithClassRule.class;
+        final Class<?> waitClass = ParentRunnerClassLoaderTest.class;
+
+        ParentRunner<FrameworkMethod> subParentRunner = new BlockJUnit4ClassRunner(originalTestClass) {
+            @Override
+            protected String getName() {
+                return waitClass.getName();
+            }
+        };
+
+        Description description = subParentRunner.getDescription();
+        Class<?> result = description.getTestClass();
+
+        assertEquals("Subclass of ParentRunner can override getName method and specify another test class for run, " +
+                "we should  maintain backwards compatibility with JUnit 4.12",
+                waitClass, result
+        );
+    }
+
+    private void runTestWithParentRunner(Class<?> testClass) throws InitializationError {
+        ParentRunner<?> runner = new BlockJUnit4ClassRunner(testClass);
+        runner.run(new RunNotifier());
+    }
+
+    private Class<?> wrapToClassLoader(Class<?> sourceClass) throws ClassNotFoundException {
+        URL classpath = sourceClass.getProtectionDomain().getCodeSource().getLocation();
+        VisibleClassLoader loader = new VisibleClassLoader(new URL{classpath}, this.getClass().getClassLoader());
+        Class<?> testClassWithOwnClassLoader = loader.findClass(sourceClass.getName());
+
+        assert testClassWithOwnClassLoader != sourceClass;
+
+        return testClassWithOwnClassLoader;
+    }
+
+
+    private static class VisibleClassLoader extends URLClassLoader {
+        public VisibleClassLoader(URL urls, ClassLoader parent) {
+            super(urls, parent);
+        }
+
+        @Override // just making public
+        public Class<?> findClass(String name) throws ClassNotFoundException {
+            return super.findClass(name);
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/classes/parent/TestWithClassRule.java Added

@@ -0,0 +1,42 @@
+package org.junit.tests.running.classes.parent;
+
+import org.junit.Assert;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import java.lang.reflect.Field;
+
+/**
+ * Test class for validate run tests that was load in own ClassLoader
+ */
+public class TestWithClassRule {
+    public static Class<?> applyTestClass;
+
+    @ClassRule
+    public static TestRule rule = new CustomRule();
+
+    @Test
+    public void testClassRuleExecuted() throws Exception {
+        Assert.assertNotNull("Description should contain reference to TestClass", applyTestClass);
+    }
+
+    public static final class CustomRule implements TestRule {
+
+        public Statement apply(final Statement base, final Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    Class<?> testClass = description.getTestClass();
+                    if(testClass != null) {
+                        Field field = testClass.getDeclaredField("applyTestClass");
+                        field.set(null, description.getTestClass());
+                    }
+                    base.evaluate();
+                }
+            };
+        }
+    }
+}

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/core/AllCoreTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/core/CommandLineTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/core/CommandLineTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/core/JUnitCoreReturnsCorrectExitCodeTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/core/JUnitCoreReturnsCorrectExitCodeTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/core/MainRunner.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/core/MainRunner.java Changed

@@ -1,9 +1,7 @@
 package org.junit.tests.running.core;
 
 import java.io.ByteArrayOutputStream;
-import java.io.FileDescriptor;
 import java.io.PrintStream;
-import java.net.InetAddress;
 import java.security.Permission;
 
 public class MainRunner {
@@ -24,15 +22,9 @@
 
     /**
      * A {@code NoExitSecurityManager} throws a {@link ExitException} exception
-     * whenever {@link #checkExit(int)} is called. All other method calls are
-     * delegated to the original security manager.
+     * whenever {@link #checkExit(int)} is called; all other permissions are allowed.
      */
     public class NoExitSecurityManager extends SecurityManager {
-        private final SecurityManager originalSecurityManager;
-
-        public NoExitSecurityManager(SecurityManager originalSecurityManager) {
-            this.originalSecurityManager = originalSecurityManager;
-        }
 
         @Override
         public void checkExit(int status) {
@@ -40,227 +32,11 @@
         }
 
         @Override
-        public boolean getInCheck() {
-            return (originalSecurityManager != null) && originalSecurityManager.getInCheck();
-        }
-
-        @Override
-        public Object getSecurityContext() {
-            return (originalSecurityManager == null) ? super.getSecurityContext() : originalSecurityManager.getSecurityContext();
-        }
-
-        @Override
         public void checkPermission(Permission perm) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkPermission(perm);
-            }
-        }
-
-        @Override
-        public void checkPermission(Permission perm, Object context) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkPermission(perm, context);
-            }
-        }
-
-        @Override
-        public void checkCreateClassLoader() {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkCreateClassLoader();
-            }
-        }
-
-        @Override
-        public void checkAccess(Thread t) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkAccess(t);
-            }
-        }
-
-        @Override
-        public void checkAccess(ThreadGroup g) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkAccess(g);
-            }
-        }
-
-        @Override
-        public void checkExec(String cmd) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkExec(cmd);
-            }
-        }
-
-        @Override
-        public void checkLink(String lib) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkLink(lib);
-            }
-        }
-
-        @Override
-        public void checkRead(FileDescriptor fd) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkRead(fd);
-            }
-        }
-
-        @Override
-        public void checkRead(String file) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkRead(file);
-            }
-        }
-
-        @Override
-        public void checkRead(String file, Object context) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkRead(file, context);
-            }
-        }
-
-        @Override
-        public void checkWrite(FileDescriptor fd) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkWrite(fd);
-            }
-        }
-
-        @Override
-        public void checkWrite(String file) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkWrite(file);
-            }
-        }
-
-        @Override
-        public void checkDelete(String file) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkDelete(file);
-            }
-        }
-
-        @Override
-        public void checkConnect(String host, int port) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkConnect(host, port);
-            }
-        }
-
-        @Override
-        public void checkConnect(String host, int port, Object context) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkConnect(host, port, context);
-            }
-        }
-
-        @Override
-        public void checkListen(int port) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkListen(port);
-            }
-        }
-
-        @Override
-        public void checkAccept(String host, int port) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkAccept(host, port);
-            }
-        }
-
-        @Override
-        public void checkMulticast(InetAddress maddr) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkMulticast(maddr);
-            }
-        }
-
-        @Override
-        public void checkMulticast(InetAddress maddr, byte ttl) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkMulticast(maddr, ttl);
-            }
-        }
-
-        @Override
-        public void checkPropertiesAccess() {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkPropertiesAccess();
-            }
-        }
-
-        @Override
-        public void checkPropertyAccess(String key) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkPropertyAccess(key);
-            }
-        }
-
-        @Override
-        public boolean checkTopLevelWindow(Object window) {
-            return (originalSecurityManager == null) ? super.checkTopLevelWindow(window) : originalSecurityManager.checkTopLevelWindow(window);
-        }
-
-        @Override
-        public void checkPrintJobAccess() {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkPrintJobAccess();
+            if (perm.getName().startsWith("exitVM")) {
+                super.checkPermission(perm);
             }
         }
-
-        @Override
-        public void checkSystemClipboardAccess() {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkSystemClipboardAccess();
-            }
-        }
-
-        @Override
-        public void checkAwtEventQueueAccess() {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkAwtEventQueueAccess();
-            }
-        }
-
-        @Override
-        public void checkPackageAccess(String pkg) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkPackageAccess(pkg);
-            }
-        }
-
-        @Override
-        public void checkPackageDefinition(String pkg) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkPackageDefinition(pkg);
-            }
-        }
-
-        @Override
-        public void checkSetFactory() {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkSetFactory();
-            }
-        }
-
-        @Override
-        public void checkMemberAccess(Class<?> clazz, int which) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkMemberAccess(clazz, which);
-            }
-        }
-
-        @Override
-        public void checkSecurityAccess(String target) {
-            if (originalSecurityManager != null) {
-                originalSecurityManager.checkSecurityAccess(target);
-            }
-        }
-
-        @Override
-        public ThreadGroup getThreadGroup() {
-            return (originalSecurityManager == null) ? super.getThreadGroup() : originalSecurityManager.getThreadGroup();
-        }
     }
 
     /**
@@ -272,7 +48,7 @@
      */
     public Integer runWithCheckForSystemExit(Runnable runnable) {
         SecurityManager oldSecurityManager = System.getSecurityManager();
-        System.setSecurityManager(new NoExitSecurityManager(oldSecurityManager));
+        System.setSecurityManager(new NoExitSecurityManager());
         PrintStream oldOut = System.out;
 
         System.setOut(new PrintStream(new ByteArrayOutputStream()));

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/methods/AllMethodsTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/methods/AnnotationTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/methods/AnnotationTest.java Changed

@@ -2,7 +2,9 @@
 
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -13,7 +15,11 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExternalResource;
+import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
@@ -28,7 +34,7 @@
         run = false;
     }
 
-    static public class SimpleTest {
+    public static class SimpleTest {
         @Test
         public void success() {
             run = true;
@@ -42,7 +48,7 @@
     }
 
     @RunWith(JUnit4.class)
-    static public class SimpleTestWithFutureProofExplicitRunner {
+    public static class SimpleTestWithFutureProofExplicitRunner {
         @Test
         public void success() {
             run = true;
@@ -55,7 +61,7 @@
         assertTrue(run);
     }
 
-    static public class SetupTest {
+    public static class SetupTest {
         @Before
         public void before() {
             run = true;
@@ -72,7 +78,7 @@
         assertTrue(run);
     }
 
-    static public class TeardownTest {
+    public static class TeardownTest {
         @After
         public void after() {
             run = true;
@@ -89,7 +95,7 @@
         assertTrue(run);
     }
 
-    static public class FailureTest {
+    public static class FailureTest {
         @Test
         public void error() throws Exception {
             org.junit.Assert.fail();
@@ -104,7 +110,7 @@
         assertEquals(AssertionError.class, result.getFailures().get(0).getException().getClass());
     }
 
-    static public class SetupFailureTest {
+    public static class SetupFailureTest {
         @Before
         public void before() {
             throw new Error();
@@ -125,7 +131,7 @@
         assertFalse(run);
     }
 
-    static public class TeardownFailureTest {
+    public static class TeardownFailureTest {
         @After
         public void after() {
             throw new Error();
@@ -144,7 +150,7 @@
         assertEquals(Error.class, runner.getFailures().get(0).getException().getClass());
     }
 
-    static public class TestAndTeardownFailureTest {
+    public static class TestAndTeardownFailureTest {
         @After
         public void after() {
             throw new Error("hereAfter");
@@ -164,7 +170,7 @@
         assertThat(runner.getFailures().toString(), allOf(containsString("hereAfter"), containsString("inTest")));
     }
 
-    static public class TeardownAfterFailureTest {
+    public static class TeardownAfterFailureTest {
         @After
         public void after() {
             run = true;
@@ -185,7 +191,7 @@
     static int count;
     static Collection<Object> tests;
 
-    static public class TwoTests {
+    public static class TwoTests {
         @Test
         public void one() {
             count++;
@@ -208,7 +214,7 @@
         assertEquals(2, tests.size());
     }
 
-    static public class OldTest extends TestCase {
+    public static class OldTest extends TestCase {
         public void test() {
             run = true;
         }
@@ -220,7 +226,7 @@
         assertTrue(run);
     }
 
-    static public class OldSuiteTest extends TestCase {
+    public static class OldSuiteTest extends TestCase {
         public void testOne() {
             run = true;
         }
@@ -233,7 +239,7 @@
         assertTrue(run);
     }
 
-    static public class ExceptionTest {
+    public static class ExceptionTest {
         @Test(expected = Error.class)
         public void expectedException() {
             throw new Error();
@@ -246,7 +252,7 @@
         assertEquals(0, result.getFailureCount());
     }
 
-    static public class NoExceptionTest {
+    public static class NoExceptionTest {
         @Test(expected = Error.class)
         public void expectedException() {
         }
@@ -259,7 +265,7 @@
         assertEquals("Expected exception: java.lang.Error", result.getFailures().get(0).getMessage());
     }
 
-    static public class OneTimeSetup {
+    public static class OneTimeSetup {
         @BeforeClass
         public static void once() {
             count++;
@@ -281,7 +287,7 @@
         assertEquals(1, count);
     }
 
-    static public class OneTimeTeardown {
+    public static class OneTimeTeardown {
         @AfterClass
         public static void once() {
             count++;
@@ -339,7 +345,7 @@
         assertEquals("beforeClass before test after afterClass ", log);
     }
 
-    static public class NonStaticOneTimeSetup {
+    public static class NonStaticOneTimeSetup {
         @BeforeClass
         public void once() {
         }
@@ -355,7 +361,7 @@
         assertEquals(1, result.getFailureCount());
     }
 
-    static public class ErrorInBeforeClass {
+    public static class ErrorInBeforeClass {
         @BeforeClass
         public static void before() throws Exception {
             throw new Exception();
@@ -377,7 +383,7 @@
         assertEquals(ErrorInBeforeClass.class.getName(), description.getDisplayName());
     }
 
-    static public class ErrorInAfterClass {
+    public static class ErrorInAfterClass {
         @Test
         public void test() {
             run = true;
@@ -397,14 +403,14 @@
         assertEquals(1, result.getFailureCount());
     }
 
-    static public class SuperInheritance {
+    static class SuperInheritance {
         @BeforeClass
-        static public void beforeClassSuper() {
+        public static void beforeClassSuper() {
             log += "Before class super ";
         }
 
         @AfterClass
-        static public void afterClassSuper() {
+        public static void afterClassSuper() {
             log += "After class super ";
         }
 
@@ -419,14 +425,14 @@
         }
     }
 
-    static public class SubInheritance extends SuperInheritance {
+    public static class SubInheritance extends SuperInheritance {
         @BeforeClass
-        static public void beforeClassSub() {
+        public static void beforeClassSub() {
             log += "Before class sub ";
         }
 
         @AfterClass
-        static public void afterClassSub() {
+        public static void afterClassSub() {
             log += "After class sub ";
         }
 
@@ -453,29 +459,74 @@
         assertEquals("Before class super Before class sub Before super Before sub Test After sub After super After class sub After class super ", log);
     }
 
-    static public class SuperShadowing {
+    public abstract static class SuperShadowing {
+
+        @Rule
+        public TestRule rule() {
+            return new ExternalResource() {
+                @Override
+                protected void before() throws Throwable {
+                    log += "super.rule().before() ";
+                }
+
+                @Override
+                protected void after() {
+                    log += "super.rule().after() ";
+                }
+            };
+        }
+
         @Before
         public void before() {
-            log += "Before super ";
+            log += "super.before() ";
         }
 
         @After
         public void after() {
-            log += "After super ";
+            log += "super.after() ";
         }
     }
 
-    static public class SubShadowing extends SuperShadowing {
+    public static class SubShadowing extends SuperShadowing {
+
+        @Override
+        @Rule
+        public TestRule rule() {
+            return new ExternalResource() {
+                @Override
+                protected void before() throws Throwable {
+                    log += "sub.rule().before() ";
+                }
+
+                @Override
+                protected void after() {
+                    log += "sub.rule().after() ";
+                }
+            };
+        }
+
         @Override
         @Before
         public void before() {
-            log += "Before sub ";
+            super.before();
+            log += "sub.before() ";
+        }
+
+        @Before
+        public void anotherBefore() {
+            log += "sub.anotherBefore() ";
         }
 
         @Override
         @After
         public void after() {
-            log += "After sub ";
+            log += "sub.after() ";
+            super.after();
+        }
+
+        @After
+        public void anotherAfter() {
+            log += "sub.anotherAfter() ";
         }
 
         @Test
@@ -486,12 +537,160 @@
 
     public void testShadowing() throws Exception {
         log = "";
-        JUnitCore core = new JUnitCore();
-        core.run(SubShadowing.class);
-        assertEquals("Before sub Test After sub ", log);
+        assertThat(testResult(SubShadowing.class), isSuccessful());
+        assertEquals(
+                "sub.rule().before() sub.anotherBefore() super.before() sub.before() "
+                + "Test "
+                + "sub.anotherAfter() sub.after() super.after() sub.rule().after() ",
+                log);
+    }
+
+    public abstract static class SuperStaticMethodShadowing {
+
+        @ClassRule
+        public static TestRule rule() {
+            return new ExternalResource() {
+                @Override
+                protected void before() throws Throwable {
+                    log += "super.rule().before() ";
+                }
+
+                @Override
+                protected void after() {
+                    log += "super.rule().after() ";
+                }
+            };
+        }
+    }
+
+    public static class SubStaticMethodShadowing extends SuperStaticMethodShadowing {
+
+        @ClassRule
+        public static TestRule rule() {
+            return new ExternalResource() {
+                @Override
+                protected void before() throws Throwable {
+                    log += "sub.rule().before() ";
+                }
+
+                @Override
+                protected void after() {
+                    log += "sub.rule().after() ";
+                }
+            };
+        }
+
+        @Test
+        public void test() {
+            log += "Test ";
+        }
+    }
+
+    public void testStaticMethodsCanBeTreatedAsShadowed() throws Exception {
+        log = "";
+        assertThat(testResult(SubStaticMethodShadowing.class), isSuccessful());
+        assertEquals(
+                "sub.rule().before() "
+                + "Test "
+                + "sub.rule().after() ",
+                log);
+    }
+
+    public abstract static class SuperFieldShadowing {
+
+        @Rule
+        public final TestRule rule = new ExternalResource() {
+            @Override
+            protected void before() throws Throwable {
+                log += "super.rule.before() ";
+            }
+
+            @Override
+            protected void after() {
+                log += "super.rule.after() ";
+            }
+        };
+    }
+
+    public static class SubFieldShadowing extends SuperFieldShadowing {
+
+        @Rule
+        public final TestRule rule = new ExternalResource() {
+            @Override
+            protected void before() throws Throwable {
+                log += "sub.rule.before() ";
+            }
+
+            @Override
+            protected void after() {
+                log += "sub.rule.after() ";
+            }
+        };
+
+        @Test
+        public void test() {
+            log += "Test ";
+        }
+    }
+
+    public void testFieldsShadowFieldsFromParent() throws Exception {
+        log = "";
+        assertThat(testResult(SubFieldShadowing.class), isSuccessful());
+        assertEquals(
+                "sub.rule.before() "
+                + "Test "
+                + "sub.rule.after() ",
+                log);
     }
 
-    static public class SuperTest {
+    public abstract static class SuperStaticFieldShadowing {
+
+        @ClassRule
+        public static TestRule rule = new ExternalResource() {
+            @Override
+            protected void before() throws Throwable {
+                log += "super.rule.before() ";
+            }
+
+            @Override
+            protected void after() {
+                log += "super.rule.after() ";
+            }
+        };
+    }
+
+    public static class SubStaticFieldShadowing extends SuperStaticFieldShadowing {
+
+        @ClassRule
+        public static TestRule rule = new ExternalResource() {
+            @Override
+            protected void before() throws Throwable {
+                log += "sub.rule.before() ";
+            }
+
+            @Override
+            protected void after() {
+                log += "sub.rule.after() ";
+            }
+        };
+
+        @Test
+        public void test() {
+            log += "Test ";
+        }
+    }
+
+    public void testStaticFieldsCanBeTreatedAsShadowed() throws Exception {
+        log = "";
+        assertThat(testResult(SubStaticFieldShadowing.class), isSuccessful());
+        assertEquals(
+                "sub.rule.before() "
+                + "Test "
+                + "sub.rule.after() ",
+                log);
+    }
+
+    public static class SuperTest {
         @Test
         public void one() {
             log += "Super";
@@ -503,7 +702,7 @@
         }
     }
 
-    static public class SubTest extends SuperTest {
+    public static class SubTest extends SuperTest {
         @Override
         @Test
         public void one() {
@@ -521,7 +720,7 @@
         assertFalse(log.contains("Super"));
     }
 
-    static public class RunAllAfters {
+    public static class RunAllAfters {
         @Before
         public void good() {
         }
@@ -554,7 +753,7 @@
         assertTrue(log.contains("two"));
     }
 
-    static public class RunAllAftersRegardless {
+    public static class RunAllAftersRegardless {
         @Test
         public void empty() {
         }
@@ -581,7 +780,7 @@
         assertEquals(2, result.getFailureCount());
     }
 
-    static public class RunAllAfterClasses {
+    public static class RunAllAfterClasses {
         @Before
         public void good() {
         }
@@ -614,19 +813,19 @@
         assertTrue(log.contains("two"));
     }
 
-    static public class RunAllAfterClassesRegardless {
+    public static class RunAllAfterClassesRegardless {
         @Test
         public void empty() {
         }
 
         @AfterClass
-        static public void one() {
+        public static void one() {
             log += "one";
             throw new Error();
         }
 
         @AfterClass
-        static public void two() {
+        public static void two() {
             log += "two";
             throw new Error();
         }

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/methods/ExpectedTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/methods/ExpectedTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/methods/ParameterizedTestMethodTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/methods/ParameterizedTestMethodTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/running/methods/TimeoutTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/running/methods/TimeoutTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/validation/AllValidationTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/validation/BadlyFormedClassesTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/validation/BadlyFormedClassesTest.java Changed

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/tests/validation/ValidationTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/tests/validation/ValidationTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/validator/AllValidatorTests.java Added

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/validator/AnnotationValidatorFactoryTest.java Changed

@@ -1,15 +1,12 @@
 package org.junit.validator;
 
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import java.lang.annotation.Annotation;
-
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertThat;
-
 public class AnnotationValidatorFactoryTest {
 
     @Rule
@@ -17,33 +14,13 @@
 
     @Test
     public void createAnnotationValidator() {
-        ValidateWith validateWith = SampleTestWithValidator.class.getAnnotation(ValidateWith.class);
+        ValidateWith validateWith = SampleAnnotationWithValidator.class.getAnnotation(ValidateWith.class);
         AnnotationValidator annotationValidator = new AnnotationValidatorFactory().createAnnotationValidator(validateWith);
         assertThat(annotationValidator, is(instanceOf(Validator.class)));
     }
 
-    @Test
-    public void exceptionWhenAnnotationWithNullClassIsPassedIn() {
-        exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("Can't create validator, value is null in " +
-                "annotation org.junit.validator.AnnotationValidatorFactoryTest$ValidatorWithNullValue");
-
-        new AnnotationValidatorFactory().createAnnotationValidator(new ValidatorWithNullValue());
-    }
-
-
-    public static class ValidatorWithNullValue implements ValidateWith {
-        public Class<? extends AnnotationValidator> value() {
-            return null;
-        }
-
-        public Class<? extends Annotation> annotationType() {
-            return ValidateWith.class;
-        }
-    }
-
     @ValidateWith(value = Validator.class)
-    public static class SampleTestWithValidator {
+    public @interface SampleAnnotationWithValidator {
     }
 
     public static class Validator extends AnnotationValidator {
@@ -51,7 +28,7 @@
 
     @Test
     public void exceptionWhenAnnotationValidatorCantBeCreated() {
-        ValidateWith validateWith = SampleTestWithValidatorThatThrowsException.class.getAnnotation(ValidateWith.class);
+        ValidateWith validateWith = SampleAnnotationWithValidatorThatThrowsException.class.getAnnotation(ValidateWith.class);
         exception.expect(RuntimeException.class);
         exception.expectMessage("Exception received when creating AnnotationValidator class " +
                 "org.junit.validator.AnnotationValidatorFactoryTest$ValidatorThatThrowsException");
@@ -59,7 +36,7 @@
     }
 
     @ValidateWith(value = ValidatorThatThrowsException.class)
-    public static class SampleTestWithValidatorThatThrowsException {
+    public @interface SampleAnnotationWithValidatorThatThrowsException {
     }
 
     public static class ValidatorThatThrowsException extends AnnotationValidator {

_service:tar_scm:r4.12.tar.gz/src/test/java/org/junit/validator/AnnotationsValidatorTest.java -> _service:tar_scm:r4.13.2.tar.gz/src/test/java/org/junit/validator/AnnotationsValidatorTest.java Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/junit/tests/runner/testRunAssumptionFailedResultCanBeReserialised_v4_12 Added

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/junit/tests/runner/testRunAssumptionFailedResultCanBeReserialised_v4_13 Added

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/junit/tests/runner/testRunFailureResultCanBeReserialised_v4_12 Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/junit/tests/runner/testRunSuccessResultCanBeReserialised_v4_12 Changed

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/junit/tests/runner/testRunSuccessResultCanBeReserialised_v4_13 Added

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/org Added

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/org/junit Added

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/org/junit/assumptionViolatedExceptionWithValueAndMatcherCanBeReserialized_v4_13 Added

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/org/junit/assumptionViolatedExceptionWithoutValueAndMatcherCanBeReserialized_v4_13 Added

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/org/junit/internal Added

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/org/junit/internal/arrayComparisonFailure_411 Added

_service:tar_scm:r4.13.2.tar.gz/src/test/resources/org/junit/internal/arrayComparisonFailure_412 Added