Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Oct 07, 2011

  1. Merge pull request #334 from matthewfarwell/333-build.xml-is-broken-a…

    …fter-merges
    
    Fixes gh-333: build.xml is broken after merge
    David Saff authored
  2. Matthew Farwell

    Fix for #333 build.xml is broken after merge

    matthewfarwell authored

Sep 29, 2011

  1. Merge branch '4.10'

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

    David Saff authored
  3. 4.10 final

    David Saff authored

Sep 28, 2011

  1. Merge pull request #329 from stefanbirkner/constructor

    Removed explicit constructor of JUnitCore
    David Saff authored

Sep 27, 2011

  1. Stefan Birkner

    Removed explicit constructor of JUnitCore

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

Sep 23, 2011

  1. Merge pull request #326 from matthewfarwell/49-master-git-branch-does…

    …-not-build-on-windows
    
    Fixes gh-49 Master now builds on windows
    David Saff authored
  2. Matthew Farwell

    fix for #49 Master now builds on windows.

    matthewfarwell authored
  3. Merge pull request #325 from matthewfarwell/support-rule-methods

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

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

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

Sep 22, 2011

  1. 4.10 release notes up to date

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

    David Saff authored

Sep 19, 2011

  1. Merge pull request #319 from stefanbirkner/issue318

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

    fixed issue #42 (error message for non-static inner class)
    David Saff authored

Sep 18, 2011

  1. Stefan Birkner

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

    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.
    stefanbirkner authored
  2. Stefan Birkner

    Fixed gh-318 (Empty message instead of null)

    stefanbirkner authored

Sep 16, 2011

  1. Merge pull request #313 from dsaff/categorized_parameters_fix

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

    Fixes gh-225 (initialize error count)
    David Saff authored

Sep 15, 2011

  1. Stefan Birkner

    Fixes gh-225 (initialize error count)

    stefanbirkner authored

Sep 14, 2011

  1. Merge pull request #314 from stefanbirkner/RuleChain

    Rule chain
    David Saff authored
  2. Stefan Birkner

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

    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
    stefanbirkner authored
  3. Merge pull request #315 from dsaff/master

    Fixes gh-311: Fix 4.9.1 release notes, make sure markdown errors halt build
    David Saff authored
  4. Fixes gh-311: Fix 4.9.1 release notes, make sure markdown errors halt…

    … build
    David Saff authored
  5. Merge pull request #310 from dsaff/master

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

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

    Also does a little code hygiene throughout the project
    David Saff authored

Sep 13, 2011

  1. Backed version up to 4.10. Oops.

    David Saff authored
  2. Set master version to 4.10.1 in build.xml

    David Saff authored
  3. Merge 4.9.1 into master

    David Saff authored
  4. Resolve merge conflicts between master and 4.10

    David Saff authored
  5. Merge pull request #11 from dsaff/4.9.1

    Merge 4.9.1 -> master
    David Saff authored
  6. Fixes gh-309: build.xml uploads junitX.jar as junit-depX.jar

    David Saff authored

Sep 10, 2011

  1. Merge pull request #301 from stefanbirkner/issue289

    fixed issue #289 (removed useless code)
    David Saff authored

Sep 09, 2011

  1. Stefan Birkner

    fixed issue #289 (removed useless code)

    stefanbirkner authored
Something went wrong with that request. Please try again.