Attachment #52429 for bug #161555

Lines 124-129 Link Here

(-)src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java (+7 lines)
124	}	124	}
125	};	125	};
126	org.eclipse.jdt.internal.core.util.Util.sort(elementDeltas, comparer);	126	org.eclipse.jdt.internal.core.util.Util.sort(elementDeltas, comparer);
		127	for (int i = 0, max = elementDeltas.length; i < max; i++) {
		128	IJavaElementDelta delta = elementDeltas[i];
		129	IJavaElementDelta[] children = delta.getAffectedChildren();
		130	if (children != null) {
		131	sortDeltas(children);
		132	}
		133	}
127	}	134	}
128	public String toString() {	135	public String toString() {
129	StringBuffer buffer = new StringBuffer();	136	StringBuffer buffer = new StringBuffer();




			"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 {

Lines 522-529 Link Here

(-)src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java (-1 / +1 lines)
522	assertDeltas(	522	assertDeltas(
523	"Unexpected delta",	523	"Unexpected delta",
524	"P[*]: {CHILDREN \| CLASSPATH CHANGED}\n"+	524	"P[*]: {CHILDREN \| CLASSPATH CHANGED}\n"+
525	" foo.jar[*]: {REMOVED FROM CLASSPATH}\n"+
526	" "+externalFooPathString+"[+]: {}\n"+	525	" "+externalFooPathString+"[+]: {}\n"+
		526	" foo.jar[*]: {REMOVED FROM CLASSPATH}\n"+
527	" ResourceDelta(/P/.classpath)[*]\n"+	527	" ResourceDelta(/P/.classpath)[*]\n"+
528	"\n"+	528	"\n"+
529	"P[*]: {CHILDREN}\n"+	529	"P[*]: {CHILDREN}\n"+




			null);
		assertDeltas(
			"Unexpected delta", 
			"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();

		assertDeltas(
			"Unexpected deltas",
			"P1[*]: {CHILDREN | CLASSPATH CHANGED}\n" + 
			"	src[*]: {REMOVED FROM CLASSPATH}\n" + 
			"	<project root>[*]: {ADDED TO CLASSPATH}\n" + 
			"	src[*]: {REMOVED FROM CLASSPATH}\n" + 
			"	ResourceDelta(/P1/.classpath)[*]\n" + 
			"P2[-]: {}"
		);

		cu.move(pkg, null, null, true, null);
		assertDeltas(
			"Unexpected delta", 
			"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",

		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)[*]"
		);

		assertDeltas(
			"Unexpected delta", 
			"P[*]: {CHILDREN | CLASSPATH CHANGED}\n" + 
			"	lib.jar[-]: {}\n" + 
			"	<project root>[*]: {ADDED TO CLASSPATH}\n" + 
			"	lib.jar[-]: {}\n" + 
			"	ResourceDelta(/P/.classpath)[*]\n" + 
			"	ResourceDelta(/P/.project)[*]"
		);

			"		x.y[*]: {CHILDREN}\n" + 
			"			A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
			"				A[*]: {CHILDREN | FINE GRAINED}\n" + 
			"					foo1()[-]: {}\n" + 
			"					foo2()[+]: {}"
		);
	} finally {
		stopDeltas();

			"Should notice src2 and myLib additions to the classpath", 
			"P1[*]: {CHILDREN | 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 {




	assertDeltas(
		"Unexpected delta", 
		"X[*]: {CHILDREN | FINE GRAINED}\n" + 
		"	X(int)[+]: {}\n" + 
		"	i[+]: {}"
	);
}
/**

	this.workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
	assertDeltas(
		"Unexpected delta", 
		"<import container>[*]: {CHILDREN | FINE GRAINED}\n" + 
		"	import p[-]: {}\n" + 
		"	import p2[+]: {}"
	);
}
/*




		"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" + 
		"			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]]])}"
	);
}
/**

		"P[*]: {CHILDREN}\n" + 
		"	src[*]: {CHILDREN}\n" + 
		"		<default>[*]: {CHILDREN}\n" + 
		"			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 {

		"Unexpected deltas",
		"P[*]: {CHILDREN}\n" + 
		"	src[*]: {CHILDREN}\n" + 
		"		x.y[+]: {MOVED_FROM(x.y.z [in src [in P]])}\n" + 
		"		x.y.z[-]: {MOVED_TO(x.y [in src [in P]])}"
	);
}
/*

		"		<default>[*]: {CHILDREN}\n" + 
		"			X.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
		"				X[*]: {CHILDREN | FINE GRAINED}\n" + 
		"					bar[-]: {}\n" + 
		"					fred[+]: {}"
	);
	ensureCorrectPositioning(type, type.getField("fred"), type.getField("other"));
}

		"Unexpected deltas",
		"P[*]: {CHILDREN}\n" + 
		"	src[*]: {CHILDREN}\n" + 
		"		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]])}"
	);
}
/*




		assertDeltas(
			"Unexpected delta (1)",
			"P2[*]: {CHILDREN | CLASSPATH CHANGED}\n" + 
			"	src[+]: {}\n" + 
			"	src1[*]: {REORDERED}\n" + 
			"	src2[*]: {REORDERED}\n" + 
			"	src[+]: {}\n" + 
			"	ResourceDelta(/P2/.classpath)[*]"
		);
		assertElementsEqual(

			"	src[-]: {MOVED_TO(src [in P2])}\n" + 
			"	ResourceDelta(/P1/.classpath)[*]\n" + 
			"P2[*]: {CHILDREN | 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(

			"	src[-]: {MOVED_TO(src [in P2])}\n" + 
			"	ResourceDelta(/P1/.classpath)[*]\n" + 
			"P2[*]: {CHILDREN | CLASSPATH CHANGED}\n" + 
			"	src2[*]: {REORDERED}\n" + 
			"	src[+]: {MOVED_FROM(src [in P1])}\n" + 
			"	src2[*]: {REORDERED}\n" + 
			"	ResourceDelta(/P2/.classpath)[*]"
		);
		assertJavaProject(

		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]])}\n" + 
			"	src1[-]: {MOVED_TO(src2 [in <project root> [in P]])}"
		);
	} finally {
		stopDeltas();

Return to bug 161555

Lines 616-632 Link Here

(-)src/org/eclipse/jdt/core/tests/model/DeleteTests.java (-5 / +5 lines)
616	"Unexpected delta",	616	"Unexpected delta",
617	"P[*]: {CHILDREN}\n" +	617	"P[*]: {CHILDREN}\n" +
618	" <project root>[*]: {CHILDREN}\n" +	618	" <project root>[*]: {CHILDREN}\n" +
		619	" a.b[*]: {CHILDREN}\n" +
		620	" Y.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +
		621	" Y[*]: {CHILDREN \| FINE GRAINED}\n" +
		622	" foo[-]: {}\n" +
		623	" main(String[])[-]: {}\n" +
619	" a.b.c[*]: {CHILDREN}\n" +	624	" a.b.c[*]: {CHILDREN}\n" +
620	" X.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +	625	" X.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +
621	" <import container>[*]: {CHILDREN \| FINE GRAINED}\n" +	626	" <import container>[*]: {CHILDREN \| FINE GRAINED}\n" +
622	" import java.util.Vector[-]: {}\n" +	627	" import java.util.Vector[-]: {}\n" +
623	" X[*]: {CHILDREN \| FINE GRAINED}\n" +	628	" X[*]: {CHILDREN \| FINE GRAINED}\n" +
624	" main(String[])[-]: {}\n" +
625	" Bar[-]: {}\n" +	629	" Bar[-]: {}\n" +
626	" a.b[*]: {CHILDREN}\n" +
627	" Y.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +
628	" Y[*]: {CHILDREN \| FINE GRAINED}\n" +
629	" foo[-]: {}\n" +
630	" main(String[])[-]: {}"	630	" main(String[])[-]: {}"
631	);	631	);
632	} finally {	632	} finally {

Lines 503-515 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java (-19 / +19 lines)
503	null);	503	null);
504	assertDeltas(	504	assertDeltas(
505	"Unexpected delta",	505	"Unexpected delta",
506	"P[*]: {CHILDREN}\n" +	506	"P[*]: {CHILDREN}\n" +
507	" src[*]: {CHILDREN}\n" +	507	" src[*]: {CHILDREN}\n" +
508	" x[*]: {CHILDREN}\n" +	508	" x[*]: {CHILDREN}\n" +
509	" A.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +	509	" A.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +
510	" B[+]: {}\n" +	510	" A[*]: {CHILDREN \| FINE GRAINED}\n" +
511	" A[*]: {CHILDREN \| FINE GRAINED}\n" +	511	" i[+]: {}\n" +
512	" i[+]: {}"	512	" B[+]: {}"
513	);	513	);
514	} finally {	514	} finally {
515	stopDeltas();	515	stopDeltas();
Lines 949-956 Link Here
949	assertDeltas(	949	assertDeltas(
950	"Unexpected deltas",	950	"Unexpected deltas",
951	"P1[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +	951	"P1[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +
952	" src[*]: {REMOVED FROM CLASSPATH}\n" +
953	" <project root>[*]: {ADDED TO CLASSPATH}\n" +	952	" <project root>[*]: {ADDED TO CLASSPATH}\n" +
		953	" src[*]: {REMOVED FROM CLASSPATH}\n" +
954	" ResourceDelta(/P1/.classpath)[*]\n" +	954	" ResourceDelta(/P1/.classpath)[*]\n" +
955	"P2[-]: {}"	955	"P2[-]: {}"
956	);	956	);
Lines 1431-1442 Link Here
1431	cu.move(pkg, null, null, true, null);	1431	cu.move(pkg, null, null, true, null);
1432	assertDeltas(	1432	assertDeltas(
1433	"Unexpected delta",	1433	"Unexpected delta",
1434	"P[*]: {CHILDREN}\n" +	1434	"P[*]: {CHILDREN}\n" +
1435	" <project root>[*]: {CHILDREN}\n" +	1435	" <project root>[*]: {CHILDREN}\n" +
1436	" x.y[*]: {CHILDREN}\n" +	1436	" x[*]: {CHILDREN}\n" +
1437	" A.java[-]: {MOVED_TO(A.java [in x [in <project root> [in P]]])}\n" +	1437	" A.java[+]: {MOVED_FROM(A.java [in x.y [in <project root> [in P]]])}\n" +
1438	" x[*]: {CHILDREN}\n" +	1438	" x.y[*]: {CHILDREN}\n" +
1439	" A.java[+]: {MOVED_FROM(A.java [in x.y [in <project root> [in P]]])}"	1439	" A.java[-]: {MOVED_TO(A.java [in x [in <project root> [in P]]])}"
1440	);	1440	);
1441	assertElementDescendants(	1441	assertElementDescendants(
1442	"Unexpected children for package x",	1442	"Unexpected children for package x",
Lines 1528-1535 Link Here
1528	assertDeltas(	1528	assertDeltas(
1529	"Unexpected delta",	1529	"Unexpected delta",
1530	"P[*]: {CHILDREN \| CONTENT}\n" +	1530	"P[*]: {CHILDREN \| CONTENT}\n" +
1531	" nested/src[-]: {MOVED_TO(nested2/src [in P])}\n" +
1532	" nested2/src[+]: {MOVED_FROM(nested/src [in P])}\n" +	1531	" nested2/src[+]: {MOVED_FROM(nested/src [in P])}\n" +
		1532	" nested/src[-]: {MOVED_TO(nested2/src [in P])}\n" +
1533	" ResourceDelta(/P/nested)[*]\n" +	1533	" ResourceDelta(/P/nested)[*]\n" +
1534	" ResourceDelta(/P/nested2)[*]"	1534	" ResourceDelta(/P/nested2)[*]"
1535	);	1535	);
Lines 1758-1765 Link Here
1758	assertDeltas(	1758	assertDeltas(
1759	"Unexpected delta",	1759	"Unexpected delta",
1760	"P[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +	1760	"P[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +
1761	" lib.jar[-]: {}\n" +
1762	" <project root>[*]: {ADDED TO CLASSPATH}\n" +	1761	" <project root>[*]: {ADDED TO CLASSPATH}\n" +
		1762	" lib.jar[-]: {}\n" +
1763	" ResourceDelta(/P/.classpath)[*]\n" +	1763	" ResourceDelta(/P/.classpath)[*]\n" +
1764	" ResourceDelta(/P/.project)[*]"	1764	" ResourceDelta(/P/.project)[*]"
1765	);	1765	);
Lines 2075-2082 Link Here
2075	" x.y[*]: {CHILDREN}\n" +	2075	" x.y[*]: {CHILDREN}\n" +
2076	" A.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +	2076	" A.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +
2077	" A[*]: {CHILDREN \| FINE GRAINED}\n" +	2077	" A[*]: {CHILDREN \| FINE GRAINED}\n" +
2078	" foo2()[+]: {}\n" +	2078	" foo1()[-]: {}\n" +
2079	" foo1()[-]: {}"	2079	" foo2()[+]: {}"
2080	);	2080	);
2081	} finally {	2081	} finally {
2082	stopDeltas();	2082	stopDeltas();
Lines 2197-2204 Link Here
2197	"Should notice src2 and myLib additions to the classpath",	2197	"Should notice src2 and myLib additions to the classpath",
2198	"P1[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +	2198	"P1[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +
2199	" <project root>[*]: {REMOVED FROM CLASSPATH}\n" +	2199	" <project root>[*]: {REMOVED FROM CLASSPATH}\n" +
2200	" src2[*]: {ADDED TO CLASSPATH}\n" +
2201	" /LibProj/mylib.jar[*]: {ADDED TO CLASSPATH}\n" +	2200	" /LibProj/mylib.jar[*]: {ADDED TO CLASSPATH}\n" +
		2201	" src2[*]: {ADDED TO CLASSPATH}\n" +
2202	" ResourceDelta(/P1/.classpath)[*]"	2202	" ResourceDelta(/P1/.classpath)[*]"
2203	);	2203	);
2204	} finally {	2204	} finally {

Lines 437-444 Link Here

(-)src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java (-5 / +5 lines)
437	assertDeltas(	437	assertDeltas(
438	"Unexpected delta",	438	"Unexpected delta",
439	"X[*]: {CHILDREN \| FINE GRAINED}\n" +	439	"X[*]: {CHILDREN \| FINE GRAINED}\n" +
440	" i[+]: {}\n" +	440	" X(int)[+]: {}\n" +
441	" X(int)[+]: {}"	441	" i[+]: {}"
442	);	442	);
443	}	443	}
444	/**	444	/**
Lines 1266-1274 Link Here
1266	this.workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);	1266	this.workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
1267	assertDeltas(	1267	assertDeltas(
1268	"Unexpected delta",	1268	"Unexpected delta",
1269	"<import container>[*]: {CHILDREN \| FINE GRAINED}\n" +	1269	"<import container>[*]: {CHILDREN \| FINE GRAINED}\n" +
1270	" import p2[+]: {}\n" +	1270	" import p[-]: {}\n" +
1271	" import p[-]: {}"	1271	" import p2[+]: {}"
1272	);	1272	);
1273	}	1273	}
1274	/*	1274	/*

Lines 278-287 Link Here

(-)src/org/eclipse/jdt/core/tests/model/RenameTests.java (-11 / +11 lines)
278	"P[*]: {CHILDREN}\n" +	278	"P[*]: {CHILDREN}\n" +
279	" src[*]: {CHILDREN}\n" +	279	" src[*]: {CHILDREN}\n" +
280	" <default>[*]: {CHILDREN}\n" +	280	" <default>[*]: {CHILDREN}\n" +
281	" X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}\n" +
282	" NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}\n" +	281	" NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}\n" +
283	" Y.java[-]: {MOVED_TO(NewY.java [in <default> [in src [in P]]])}\n" +	282	" NewY.java[+]: {MOVED_FROM(Y.java [in <default> [in src [in P]]])}\n" +
284	" NewY.java[+]: {MOVED_FROM(Y.java [in <default> [in src [in P]]])}"	283	" X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}\n" +
		284	" Y.java[-]: {MOVED_TO(NewY.java [in <default> [in src [in P]]])}"
285	);	285	);
286	}	286	}
287	/**	287	/**
Lines 333-340 Link Here
333	"P[*]: {CHILDREN}\n" +	333	"P[*]: {CHILDREN}\n" +
334	" src[*]: {CHILDREN}\n" +	334	" src[*]: {CHILDREN}\n" +
335	" <default>[*]: {CHILDREN}\n" +	335	" <default>[*]: {CHILDREN}\n" +
336	" X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}\n" +	336	" NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}\n" +
337	" NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}"	337	" X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}"
338	);	338	);
339	}	339	}
340	public void testRenameCUForce() throws CoreException {	340	public void testRenameCUForce() throws CoreException {
Lines 386-393 Link Here
386	"Unexpected deltas",	386	"Unexpected deltas",
387	"P[*]: {CHILDREN}\n" +	387	"P[*]: {CHILDREN}\n" +
388	" src[*]: {CHILDREN}\n" +	388	" src[*]: {CHILDREN}\n" +
389	" x.y.z[-]: {MOVED_TO(x.y [in src [in P]])}\n" +	389	" x.y[+]: {MOVED_FROM(x.y.z [in src [in P]])}\n" +
390	" x.y[+]: {MOVED_FROM(x.y.z [in src [in P]])}"	390	" x.y.z[-]: {MOVED_TO(x.y [in src [in P]])}"
391	);	391	);
392	}	392	}
393	/*	393	/*
Lines 468-475 Link Here
468	" <default>[*]: {CHILDREN}\n" +	468	" <default>[*]: {CHILDREN}\n" +
469	" X.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +	469	" X.java[*]: {CHILDREN \| FINE GRAINED \| PRIMARY RESOURCE}\n" +
470	" X[*]: {CHILDREN \| FINE GRAINED}\n" +	470	" X[*]: {CHILDREN \| FINE GRAINED}\n" +
471	" fred[+]: {}\n" +	471	" bar[-]: {}\n" +
472	" bar[-]: {}"	472	" fred[+]: {}"
473	);	473	);
474	ensureCorrectPositioning(type, type.getField("fred"), type.getField("other"));	474	ensureCorrectPositioning(type, type.getField("fred"), type.getField("other"));
475	}	475	}
Lines 730-737 Link Here
730	"Unexpected deltas",	730	"Unexpected deltas",
731	"P[*]: {CHILDREN}\n" +	731	"P[*]: {CHILDREN}\n" +
732	" src[*]: {CHILDREN}\n" +	732	" src[*]: {CHILDREN}\n" +
733	" x.y.z[-]: {MOVED_TO(x.y.newZ [in src [in P]])}\n" +	733	" x.y.newZ[+]: {MOVED_FROM(x.y.z [in src [in P]])}\n" +
734	" x.y.newZ[+]: {MOVED_FROM(x.y.z [in src [in P]])}"	734	" x.y.z[-]: {MOVED_TO(x.y.newZ [in src [in P]])}"
735	);	735	);
736	}	736	}
737	/*	737	/*

Lines 248-256 Link Here

(-)src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java (-5 / +5 lines)
248	assertDeltas(	248	assertDeltas(
249	"Unexpected delta (1)",	249	"Unexpected delta (1)",
250	"P2[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +	250	"P2[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +
		251	" src[+]: {}\n" +
251	" src1[*]: {REORDERED}\n" +	252	" src1[*]: {REORDERED}\n" +
252	" src2[*]: {REORDERED}\n" +	253	" src2[*]: {REORDERED}\n" +
253	" src[+]: {}\n" +
254	" ResourceDelta(/P2/.classpath)[*]"	254	" ResourceDelta(/P2/.classpath)[*]"
255	);	255	);
256	assertElementsEqual(	256	assertElementsEqual(
Lines 806-814 Link Here
806	" src[-]: {MOVED_TO(src [in P2])}\n" +	806	" src[-]: {MOVED_TO(src [in P2])}\n" +
807	" ResourceDelta(/P1/.classpath)[*]\n" +	807	" ResourceDelta(/P1/.classpath)[*]\n" +
808	"P2[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +	808	"P2[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +
		809	" src[+]: {MOVED_FROM(src [in P1])}\n" +
809	" src1[*]: {REORDERED}\n" +	810	" src1[*]: {REORDERED}\n" +
810	" src2[*]: {REORDERED}\n" +	811	" src2[*]: {REORDERED}\n" +
811	" src[+]: {MOVED_FROM(src [in P1])}\n" +
812	" ResourceDelta(/P2/.classpath)[*]"	812	" ResourceDelta(/P2/.classpath)[*]"
813	);	813	);
814	assertJavaProject(	814	assertJavaProject(
Lines 853-860 Link Here
853	" src[-]: {MOVED_TO(src [in P2])}\n" +	853	" src[-]: {MOVED_TO(src [in P2])}\n" +
854	" ResourceDelta(/P1/.classpath)[*]\n" +	854	" ResourceDelta(/P1/.classpath)[*]\n" +
855	"P2[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +	855	"P2[*]: {CHILDREN \| CLASSPATH CHANGED}\n" +
856	" src2[*]: {REORDERED}\n" +
857	" src[+]: {MOVED_FROM(src [in P1])}\n" +	856	" src[+]: {MOVED_FROM(src [in P1])}\n" +
		857	" src2[*]: {REORDERED}\n" +
858	" ResourceDelta(/P2/.classpath)[*]"	858	" ResourceDelta(/P2/.classpath)[*]"
859	);	859	);
860	assertJavaProject(	860	assertJavaProject(
Lines 1015-1023 Link Here
1015	assertDeltas(	1015	assertDeltas(
1016	"Unexpected delta",	1016	"Unexpected delta",
1017	"P[*]: {CHILDREN}\n" +	1017	"P[*]: {CHILDREN}\n" +
1018	" src1[-]: {MOVED_TO(src2 [in <project root> [in P]])}\n" +
1019	" <project root>[*]: {CHILDREN}\n" +	1018	" <project root>[*]: {CHILDREN}\n" +
1020	" src2[+]: {MOVED_FROM(<default> [in src1 [in P]])}"	1019	" src2[+]: {MOVED_FROM(<default> [in src1 [in P]])}\n" +
		1020	" src1[-]: {MOVED_TO(src2 [in <project root> [in P]])}"
1021	);	1021	);
1022	} finally {	1022	} finally {
1023	stopDeltas();	1023	stopDeltas();