Update jdt.core to S4_8_0_M7
- fix compile errors in OT tests
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDNullAnnotationTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDNullAnnotationTest.java
index 2e3c075..79fb61b 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDNullAnnotationTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDNullAnnotationTest.java
@@ -90,7 +90,7 @@
default:
throw new IllegalStateException("Unsupported weavingScheme "+this.weavingScheme);
}
- if (isJRE9)
+ if (isJRE9Plus)
return new String[] {
"-javaagent:"+OTAGENT_JAR_PATH,
"-Xbootclasspath/a:"+OTRE_MIN_JAR_PATH,
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 206902b..a65fc82 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
@@ -94,7 +94,7 @@
default:
throw new IllegalStateException("Unsupported weavingScheme "+this.weavingScheme);
}
- if (isJRE9)
+ if (isJRE9Plus)
return new String[] {
"-javaagent:"+OTAGENT_JAR_PATH,
"-Xbootclasspath/a:"+OTRE_MIN_JAR_PATH,
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java5.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java5.java
index 276ab34..259ab79 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java5.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java5.java
@@ -4118,7 +4118,7 @@
"}\n" +
" \n"
},
- isJRE9 ? "@IA117cfa4(left=\"one\", right=\"two\")" : "@IA117cfa4(left=one, right=two)");
+ isJRE9Plus ? "@IA117cfa4(left=\"one\", right=\"two\")" : "@IA117cfa4(left=one, right=two)");
}
// a role method has a nested custom annotation, so should its tsub - testing at runtime via reflection
@@ -4182,7 +4182,7 @@
},
(this.weavingScheme == WeavingScheme.OTRE
? ""
- : (isJRE9 ? "@IA117cfa5_2(left=\"one\", right=@IA117cfa5_1(value=\"two\"))": "@IA117cfa5_2(left=one, right=@IA117cfa5_1(value=two))")));
+ : (isJRE9Plus ? "@IA117cfa5_2(left=\"one\", right=@IA117cfa5_1(value=\"two\"))": "@IA117cfa5_2(left=one, right=@IA117cfa5_1(value=two))")));
}
// a role method has a custom annotation with enum values, annotation was in conflict with implicit activation annotation
@@ -4347,7 +4347,7 @@
},
(this.weavingScheme == WeavingScheme.OTRE && IS_JRE_8
? ""
- : isJRE9 ? "@IA117cfa7(value={\"one\", \"two\"})" : "@IA117cfa7(value=[one, two])"));
+ : isJRE9Plus ? "@IA117cfa7(value={\"one\", \"two\"})" : "@IA117cfa7(value=[one, two])"));
}
// a role field has a custom annotation (scalar arg), so should its tsub - testing at runtime via reflection
@@ -4402,7 +4402,7 @@
},
(this.weavingScheme == WeavingScheme.OTRE && IS_JRE_8
? ""
- : isJRE9 ? "@IA117cfa8(value=\"val\")" : "@IA117cfa8(value=val)"));
+ : isJRE9Plus ? "@IA117cfa8(value=\"val\")" : "@IA117cfa8(value=val)"));
}
// a role field has a custom annotation (enum typed arg), so should its tsub - testing at runtime via reflection
@@ -4513,7 +4513,7 @@
},
(this.weavingScheme == WeavingScheme.OTRE && IS_JRE_8
? ""
- : isJRE9 ? "@IA117cfa9(value={1, 2})" : "@IA117cfa9(value=[1, 2])"));
+ : isJRE9Plus ? "@IA117cfa9(value={1, 2})" : "@IA117cfa9(value=[1, 2])"));
}
// a role class extends a generic class providing type parameters
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/regression/ReportedBugs.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/regression/ReportedBugs.java
index b0b8ea1..733b412 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/regression/ReportedBugs.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/regression/ReportedBugs.java
@@ -1539,7 +1539,7 @@
"}\n" +
" \n"
};
- String[] vmArgs = isJRE9 ? new String[]{ "--add-reads", "java.datatransfer=ALL-UNNAMED" } : new String[0];
+ String[] vmArgs = isJRE9Plus ? new String[]{ "--add-reads", "java.datatransfer=ALL-UNNAMED" } : new String[0];
runTest(files, false, "", "OK", "", false, null, true, vmArgs, getCompilerOptions(), null, true);
}