Permalink
Commits on Aug 13, 2012
  1. Replaced IllegalArgumentException for IOException

    It's more consistent to throw an IOException instead of an
    IllegalArgumentException
    Arjan Wulder committed Aug 13, 2012
Commits on Aug 12, 2012
  1. Fixed indenting on several lines

    After solving #479 also fixed the indenting
    Arjan Wulder committed Aug 12, 2012
  2. Changes suggested by kcooney

    kcooney suggested some changes for #479
    Arjan Wulder committed Aug 12, 2012
  3. Issue 478: Throw an IllegalStateException when the folder already exists

    Changed the code so it behaves like it is described in the
    documentation.
    Arjan Wulder committed Aug 12, 2012
Commits on Aug 3, 2012
  1. @dsaff

    Merge pull request #470 from marcphilipp/fix-javac-build

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

    Fix javac build

    Replace both() with allOf()
    marcphilipp committed Aug 2, 2012
  2. @dsaff

    Merge pull request #436 from matthewfarwell/testrule-javadoc

    Fixes #427 inconsistent javadoc for test rules
    dsaff committed Aug 2, 2012
  3. @dsaff

    Merge pull request #404 from marcphilipp/hamcrest-1.3

    Upgrade to Hamcrest 1.3
    dsaff committed Aug 2, 2012
  4. @dsaff

    Merge pull request #452 from davidhart82/issue433

    TestWatcher exceptions hide test exceptions
    dsaff committed Aug 2, 2012
Commits on Jul 20, 2012
  1. @dsaff

    Merge pull request #447 from shirish4you/patch-2

    Removed "GENERATOR" meta for "Microsoft FrontPage 4.0" from index.html
    dsaff committed Jul 20, 2012
  2. @marcphilipp

    Fix typo in test name

    marcphilipp committed Jul 20, 2012
  3. @marcphilipp
  4. @marcphilipp
  5. @marcphilipp
  6. @marcphilipp
  7. @marcphilipp

    Rename withStacktrace() to isException()/isThrowable()

    Following suggestion by @sf105
    marcphilipp committed Jul 20, 2012
Commits on Jul 19, 2012
  1. @marcphilipp
  2. @marcphilipp
  3. @marcphilipp
  4. @marcphilipp

    Fix javac compile error

    marcphilipp committed Jul 19, 2012
  5. @dsaff

    Merge pull request #448 from davidhart82/publicdatapoints

    DataPoints need to be Public
    dsaff committed Jul 19, 2012
  6. @davidhart82

    Move brace (code review)

    davidhart82 committed Jul 19, 2012
  7. @marcphilipp

    Introduce withStacktrace() matcher

    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.
    marcphilipp committed Jul 19, 2012
  8. @marcphilipp
  9. @marcphilipp

    Custom matcher for ExpectedException (refactoring)

    ExpectedExceptionMatcher now collects all the matchers and internally
    provides custom matchers for checking the message and the cause of an
    exception.
    marcphilipp committed Jul 19, 2012
Commits on Jul 15, 2012
  1. @kcooney

    Merge pull request #462 from marcphilipp/fix-method-sorter-warnings

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

    Fix warnings in MethodSorterTest

    There were several compiler warnings due to seemingly unused members of
    private classes that were only used via reflection.
    marcphilipp committed Jul 15, 2012
  3. @marcphilipp
  4. @marcphilipp

    Remove unused import

    marcphilipp committed Jul 15, 2012
  5. @marcphilipp
  6. @marcphilipp

    Merge remote-tracking branch 'KentBeck/master' into hamcrest-1.3

    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
    marcphilipp committed Jul 15, 2012
Commits on Jun 24, 2012
  1. @davidhart82
  2. @davidhart82
  3. @davidhart82
Commits on Jun 23, 2012
  1. @kcooney

    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