Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java')
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java262
1 files changed, 221 insertions, 41 deletions
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java
index 7ddf30ed14..e0be6b9599 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java
@@ -1,59 +1,239 @@
package org.eclipse.jdt.core.tests.compiler.regression;
+import java.util.ArrayList;
import java.util.Map;
-import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-
import junit.framework.Test;
import junit.framework.TestSuite;
-public class AnnotationTest extends AbstractRegressionTest {
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+
+public abstract class AnnotationTest extends AbstractRegressionTest {
+boolean useLibrary = true;
+static String zipFile = "/TestAnnotationVisibility.zip";
+public static ArrayList allTestClasses = null;
+
+static {
+ allTestClasses = new ArrayList(6);
+ allTestClasses.add(AnnotationTestForClass.class);
+ allTestClasses.add(AnnotationTestForConstructor.class);
+ allTestClasses.add(AnnotationTestForField.class);
+ allTestClasses.add(AnnotationTestForInterface.class);
+ allTestClasses.add(AnnotationTestForMethod.class);
+ allTestClasses.add(AnnotationTestMixed.class);
+}
+
+
+public static void addTest(TestSuite suite, Class testClass) {
+ TestSuite innerSuite = new TestSuite(testClass);
+ suite.addTest(innerSuite);
+}
+public static Test suite() {
+ TestSuite suite = new TestSuite(AnnotationTest.class.getName());
+ for (int i=0; i<allTestClasses.size(); i++) {
+ addTest(suite, (Class) allTestClasses.get(i));
+ }
+ return new RegressionTestSetup(suite, COMPLIANCE_1_4);
+}
+
public AnnotationTest(String name) {
super(name);
}
-public static Test suite() {
- if (false) {
- TestSuite ts;
- //some of the tests depend on the order of this suite.
- ts = new TestSuite();
- ts.addTest(new AnnotationTest("test221"));
- return new RegressionTestSetup(ts, COMPLIANCE_1_4);
+protected Map getCompilerOptions() {
+ Map options = super.getCompilerOptions();
+ options.put(CompilerOptions.OPTION_ReportInvalidAnnotation, CompilerOptions.ERROR);
+ //options.put(CompilerOptions.OPTION_ReportMissingAnnotation, CompilerOptions.IGNORE);
+ options.put(CompilerOptions.OPTION_ReportFieldHiding, CompilerOptions.IGNORE);
+ options.put(CompilerOptions.OPTION_ReportSyntheticAccessEmulation, CompilerOptions.IGNORE);
+ return options;
+}
+
+protected String[] getDefaultClassPaths() {
+ if (useLibrary) {
+ String[] classLibs = super.getDefaultClassPaths();
+ final int length = classLibs.length;
+ String[] newClassPaths = new String[length + 1];
+ System.arraycopy(classLibs, 0, newClassPaths, 0, length);
+ newClassPaths[length] = getClass().getResource(zipFile).getPath();
+ return newClassPaths;
+ } else {
+ return super.getDefaultClassPaths();
}
- return setupSuite(testClass());
}
-public void test001() {
- Map customOptions = getCompilerOptions();
- customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
- this.runNegativeTest(
+static String[] referencedClasses = null;
+static {
+ referencedClasses =
new String[] {
- "X.java",
- "public class X {\n" +
- " \n" +
- " {\n" +
- " new Z().foo();\n" +
- " }\n" +
- "}\n",
- "Z.java",
- "public class Z {\n" +
- " /** \n"+
- " * \n"+
- " * ** ** ** ** @deprecated */\n" +
- " public void foo() { \n" +
- " }\n" +
- "}\n",
- },
- "----------\n" +
- "1. WARNING in X.java (at line 4)\n" +
- " new Z().foo();\n" +
- " ^^^^^^^^^^^^^\n" +
- "The method foo() from the type Z is deprecated\n" +
- "----------\n");
-}
-
-public static Class testClass() {
- return AnnotationTest.class;
+ "test/AbstractVisibility.java",
+ "package test;\n"
+ + "public abstract class AbstractVisibility {\n"
+ + " private class AvcPrivate {\n"
+ + " private int avf_private = 10;\n"
+ + " public int avf_public = avf_private;\n"
+ + " private int avm_private() {\n"
+ + " avf_private = (new AvcPrivate()).avf_private;\n"
+ + " return avf_private;\n"
+ + " }\n"
+ + " public int avm_public() {\n"
+ + " return avm_private();\n"
+ + " }\n"
+ + " }\n"
+ + " public class AvcPublic {\n"
+ + " private int avf_private = 10;\n"
+ + " public int avf_public = avf_private;\n"
+ + " private int avm_private() {\n"
+ + " avf_private = (new AvcPrivate()).avf_private;\n"
+ + " return avf_private;\n"
+ + " }\n"
+ + " public int avm_public() {\n"
+ + " return avm_private();\n"
+ + " }\n"
+ + " }\n"
+ + " private int avf_private = 100;\n"
+ + " public int avf_public = avf_private;\n"
+ + " \n"
+ + " private int avm_private() {\n"
+ + " avf_private = (new AvcPrivate()).avf_private;\n"
+ + " return avf_private;\n"
+ + " }\n"
+ + " public int avm_public() {\n"
+ + " return avm_private();\n"
+ + " }\n"
+ + "}\n",
+ "test/Visibility.java",
+ "package test;\n"
+ + "public class Visibility extends AbstractVisibility {\n"
+ + " private class VcPrivate {\n"
+ + " private int vf_private = 10;\n"
+ + " public int vf_public = vf_private;\n"
+ + " private int vm_private() {\n"
+ + " vf_private = (new VcPrivate()).vf_private;\n"
+ + " avf_private = vf_private;\n"
+ + " return vf_private+avf_private;\n"
+ + " }\n"
+ + " public int vm_public() {\n"
+ + " return vm_private();\n"
+ + " }\n"
+ + " };\n"
+ + " public class VcPublic {\n"
+ + " private int vf_private = 10;\n"
+ + " public int vf_public = vf_private;\n"
+ + " private int vm_private() {\n"
+ + " vf_private = (new VcPrivate()).vf_private;\n"
+ + " avf_private = vf_private;\n"
+ + " return vf_private+avf_private;\n"
+ + " }\n"
+ + " public int vm_public() {\n"
+ + " return vm_private();\n"
+ + " }\n"
+ + " };\n"
+ + " private int vf_private = 100;\n"
+ + " private int avf_private = 100;\n"
+ + " public int vf_public = vf_private;\n"
+ + " public int avf_public = vf_private;\n"
+ + " \n"
+ + " private int vm_private() {\n"
+ + " vf_private = (new VcPrivate()).vf_private;\n"
+ + " avf_private = vf_private;\n"
+ + " return vf_private+avf_private;\n"
+ + " }\n"
+ + " public int vm_public() {\n"
+ + " return vm_private();\n"
+ + " }\n"
+ + "}\n",
+ "test/copy/VisibilityPackage.java",
+ "package test.copy;\n"
+ + "class VisibilityPackage {\n"
+ + " private class VpPrivate {\n"
+ + " private int vf_private = 10;\n"
+ + " public int vf_public = vf_private;\n"
+ + " private int vm_private() {\n"
+ + " vf_private = (new VpPrivate()).vf_private;\n"
+ + " return vf_private;\n"
+ + " }\n"
+ + " public int vm_public() {\n"
+ + " return vm_private();\n"
+ + " }\n"
+ + " }\n"
+ + " public class VpPublic {\n"
+ + " private int vf_private = 10;\n"
+ + " public int vf_public = vf_private;\n"
+ + " private int vm_private() {\n"
+ + " vf_private = (new VpPrivate()).vf_private;\n"
+ + " return vf_private;\n"
+ + " }\n"
+ + " public int vm_public() {\n"
+ + " return vm_private();\n"
+ + " }\n"
+ + " }\n"
+ + " private int vf_private = 100;\n"
+ + " public int vf_public = vf_private;\n"
+ + " \n"
+ + " private int vm_private() {\n"
+ + " vf_private = (new VpPrivate()).vf_private;\n"
+ + " return vf_private;\n"
+ + " }\n"
+ + " public int vm_public() {\n"
+ + " return vm_private();\n"
+ + " }\n"
+ + "}\n",
+ "test/copy/VisibilityPublic.java",
+ "package test.copy;\n"
+ + "public class VisibilityPublic {\n"
+ + " private class VpPrivate {\n"
+ + " private int vf_private = 10;\n"
+ + " public int vf_public = vf_private;\n"
+ + " private int vm_private() {\n"
+ + " vf_private = (new VpPrivate()).vf_private;\n"
+ + " return vf_private;\n"
+ + " }\n"
+ + " public int vm_public() {\n"
+ + " return vm_private();\n"
+ + " }\n"
+ + " }\n"
+ + " public class VpPublic {\n"
+ + " private int vf_private = 10;\n"
+ + " public int vf_public = vf_private;\n"
+ + " private int vm_private() {\n"
+ + " vf_private = (new VpPrivate()).vf_private;\n"
+ + " return vf_private;\n"
+ + " }\n"
+ + " public int vm_public() {\n"
+ + " return vm_private();\n"
+ + " }\n"
+ + " }\n"
+ + " private int vf_private = 100;\n"
+ + " public int vf_public = vf_private;\n"
+ + " \n"
+ + " private int vm_private() {\n"
+ + " vf_private = (new VpPrivate()).vf_private;\n"
+ + " return vf_private;\n"
+ + " }\n"
+ + " public int vm_public() {\n"
+ + " return vm_private();\n"
+ + " }\n"
+ + "}\n" };
+}
+
+protected void runConformReferenceTest(String[] testFiles) {
+ String[] completedFiles = testFiles;
+ if (!useLibrary) {
+ completedFiles = new String[testFiles.length + referencedClasses.length];
+ System.arraycopy(referencedClasses, 0, completedFiles, 0, referencedClasses.length);
+ System.arraycopy(testFiles, 0, completedFiles, referencedClasses.length, testFiles.length);
+ }
+ runConformTest(completedFiles);
+}
+protected void runNegativeReferenceTest(String[] testFiles, String expected) {
+ String[] completedFiles = testFiles;
+ if (!useLibrary) {
+ completedFiles = new String[testFiles.length + referencedClasses.length];
+ System.arraycopy(referencedClasses, 0, completedFiles, 0, referencedClasses.length);
+ System.arraycopy(testFiles, 0, completedFiles, referencedClasses.length, testFiles.length);
+ }
+ runNegativeTest(completedFiles, expected);
}
}

Back to the top