Attachment #10319 for bug #61148

Lines 1-12 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/DOMTests.java (-1 / +4 lines)
1	package org.eclipse.jdt.tests.core;	1	package org.eclipse.jdt.tests.core;
2		2
3	import org.eclipse.jdt.core.*;	3	import org.eclipse.jdt.core.*;
4	import org.eclipse.jdt.core.jdom.IDOMNode;	4	import org.eclipse.jdt.core.jdom.*;
5	import org.eclipse.jdt.internal.core.JavaElement;	5	import org.eclipse.jdt.internal.core.JavaElement;
6		6
7	import junit.framework.Test;	7	import junit.framework.Test;
8	import junit.framework.TestSuite;	8	import junit.framework.TestSuite;
9		9
		10	/**
		11	* @deprecated JDOM is obsolete
		12	*/
10	public class DOMTests extends ToBeConverted {	13	public class DOMTests extends ToBeConverted {
11	public DOMTests(String name) {	14	public DOMTests(String name) {
12	super(name);	15	super(name);

Lines 7-12 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/FindNodeTests.java (+3 lines)
7	import junit.framework.Test;	7	import junit.framework.Test;
8	import junit.framework.TestSuite;	8	import junit.framework.TestSuite;
9		9
		10	/**
		11	* @deprecated JDOM is obsolete
		12	*/
10	public class FindNodeTests extends ToBeConverted {	13	public class FindNodeTests extends ToBeConverted {
11	/**	14	/**
12	* FindNodeTests constructor.	15	* FindNodeTests constructor.

Lines 7-12 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JDOMFindNodeTests.java (+3 lines)
7	import junit.framework.Test;	7	import junit.framework.Test;
8	import junit.framework.TestSuite;	8	import junit.framework.TestSuite;
9		9
		10	/**
		11	* @deprecated JDOM is obsolete
		12	*/
10	public class JDOMFindNodeTests extends ToBeConverted {	13	public class JDOMFindNodeTests extends ToBeConverted {
11	public JDOMFindNodeTests(String name) {	14	public JDOMFindNodeTests(String name) {
12	super(name);	15	super(name);




		//Unicode tests
		suite.addTest(UnicodeTests.suite());
		
		// JDOM Navigation tests
		suite.addTest(DOMTests.suite());

		// Model state tests
		suite.addTest(new JavaModelRegressionTests("testHasUnsavedChanges"));
		

		//Create compilation unit members tests
		suite.addTest(CreateMemberTests.suite());

		//FindNode tests
		suite.addTest(FindNodeTests.suite());

		// Evaluation tests (they force a build of the 'Minimal Jar' project)
		suite.addTest(EvaluationTests.suite());

		// Char array tests
		suite.addTest(CharArrayBufferTests.suite());
		suite.addTest(CharArrayOpsTests.suite());
		
		includeDeprecatedJDOMTests(suite);
			
		return new JavaModelRegressionTestSetup(suite, getProjectNames());
	}
	
	/**
	 * @deprecated JDOM is obsolete
	 */
	private static void includeDeprecatedJDOMTests(TestSuite suite) {
		// Enter each deprecated test here, grouping the tests that are related
		
		// JDOM Navigation tests
		suite.addTest(DOMTests.suite());

		//FindNode tests
		suite.addTest(FindNodeTests.suite());

		// JDOM tests
		suite.addTest(JDOMQuickTests.suite());
		suite.addTest(JDOMIsolationTests.suite());
	}
	
/**
 * When a working copy is edited the original element is not affected,
 * but that the package, root, and project know that they cannot be




import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.jdt.core.*;
import org.eclipse.jdt.core.jdom.*;
import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
import org.eclipse.jdt.core.tests.model.AbstractJavaModelTests;
import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
import org.eclipse.jdt.internal.core.util.Util;

	 * A placeholder for any JDOMs used in test cases. Groups of
	 * tests that use a JDOM should initialize and cleanup this
	 * field.
	 * @deprecated JDOM is obsolete
	 */
	public static IDOMCompilationUnit fgDOM= null;
	/**

}
/**
 * Returns the JDOM for the given compilation unit
 * @deprecated JDOM is obsolete
 */
public IDOMCompilationUnit getJDOM(ICompilationUnit cu) throws JavaModelException {
	return new DOMFactory().createCompilationUnit(cu.getSource(), cu.getElementName());

Lines 12-17 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMFragmentationTests.java (+1 lines)
12	/**	12	/**
13	* This test requires all of the JDK source - found in the	13	* This test requires all of the JDK source - found in the
14	* resources for this project.	14	* resources for this project.
		15	* @deprecated JDOM is obsolete
15	*/	16	*/
16	public class JDOMFragmentationTests extends TestCase {	17	public class JDOMFragmentationTests extends TestCase {
17	protected String fFilename;	18	protected String fFilename;

Lines 6-11 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMIsolationTests.java (+3 lines)
6		6
7	import junit.framework.*;	7	import junit.framework.*;
8		8
		9	/**
		10	* @deprecated JDOM is obsolete
		11	*/
9	public class JDOMIsolationTests extends TestCase {	12	public class JDOMIsolationTests extends TestCase {
10	static final String LINE_SEPARATOR = System.getProperty("line.separator");	13	static final String LINE_SEPARATOR = System.getProperty("line.separator");
11	public JDOMIsolationTests(String name) {	14	public JDOMIsolationTests(String name) {

Lines 5-10 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMKnownFailures.java (+3 lines)
5		5
6	import junit.framework.*;	6	import junit.framework.*;
7		7
		8	/**
		9	* @deprecated JDOM is obsolete
		10	*/
8	public class JDOMKnownFailures extends TestCase {	11	public class JDOMKnownFailures extends TestCase {
9	/**	12	/**
10	* ProgrammaticTests constructor comment.	13	* ProgrammaticTests constructor comment.

Lines 14-19 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMQuickTests.java (+3 lines)
14	import java.io.*;	14	import java.io.*;
15	import java.util.*;	15	import java.util.*;
16		16
		17	/**
		18	* @deprecated JDOM is obsolete
		19	*/
17	public class JDOMQuickTests extends TestCase {	20	public class JDOMQuickTests extends TestCase {
18	static final String LINE_SEPARATOR = System.getProperty("line.separator");	21	static final String LINE_SEPARATOR = System.getProperty("line.separator");
19	/**	22	/**

Lines 20-25 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/RunAllJDOMTests.java (+3 lines)
20	public RunAllJDOMTests(String name) {	20	public RunAllJDOMTests(String name) {
21	super(name);	21	super(name);
22	}	22	}
		23	/**
		24	* @deprecated JDOM is obsolete
		25	*/
23	public static Class[] getAllTestClasses() {	26	public static Class[] getAllTestClasses() {
24	return new Class[] {	27	return new Class[] {
25	CharArrayBufferTests.class,	28	CharArrayBufferTests.class,

Return to bug 61148

Lines 51-59 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JavaModelRegressionTests.java (-9 / +21 lines)
51	//Unicode tests	51	//Unicode tests
52	suite.addTest(UnicodeTests.suite());	52	suite.addTest(UnicodeTests.suite());
53		53
54	// JDOM Navigation tests
55	suite.addTest(DOMTests.suite());
56
57	// Model state tests	54	// Model state tests
58	suite.addTest(new JavaModelRegressionTests("testHasUnsavedChanges"));	55	suite.addTest(new JavaModelRegressionTests("testHasUnsavedChanges"));
59		56
Lines 82-101 Link Here
82	//Create compilation unit members tests	79	//Create compilation unit members tests
83	suite.addTest(CreateMemberTests.suite());	80	suite.addTest(CreateMemberTests.suite());
84		81
85	//FindNode tests
86	suite.addTest(FindNodeTests.suite());
87
88	// Evaluation tests (they force a build of the 'Minimal Jar' project)	82	// Evaluation tests (they force a build of the 'Minimal Jar' project)
89	suite.addTest(EvaluationTests.suite());	83	suite.addTest(EvaluationTests.suite());
90		84
91	// JDOM tests	85	// Char array tests
92	suite.addTest(CharArrayBufferTests.suite());	86	suite.addTest(CharArrayBufferTests.suite());
93	suite.addTest(CharArrayOpsTests.suite());	87	suite.addTest(CharArrayOpsTests.suite());
94	suite.addTest(JDOMQuickTests.suite());	88
95	suite.addTest(JDOMIsolationTests.suite());	89	includeDeprecatedJDOMTests(suite);
96		90
97	return new JavaModelRegressionTestSetup(suite, getProjectNames());	91	return new JavaModelRegressionTestSetup(suite, getProjectNames());
98	}	92	}
		93
		94	/**
		95	* @deprecated JDOM is obsolete
		96	*/
		97	private static void includeDeprecatedJDOMTests(TestSuite suite) {
		98	// Enter each deprecated test here, grouping the tests that are related
		99
		100	// JDOM Navigation tests
		101	suite.addTest(DOMTests.suite());
		102
		103	//FindNode tests
		104	suite.addTest(FindNodeTests.suite());
		105
		106	// JDOM tests
		107	suite.addTest(JDOMQuickTests.suite());
		108	suite.addTest(JDOMIsolationTests.suite());
		109	}
		110
99	/**	111	/**
100	* When a working copy is edited the original element is not affected,	112	* When a working copy is edited the original element is not affected,
101	* but that the package, root, and project know that they cannot be	113	* but that the package, root, and project know that they cannot be

Lines 7-14 Link Here

(-)Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/RegressionTestSuite.java (-2 / +3 lines)
7	import org.eclipse.core.resources.*;	7	import org.eclipse.core.resources.*;
8	import org.eclipse.core.runtime.*;	8	import org.eclipse.core.runtime.*;
9	import org.eclipse.jdt.core.*;	9	import org.eclipse.jdt.core.*;
10	import org.eclipse.jdt.core.jdom.DOMFactory;	10	import org.eclipse.jdt.core.jdom.*;
11	import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
12	import org.eclipse.jdt.core.tests.model.AbstractJavaModelTests;	11	import org.eclipse.jdt.core.tests.model.AbstractJavaModelTests;
13	import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;	12	import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
14	import org.eclipse.jdt.internal.core.util.Util;	13	import org.eclipse.jdt.internal.core.util.Util;
Lines 27-32 Link Here
27	* A placeholder for any JDOMs used in test cases. Groups of	26	* A placeholder for any JDOMs used in test cases. Groups of
28	* tests that use a JDOM should initialize and cleanup this	27	* tests that use a JDOM should initialize and cleanup this
29	* field.	28	* field.
		29	* @deprecated JDOM is obsolete
30	*/	30	*/
31	public static IDOMCompilationUnit fgDOM= null;	31	public static IDOMCompilationUnit fgDOM= null;
32	/**	32	/**
Lines 129-134 Link Here
129	}	129	}
130	/**	130	/**
131	* Returns the JDOM for the given compilation unit	131	* Returns the JDOM for the given compilation unit
		132	* @deprecated JDOM is obsolete
132	*/	133	*/
133	public IDOMCompilationUnit getJDOM(ICompilationUnit cu) throws JavaModelException {	134	public IDOMCompilationUnit getJDOM(ICompilationUnit cu) throws JavaModelException {
134	return new DOMFactory().createCompilationUnit(cu.getSource(), cu.getElementName());	135	return new DOMFactory().createCompilationUnit(cu.getSource(), cu.getElementName());