Bug 537485: [JUnit 5] Result Comparision dialog on assertion failure
doesn't work in mixed JUnit 4/5 scenarios
Change-Id: I57f037a3e422ebd40a44f3e85e52ac3b82d743c1
diff --git a/org.eclipse.jdt.junit5.runtime/META-INF/MANIFEST.MF b/org.eclipse.jdt.junit5.runtime/META-INF/MANIFEST.MF
index 40b6191..f517e33 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 @@
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 b095fe9..6b31b1f 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 @@
}
}
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;
}
