aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/junit/framework/TestFailure.java
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2021-03-03 13:41:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-03 13:41:16 +0000
commitc7a6d4ec7defd99aab81c3add6e2916629a79a24 (patch)
tree9d0ef66d108d76d38341cb002d5a46f74299983f /src/main/java/junit/framework/TestFailure.java
parent91c5e5ff9d71ebc00818b310c09b175016c36dc2 (diff)
parentfcd81b3e3fa66cb13ab508ef8f9a4a8704309350 (diff)
downloadjunit-c7a6d4ec7defd99aab81c3add6e2916629a79a24.tar.gz
Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: b6446bec0a am: fcd81b3e3f
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1613132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ide8f718358c2b88fb4af0b2b2792f5a560de4d67
Diffstat (limited to 'src/main/java/junit/framework/TestFailure.java')
-rw-r--r--src/main/java/junit/framework/TestFailure.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/junit/framework/TestFailure.java b/src/main/java/junit/framework/TestFailure.java
index 6168b58..d1ddfbc 100644
--- a/src/main/java/junit/framework/TestFailure.java
+++ b/src/main/java/junit/framework/TestFailure.java
@@ -1,7 +1,6 @@
package junit.framework;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import org.junit.internal.Throwables;
/**
@@ -49,10 +48,7 @@ public class TestFailure {
* thrown by TestFailure.
*/
public String trace() {
- StringWriter stringWriter = new StringWriter();
- PrintWriter writer = new PrintWriter(stringWriter);
- thrownException().printStackTrace(writer);
- return stringWriter.toString();
+ return Throwables.getStacktrace(thrownException());
}
/**