Permalink
Commits on May 24, 2012
  1. Merge branch 'master' of git://github.com/KentBeck/junit

    arjenw committed May 24, 2012
    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)
  2. Renamed ThrowableMatcher to CauseMatcher (including accompanying test…

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

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

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

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

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

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

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

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

    Petter Måhlén
    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

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

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

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

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

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

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

    unknown unknown
    unknown authored and unknown committed Apr 25, 2012
    * 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
Commits on Apr 24, 2012
  1. Merge remote-tracking branch 'upstream/master'

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

    dsaff committed Apr 24, 2012
    Allow creation of Description with a unique id. Needed for Cucumber-JVM.
Commits on Apr 23, 2012
  1. Merge pull request #421 from marcphilipp/fix-mvn-artifacts

    dsaff committed Apr 23, 2012
    Relocate Maven artifact "junit-dep" to "junit"
  2. Merge pull request #423 from ahitrin/fix-issue-170

    dsaff committed Apr 23, 2012
    Fixed #170: display actual object value in assertNull()
Commits on Apr 22, 2012
  1. merged with master

    pettermahlen committed Apr 22, 2012
Commits on Apr 21, 2012
  1. Fix #88

    marcphilipp committed Apr 21, 2012
Commits on Apr 19, 2012
  1. changed the expectedCause() method to accept a Matcher instead of an …

    Petter Måhlén
    Petter Måhlén committed Apr 19, 2012
    …explicit Throwable and made some documentation changes
Commits on Apr 12, 2012
  1. Merge pull request #412 from kcooney/class-request-memoize-runner

    dsaff committed Apr 12, 2012
    Make ClassRequest memoize the runner.