Fix test suite building (now supports all api levels >= JSL3).

3 files changed, 17 insertions, 13 deletions

diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/AstRewritingDescribingTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/AstRewritingDescribingTest.java
index fbcb0ba4b..d8d896744 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/AstRewritingDescribingTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/AstRewritingDescribingTest.java
@@ -36,6 +36,10 @@ public class AstRewritingDescribingTest
 		super(name);
 	}
 	
+	public AstRewritingDescribingTest(String name, int apilevel) {
+		super(name, apilevel);
+	}
+
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/CallinMappingDeclarationTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/CallinMappingDeclarationTest.java
index 0c5f5a121..e6cede7aa 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/CallinMappingDeclarationTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/CallinMappingDeclarationTest.java
@@ -28,19 +28,19 @@ import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
 import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
 
 public class CallinMappingDeclarationTest extends AstRewritingDescribingTest {
-	private static final Class THIS = CallinMappingDeclarationTest.class;
-	
+
 	public CallinMappingDeclarationTest(String name) {
 		super(name);
 	}
-	
-	public static Test allTests() {
-		return new Suite(THIS);
+
+	public CallinMappingDeclarationTest(String name, int apilevel) {
+		super(name, apilevel);
 	}
-	
+
+	@SuppressWarnings("deprecation")
 	public static Test suite() {
 		if (true) {
-			return allTests();
+			return createSuite(CallinMappingDeclarationTest.class, AST.JLS3);
 		}
 		TestSuite suite= new Suite("one test");
 		suite.addTest(new CallinMappingDeclarationTest("test0009")); // FIXME? Used?
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/TypeDeclarationTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/TypeDeclarationTest.java
index 14615141c..5635dd698 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/TypeDeclarationTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/TypeDeclarationTest.java
@@ -41,18 +41,18 @@ import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
 import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
 
 public class TypeDeclarationTest extends AstRewritingDescribingTest {
-	private static final Class THIS = TypeDeclarationTest.class;
 
 	public TypeDeclarationTest(String name) {
 		super(name);
 	}
-	
-	public static Test allTests() {
-		return new Suite(THIS);
+
+	public TypeDeclarationTest(String name, int apilevel) {
+		super(name, apilevel);
 	}
-	
+
+	@SuppressWarnings("deprecation")
 	public static Test suite() {
-		return allTests();
+		return createSuite(TypeDeclarationTest.class, AST.JLS3);
 	}