Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: master
Commits on Mar 5, 2012
  1. Merge pull request #362 from nkeywal/eb307fa6f37ac8ec695b2f556e543969…

    David Saff authored
    …503418f5
    
    Fix for #359
Commits on Feb 29, 2012
  1. Merge pull request #372 from matthewfarwell/doc-methodrule

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

    David Saff authored
    Improved Description class
Commits on Feb 16, 2012
  1. Merge pull request #178 from abyx/master

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

    David Saff authored
    Sort test methods for predictability
Commits on Jan 31, 2012
  1. Using MethodSorter here too, just in case it matters.

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

    David Saff authored
    Use Iterable for the parameters of Parameterized (fixes gh-104).
Commits on Nov 28, 2011
  1. @stefanbirkner

    Improved Description class.

    stefanbirkner authored
    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. @nkeywal

    Fix for #359

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

    David Saff authored
    Fixes gh-342: TemporaryFolder.newFile(String) throws IllegalStateException in junit-4.10
Commits on Oct 20, 2011
  1. @stefanbirkner

    Use Iterable for the parameters of Parameterized (fixes #104).

    stefanbirkner authored
    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
  1. @vyazelenko
Commits on Oct 17, 2011
  1. Fixes for issue #342

    unknown authored
  2. Merge pull request #343 from marcphilipp/no-static-rules

    David Saff authored
    Fixes gh-339: @Rule fields/methods must not be static
Commits on Oct 16, 2011
  1. @marcphilipp

    @Rule fields/methods must not be static

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

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

    David Saff authored
    …fter-merges
    
    Fixes gh-333: build.xml is broken after merge
  2. @matthewfarwell
Commits on Oct 5, 2011
  1. @fbarber

    Use <? super T> in Assert.assertThat

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

    David Saff authored
    Conflicts:
    	build.xml
    	src/main/java/junit/runner/Version.java
  2. 4.10 final in version, non-snapshot staging

    David Saff authored
  3. 4.10 final

    David Saff authored
Commits on Sep 28, 2011
  1. Merge pull request #329 from stefanbirkner/constructor

    David Saff authored
    Removed explicit constructor of JUnitCore
  2. @fbarber

    Use <? super T> in Assert.assertThat

    fbarber authored
    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. @stefanbirkner

    Removed explicit constructor of JUnitCore

    stefanbirkner authored
    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…

    David Saff authored
    …-not-build-on-windows
    
    Fixes gh-49 Master now builds on windows
  2. @matthewfarwell
  3. Merge pull request #325 from matthewfarwell/support-rule-methods

    David Saff authored
    This is a fix for #83 support @Rule on methods
  4. @matthewfarwell

    This is a fix for #83 support @Rule on methods

    matthewfarwell authored
    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

    David Saff authored
  2. Development version goes to 11\!

    David Saff authored
Commits on Sep 21, 2011
  1. Switching to method sort based on hash code - deterministic but hard …

    Jesse Glick authored
    …to abuse.
Something went wrong with that request. Please try again.