Attachment 52362 Details for Bug 161555 – Complete patch (all tests updated)

[patch] Complete patch (all tests updated)

patch_161555.txt (text/plain), 12.58 KB, created by Olivier Thomann

on 2006-10-19 21:32:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-10-19 21:32:25 EDT

Size: 12.58 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/DeleteTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/DeleteTests.java,v
>retrieving revision 1.19
>diff -u -r1.19 DeleteTests.java
>--- src/org/eclipse/jdt/core/tests/model/DeleteTests.java	15 Sep 2006 02:14:30 -0000	1.19
>+++ src/org/eclipse/jdt/core/tests/model/DeleteTests.java	20 Oct 2006 01:35:54 -0000
>@@ -616,17 +616,17 @@
> 			"Unexpected delta",
> 			"P[*]: {CHILDREN}\n" + 
> 			"	<project root>[*]: {CHILDREN}\n" + 
>+			"		a.b[*]: {CHILDREN}\n" + 
>+			"			Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
>+			"				Y[*]: {CHILDREN | FINE GRAINED}\n" + 
>+			"					foo[-]: {}\n" + 
>+			"					main(String[])[-]: {}\n" + 
> 			"		a.b.c[*]: {CHILDREN}\n" + 
> 			"			X.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
> 			"				<import container>[*]: {CHILDREN | FINE GRAINED}\n" + 
> 			"					import java.util.Vector[-]: {}\n" + 
> 			"				X[*]: {CHILDREN | FINE GRAINED}\n" + 
>-			"					main(String[])[-]: {}\n" + 
> 			"					Bar[-]: {}\n" + 
>-			"		a.b[*]: {CHILDREN}\n" + 
>-			"			Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
>-			"				Y[*]: {CHILDREN | FINE GRAINED}\n" + 
>-			"					foo[-]: {}\n" + 
> 			"					main(String[])[-]: {}"
> 		);
> 	} finally {
>Index: src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java,v
>retrieving revision 1.174
>diff -u -r1.174 AbstractJavaModelTests.java
>--- src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java	17 Oct 2006 13:24:12 -0000	1.174
>+++ src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java	20 Oct 2006 01:35:54 -0000
>@@ -127,6 +127,13 @@
> 				}
> 			};
> 			org.eclipse.jdt.internal.core.util.Util.sort(elementDeltas, comparer);
>+			for (int i = 0, max = elementDeltas.length; i < max; i++) {
>+				IJavaElementDelta delta = elementDeltas[i];
>+				IJavaElementDelta[] children = delta.getAffectedChildren();
>+				if (children != null) {
>+					sortDeltas(children);
>+				}
>+			}
> 		}
> 		public String toString() {
> 			StringBuffer buffer = new StringBuffer();
>Index: src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java,v
>retrieving revision 1.104
>diff -u -r1.104 ReconcilerTests.java
>--- src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java	3 Oct 2006 15:18:21 -0000	1.104
>+++ src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java	20 Oct 2006 01:35:57 -0000
>@@ -441,8 +441,8 @@
> 	assertDeltas(
> 		"Unexpected delta", 
> 		"X[*]: {CHILDREN | FINE GRAINED}\n" + 
>-		"	i[+]: {}\n" + 
>-		"	X(int)[+]: {}"
>+		"	X(int)[+]: {}\n" + 
>+		"	i[+]: {}"
> 	);
> }
> /**
>@@ -1305,9 +1305,9 @@
> 	this.workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
> 	assertDeltas(
> 		"Unexpected delta", 
>-		"<import container>[*]: {CHILDREN | FINE GRAINED}\n" +
>-		"	import p2[+]: {}\n" +
>-		"	import p[-]: {}"
>+		"<import container>[*]: {CHILDREN | FINE GRAINED}\n" + 
>+		"	import p[-]: {}\n" + 
>+		"	import p2[+]: {}"
> 	);
> }
> /*
>Index: src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java,v
>retrieving revision 1.27
>diff -u -r1.27 ExternalJarDeltaTests.java
>--- src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java	13 Jun 2006 13:01:04 -0000	1.27
>+++ src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java	20 Oct 2006 01:35:55 -0000
>@@ -522,8 +522,8 @@
> 		assertDeltas(
> 			"Unexpected delta", 
> 			"P[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n"+
>-			"	foo.jar[*]: {REMOVED FROM CLASSPATH}\n"+
> 			"	"+externalFooPathString+"[+]: {}\n"+
>+			"	foo.jar[*]: {REMOVED FROM CLASSPATH}\n"+
> 			"	ResourceDelta(/P/.classpath)[*]\n"+
> 			"\n"+
> 			"P[*]: {CHILDREN}\n"+
>Index: src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java,v
>retrieving revision 1.70
>diff -u -r1.70 JavaElementDeltaTests.java
>--- src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java	22 Jun 2006 09:42:26 -0000	1.70
>+++ src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java	20 Oct 2006 01:35:55 -0000
>@@ -517,13 +517,13 @@
> 			null);
> 		assertDeltas(
> 			"Unexpected delta", 
>-			"P[*]: {CHILDREN}\n" +
>-			"	src[*]: {CHILDREN}\n" +
>-			"		x[*]: {CHILDREN}\n" +
>-			"			A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
>-			"				B[+]: {}\n" +
>-			"				A[*]: {CHILDREN | FINE GRAINED}\n" +
>-			"					i[+]: {}"
>+			"P[*]: {CHILDREN}\n" + 
>+			"	src[*]: {CHILDREN}\n" + 
>+			"		x[*]: {CHILDREN}\n" + 
>+			"			A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
>+			"				A[*]: {CHILDREN | FINE GRAINED}\n" + 
>+			"					i[+]: {}\n" + 
>+			"				B[+]: {}"
> 		);
> 	} finally {
> 		stopDeltas();
>@@ -987,8 +987,8 @@
> 		assertDeltas(
> 			"Unexpected deltas",
> 			"P1[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" + 
>-			"	src[*]: {REMOVED FROM CLASSPATH}\n" + 
> 			"	<project root>[*]: {ADDED TO CLASSPATH}\n" + 
>+			"	src[*]: {REMOVED FROM CLASSPATH}\n" + 
> 			"	ResourceDelta(/P1/.classpath)[*]\n" + 
> 			"P2[-]: {}"
> 		);
>@@ -1469,12 +1469,12 @@
> 		cu.move(pkg, null, null, true, null);
> 		assertDeltas(
> 			"Unexpected delta", 
>-			"P[*]: {CHILDREN}\n" +
>-			"	<project root>[*]: {CHILDREN}\n" +
>-			"		x.y[*]: {CHILDREN}\n" +
>-			"			A.java[-]: {MOVED_TO(A.java [in x [in <project root> [in P]]])}\n" +
>-			"		x[*]: {CHILDREN}\n" +
>-			"			A.java[+]: {MOVED_FROM(A.java [in x.y [in <project root> [in P]]])}"
>+			"P[*]: {CHILDREN}\n" + 
>+			"	<project root>[*]: {CHILDREN}\n" + 
>+			"		x[*]: {CHILDREN}\n" + 
>+			"			A.java[+]: {MOVED_FROM(A.java [in x.y [in <project root> [in P]]])}\n" + 
>+			"		x.y[*]: {CHILDREN}\n" + 
>+			"			A.java[-]: {MOVED_TO(A.java [in x [in <project root> [in P]]])}"
> 		);
> 		assertElementDescendants(
> 			"Unexpected children for package x",
>@@ -1566,8 +1566,8 @@
> 		assertDeltas(
> 			"Unexpected delta",
> 			"P[*]: {CHILDREN | CONTENT}\n" + 
>-			"	nested/src[-]: {MOVED_TO(nested2/src [in P])}\n" + 
> 			"	nested2/src[+]: {MOVED_FROM(nested/src [in P])}\n" + 
>+			"	nested/src[-]: {MOVED_TO(nested2/src [in P])}\n" + 
> 			"	ResourceDelta(/P/nested)[*]\n" + 
> 			"	ResourceDelta(/P/nested2)[*]"
> 		);
>@@ -1796,8 +1796,8 @@
> 		assertDeltas(
> 			"Unexpected delta", 
> 			"P[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" + 
>-			"	lib.jar[-]: {}\n" + 
> 			"	<project root>[*]: {ADDED TO CLASSPATH}\n" + 
>+			"	lib.jar[-]: {}\n" + 
> 			"	ResourceDelta(/P/.classpath)[*]\n" + 
> 			"	ResourceDelta(/P/.project)[*]"
> 		);
>@@ -2113,8 +2113,8 @@
> 			"		x.y[*]: {CHILDREN}\n" + 
> 			"			A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
> 			"				A[*]: {CHILDREN | FINE GRAINED}\n" + 
>-			"					foo2()[+]: {}\n" + 
>-			"					foo1()[-]: {}"
>+			"					foo1()[-]: {}\n" + 
>+			"					foo2()[+]: {}"
> 		);
> 	} finally {
> 		stopDeltas();
>@@ -2235,8 +2235,8 @@
> 			"Should notice src2 and myLib additions to the classpath", 
> 			"P1[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" + 
> 			"	<project root>[*]: {REMOVED FROM CLASSPATH}\n" + 
>-			"	src2[*]: {ADDED TO CLASSPATH}\n" + 
> 			"	/LibProj/mylib.jar[*]: {ADDED TO CLASSPATH}\n" + 
>+			"	src2[*]: {ADDED TO CLASSPATH}\n" + 
> 			"	ResourceDelta(/P1/.classpath)[*]"
> 		);
> 	} finally {
>Index: src/org/eclipse/jdt/core/tests/model/RenameTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java,v
>retrieving revision 1.23
>diff -u -r1.23 RenameTests.java
>--- src/org/eclipse/jdt/core/tests/model/RenameTests.java	29 Mar 2006 04:03:08 -0000	1.23
>+++ src/org/eclipse/jdt/core/tests/model/RenameTests.java	20 Oct 2006 01:35:57 -0000
>@@ -278,10 +278,10 @@
> 		"P[*]: {CHILDREN}\n" + 
> 		"	src[*]: {CHILDREN}\n" + 
> 		"		<default>[*]: {CHILDREN}\n" + 
>-		"			X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}\n" + 
> 		"			NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}\n" + 
>-		"			Y.java[-]: {MOVED_TO(NewY.java [in <default> [in src [in P]]])}\n" + 
>-		"			NewY.java[+]: {MOVED_FROM(Y.java [in <default> [in src [in P]]])}"
>+		"			NewY.java[+]: {MOVED_FROM(Y.java [in <default> [in src [in P]]])}\n" + 
>+		"			X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}\n" + 
>+		"			Y.java[-]: {MOVED_TO(NewY.java [in <default> [in src [in P]]])}"
> 	);
> }
> /**
>@@ -333,8 +333,8 @@
> 		"P[*]: {CHILDREN}\n" + 
> 		"	src[*]: {CHILDREN}\n" + 
> 		"		<default>[*]: {CHILDREN}\n" + 
>-		"			X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}\n" + 
>-		"			NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}"
>+		"			NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}\n" + 
>+		"			X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}"
> 	);
> }
> public void testRenameCUForce() throws CoreException {
>@@ -386,8 +386,8 @@
> 		"Unexpected deltas",
> 		"P[*]: {CHILDREN}\n" + 
> 		"	src[*]: {CHILDREN}\n" + 
>-		"		x.y.z[-]: {MOVED_TO(x.y [in src [in P]])}\n" + 
>-		"		x.y[+]: {MOVED_FROM(x.y.z [in src [in P]])}"
>+		"		x.y[+]: {MOVED_FROM(x.y.z [in src [in P]])}\n" + 
>+		"		x.y.z[-]: {MOVED_TO(x.y [in src [in P]])}"
> 	);
> }
> /*
>@@ -468,8 +468,8 @@
> 		"		<default>[*]: {CHILDREN}\n" + 
> 		"			X.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
> 		"				X[*]: {CHILDREN | FINE GRAINED}\n" + 
>-		"					fred[+]: {}\n" + 
>-		"					bar[-]: {}"
>+		"					bar[-]: {}\n" + 
>+		"					fred[+]: {}"
> 	);
> 	ensureCorrectPositioning(type, type.getField("fred"), type.getField("other"));
> }
>@@ -730,8 +730,8 @@
> 		"Unexpected deltas",
> 		"P[*]: {CHILDREN}\n" + 
> 		"	src[*]: {CHILDREN}\n" + 
>-		"		x.y.z[-]: {MOVED_TO(x.y.newZ [in src [in P]])}\n" + 
>-		"		x.y.newZ[+]: {MOVED_FROM(x.y.z [in src [in P]])}"
>+		"		x.y.newZ[+]: {MOVED_FROM(x.y.z [in src [in P]])}\n" + 
>+		"		x.y.z[-]: {MOVED_TO(x.y.newZ [in src [in P]])}"
> 	);
> }
> /*
>Index: src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java,v
>retrieving revision 1.33
>diff -u -r1.33 RootManipulationsTests.java
>--- src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java	13 Jun 2006 13:01:05 -0000	1.33
>+++ src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java	20 Oct 2006 01:35:57 -0000
>@@ -248,9 +248,9 @@
> 		assertDeltas(
> 			"Unexpected delta (1)",
> 			"P2[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" + 
>+			"	src[+]: {}\n" + 
> 			"	src1[*]: {REORDERED}\n" + 
> 			"	src2[*]: {REORDERED}\n" + 
>-			"	src[+]: {}\n" + 
> 			"	ResourceDelta(/P2/.classpath)[*]"
> 		);
> 		assertElementsEqual(
>@@ -806,9 +806,9 @@
> 			"	src[-]: {MOVED_TO(src [in P2])}\n" + 
> 			"	ResourceDelta(/P1/.classpath)[*]\n" + 
> 			"P2[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" + 
>+			"	src[+]: {MOVED_FROM(src [in P1])}\n" + 
> 			"	src1[*]: {REORDERED}\n" + 
> 			"	src2[*]: {REORDERED}\n" + 
>-			"	src[+]: {MOVED_FROM(src [in P1])}\n" + 
> 			"	ResourceDelta(/P2/.classpath)[*]"
> 		);
> 		assertJavaProject(
>@@ -853,8 +853,8 @@
> 			"	src[-]: {MOVED_TO(src [in P2])}\n" + 
> 			"	ResourceDelta(/P1/.classpath)[*]\n" + 
> 			"P2[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" + 
>-			"	src2[*]: {REORDERED}\n" + 
> 			"	src[+]: {MOVED_FROM(src [in P1])}\n" + 
>+			"	src2[*]: {REORDERED}\n" + 
> 			"	ResourceDelta(/P2/.classpath)[*]"
> 		);
> 		assertJavaProject(
>@@ -1015,9 +1015,9 @@
> 		assertDeltas(
> 			"Unexpected delta",
> 			"P[*]: {CHILDREN}\n" + 
>-			"	src1[-]: {MOVED_TO(src2 [in <project root> [in P]])}\n" + 
> 			"	<project root>[*]: {CHILDREN}\n" + 
>-			"		src2[+]: {MOVED_FROM(<default> [in src1 [in P]])}"
>+			"		src2[+]: {MOVED_FROM(<default> [in src1 [in P]])}\n" + 
>+			"	src1[-]: {MOVED_TO(src2 [in <project root> [in P]])}"
> 		);
> 	} finally {
> 		stopDeltas();

Actions: View | Diff

Attachments on bug 161555: 52354 | 52362 | 52429