Skip to content
Commits on Oct 24, 2011
  1. Merge pull request #344 from vyazelenko/master

    David Saff committed
    Fixes gh-342: TemporaryFolder.newFile(String) throws IllegalStateException in junit-4.10
Commits on Oct 18, 2011
  1. @vyazelenko
Commits on Oct 17, 2011
  1. Fixes for issue #342

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

    David Saff committed
    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 committed
    Fixes KentBeck/junit#339
Commits on Oct 10, 2011
  1. Merge pull request #330 from fbarber/master

    David Saff committed
    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 committed
    …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 committed
    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 committed
    Conflicts:
    	build.xml
    	src/main/java/junit/runner/Version.java
  2. 4.10 final in version, non-snapshot staging

    David Saff committed
  3. 4.10 final

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

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

    Use <? super T> in Assert.assertThat

    fbarber committed
    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 committed
    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 committed
    …-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 committed
    This is a fix for #83 support @Rule on methods
  4. @matthewfarwell

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

    matthewfarwell committed
    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 committed
  2. Development version goes to 11\!

    David Saff committed
Commits on Sep 19, 2011
  1. Merge pull request #319 from stefanbirkner/issue318

    David Saff committed
    Fixed gh-318 (Empty message instead of null)
  2. Merge pull request #304 from stefanbirkner/NonStaticInnerTestClass

    David Saff committed
    fixed issue #42 (error message for non-static inner class)
Commits on Sep 18, 2011
  1. @stefanbirkner

    Fixes gh-42 (error message for non-static inner class)

    stefanbirkner committed
    Add an appropriate error when a test class is a non-static inner class
    and don't try to validate the parameter count of its constructor.
  2. @stefanbirkner
Commits on Sep 16, 2011
  1. Merge pull request #313 from dsaff/categorized_parameters_fix

    David Saff committed
    Fixes gh-291: Categories + Parameterized still does not work
  2. Merge pull request #317 from stefanbirkner/issue225

    David Saff committed
    Fixes gh-225 (initialize error count)
Commits on Sep 15, 2011
  1. @stefanbirkner
Commits on Sep 14, 2011
  1. Merge pull request #314 from stefanbirkner/RuleChain

    David Saff committed
    Rule chain
  2. @stefanbirkner

    Fixes gh-193 (allow explicit ordering of Rules).

    stefanbirkner committed
    Add a class RuleChain, which allows ordering of TestRules.
    
    Usage:
      @Rule
      public TestRule chain= RuleChain
                             .outerRule(new LoggingRule("outer rule")
                             .around(new LoggingRule("middle rule")
                             .around(new LoggingRule("inner rule");
    
    A test with such a rule chain creates the following log:
      starting outer rule
      starting middle rule
      starting inner rule
      finished inner rule
      finished middle rule
      finished outer rule
  3. Merge pull request #315 from dsaff/master

    David Saff committed
    Fixes gh-311: Fix 4.9.1 release notes, make sure markdown errors halt build
  4. Merge pull request #310 from dsaff/master

    David Saff committed
    Fixes gh-309: build.xml uploads junitX.jar as junit-depX.jar
  5. Merge branch 'master' of github.com:KentBeck/junit

    David Saff committed
    Conflicts:
    	build.xml
    	src/main/java/junit/runner/Version.java
  6. Fixes gh-291: Categories + Parameterized still does not work

    David Saff committed
    Also does a little code hygiene throughout the project
Something went wrong with that request. Please try again.