Bug 552082 - Fix the applicability of a no-@Target annotation type
- add an excuse for javac bug JDK-8231436, not yet fixed
Change-Id: I065a8db1c3ac1616b38ee0d4e132cde7c693e298
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
index f275bc5..62e60dd 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
@@ -1026,7 +1026,9 @@
JavacBug8221413_switchExpression = RUN_JAVAC ? // https://bugs.openjdk.java.net/browse/JDK-8221413
new JavacBug8221413(" --release 12 --enable-preview -Xlint:-preview") : null,
JavacBug8226510_switchExpression = RUN_JAVAC ? // https://bugs.openjdk.java.net/browse/JDK-8226510
- new JavacBug8226510(" --release 12 --enable-preview -Xlint:-preview") : null;
+ new JavacBug8226510(" --release 12 --enable-preview -Xlint:-preview") : null,
+ JavacBug8231436 = RUN_JAVAC ? // https://bugs.openjdk.java.net/browse/JDK-8231436 to implement https://bugs.openjdk.java.net/browse/JDK-8231435
+ new JavacHasABug(MismatchType.JavacErrorsEclipseNone) : null;
// bugs that have been fixed but that we've not identified
public static JavacHasABug
@@ -2846,8 +2848,8 @@
boolean shouldFlushOutputDirectory,
Map customOptions,
String expectedErrorString) {
- runNegativeTest(testFiles, expectedCompilerLog, classLibraries,
- shouldFlushOutputDirectory, customOptions, expectedErrorString,
+ runNegativeTest(testFiles, expectedCompilerLog, classLibraries,
+ shouldFlushOutputDirectory, customOptions, expectedErrorString,
JavacTestOptions.DEFAULT);
}
protected void runNegativeTest(
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JSR308SpecSnippetTests.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JSR308SpecSnippetTests.java
index 6b75b8b..62e23d7 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JSR308SpecSnippetTests.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JSR308SpecSnippetTests.java
@@ -889,8 +889,8 @@
checkDisassembledClassFile(OUTPUT_DIR + File.separator + "X$Y.class", "Y", expectedOutput, ClassFileBytesDisassembler.SYSTEM);
}
public void test018() throws Exception {
- // was negative prior to https://bugs.openjdk.java.net/browse/JDK-8231435
- this.runConformTest(
+ Runner runner = new Runner();
+ runner.testFiles =
new String[] {
"X.java",
"@interface Receiver {}\n" +
@@ -904,8 +904,9 @@
" Y(@Receiver X X.this, boolean b) { }\n" +
" }\n" +
"}\n",
- },
- "");
+ };
+ runner.javacTestOptions = JavacTestOptions.JavacHasABug.JavacBug8231436;
+ runner.runConformTest();
}
public void test019() throws Exception {
this.runConformTest(
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NegativeTypeAnnotationTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NegativeTypeAnnotationTest.java
index 4ea739d..31d0de2 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NegativeTypeAnnotationTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NegativeTypeAnnotationTest.java
@@ -685,19 +685,20 @@
"----------\n");
}
public void test032() throws Exception {
- // was negative prior to https://bugs.openjdk.java.net/browse/JDK-8231435
- this.runConformTest(
+ Runner runner = new Runner();
+ runner.testFiles =
new String[] {
"Marker.java",
"@interface Marker {}",
"X.java",
"public class X<@Marker T> {}",
- },
- "");
+ };
+ runner.javacTestOptions = JavacTestOptions.JavacHasABug.JavacBug8231436;
+ runner.runConformTest();
}
public void test033() throws Exception {
- // was negative prior to https://bugs.openjdk.java.net/browse/JDK-8231435
- this.runConformTest(
+ Runner runner = new Runner();
+ runner.testFiles =
new String[] {
"Marker.java",
"@interface Marker {}",
@@ -705,8 +706,9 @@
"public class Y {}",
"X.java",
"public class X extends @Marker Y {}",
- },
- "");
+ };
+ runner.javacTestOptions = JavacTestOptions.JavacHasABug.JavacBug8231436;
+ runner.runConformTest();
}
// check locations
public void test034() throws Exception {
@@ -877,8 +879,8 @@
"----------\n");
}
public void test037() {
- // was negative prior to https://bugs.openjdk.java.net/browse/JDK-8231435
- this.runConformTest(
+ Runner runner = new Runner();
+ runner.testFiles =
new String[] {
"X.java",
"@interface Marker {}\n" +
@@ -888,8 +890,9 @@
" return null;\n" +
" }\n" +
"}\n",
- },
- "");
+ };
+ runner.javacTestOptions = JavacTestOptions.JavacHasABug.JavacBug8231436;
+ runner.runConformTest();
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=383950
// [1.8][compiler] Type annotations must have target type meta annotation TYPE_USE
@@ -2149,8 +2152,8 @@
"----------\n");
}
public void test065() throws Exception {
- // was negative prior to https://bugs.openjdk.java.net/browse/JDK-8231435
- this.runConformTest(
+ Runner runner = new Runner();
+ runner.testFiles =
new String[] {
"X.java",
"public class X {\n" +
@@ -2158,8 +2161,9 @@
"}\n" +
"@interface Marker {\n" +
"}\n"
- },
- "");
+ };
+ runner.javacTestOptions = JavacTestOptions.JavacHasABug.JavacBug8231436;
+ runner.runConformTest();
}
public void test066() throws Exception {
this.runNegativeTest(
@@ -2197,8 +2201,8 @@
"----------\n");
}
public void test068() throws Exception {
- // was negative prior to https://bugs.openjdk.java.net/browse/JDK-8231435
- this.runConformTest(
+ Runner runner = new Runner();
+ runner.testFiles =
new String[] {
"X.java",
"public class X {\n" +
@@ -2206,8 +2210,9 @@
"}\n" +
"@interface Marker {\n" +
"}\n"
- },
- "");
+ };
+ runner.javacTestOptions = JavacTestOptions.JavacHasABug.JavacBug8231436;
+ runner.runConformTest();
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=385293
public void test069() throws Exception {
