diff options
| author | ssankaran | 2013-08-26 03:09:35 +0000 |
|---|---|---|
| committer | ssankaran | 2013-08-26 03:09:35 +0000 |
| commit | f5abb716de8ce6d7aaee3cf06a3285e91953dad7 (patch) | |
| tree | aabcf3f3f14647b51bb67520c1a6982db286ab39 | |
| parent | 926127edb74c4e9bf214c4a80335d01c8995a448 (diff) | |
| download | eclipse.jdt.core-f5abb716de8ce6d7aaee3cf06a3285e91953dad7.tar.gz eclipse.jdt.core-f5abb716de8ce6d7aaee3cf06a3285e91953dad7.tar.xz eclipse.jdt.core-f5abb716de8ce6d7aaee3cf06a3285e91953dad7.zip | |
Fixed test failures to original fix for Bug 415470 - [1.8][compiler]
Type annotations on class declaration go vanishing
Signed-off-by: ssankaran <srikanth_sankaran@in.ibm.com>
| -rw-r--r-- | org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NegativeTypeAnnotationTest.java | 67 |
1 files changed, 16 insertions, 51 deletions
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 1531ebbf15..6626ef0514 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 @@ -2932,21 +2932,6 @@ public class NegativeTypeAnnotationTest extends AbstractRegressionTest { "}\n" +
"@java.lang.annotation.Target ({java.lang.annotation.ElementType.TYPE_USE})\n" +
"@interface Marker8 {\n" +
- "}\n",
-
- "java/lang/annotation/ElementType.java",
- "package java.lang.annotation;\n" +
- "public enum ElementType {\n" +
- " TYPE,\n" +
- " FIELD,\n" +
- " METHOD,\n" +
- " PARAMETER,\n" +
- " CONSTRUCTOR,\n" +
- " LOCAL_VARIABLE,\n" +
- " ANNOTATION_TYPE,\n" +
- " PACKAGE,\n" +
- " TYPE_PARAMETER,\n" +
- " TYPE_USE\n" +
"}\n"
},
"----------\n" +
@@ -2965,8 +2950,12 @@ public class NegativeTypeAnnotationTest extends AbstractRegressionTest { " RuntimeInvisibleAnnotations: \n" +
" #24 @Marker78(\n" +
" )\n" +
- " #25 @Marker7(\n" +
- " )\n";
+ " #25 @Marker8(\n" +
+ " )\n" +
+ " #26 @Marker7(\n" +
+ " )\n" +
+ " Attribute: MissingTypes Length: 4\n" +
+ "}";
checkDisassembledClassFile(OUTPUT_DIR + File.separator + "X.class", "X", expectedOutput, ClassFileBytesDisassembler.SYSTEM);
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=392119, variant with explicit class file retention.
@@ -2989,21 +2978,6 @@ public class NegativeTypeAnnotationTest extends AbstractRegressionTest { "@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS)\n" +
"@java.lang.annotation.Target ({java.lang.annotation.ElementType.TYPE_USE})\n" +
"@interface Marker8 {\n" +
- "}\n",
-
- "java/lang/annotation/ElementType.java",
- "package java.lang.annotation;\n" +
- "public enum ElementType {\n" +
- " TYPE,\n" +
- " FIELD,\n" +
- " METHOD,\n" +
- " PARAMETER,\n" +
- " CONSTRUCTOR,\n" +
- " LOCAL_VARIABLE,\n" +
- " ANNOTATION_TYPE,\n" +
- " PACKAGE,\n" +
- " TYPE_PARAMETER,\n" +
- " TYPE_USE\n" +
"}\n"
},
"----------\n" +
@@ -3022,11 +2996,15 @@ public class NegativeTypeAnnotationTest extends AbstractRegressionTest { " RuntimeInvisibleAnnotations: \n" +
" #24 @Marker78(\n" +
" )\n" +
- " #25 @Marker7(\n" +
- " )\n";
+ " #25 @Marker8(\n" +
+ " )\n" +
+ " #26 @Marker7(\n" +
+ " )\n" +
+ " Attribute: MissingTypes Length: 4\n" +
+ "}";
checkDisassembledClassFile(OUTPUT_DIR + File.separator + "X.class", "X", expectedOutput, ClassFileBytesDisassembler.SYSTEM);
}
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=392119, variant with explicit class file retention.
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=392119, variant with explicit runtime retention.
public void test392119c() throws Exception {
this.runNegativeTest(
new String[] {
@@ -3046,21 +3024,6 @@ public class NegativeTypeAnnotationTest extends AbstractRegressionTest { "@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)\n" +
"@java.lang.annotation.Target ({java.lang.annotation.ElementType.TYPE_USE})\n" +
"@interface Marker8 {\n" +
- "}\n",
-
- "java/lang/annotation/ElementType.java",
- "package java.lang.annotation;\n" +
- "public enum ElementType {\n" +
- " TYPE,\n" +
- " FIELD,\n" +
- " METHOD,\n" +
- " PARAMETER,\n" +
- " CONSTRUCTOR,\n" +
- " LOCAL_VARIABLE,\n" +
- " ANNOTATION_TYPE,\n" +
- " PACKAGE,\n" +
- " TYPE_PARAMETER,\n" +
- " TYPE_USE\n" +
"}\n"
},
"----------\n" +
@@ -3079,7 +3042,9 @@ public class NegativeTypeAnnotationTest extends AbstractRegressionTest { " RuntimeVisibleAnnotations: \n" +
" #24 @Marker78(\n" +
" )\n" +
- " #25 @Marker7(\n" +
+ " #25 @Marker8(\n" +
+ " )\n" +
+ " #26 @Marker7(\n" +
" )\n";
checkDisassembledClassFile(OUTPUT_DIR + File.separator + "X.class", "X", expectedOutput, ClassFileBytesDisassembler.SYSTEM);
}
|