diff options
author | Pete Bentley <prb@google.com> | 2021-02-24 08:57:22 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-24 08:57:22 +0000 |
commit | d1359663578e2a49e74ed74eb10d4b663d58cf3f (patch) | |
tree | 1331fa1b743d5d0a341f82ff555ce4c602f40ab9 /src/main/java/junit/runner | |
parent | e938015d2d5a2157ed20eb622fcd9750a12bb4af (diff) | |
parent | 7db56fab8af99e12a7644349d14109235ec584b9 (diff) | |
download | junit-d1359663578e2a49e74ed74eb10d4b663d58cf3f.tar.gz |
Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df
* changes:
Remove support for stuck threads
Remove DisableOnDebug (new in 4.12) as it is not supported on Android
Extra generic type information to aid certain javacs.
Upgrade external/junit to 4.13.2
Diffstat (limited to 'src/main/java/junit/runner')
-rw-r--r-- | src/main/java/junit/runner/BaseTestRunner.java | 9 | ||||
-rw-r--r-- | src/main/java/junit/runner/TestRunListener.java | 16 | ||||
-rw-r--r-- | src/main/java/junit/runner/Version.java | 2 |
3 files changed, 13 insertions, 14 deletions
diff --git a/src/main/java/junit/runner/BaseTestRunner.java b/src/main/java/junit/runner/BaseTestRunner.java index 8268323..d63fae7 100644 --- a/src/main/java/junit/runner/BaseTestRunner.java +++ b/src/main/java/junit/runner/BaseTestRunner.java @@ -20,6 +20,8 @@ import junit.framework.Test; import junit.framework.TestListener; import junit.framework.TestSuite; +import org.junit.internal.Throwables; + /** * Base class for all test runners. * This class was born live on stage in Sardinia during XP2000. @@ -233,6 +235,7 @@ public abstract class BaseTestRunner implements TestListener { setPreferences(new Properties(getPreferences())); getPreferences().load(is); } catch (IOException ignored) { + } catch (SecurityException ignored) { } finally { try { if (is != null) { @@ -264,11 +267,7 @@ public abstract class BaseTestRunner implements TestListener { * Returns a filtered stack trace */ public static String getFilteredTrace(Throwable e) { - StringWriter stringWriter = new StringWriter(); - PrintWriter writer = new PrintWriter(stringWriter); - e.printStackTrace(writer); - String trace = stringWriter.toString(); - return BaseTestRunner.getFilteredTrace(trace); + return BaseTestRunner.getFilteredTrace(Throwables.getStacktrace(e)); } /** diff --git a/src/main/java/junit/runner/TestRunListener.java b/src/main/java/junit/runner/TestRunListener.java index b5e22f5..ce5b3d5 100644 --- a/src/main/java/junit/runner/TestRunListener.java +++ b/src/main/java/junit/runner/TestRunListener.java @@ -8,18 +8,18 @@ package junit.runner; */ public interface TestRunListener { /* test status constants*/ - public static final int STATUS_ERROR = 1; - public static final int STATUS_FAILURE = 2; + int STATUS_ERROR = 1; + int STATUS_FAILURE = 2; - public void testRunStarted(String testSuiteName, int testCount); + void testRunStarted(String testSuiteName, int testCount); - public void testRunEnded(long elapsedTime); + void testRunEnded(long elapsedTime); - public void testRunStopped(long elapsedTime); + void testRunStopped(long elapsedTime); - public void testStarted(String testName); + void testStarted(String testName); - public void testEnded(String testName); + void testEnded(String testName); - public void testFailed(int status, String testName, String trace); + void testFailed(int status, String testName, String trace); } diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java index eaf3db7..6c7862e 100644 --- a/src/main/java/junit/runner/Version.java +++ b/src/main/java/junit/runner/Version.java @@ -9,7 +9,7 @@ public class Version { } public static String id() { - return "4.12-SNAPSHOT"; + return "4.13.3-SNAPSHOT"; } public static void main(String[] args) { |