Permalink
Commits on Aug 3, 2012
  1. Merge pull request #470 from marcphilipp/fix-javac-build

    dsaff committed Aug 3, 2012
    Fix javac build
Commits on Aug 2, 2012
  1. Fix javac build

    marcphilipp committed Aug 2, 2012
    Replace both() with allOf()
  2. Merge pull request #436 from matthewfarwell/testrule-javadoc

    dsaff committed Aug 2, 2012
    Fixes #427 inconsistent javadoc for test rules
  3. Merge pull request #404 from marcphilipp/hamcrest-1.3

    dsaff committed Aug 2, 2012
    Upgrade to Hamcrest 1.3
  4. Merge pull request #452 from davidhart82/issue433

    dsaff committed Aug 2, 2012
    TestWatcher exceptions hide test exceptions
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
  2. Fix typo in test name

    marcphilipp committed Jul 20, 2012
  3. Rename withStacktrace() to isException()/isThrowable()

    marcphilipp committed Jul 20, 2012
    Following suggestion by @sf105
Commits on Jul 19, 2012
  1. Fix javac compile error

    marcphilipp committed Jul 19, 2012
  2. Merge pull request #448 from davidhart82/publicdatapoints

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

    davidhart82 committed Jul 19, 2012
  4. Introduce withStacktrace() matcher

    marcphilipp committed Jul 19, 2012
    StacktracePrintingMatcher delegates to a Matcher<Throwable> and in
    addition appends the stacktrace of the actual item in case of a
    mismatch.
    
    It is used inside ExpectedExceptionMatcher and can also be used
    separately when matching Throwables by calling `assertThat(actual,
    withStacktrace(throwableMatcher)`.
    
    assertThat no longer sets the cause of the AssertionError. CauseMatcher
    has been removed.
  5. Custom matcher for ExpectedException (refactoring)

    marcphilipp committed Jul 19, 2012
    ExpectedExceptionMatcher now collects all the matchers and internally
    provides custom matchers for checking the message and the cause of an
    exception.
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.
  3. Remove unused import

    marcphilipp committed Jul 15, 2012
  4. Merge remote-tracking branch 'KentBeck/master' into hamcrest-1.3

    marcphilipp committed Jul 15, 2012
    Conflicts:
    	src/main/java/org/junit/Assert.java
    	src/main/java/org/junit/matchers/JUnitMatchers.java
    	src/main/java/org/junit/rules/ExpectedException.java
    	src/test/java/org/junit/tests/experimental/rules/ExpectedExceptionTest.java
Commits on Jun 24, 2012
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