remove unused code
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterAST3Test.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterAST3Test.java
index 341c4b9..c9c9289 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterAST3Test.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterAST3Test.java
@@ -11,13 +11,87 @@
package org.eclipse.wst.jsdt.core.tests.dom;
-import java.util.*;
+import java.util.List;
import junit.framework.Test;
-import org.eclipse.wst.jsdt.core.*;
-import org.eclipse.wst.jsdt.core.dom.*;
-import org.eclipse.wst.jsdt.core.jdom.*;
+import org.eclipse.wst.jsdt.core.ICompilationUnit;
+import org.eclipse.wst.jsdt.core.IJavaProject;
+import org.eclipse.wst.jsdt.core.JavaCore;
+import org.eclipse.wst.jsdt.core.JavaModelException;
+import org.eclipse.wst.jsdt.core.dom.AST;
+import org.eclipse.wst.jsdt.core.dom.ASTMatcher;
+import org.eclipse.wst.jsdt.core.dom.ASTNode;
+import org.eclipse.wst.jsdt.core.dom.AbstractTypeDeclaration;
+import org.eclipse.wst.jsdt.core.dom.AnonymousClassDeclaration;
+import org.eclipse.wst.jsdt.core.dom.ArrayCreation;
+import org.eclipse.wst.jsdt.core.dom.ArrayInitializer;
+import org.eclipse.wst.jsdt.core.dom.ArrayType;
+import org.eclipse.wst.jsdt.core.dom.Assignment;
+import org.eclipse.wst.jsdt.core.dom.Block;
+import org.eclipse.wst.jsdt.core.dom.BodyDeclaration;
+import org.eclipse.wst.jsdt.core.dom.BooleanLiteral;
+import org.eclipse.wst.jsdt.core.dom.BreakStatement;
+import org.eclipse.wst.jsdt.core.dom.CastExpression;
+import org.eclipse.wst.jsdt.core.dom.CatchClause;
+import org.eclipse.wst.jsdt.core.dom.CharacterLiteral;
+import org.eclipse.wst.jsdt.core.dom.ClassInstanceCreation;
+import org.eclipse.wst.jsdt.core.dom.CompilationUnit;
+import org.eclipse.wst.jsdt.core.dom.ConditionalExpression;
+import org.eclipse.wst.jsdt.core.dom.ContinueStatement;
+import org.eclipse.wst.jsdt.core.dom.DoStatement;
+import org.eclipse.wst.jsdt.core.dom.EmptyStatement;
+import org.eclipse.wst.jsdt.core.dom.Expression;
+import org.eclipse.wst.jsdt.core.dom.ExpressionStatement;
+import org.eclipse.wst.jsdt.core.dom.FieldAccess;
+import org.eclipse.wst.jsdt.core.dom.FieldDeclaration;
+import org.eclipse.wst.jsdt.core.dom.ForStatement;
+import org.eclipse.wst.jsdt.core.dom.IBinding;
+import org.eclipse.wst.jsdt.core.dom.IMethodBinding;
+import org.eclipse.wst.jsdt.core.dom.IPackageBinding;
+import org.eclipse.wst.jsdt.core.dom.ITypeBinding;
+import org.eclipse.wst.jsdt.core.dom.IVariableBinding;
+import org.eclipse.wst.jsdt.core.dom.IfStatement;
+import org.eclipse.wst.jsdt.core.dom.ImportDeclaration;
+import org.eclipse.wst.jsdt.core.dom.InfixExpression;
+import org.eclipse.wst.jsdt.core.dom.Initializer;
+import org.eclipse.wst.jsdt.core.dom.InstanceofExpression;
+import org.eclipse.wst.jsdt.core.dom.Javadoc;
+import org.eclipse.wst.jsdt.core.dom.LabeledStatement;
+import org.eclipse.wst.jsdt.core.dom.MethodDeclaration;
+import org.eclipse.wst.jsdt.core.dom.MethodInvocation;
+import org.eclipse.wst.jsdt.core.dom.Modifier;
+import org.eclipse.wst.jsdt.core.dom.Name;
+import org.eclipse.wst.jsdt.core.dom.NullLiteral;
+import org.eclipse.wst.jsdt.core.dom.NumberLiteral;
+import org.eclipse.wst.jsdt.core.dom.PackageDeclaration;
+import org.eclipse.wst.jsdt.core.dom.ParenthesizedExpression;
+import org.eclipse.wst.jsdt.core.dom.PostfixExpression;
+import org.eclipse.wst.jsdt.core.dom.PrefixExpression;
+import org.eclipse.wst.jsdt.core.dom.PrimitiveType;
+import org.eclipse.wst.jsdt.core.dom.QualifiedName;
+import org.eclipse.wst.jsdt.core.dom.ReturnStatement;
+import org.eclipse.wst.jsdt.core.dom.SimpleName;
+import org.eclipse.wst.jsdt.core.dom.SimpleType;
+import org.eclipse.wst.jsdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.wst.jsdt.core.dom.Statement;
+import org.eclipse.wst.jsdt.core.dom.StringLiteral;
+import org.eclipse.wst.jsdt.core.dom.SuperConstructorInvocation;
+import org.eclipse.wst.jsdt.core.dom.SuperFieldAccess;
+import org.eclipse.wst.jsdt.core.dom.SuperMethodInvocation;
+import org.eclipse.wst.jsdt.core.dom.SwitchCase;
+import org.eclipse.wst.jsdt.core.dom.SwitchStatement;
+import org.eclipse.wst.jsdt.core.dom.ThisExpression;
+import org.eclipse.wst.jsdt.core.dom.ThrowStatement;
+import org.eclipse.wst.jsdt.core.dom.TryStatement;
+import org.eclipse.wst.jsdt.core.dom.Type;
+import org.eclipse.wst.jsdt.core.dom.TypeDeclaration;
+import org.eclipse.wst.jsdt.core.dom.TypeDeclarationStatement;
+import org.eclipse.wst.jsdt.core.dom.TypeLiteral;
+import org.eclipse.wst.jsdt.core.dom.VariableDeclarationExpression;
+import org.eclipse.wst.jsdt.core.dom.VariableDeclarationFragment;
+import org.eclipse.wst.jsdt.core.dom.VariableDeclarationStatement;
+import org.eclipse.wst.jsdt.core.dom.WhileStatement;
import org.eclipse.wst.jsdt.core.util.IModifierConstants;
public class ASTConverterAST3Test extends ConverterTestSetup {
@@ -8279,50 +8353,50 @@
checkSourceRange(elseStatement, expectedSource, source);
}
- /**
- * http://dev.eclipse.org/bugs/show_bug.cgi?id=15657
- * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
- */
- public void test0342() throws JavaModelException {
- ICompilationUnit sourceUnit = getCompilationUnit("Converter" , "src", "test0342", "Test.js"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- IDOMCompilationUnit dcompUnit = new DOMFactory().createCompilationUnit(sourceUnit.getSource(), sourceUnit.getElementName());
- assertNotNull("dcompUnit is null", dcompUnit); //$NON-NLS-1$
-
- // searching class
- IDOMType classNode = null;
- Enumeration children = dcompUnit.getChildren();
- assertNotNull("dcompUnit has no children", children); //$NON-NLS-1$
-
- while (children.hasMoreElements()) {
- IDOMNode child = (IDOMNode) children.nextElement();
- if (child.getNodeType() == IDOMNode.TYPE) {
- classNode = (IDOMType) child;
- break;
- }
- }
- assertNotNull("classNode is null", classNode); //$NON-NLS-1$
-
- // searching for methods
- children = classNode.getChildren();
-
- assertNotNull("classNode has no children", children); //$NON-NLS-1$
-
- while (children.hasMoreElements()) {
- IDOMNode child = (IDOMNode) children.nextElement();
- if (child.getNodeType() == IDOMNode.METHOD) {
- IDOMMethod childMethod = (IDOMMethod) child;
-
- // returnType is always null;
- String returnType = childMethod.getReturnType();
- if (childMethod.isConstructor()) {
- assertNull(returnType);
- } else {
- assertNotNull("no return type", returnType); //$NON-NLS-1$
- }
- }
- }
- }
-
+// /**
+// * http://dev.eclipse.org/bugs/show_bug.cgi?id=15657
+// * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
+// */
+// public void test0342() throws JavaModelException {
+// ICompilationUnit sourceUnit = getCompilationUnit("Converter" , "src", "test0342", "Test.js"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+// IDOMCompilationUnit dcompUnit = new DOMFactory().createCompilationUnit(sourceUnit.getSource(), sourceUnit.getElementName());
+// assertNotNull("dcompUnit is null", dcompUnit); //$NON-NLS-1$
+//
+// // searching class
+// IDOMType classNode = null;
+// Enumeration children = dcompUnit.getChildren();
+// assertNotNull("dcompUnit has no children", children); //$NON-NLS-1$
+//
+// while (children.hasMoreElements()) {
+// IDOMNode child = (IDOMNode) children.nextElement();
+// if (child.getNodeType() == IDOMNode.TYPE) {
+// classNode = (IDOMType) child;
+// break;
+// }
+// }
+// assertNotNull("classNode is null", classNode); //$NON-NLS-1$
+//
+// // searching for methods
+// children = classNode.getChildren();
+//
+// assertNotNull("classNode has no children", children); //$NON-NLS-1$
+//
+// while (children.hasMoreElements()) {
+// IDOMNode child = (IDOMNode) children.nextElement();
+// if (child.getNodeType() == IDOMNode.METHOD) {
+// IDOMMethod childMethod = (IDOMMethod) child;
+//
+// // returnType is always null;
+// String returnType = childMethod.getReturnType();
+// if (childMethod.isConstructor()) {
+// assertNull(returnType);
+// } else {
+// assertNotNull("no return type", returnType); //$NON-NLS-1$
+// }
+// }
+// }
+// }
+//
/**
* http://dev.eclipse.org/bugs/show_bug.cgi?id=16051
*/
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterTest.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterTest.java
index 95f392a..a33b314 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterTest.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterTest.java
@@ -11,15 +11,76 @@
package org.eclipse.wst.jsdt.core.tests.dom;
-import java.util.*;
+import java.util.List;
import junit.framework.Test;
import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.jsdt.core.dom.*;
-import org.eclipse.wst.jsdt.core.jdom.*;
+import org.eclipse.wst.jsdt.core.ICompilationUnit;
+import org.eclipse.wst.jsdt.core.IField;
+import org.eclipse.wst.jsdt.core.JavaCore;
+import org.eclipse.wst.jsdt.core.JavaModelException;
+import org.eclipse.wst.jsdt.core.dom.AST;
+import org.eclipse.wst.jsdt.core.dom.ASTMatcher;
+import org.eclipse.wst.jsdt.core.dom.ASTNode;
+import org.eclipse.wst.jsdt.core.dom.ArrayAccess;
+import org.eclipse.wst.jsdt.core.dom.ArrayCreation;
+import org.eclipse.wst.jsdt.core.dom.ArrayInitializer;
+import org.eclipse.wst.jsdt.core.dom.ArrayType;
+import org.eclipse.wst.jsdt.core.dom.Assignment;
+import org.eclipse.wst.jsdt.core.dom.Block;
+import org.eclipse.wst.jsdt.core.dom.BooleanLiteral;
+import org.eclipse.wst.jsdt.core.dom.BreakStatement;
+import org.eclipse.wst.jsdt.core.dom.CastExpression;
+import org.eclipse.wst.jsdt.core.dom.CatchClause;
+import org.eclipse.wst.jsdt.core.dom.CharacterLiteral;
+import org.eclipse.wst.jsdt.core.dom.ClassInstanceCreation;
+import org.eclipse.wst.jsdt.core.dom.CompilationUnit;
+import org.eclipse.wst.jsdt.core.dom.ConditionalExpression;
+import org.eclipse.wst.jsdt.core.dom.ContinueStatement;
+import org.eclipse.wst.jsdt.core.dom.DoStatement;
+import org.eclipse.wst.jsdt.core.dom.EmptyStatement;
+import org.eclipse.wst.jsdt.core.dom.Expression;
+import org.eclipse.wst.jsdt.core.dom.ExpressionStatement;
+import org.eclipse.wst.jsdt.core.dom.FieldAccess;
+import org.eclipse.wst.jsdt.core.dom.ForStatement;
+import org.eclipse.wst.jsdt.core.dom.IBinding;
+import org.eclipse.wst.jsdt.core.dom.IMethodBinding;
+import org.eclipse.wst.jsdt.core.dom.ITypeBinding;
+import org.eclipse.wst.jsdt.core.dom.IVariableBinding;
+import org.eclipse.wst.jsdt.core.dom.IfStatement;
+import org.eclipse.wst.jsdt.core.dom.ImportDeclaration;
+import org.eclipse.wst.jsdt.core.dom.InfixExpression;
+import org.eclipse.wst.jsdt.core.dom.Javadoc;
+import org.eclipse.wst.jsdt.core.dom.LabeledStatement;
+import org.eclipse.wst.jsdt.core.dom.MethodDeclaration;
+import org.eclipse.wst.jsdt.core.dom.MethodInvocation;
+import org.eclipse.wst.jsdt.core.dom.Modifier;
+import org.eclipse.wst.jsdt.core.dom.Name;
+import org.eclipse.wst.jsdt.core.dom.NullLiteral;
+import org.eclipse.wst.jsdt.core.dom.NumberLiteral;
+import org.eclipse.wst.jsdt.core.dom.ParenthesizedExpression;
+import org.eclipse.wst.jsdt.core.dom.PostfixExpression;
+import org.eclipse.wst.jsdt.core.dom.PrefixExpression;
+import org.eclipse.wst.jsdt.core.dom.QualifiedName;
+import org.eclipse.wst.jsdt.core.dom.ReturnStatement;
+import org.eclipse.wst.jsdt.core.dom.SimpleName;
+import org.eclipse.wst.jsdt.core.dom.SimpleType;
+import org.eclipse.wst.jsdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.wst.jsdt.core.dom.Statement;
+import org.eclipse.wst.jsdt.core.dom.StringLiteral;
+import org.eclipse.wst.jsdt.core.dom.SuperMethodInvocation;
+import org.eclipse.wst.jsdt.core.dom.SwitchCase;
+import org.eclipse.wst.jsdt.core.dom.SwitchStatement;
+import org.eclipse.wst.jsdt.core.dom.ThrowStatement;
+import org.eclipse.wst.jsdt.core.dom.TryStatement;
+import org.eclipse.wst.jsdt.core.dom.Type;
+import org.eclipse.wst.jsdt.core.dom.TypeDeclaration;
+import org.eclipse.wst.jsdt.core.dom.VariableDeclarationExpression;
+import org.eclipse.wst.jsdt.core.dom.VariableDeclarationFragment;
+import org.eclipse.wst.jsdt.core.dom.VariableDeclarationStatement;
+import org.eclipse.wst.jsdt.core.dom.WhileStatement;
import org.eclipse.wst.jsdt.core.util.IModifierConstants;
-import org.eclipse.wst.jsdt.core.*;
public class ASTConverterTest extends ConverterTestSetup {
@@ -8503,50 +8564,6 @@
}
/**
- * http://dev.eclipse.org/bugs/show_bug.cgi?id=15657
- * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
- */
- public void test0342() throws JavaModelException {
- ICompilationUnit sourceUnit = getCompilationUnit("Converter" , "src", "test0342", "Test.js"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- IDOMCompilationUnit dcompUnit = new DOMFactory().createCompilationUnit(sourceUnit.getSource(), sourceUnit.getElementName());
- assertNotNull("dcompUnit is null", dcompUnit); //$NON-NLS-1$
-
- // searching class
- IDOMType classNode = null;
- Enumeration children = dcompUnit.getChildren();
- assertNotNull("dcompUnit has no children", children); //$NON-NLS-1$
-
- while (children.hasMoreElements()) {
- IDOMNode child = (IDOMNode) children.nextElement();
- if (child.getNodeType() == IDOMNode.TYPE) {
- classNode = (IDOMType) child;
- break;
- }
- }
- assertNotNull("classNode is null", classNode); //$NON-NLS-1$
-
- // searching for methods
- children = classNode.getChildren();
-
- assertNotNull("classNode has no children", children); //$NON-NLS-1$
-
- while (children.hasMoreElements()) {
- IDOMNode child = (IDOMNode) children.nextElement();
- if (child.getNodeType() == IDOMNode.METHOD) {
- IDOMMethod childMethod = (IDOMMethod) child;
-
- // returnType is always null;
- String returnType = childMethod.getReturnType();
- if (childMethod.isConstructor()) {
- assertNull(returnType);
- } else {
- assertNotNull("no return type", returnType); //$NON-NLS-1$
- }
- }
- }
- }
-
- /**
* http://dev.eclipse.org/bugs/show_bug.cgi?id=16051
*/
public void test0343() throws JavaModelException {
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterTestAST3_2.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterTestAST3_2.java
index 6b31825..be0fbe3 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterTestAST3_2.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/dom/ASTConverterTestAST3_2.java
@@ -21,7 +21,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.wst.jsdt.core.Flags;
import org.eclipse.wst.jsdt.core.IClassFile;
import org.eclipse.wst.jsdt.core.ICompilationUnit;
import org.eclipse.wst.jsdt.core.IInitializer;
@@ -5360,19 +5359,19 @@
assertFalse("are Equals", methodBinding.isEqualTo(methodBinding2));
}
- /**
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78740
- * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
- */
- public void test0576() throws JavaModelException {
- org.eclipse.wst.jsdt.core.jdom.DOMFactory factory = new org.eclipse.wst.jsdt.core.jdom.DOMFactory();
- org.eclipse.wst.jsdt.core.jdom.IDOMCompilationUnit domCompilationUnit = factory.createCompilationUnit(
- "package x; /** @model */ interface X {}", "NAME");
- org.eclipse.wst.jsdt.core.jdom.IDOMType domType = (org.eclipse.wst.jsdt.core.jdom.IDOMType) domCompilationUnit.getFirstChild().getNextNode();
- assertTrue("Not an interface", Flags.isInterface(domType.getFlags()));
- domType.getComment();
- assertTrue("Not an interface", Flags.isInterface(domType.getFlags()));
- }
+// /**
+// * https://bugs.eclipse.org/bugs/show_bug.cgi?id=78740
+// * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
+// */
+// public void test0576() throws JavaModelException {
+// org.eclipse.wst.jsdt.core.jdom.DOMFactory factory = new org.eclipse.wst.jsdt.core.jdom.DOMFactory();
+// org.eclipse.wst.jsdt.core.jdom.IDOMCompilationUnit domCompilationUnit = factory.createCompilationUnit(
+// "package x; /** @model */ interface X {}", "NAME");
+// org.eclipse.wst.jsdt.core.jdom.IDOMType domType = (org.eclipse.wst.jsdt.core.jdom.IDOMType) domCompilationUnit.getFirstChild().getNextNode();
+// assertTrue("Not an interface", Flags.isInterface(domType.getFlags()));
+// domType.getComment();
+// assertTrue("Not an interface", Flags.isInterface(domType.getFlags()));
+// }
/**
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=77645
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CreateMethodSourceExamplesTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CreateMethodSourceExamplesTests.java
deleted file mode 100644
index ad8ba56..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CreateMethodSourceExamplesTests.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import org.eclipse.wst.jsdt.internal.compiler.classfmt.ClassFileConstants;
-import org.eclipse.wst.jsdt.core.jdom.*;
-
-import junit.framework.Test;
-
-/**
- * @deprecated JDOM is obsolete
- */
-public class CreateMethodSourceExamplesTests extends AbstractJavaModelTests {
-
- IDOMFactory domFactory;
-
-public CreateMethodSourceExamplesTests(String name) {
- super(name);
-}
-public void setUpSuite() throws Exception {
- super.setUpSuite();
- this.domFactory = new DOMFactory();
-}
-
-public static Test suite() {
- return buildModelTestSuite(CreateMethodSourceExamplesTests.class);
-}
-/**
- * Example of creating source for a method in an interface.
- */
-public void testCreateEmptyInterfaceMethod() {
- IDOMMethod method= this.domFactory.createMethod();
- method.setName("foo");
- method.setBody(";\n");
- assertSourceEquals(
- "source code incorrect",
- "public void foo();\n",
- method.getContents());
-}
-/**
- * Example of creating a default empty method.
- */
-public void testCreateEmptyMethod() {
- IDOMMethod method= this.domFactory.createMethod();
- method.setName("foo");
- assertSourceEquals(
- "source code incorrect",
- "public void foo() {\n" +
- "}\n",
- method.getContents());
-}
-/**
- * Example of creating an abstract method.
- */
-public void testCreateMethodWithAbstractModifier() {
-
- IDOMMethod method= this.domFactory.createMethod();
- method.setName("foo");
- method.setFlags(ClassFileConstants.AccPublic| ClassFileConstants.AccAbstract);
- assertSourceEquals(
- "source code incorrect",
- "public abstract void foo() {\n" +
- "}\n",
- method.getContents());
-
-}
-/**
- * Example of creating a method body.
- */
-public void testCreateMethodWithBody() {
-
- IDOMMethod method= this.domFactory.createMethod();
- method.setName("foo");
- method.setBody(
- " {\n" +
- "\t...method body...\n" +
- "}\n");
- assertSourceEquals(
- "source code incorrect",
- "public void foo() {\n" +
- "\t...method body...\n" +
- "}\n",
- method.getContents());
-
-}
-/**
- * Example of creating a method with public and static modifiers.
- */
-public void testCreateMethodWithModifiers() {
-
- IDOMMethod method= this.domFactory.createMethod();
- method.setName("foo");
- method.setFlags(ClassFileConstants.AccPublic| ClassFileConstants.AccStatic);
- assertSourceEquals(
- "source code incorrect",
- "public static void foo() {\n" +
- "}\n",
- method.getContents());
-
-}
-/**
- * Example of creating a method with modifiers and exceptions
- */
-public void testCreateMethodWithModifiersAndExceptions() {
-
- IDOMMethod method= this.domFactory.createMethod();
- method.setName("foo");
- method.setFlags(ClassFileConstants.AccPrivate);
- method.setExceptions(new String[]
- {"java.lang.IllegalArgumentException",
- "java.io.FileNotFoundExcpetion"});
- assertSourceEquals(
- "source code incorrect",
- "private void foo() throws java.lang.IllegalArgumentException, java.io.FileNotFoundExcpetion {\n" +
- "}\n",
- method.getContents());
-
-}
-/**
- * Example of creating a method with parameters
- */
-public void testCreateMethodWithParameters() {
-
- IDOMMethod method= this.domFactory.createMethod();
- method.setName("foo");
- method.setParameters(
- new String[] {"String", "int", "char[]"},
- new String[] {"name", "number", "buffer"});
- assertSourceEquals(
- "source code incorrect",
- "public void foo(String name, int number, char[] buffer) {\n" +
- "}\n",
- method.getContents());
-}
-/**
- * Example of creating a method with a return type
- */
-public void testCreateMethodWithReturnType() {
-
- IDOMMethod method= this.domFactory.createMethod();
- method.setName("foo");
- method.setReturnType("String");
- assertSourceEquals(
- "source code incorrect",
- "public String foo() {\n" +
- "}\n",
- method.getContents());
-}
-}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CreateTypeSourceExamplesTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CreateTypeSourceExamplesTests.java
deleted file mode 100644
index dadeaf4..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CreateTypeSourceExamplesTests.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.core.tests.model;
-
-import org.eclipse.wst.jsdt.internal.compiler.classfmt.ClassFileConstants;
-import org.eclipse.wst.jsdt.core.jdom.*;
-
-import junit.framework.Test;
-
-/**
- * @deprecated JDOM is obsolete
- */
-public class CreateTypeSourceExamplesTests extends AbstractJavaModelTests {
- IDOMFactory domFactory;
-
-public CreateTypeSourceExamplesTests(String name) {
- super(name);
-}
-public static Test suite() {
- return buildModelTestSuite(CreateTypeSourceExamplesTests.class);
-}
-public void setUpSuite() throws Exception {
- super.setUpSuite();
- this.domFactory = new DOMFactory();
-}
-/**
- * Example of creating a class with an extends clause
- */
-public void testCreateClassWithExtends() {
- IDOMType type= this.domFactory.createType();
- type.setName("Foo");
- type.setSuperclass("Bar");
- assertSourceEquals(
- "source code incorrect",
- "public class Foo extends Bar {\n" +
- "}\n",
- type.getContents());
-}
-/**
- * Example of creating a class with an implements clause.
- */
-public void testCreateClassWithImplements() {
- IDOMType type= this.domFactory.createType();
- type.setName("Foo");
- type.setSuperInterfaces(new String[] {"ISomething", "IOtherwise"});
- assertSourceEquals(
- "source code incorrect",
- "public class Foo implements ISomething, IOtherwise {\n" +
- "}\n",
- type.getContents());
-}
-
-/**
- * Example of creating a class with an implements clause.
- * http://dev.eclipse.org/bugs/show_bug.cgi?id=10979
- */
-public void testCreateClassWithImplements2() {
- IDOMType type= this.domFactory.createType("class A implements I1 {\n}");
- type.addSuperInterface("I2");
- assertSourceEquals(
- "source code incorrect",
- "class A implements I1, I2 {\n}",
- type.getContents());
-}
-
-/**
- * Example of creating a class with an implements clause.
- * http://dev.eclipse.org/bugs/show_bug.cgi?id=10979
- */
-public void testCreateClassWithImplements3() {
- IDOMType type= this.domFactory.createType("class A {\n}");
- type.setSuperInterfaces(new String[] {"I1", "I2"});
- assertSourceEquals(
- "source code incorrect",
- "class A implements I1, I2 {\n}",
- type.getContents());
-}
-
-/**
- * Example of creating a class with an implements clause.
- * http://dev.eclipse.org/bugs/show_bug.cgi?id=10979
- */
-public void testCreateClassWithImplements4() {
- IDOMType type= this.domFactory.createType("class A implements I1{\n}");
- type.addSuperInterface("I2");
- assertSourceEquals(
- "source code incorrect",
- "class A implements I1, I2{\n}",
- type.getContents());
-}
-
-/**
- * Example of creating a class with modifiers
- */
-public void testCreateClassWithModifiers() {
- IDOMType type= this.domFactory.createType();
- type.setName("Foo");
- type.setFlags(ClassFileConstants.AccPublic | ClassFileConstants.AccFinal);
- assertSourceEquals(
- "source code incorrect",
- "public final class Foo {\n" +
- "}\n",
- type.getContents());
-}
-/**
- * Example of creating a default class
- */
-public void testCreateEmptyClass() {
- IDOMType type= this.domFactory.createType();
- type.setName("Foo");
- assertSourceEquals(
- "source code incorrect",
- "public class Foo {\n" +
- "}\n",
- type.getContents());
-}
-/**
- * Ensures that an interface is created using
- * <code>CreateTypeSourceOperation</code> and that the source
- * of the created interface is correct.
- */
-public void testCreateEmptyInterface() {
- IDOMType type= this.domFactory.createType();
- type.setName("Foo");
- type.setClass(false);
- assertSourceEquals(
- "source code incorrect",
- "public interface Foo {\n" +
- "}\n",
- type.getContents());
-}
-}