Permalink
Commits on Nov 14, 2012
  1. Merge pull request #542 from coreyjv/master

    dsaff committed Nov 14, 2012
    Pull request for issue #144
Commits on Nov 13, 2012
  1. Converted tab to spaces

    coreyjv committed Nov 13, 2012
  2. Refactored logic out of failDueToMissingException

    coreyjv committed Nov 13, 2012
    Refactored message decision logic out of failDueToMissingException into
    its own method missingExceptionMessage.
  3. Merge pull request #543 from marcphilipp/4.11-release-notes-additions

    dsaff committed Nov 13, 2012
    Final version of release notes for 4.11
Commits on Nov 12, 2012
  1. Converted tabs to spaces

    coreyjv committed Nov 12, 2012
    Converted tabs to spaces for newly added code to be in line with
    guidelines.
  2. Changed exception message method name

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

    coreyjv committed Nov 10, 2012
    The test method name was never updated. Updated the test method name to
    be consistent with what the test was executing.
  2. Implementation for issue #144

    coreyjv committed Nov 10, 2012
    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.
Commits on Nov 6, 2012
  1. Merge pull request #521 from mmichaelis/adjust-testwatcher-skipped

    dsaff committed Nov 6, 2012
    Adjust testwatcher skipped to handle failures correctly
Commits on Oct 29, 2012
  1. Merge pull request #519 from kcooney/undeprecate

    dsaff committed Oct 29, 2012
    Remove @Deprecated from MethodRule and related methods.
Commits on Oct 24, 2012
  1. Rename variable name for exception from "t" to "e"

    mmichaelis committed Oct 24, 2012
    Changed the catched throwable name accordingly.
  2. Remove tabs

    kcooney committed Oct 24, 2012
  3. Fix formatting

    kcooney committed Oct 24, 2012
  4. Merge branch 'master' into undeprecate

    kcooney committed Oct 24, 2012
    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
Commits on Oct 22, 2012
  1. Merge pull request #526 from marcphilipp/release-notes-file-extension

    dsaff committed Oct 22, 2012
    Change to Markdown extension for ease of viewing
  2. Merge pull request #533 from marcphilipp/fix-531

    dsaff committed Oct 22, 2012
    Use TimeUnit.NANOSECONDS for JDK 5 compatibility
Commits on Oct 21, 2012
  1. Change extension to .md for all release note files

    marcphilipp committed Oct 21, 2012
    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.
Commits on Oct 16, 2012
  1. Merge pull request #520 from kcooney/ant-test-rule

    dsaff committed Oct 16, 2012
    Add 'test' rule to build.xml
Commits on Oct 15, 2012
  1. Merge pull request #524 from marcphilipp/4.11-release-notes

    dsaff committed Oct 15, 2012
    JUnit 4.11 release notes
  2. Merge pull request #525 from marcphilipp/mvn-staging-adjustments

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

    marcphilipp committed Oct 15, 2012
    - Packaging-type POM
    - message for relocation
    - project description and meta data
    
    See https://issues.sonatype.org/browse/OSSRH-4501 for rationale.
Commits on Oct 11, 2012
Commits on Oct 4, 2012
  1. Issue #426 Applied new coding style

    Arjan Wulder committed Oct 4, 2012
    Applied the new coding style to the code base for issue #426.
  2. Merge pull request #502 from awulder/issue-426

    dsaff committed Oct 4, 2012
    issue #426 Description of the coding style
Commits on Oct 2, 2012
  1. Merge pull request #498 from jglick/DescriptionTest.roundTripsClassOb…

    dsaff committed Oct 2, 2012
    …ject
    
    Description.getTestClass() will now return the same Class instance passed to the creational method
Commits on Oct 1, 2012
  1. TestWatcher.skipped(): Make test pass

    mmichaelis committed Oct 1, 2012
    Now skipped() is handled comparable to failed() statement. Thus failures in skipped() method will raise an extra exception.
    Otherwise just the AssumptionViolatedException is thrown.
  2. TestWatcher.skipped(): Make test fail

    mmichaelis committed Oct 1, 2012
    To show problem of skipped not ignoring failures in skipped-method here is the test - which fails.