Permalink
Commits on May 27, 2012
  1. Merge pull request #439 from plasticle/patch-1

    closed method assertEquals with }
    dsaff committed May 27, 2012
Commits on May 25, 2012
  1. Merge pull request #416 from jcortez/master

    Fixed issue #219 (rebased)
    dsaff committed May 25, 2012
  2. Merge pull request #435 from matthewfarwell/result-javadoc

    Fixes #295 clarify javadoc for Result
    dsaff committed May 25, 2012
  3. Merge pull request #437 from matthewfarwell/verifier-abstract

    Fixes #51 Verifier is abstract to indicate that it should be extended
    dsaff committed May 25, 2012
  4. Fixed merge artifacts

    jcortez committed May 25, 2012
  5. Rebased changes

    jcortez committed May 25, 2012
Commits on May 24, 2012
  1. Merge pull request #369 from arjenw/master

    Improved information with failed ExpectedException assertion
    dsaff committed May 24, 2012
  2. Merge branch 'master' of git://github.com/KentBeck/junit

    Conflicts:
    	src/test/java/org/junit/tests/AllTests.java
    	src/test/java/org/junit/tests/experimental/rules/ExpectedExceptionRuleTest.java
    
    Merged changes from the HEAD branch
    
    Besides the merged changes also the approach to test for the failure has
    been changed to comply to the new way of testing in
    ExpectedExceptionTest. That no longer required the changes in
    ResultMatchers (with their accompanying tests)
    arjenw committed May 24, 2012
  3. Renamed ThrowableMatcher to CauseMatcher (including accompanying test…

    …) and fixed the oddly indented brace
    arjenw committed May 24, 2012
  4. Merge pull request #434 from matthewfarwell/testwatcher-description

    TestWatcher javadoc was not correct for example method names
    dsaff committed May 24, 2012
Commits on May 22, 2012
  1. Merge pull request #377 from pettermahlen/master

    Enable ExpectedException to match causes more easily
    dsaff committed May 22, 2012
  2. Merge pull request #428 from shs96c/master

    Allow users to define the parent directory used by the TemporaryFolder
    dsaff committed May 22, 2012
  3. Responding to review comment

    Simon Stewart committed May 22, 2012
  4. Responding to review comment

    Simon Stewart committed May 22, 2012
  5. more indentation fixes

    Petter Måhlén committed May 22, 2012
Commits on May 21, 2012
  1. Merge pull request #431 from sl4mmy/issue-429

    Restore deterministic test ordering.
    dsaff committed May 21, 2012
  2. switched to using tabs instead of spaces for indentation

    Petter Måhlén committed May 21, 2012
Commits on May 18, 2012
Commits on May 14, 2012
  1. Merge pull request #385 from peterdemaeyer/master

    Bugfixes for #382 and #384
    dsaff committed May 14, 2012
Commits on May 10, 2012
  1. Merge pull request #415 from adriannistoruiuc/patch-1

    Addressing some style and performance issues with null error messages.
    dsaff committed May 10, 2012
  2. style edit. space after if

    a committed May 10, 2012
  3. implementing kcooney's suggestion

    a committed May 10, 2012
Commits on May 9, 2012
  1. deleted extra space

    a committed May 9, 2012
  2. Merge pull request #418 from detinho/_issue_22

    Issue 22: Adding assertNotEquals to Object, long and double
    dsaff committed May 9, 2012
Commits on Apr 27, 2012
Commits on Apr 25, 2012
  1. Reworked based on suggestions

    * Fixed the javadoc of ResultMatchers.failureIs()
    * Made the ResultMatchers.failureIs() matcher based on PrintableResult instead of Result
    * Introduced method 'getFailures()' in PrintableResult to achieve that
    * Moved causedBy() matcher from ResultMatchers to JUnitMatchers (as it is a Throwable matcher)
    * Introduced the required tests at the right places
    unknown committed Apr 25, 2012
Commits on Apr 24, 2012
  1. Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	src/main/java/org/junit/internal/MethodSorter.java
    
    Upstream version chosen for all conflicts
    peterdemaeyer committed Apr 24, 2012
  2. Merge pull request #405 from aslakhellesoy/description-with-unique-id

    Allow creation of Description with a unique id. Needed for Cucumber-JVM.
    dsaff committed Apr 24, 2012