Permalink
Commits on Jun 23, 2012
  1. Merge pull request #454 from matthewfarwell/fix-441-recursive-temp-fo…

    …lders
    
    Fixes #441 fix for issue 283 (recursive temp folders) caused incompatibility
    kcooney committed Jun 23, 2012
Commits on Jun 19, 2012
  1. Fixes #441 fix for issue 283 (recursive temp folders) caused incompat…

    …ibility
    
    Put back in the method folder.newFolder(String) that
    was removed in #283. Tests that the method is there using
    reflection.
    matthewfarwell committed Jun 19, 2012
Commits on Jun 8, 2012
  1. Merge pull request #445 from matthewfarwell/67-since2

    Fixes #67 no since javadoc
    kcooney committed Jun 8, 2012
Commits on Jun 1, 2012
  1. Fixes #67 no since javadoc

    matthewfarwell committed Jun 1, 2012
  2. Fixes #67 no since javadoc

    matthewfarwell committed Jun 1, 2012
  3. Merge pull request #440 from ibeauregard/testNameAsc

    Make MethodSorters deterministic in JDK 7
    kcooney committed Jun 1, 2012
Commits on May 31, 2012
  1. NAME_ASCENDING comparator is now more clear, DEFAULT delegates to

    NAME_ASCENDING in case the hash codes are equal. no more private compare
    method
    ibeauregard committed May 31, 2012
Commits on May 30, 2012
  1. make MethodSorter.NAME_ASCENDING a deterministic comparator, with Met…

    …hod.toString used as a tiebreaker
    ibeauregard committed May 30, 2012
Commits on May 29, 2012
  1. Changed incorrect comments in MethodSorter and MethodSorters.

    In MethodSorterTest, I took into account the fact that the getDeclaredMethods
    method from Class returns methods in an arbitrary order. We can therefore
    expect 2 possible outcomes for the output of declaredMethods.
    
    I adapted the test to this reality.
    ibeauregard committed May 29, 2012
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