Permalink
Commits on Nov 15, 2012
  1. @dsaff

    Merge pull request #548 from coreyjv/master

    Fixed a JDK5 backwards compatibility issue introduced in Pull #542
    dsaff committed Nov 15, 2012
  2. @dsaff

    Merge pull request #544 from Tibor17/junit.reopen

    forked from #450 and improved
    dsaff committed Nov 15, 2012
  3. @Tibor17
Commits on Nov 14, 2012
  1. @Tibor17

    deleted 2 examples and improved javadoc, improved javadoc in construc…

    …tor, added factories, prepared for 4.12
    Tibor17 committed Nov 14, 2012
  2. @coreyjv

    Fixed JDK5 backwards compatibility issue

    In fixing issue #144 a JDK6 API call was accidentally introduced.
    Updated to be compatible with JDK5.
    coreyjv committed Nov 14, 2012
  3. @dsaff

    Merge pull request #542 from coreyjv/master

    Pull request for issue #144
    dsaff committed Nov 14, 2012
Commits on Nov 13, 2012
  1. @coreyjv

    Converted tab to spaces

    coreyjv committed Nov 13, 2012
  2. @coreyjv

    Refactored logic out of failDueToMissingException

    Refactored message decision logic out of failDueToMissingException into
    its own method missingExceptionMessage.
    coreyjv committed Nov 13, 2012
  3. @dsaff

    Merge pull request #543 from marcphilipp/4.11-release-notes-additions

    Final version of release notes for 4.11
    dsaff committed Nov 13, 2012
  4. @Tibor17
Commits on Nov 12, 2012
  1. @Tibor17

    forked from #450 and improved

    Tibor17 committed Nov 12, 2012
  2. @coreyjv
  3. @coreyjv
  4. @coreyjv

    Converted tabs to spaces

    Converted tabs to spaces for newly added code to be in line with
    guidelines.
    coreyjv committed Nov 12, 2012
  5. @coreyjv

    Changed exception message method name

    Changed method name from setMissingExceptionMessage to
    reportMissingExceptionWithMessage to be more consistent with the
    existing API.
    coreyjv committed Nov 12, 2012
Commits on Nov 11, 2012
  1. @marcphilipp
Commits on Nov 10, 2012
  1. @coreyjv

    Modified test method name to be consistent

    The test method name was never updated. Updated the test method name to
    be consistent with what the test was executing.
    coreyjv committed Nov 10, 2012
  2. @coreyjv

    Implementation for issue #144

    Added additional public method, setMissingExceptionMessage, to allow a
    user to specify a custom message that would be thrown in the event a
    test did not throw the expected exception. If one is not provided the
    class falls back to the previous behavior.
    coreyjv committed Nov 10, 2012
Commits on Nov 6, 2012
  1. @dsaff

    Merge pull request #521 from mmichaelis/adjust-testwatcher-skipped

    Adjust testwatcher skipped to handle failures correctly
    dsaff committed Nov 6, 2012
Commits on Oct 29, 2012
  1. @dsaff

    Merge pull request #519 from kcooney/undeprecate

    Remove @Deprecated from MethodRule and related methods.
    dsaff committed Oct 29, 2012
Commits on Oct 24, 2012
  1. @mmichaelis
  2. @mmichaelis
  3. @mmichaelis

    Rename variable name for exception from "t" to "e"

    Changed the catched throwable name accordingly.
    mmichaelis committed Oct 24, 2012
  4. @kcooney

    Remove tabs

    kcooney committed Oct 24, 2012
  5. @kcooney

    Fix formatting

    kcooney committed Oct 24, 2012
  6. @kcooney

    Merge branch 'master' into undeprecate

    Conflicts:
    	src/main/java/org/junit/ClassRule.java
    	src/main/java/org/junit/Rule.java
    	src/main/java/org/junit/rules/MethodRule.java
    	src/main/java/org/junit/rules/TestWatchman.java
    	src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
    kcooney committed Oct 24, 2012
Commits on Oct 22, 2012
  1. @dsaff

    Merge pull request #526 from marcphilipp/release-notes-file-extension

    Change to Markdown extension for ease of viewing
    dsaff committed Oct 22, 2012
  2. @dsaff

    Merge pull request #533 from marcphilipp/fix-531

    Use TimeUnit.NANOSECONDS for JDK 5 compatibility
    dsaff committed Oct 22, 2012
Commits on Oct 21, 2012
  1. @marcphilipp
  2. @marcphilipp
  3. @marcphilipp

    Change extension to .md for all release note files

    Because we do not want to break any URLs pointing to the .txt files,
    we keep them around but they contain nothing more but a short hint
    to look at the .md ones.
    marcphilipp committed Oct 21, 2012
Commits on Oct 16, 2012
  1. @dsaff

    Merge pull request #520 from kcooney/ant-test-rule

    Add 'test' rule to build.xml
    dsaff committed Oct 16, 2012
Commits on Oct 15, 2012
  1. @marcphilipp
  2. @dsaff

    Merge pull request #524 from marcphilipp/4.11-release-notes

    JUnit 4.11 release notes
    dsaff committed Oct 15, 2012
  3. @dsaff

    Merge pull request #525 from marcphilipp/mvn-staging-adjustments

    Adjustments for deploying releases to Maven central
    dsaff committed Oct 15, 2012