diff options
| author | Noopur Gupta | 2018-07-31 08:01:31 +0000 |
|---|---|---|
| committer | Noopur Gupta | 2018-08-13 09:04:01 +0000 |
| commit | 65a1ca2ccb9abf4210bf27a8af7abe1733a6e3f3 (patch) | |
| tree | 9c3559e1bcb12f6bf7830bc5de28031a96b5dd22 | |
| parent | 2b5d3c7d279c88f53d1a63a12a062a314e378152 (diff) | |
| download | eclipse.jdt.ui-65a1ca2ccb9abf4210bf27a8af7abe1733a6e3f3.tar.gz eclipse.jdt.ui-65a1ca2ccb9abf4210bf27a8af7abe1733a6e3f3.tar.xz eclipse.jdt.ui-65a1ca2ccb9abf4210bf27a8af7abe1733a6e3f3.zip | |
Bug 537485: [JUnit 5] Result Comparision dialog on assertion failureI20180816-2000I20180815-2000I20180815-1250I20180814-2000I20180814-0910I20180814-0900
doesn't work in mixed JUnit 4/5 scenarios
Change-Id: I57f037a3e422ebd40a44f3e85e52ac3b82d743c1
| -rw-r--r-- | org.eclipse.jdt.junit5.runtime/META-INF/MANIFEST.MF | 3 | ||||
| -rw-r--r-- | org.eclipse.jdt.junit5.runtime/src/org/eclipse/jdt/internal/junit5/runner/JUnit5TestListener.java | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/org.eclipse.jdt.junit5.runtime/META-INF/MANIFEST.MF b/org.eclipse.jdt.junit5.runtime/META-INF/MANIFEST.MF index 40b6191922..f517e33fc1 100644 --- a/org.eclipse.jdt.junit5.runtime/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.junit5.runtime/META-INF/MANIFEST.MF @@ -19,5 +19,6 @@ Require-Bundle: org.eclipse.jdt.junit.runtime;bundle-version="[3.4.600,4.0.0)", org.junit.platform.launcher;bundle-version="1.0.0", org.junit.platform.runner;bundle-version="1.0.0", org.junit.platform.suite.api;bundle-version="1.0.0", - org.apiguardian;bundle-version="1.0.0" + org.apiguardian;bundle-version="1.0.0", + org.junit;bundle-version="4.7.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jdt.junit5.runtime/src/org/eclipse/jdt/internal/junit5/runner/JUnit5TestListener.java b/org.eclipse.jdt.junit5.runtime/src/org/eclipse/jdt/internal/junit5/runner/JUnit5TestListener.java index b095fe923d..6b31b1f14a 100644 --- a/org.eclipse.jdt.junit5.runtime/src/org/eclipse/jdt/internal/junit5/runner/JUnit5TestListener.java +++ b/org.eclipse.jdt.junit5.runtime/src/org/eclipse/jdt/internal/junit5/runner/JUnit5TestListener.java @@ -127,6 +127,12 @@ public class JUnit5TestListener implements TestExecutionListener { } } return new FailedComparison(expectedStr, actualStr); + } else if (exception instanceof junit.framework.ComparisonFailure) { + junit.framework.ComparisonFailure comparisonFailure= (junit.framework.ComparisonFailure) exception; + return new FailedComparison(comparisonFailure.getExpected(), comparisonFailure.getActual()); + } else if (exception instanceof org.junit.ComparisonFailure) { + org.junit.ComparisonFailure comparisonFailure= (org.junit.ComparisonFailure) exception; + return new FailedComparison(comparisonFailure.getExpected(), comparisonFailure.getActual()); } return null; } |