Permalink
Commits on Jul 25, 2012
  1. Correct regression introduced by pull 283

    alain-odea-vgh committed Jul 25, 2012
    Pull 283 changed newFolder(String) so that it no longer returns the file created, but the root.  This makes no sense and is an API regression.
    
    This commit corrects that by returning newFolder(String) to its pre Pull 283 implementation.
Commits on Jul 20, 2012
  1. Merge pull request #447 from shirish4you/patch-2

    dsaff committed Jul 20, 2012
    Removed "GENERATOR" meta for "Microsoft FrontPage 4.0" from index.html
Commits on Jul 19, 2012
  1. Merge pull request #448 from davidhart82/publicdatapoints

    dsaff committed Jul 19, 2012
    DataPoints need to be Public
  2. Move brace (code review)

    davidhart82 committed Jul 19, 2012
Commits on Jul 15, 2012
  1. Merge pull request #462 from marcphilipp/fix-method-sorter-warnings

    kcooney committed Jul 15, 2012
    Fix compiler warnings in MethodSorterTest
  2. Fix warnings in MethodSorterTest

    marcphilipp committed Jul 15, 2012
    There were several compiler warnings due to seemingly unused members of
    private classes that were only used via reflection.
Commits on Jun 23, 2012
  1. Merge pull request #454 from matthewfarwell/fix-441-recursive-temp-fo…

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

    matthewfarwell committed Jun 19, 2012
    …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. Merge pull request #445 from matthewfarwell/67-since2

    kcooney committed Jun 8, 2012
    Fixes #67 no since javadoc
Commits on Jun 3, 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

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

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

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

    ibeauregard committed May 29, 2012
    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

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

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

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

    dsaff committed May 25, 2012
    Fixes #51 Verifier is abstract to indicate that it should be extended
  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

    dsaff committed May 24, 2012
    Improved information with failed ExpectedException assertion
  2. 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)
  3. Renamed ThrowableMatcher to CauseMatcher (including accompanying test…

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

    dsaff committed May 24, 2012
    TestWatcher javadoc was not correct for example method names