Attachment 10319 Details for Bug 61148 – patch for o.e.jdt.core.tests

[patch] patch for o.e.jdt.core.tests

jdt-core-tests-jdom-deprecation-patch-20040505.txt (text/plain), 10.28 KB, created by Jim des Rivieres

on 2004-05-05 19:23:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jim des Rivieres

Created: 2004-05-05 19:23:50 EDT

Size: 10.28 KB

patch

obsolete

>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/DOMTests.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/DOMTests.java,v
>retrieving revision 1.9
>diff -u -r1.9 DOMTests.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/DOMTests.java	22 Sep 2003 10:38:58 -0000	1.9
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/DOMTests.java	5 May 2004 23:08:56 -0000
>@@ -1,12 +1,15 @@
> package org.eclipse.jdt.tests.core;
> 
> import org.eclipse.jdt.core.*;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.JavaElement;
> 
> import junit.framework.Test;
> import junit.framework.TestSuite;
> 
>+/**
>+ * @deprecated JDOM is obsolete
>+ */
> public class DOMTests extends ToBeConverted {
> public DOMTests(String name) {
> 	super(name);
>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/FindNodeTests.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/FindNodeTests.java,v
>retrieving revision 1.9
>diff -u -r1.9 FindNodeTests.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/FindNodeTests.java	22 Sep 2003 10:39:24 -0000	1.9
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/FindNodeTests.java	5 May 2004 23:08:56 -0000
>@@ -7,6 +7,9 @@
> import junit.framework.Test;
> import junit.framework.TestSuite;
> 
>+/**
>+ * @deprecated JDOM is obsolete
>+ */
> public class FindNodeTests extends ToBeConverted {
> /**
>  * FindNodeTests constructor.
>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JDOMFindNodeTests.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JDOMFindNodeTests.java,v
>retrieving revision 1.7
>diff -u -r1.7 JDOMFindNodeTests.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JDOMFindNodeTests.java	12 Jul 2002 16:17:25 -0000	1.7
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JDOMFindNodeTests.java	5 May 2004 23:08:56 -0000
>@@ -7,6 +7,9 @@
> import junit.framework.Test;
> import junit.framework.TestSuite;
> 
>+/**
>+ * @deprecated JDOM is obsolete
>+ */
> public class JDOMFindNodeTests extends ToBeConverted {
> public JDOMFindNodeTests(String name) {
> 	super(name);
>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JavaModelRegressionTests.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JavaModelRegressionTests.java,v
>retrieving revision 1.55
>diff -u -r1.55 JavaModelRegressionTests.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JavaModelRegressionTests.java	23 Mar 2004 11:19:27 -0000	1.55
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/JavaModelRegressionTests.java	5 May 2004 23:08:56 -0000
>@@ -51,9 +51,6 @@
> 		//Unicode tests
> 		suite.addTest(UnicodeTests.suite());
> 		
>-		// JDOM Navigation tests
>-		suite.addTest(DOMTests.suite());
>-
> 		// Model state tests
> 		suite.addTest(new JavaModelRegressionTests("testHasUnsavedChanges"));
> 		
>@@ -82,20 +79,35 @@
> 		//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());
> 
>-		// JDOM tests
>+		// Char array tests
> 		suite.addTest(CharArrayBufferTests.suite());
> 		suite.addTest(CharArrayOpsTests.suite());
>-		suite.addTest(JDOMQuickTests.suite());
>-		suite.addTest(JDOMIsolationTests.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
>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/RegressionTestSuite.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/RegressionTestSuite.java,v
>retrieving revision 1.48
>diff -u -r1.48 RegressionTestSuite.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/RegressionTestSuite.java	21 Jan 2004 17:47:20 -0000	1.48
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/RegressionTestSuite.java	5 May 2004 23:08:57 -0000
>@@ -7,8 +7,7 @@
> import org.eclipse.core.resources.*;
> import org.eclipse.core.runtime.*;
> import org.eclipse.jdt.core.*;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.core.tests.model.AbstractJavaModelTests;
> import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
> import org.eclipse.jdt.internal.core.util.Util;
>@@ -27,6 +26,7 @@
> 	 * 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;
> 	/**
>@@ -129,6 +129,7 @@
> }
> /**
>  * 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());
>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMFragmentationTests.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMFragmentationTests.java,v
>retrieving revision 1.11
>diff -u -r1.11 JDOMFragmentationTests.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMFragmentationTests.java	12 Sep 2003 16:30:40 -0000	1.11
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMFragmentationTests.java	5 May 2004 23:08:57 -0000
>@@ -12,6 +12,7 @@
> /**
>  * This test requires all of the JDK source - found in the
>  * resources for this project.
>+ * @deprecated JDOM is obsolete
>  */ 
> public class JDOMFragmentationTests extends TestCase {
> 	protected String fFilename;
>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMIsolationTests.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMIsolationTests.java,v
>retrieving revision 1.18
>diff -u -r1.18 JDOMIsolationTests.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMIsolationTests.java	3 Dec 2003 12:56:28 -0000	1.18
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMIsolationTests.java	5 May 2004 23:08:57 -0000
>@@ -6,6 +6,9 @@
> 
> import junit.framework.*;
> 
>+/**
>+ * @deprecated JDOM is obsolete
>+ */
> public class JDOMIsolationTests extends TestCase  {
> 	static final String LINE_SEPARATOR = System.getProperty("line.separator");
> public JDOMIsolationTests(String name) {
>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMKnownFailures.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMKnownFailures.java,v
>retrieving revision 1.9
>diff -u -r1.9 JDOMKnownFailures.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMKnownFailures.java	3 Dec 2003 12:56:28 -0000	1.9
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMKnownFailures.java	5 May 2004 23:08:57 -0000
>@@ -5,6 +5,9 @@
> 
> import junit.framework.*;
> 
>+/**
>+ * @deprecated JDOM is obsolete
>+ */
> public class JDOMKnownFailures extends TestCase {
> /**
>  * ProgrammaticTests constructor comment.
>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMQuickTests.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMQuickTests.java,v
>retrieving revision 1.27
>diff -u -r1.27 JDOMQuickTests.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMQuickTests.java	2 Apr 2004 16:32:12 -0000	1.27
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/JDOMQuickTests.java	5 May 2004 23:08:58 -0000
>@@ -14,6 +14,9 @@
> import java.io.*;
> import java.util.*;
> 
>+/**
>+ * @deprecated JDOM is obsolete
>+ */
> public class JDOMQuickTests extends TestCase {
> 	static final String LINE_SEPARATOR = System.getProperty("line.separator");
> /**
>Index: Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/RunAllJDOMTests.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests/Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/RunAllJDOMTests.java,v
>retrieving revision 1.1
>diff -u -r1.1 RunAllJDOMTests.java
>--- Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/RunAllJDOMTests.java	24 Feb 2003 14:34:50 -0000	1.1
>+++ Eclipse Java Tests Model/src/org/eclipse/jdt/tests/core/jdom/RunAllJDOMTests.java	5 May 2004 23:08:58 -0000
>@@ -20,6 +20,9 @@
> public RunAllJDOMTests(String name) {
> 	super(name);
> }
>+/**
>+ * @deprecated JDOM is obsolete
>+ */
> public static Class[] getAllTestClasses() {
> 	return new Class[] {
> 		CharArrayBufferTests.class,

Actions: View | Diff

Attachments on bug 61148: 10318 | 10319 | 10320 | 10812