Permalink
Commits on Mar 5, 2012
Commits on Feb 29, 2012
  1. Merge pull request #372 from matthewfarwell/doc-methodrule

    dsaff committed Feb 29, 2012
    Several javadoc referred to MethodRule when they should have referred to...
Commits on Feb 24, 2012
  1. Merge pull request #365 from stefanbirkner/cleanjunit

    dsaff committed Feb 24, 2012
    Improved Description class
Commits on Feb 16, 2012
  1. Merge pull request #178 from abyx/master

    dsaff committed Feb 16, 2012
    Simple removal of (seemingly) redundant asserts
Commits on Feb 1, 2012
  1. Merge pull request #293 from jglick/master

    dsaff committed Feb 1, 2012
    Sort test methods for predictability
Commits on Jan 31, 2012
  1. Using MethodSorter here too, just in case it matters.

    Jesse Glick committed Jan 31, 2012
Commits on Jan 19, 2012
Commits on Dec 31, 2011
  1. Merge pull request #348 from stefanbirkner/iterable

    dsaff committed Dec 31, 2011
    Use Iterable for the parameters of Parameterized (fixes gh-104).
Commits on Nov 28, 2011
  1. Improved Description class.

    stefanbirkner committed Nov 28, 2011
    A few modifications to improve the readability of the code:
    * extracted METHOD_AND_CLASS_NAME_PATTERN constant
    * extracted methodAndClassNamePatternGroupOrDefault(...)
    * merged getMethodName() and parseMethod()
    * moved validation of display name to constructor
    * throw IllegalArgumentException if display name is null
Commits on Nov 11, 2011
  1. Fix for #359

    nkeywal committed Nov 11, 2011
Commits on Oct 24, 2011
  1. Merge pull request #344 from vyazelenko/master

    dsaff committed Oct 24, 2011
    Fixes gh-342: TemporaryFolder.newFile(String) throws IllegalStateException in junit-4.10
Commits on Oct 20, 2011
  1. Use Iterable for the parameters of Parameterized (fixes #104).

    stefanbirkner committed Oct 20, 2011
    The method annotated with @Parameterized returns an Iterable<Object[]>
    (was List<Object[]> before). The test fails with a meaningful exception
    otherwise.
Commits on Oct 18, 2011
Commits on Oct 17, 2011
  1. Fixes for issue #342

    unknown committed Oct 17, 2011
  2. Merge pull request #343 from marcphilipp/no-static-rules

    dsaff committed Oct 17, 2011
    Fixes gh-339: @Rule fields/methods must not be static
Commits on Oct 16, 2011
  1. @Rule fields/methods must not be static

    marcphilipp committed Oct 16, 2011
    Fixes KentBeck/junit#339
Commits on Oct 10, 2011
  1. Merge pull request #330 from fbarber/master

    dsaff committed Oct 10, 2011
    Use <? super T> in Assert.assertThat
Commits on Oct 7, 2011
  1. Merge pull request #334 from matthewfarwell/333-build.xml-is-broken-a…

    dsaff committed Oct 7, 2011
    …fter-merges
    
    
    Fixes gh-333: build.xml is broken after merge
Commits on Oct 5, 2011
  1. Use <? super T> in Assert.assertThat

    fbarber committed Oct 5, 2011
    Add comments explaining our interpretation of the type parameter on org.hamcrest.Matcher
Commits on Sep 29, 2011
  1. Merge branch '4.10'

    dsaff committed Sep 29, 2011
    Conflicts:
    	build.xml
    	src/main/java/junit/runner/Version.java
  2. 4.10 final

    dsaff committed Sep 29, 2011
Commits on Sep 28, 2011
  1. Merge pull request #329 from stefanbirkner/constructor

    dsaff committed Sep 28, 2011
    Removed explicit constructor of JUnitCore
  2. Use <? super T> in Assert.assertThat

    fbarber committed Sep 28, 2011
    As the Matcher is only a consumer, ? super T is more appropriate.  Otherwise, a Matcher<Object> cannot be used with a String actual, for example.
Commits on Sep 27, 2011
  1. Removed explicit constructor of JUnitCore

    stefanbirkner committed Sep 27, 2011
    The constructor was used to create the RunNotifier. Now the
    initial value of the RunNotifier is provided in its declaration.
    
    Additionally added the final modifiert to the RunNotifier in
    order to make it clear, that it never changes.
Commits on Sep 23, 2011
  1. Merge pull request #326 from matthewfarwell/49-master-git-branch-does…

    dsaff committed Sep 23, 2011
    …-not-build-on-windows
    
    
    Fixes gh-49 Master now builds on windows
  2. Merge pull request #325 from matthewfarwell/support-rule-methods

    dsaff committed Sep 23, 2011
    This is a fix for #83 support @Rule on methods
  3. This is a fix for #83 support @Rule on methods

    matthewfarwell committed Sep 23, 2011
    Extend rules to support @Rule public MethodRule someRule() { return new SomeRule(); }
    
    Scala does not allow the creation of public fields. If you declare a field public, the field is created as private but with accessor methods.
    To allow the use of @Rule with Scala fields, this patch allows the addition
    of @Rule to methods. When BlockJUnit4ClassRunner retrieves the list of fields
    that have the @Rule annotation, it also searches for methods with @Rule.
    These methods are called and the values returned are added to the list of
    TestRule.
    
    @ClassRule has been similarly changed.
    
    This is intended to be used as follows:
    
    private ExpectedException thrown = rules.ExpectedException.none();
    
    @Rule public ExpectedException getThrown() {
        return thrown;
    }
    
    or
    
    @Rule public Timeout getTimeout() {
        return new Timeout(20);
    }
    
    The validation is exactly the same as for the fields, i.e the methods must be
    public and return a TestRule/MethodRule. In the case of @ClassRule, the
    methods must also be static.
Commits on Sep 22, 2011
  1. 4.10 release notes up to date

    dsaff committed Sep 22, 2011
  2. Development version goes to 11\!

    dsaff committed Sep 22, 2011
Commits on Sep 21, 2011
  1. Switching to method sort based on hash code - deterministic but hard …

    Jesse Glick committed Sep 21, 2011
    …to abuse.