Bug 416781 - reconcile compiler changes from BETA_JAVA8 with OT/J
- tests: adjust to change in superclass; add missing JCL jar
diff --git a/org.eclipse.jdt.core.tests.model/JCL/jclFull1.8.jar b/org.eclipse.jdt.core.tests.model/JCL/jclFull1.8.jar
new file mode 100644
index 0000000..02238aa
--- /dev/null
+++ b/org.eclipse.jdt.core.tests.model/JCL/jclFull1.8.jar
Binary files differ
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java
index 9608fdd..29c6094 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDTest.java
@@ -183,17 +183,19 @@
/** Relaxed comparison using contains rather than equals. TODO(SH): pattern matching. */
protected void checkCompilerLog(String[] testFiles, Requestor requestor,
- String platformIndependantExpectedLog, Throwable exception) {
+ String[] alternatePlatformIndependantExpectedLogs, Throwable exception) {
String computedProblemLog = Util.convertToIndependantLineDelimiter(requestor.problemLog.toString());
- if (!computedProblemLog.contains(platformIndependantExpectedLog)) {
- logTestTitle();
- System.out.println(Util.displayString(computedProblemLog, INDENT, SHIFT));
- logTestFiles(false, testFiles);
- if (errorMatching && exception == null)
- assertTrue("Invalid problem log\n"+computedProblemLog, false);
+ for (String platformIndependantExpectedLog : alternatePlatformIndependantExpectedLogs) {
+ if (computedProblemLog.contains(platformIndependantExpectedLog))
+ return; // OK
}
+ logTestTitle();
+ System.out.println(Util.displayString(computedProblemLog, INDENT, SHIFT));
+ logTestFiles(false, testFiles);
+ if (errorMatching && exception == null)
+ fail("Invalid problem log\n"+computedProblemLog);
if (!errorMatching && exception == null) {
- assertEquals("Invalid problem log ", platformIndependantExpectedLog, computedProblemLog);
+ assertEquals("Invalid problem log ", alternatePlatformIndependantExpectedLogs[0], computedProblemLog);
}
}
// inaccessible helper from super