Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Throw TestFailedOnTimeoutException instead of plain Exception on timeout. Fixes #771 #823

Merged
merged 11 commits into from
Feb 18, 2014
Merged

Throw TestFailedOnTimeoutException instead of plain Exception on timeout. Fixes #771 #823

merged 11 commits into from
Feb 18, 2014

Commits on Nov 28, 2013

  1. Throw TestFailedOnTimeoutException instead of plain Exception on 

    timeout. Fixes junit-team#771
    Andreas Skoog committed Nov 28, 2013
    Configuration menu
    Copy the full SHA
    dcc298c View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2013

  1. Improvements after code review. Move Exception to non internal package 

    and provide getters for timeout and time unit
    Andreas Skoog committed Nov 29, 2013
    Configuration menu
    Copy the full SHA
    619f4ff View commit details
    Browse the repository at this point in the history

  2. Use TestFailedOnTimeoutException when test times out

    Andreas Skoog committed Nov 29, 2013
    Configuration menu
    Copy the full SHA
    b645d2b View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2013

  1. Add second test verifying the time unit and timeout value fields of the 

    thrown exception
    Andreas Skoog committed Dec 2, 2013
    Configuration menu
    Copy the full SHA
    bf2f922 View commit details
    Browse the repository at this point in the history

  2. minor code review changes

    Andreas Skoog committed Dec 2, 2013
    Configuration menu
    Copy the full SHA
    6a302a6 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2013

  1. Refactor test, replace matcher with try catch

    askoog committed Dec 4, 2013
    Configuration menu
    Copy the full SHA
    66bfb24 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2013

  1. Merge remote-tracking branch 'upstream/master'

    Andreas Skoog committed Dec 25, 2013
    Configuration menu
    Copy the full SHA
    9c5a2f2 View commit details
    Browse the repository at this point in the history

  2. Rename TestFailedOnTimeoutException -> TestTimedOutException

    Andreas Skoog committed Dec 25, 2013
    Configuration menu
    Copy the full SHA
    26c25f3 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2014

  1. minor formatting change

    Andreas Skoog committed Jan 7, 2014
    Configuration menu
    Copy the full SHA
    a4f088d View commit details
    Browse the repository at this point in the history

  2. minor javadoc change

    Andreas Skoog committed Jan 7, 2014
    Configuration menu
    Copy the full SHA
    f03bc79 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2014

  1. Merge branch 'master' of https://github.com/junit-team/junit into tim… 

    …edoutexception

Conflicts:
	src/test/java/org/junit/tests/AllTests.java
    Andreas Skoog committed Feb 15, 2014
    Configuration menu
    Copy the full SHA
    baf1ea0 View commit details
    Browse the repository at this point in the history