Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: master
Commits on Jun 23, 2012
  1. @kcooney

    Merge pull request #454 from matthewfarwell/fix-441-recursive-temp-fo…

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

    Fixes #441 fix for issue 283 (recursive temp folders) caused incompat…

    matthewfarwell authored
    …ibility
    
    Put back in the method folder.newFolder(String) that
    was removed in #283. Tests that the method is there using
    reflection.
Commits on Jun 8, 2012
  1. @kcooney

    Merge pull request #445 from matthewfarwell/67-since2

    kcooney authored
    Fixes #67 no since javadoc
Commits on Jun 1, 2012
  1. @matthewfarwell

    Fixes #67 no since javadoc

    matthewfarwell authored
  2. @matthewfarwell

    Fixes #67 no since javadoc

    matthewfarwell authored
  3. @kcooney

    Merge pull request #440 from ibeauregard/testNameAsc

    kcooney authored
    Make MethodSorters deterministic in JDK 7
Commits on May 31, 2012
  1. @ibeauregard
  2. @ibeauregard

    NAME_ASCENDING comparator is now more clear, DEFAULT delegates to

    ibeauregard authored
    NAME_ASCENDING in case the hash codes are equal. no more private compare
    method
Commits on May 30, 2012
  1. @ibeauregard
  2. @ibeauregard

    make MethodSorter.NAME_ASCENDING a deterministic comparator, with Met…

    ibeauregard authored
    …hod.toString used as a tiebreaker
  3. @ibeauregard
Commits on May 29, 2012
  1. @ibeauregard

    Changed incorrect comments in MethodSorter and MethodSorters.

    ibeauregard authored
    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.
Commits on May 27, 2012
  1. Merge pull request #439 from plasticle/patch-1

    David Saff authored
    closed method assertEquals with }
  2. @plasticle
Commits on May 25, 2012
  1. Merge pull request #416 from jcortez/master

    David Saff authored
    Fixed issue #219 (rebased)
  2. Merge pull request #435 from matthewfarwell/result-javadoc

    David Saff authored
    Fixes #295 clarify javadoc for Result
  3. Merge pull request #437 from matthewfarwell/verifier-abstract

    David Saff authored
    Fixes #51 Verifier is abstract to indicate that it should be extended
  4. @matthewfarwell
  5. @matthewfarwell
  6. @jcortez

    Fixed merge artifacts

    jcortez authored
  7. @jcortez

    Rebased changes

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

    David Saff authored
    Improved information with failed ExpectedException assertion
  2. @arjenw

    Merge branch 'master' of git://github.com/KentBeck/junit

    arjenw authored
    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)
  3. @arjenw
  4. @arjenw

    Renamed ThrowableMatcher to CauseMatcher (including accompanying test…

    arjenw authored
    …) and fixed the oddly indented brace
  5. Merge pull request #434 from matthewfarwell/testwatcher-description

    David Saff authored
    TestWatcher javadoc was not correct for example method names
  6. @matthewfarwell
Commits on May 22, 2012
  1. Merge pull request #377 from pettermahlen/master

    David Saff authored
    Enable ExpectedException to match causes more easily
  2. Merge pull request #428 from shs96c/master

    David Saff authored
    Allow users to define the parent directory used by the TemporaryFolder
  3. Responding to review comment

    Simon Stewart authored
  4. Responding to review comment

    Simon Stewart authored
  5. more indentation fixes

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

    David Saff authored
    Restore deterministic test ordering.
  2. @sl4mmy
  3. switched to using tabs instead of spaces for indentation

    Petter Måhlén authored
Something went wrong with that request. Please try again.