Attachment #193699 for bug #341073





	private boolean isDerivedEncodingStoredSeparately(IProject project) {
		org.osgi.service.prefs.Preferences node = Platform.getPreferencesService().getRootNode().node(ProjectScope.SCOPE);
		String projectName = project.getName();
		try {
			if (!node.nodeExists(projectName))
				return false;

				verifier.addExpectedChange(b1, IResourceDelta.CHANGED, IResourceDelta.DERIVED_CHANGED);
				b1.setDerived(true, getMonitor());
				verifier.waitForEvent(10000);
			} catch (CoreException e) {
				fail("0.1", e);
			}
			IFile regularPrefs = getResourcesPreferenceFile(project1, false);
			IFile derivedPrefs = getResourcesPreferenceFile(project1, true);

			assertDoesNotExistInWorkspace("2.4", derivedPrefs);

			//3 - setting derived == 'true' for file
			verifier.reset();
			verifier.addExpectedChange(a, IResourceDelta.CHANGED, IResourceDelta.DERIVED_CHANGED);
			backgroundVerifier.reset();
			backgroundVerifier.addExpectedChange(regularPrefs, IResourceDelta.CHANGED, IResourceDelta.CONTENT);
			backgroundVerifier.addExpectedChange(derivedPrefs, IResourceDelta.ADDED, 0);
			try {
				a.setDerived(true, getMonitor());
			} catch (CoreException e) {
				fail("3.0", e);
			}
			//wait for all resource deltas
			try {
				Thread.sleep(5000);
			} catch (InterruptedException e) {
				fail("3.0.1", e);
			}
			assertExistsInWorkspace("3.1", regularPrefs);
			assertExistsInWorkspace("3.2", derivedPrefs);
			assertTrue("3.3", derivedPrefs.isDerived());

			//4 - setting derived == 'false' for file
			verifier.reset();
			verifier.addExpectedChange(a, IResourceDelta.CHANGED, IResourceDelta.DERIVED_CHANGED);
			backgroundVerifier.reset();
			backgroundVerifier.addExpectedChange(regularPrefs, IResourceDelta.CHANGED, IResourceDelta.CONTENT);
			backgroundVerifier.addExpectedChange(derivedPrefs, IResourceDelta.REMOVED, 0);
			try {
				a.setDerived(false, getMonitor());
			} catch (CoreException e) {
				fail("4.0", e);
			}
			//wait for all resource deltas
			try {
				Thread.sleep(5000);
			} catch (InterruptedException e) {
				fail("4.0.1", e);
			}
			assertExistsInWorkspace("4.1", regularPrefs);
			assertDoesNotExistInWorkspace("4.2", derivedPrefs);

			//5 - moving file to derived folder
			IFile source = project1.getFolder("a1").getFile("a.txt");

			} catch (CoreException e) {
				fail("5.0", e);
			}
			assertTrue("5.1", backgroundVerifier.waitForEvent(10000));
			assertTrue("5.2 " + backgroundVerifier.getMessage(), backgroundVerifier.isDeltaValid());
			assertExistsInWorkspace("5.3", regularPrefs);
			assertExistsInWorkspace("5.4", derivedPrefs);

Return to bug 341073

Lines 210-216 Link Here

(-)src/org/eclipse/core/tests/resources/CharsetTest.java (-27 / +21 lines)
210		210
211	private boolean isDerivedEncodingStoredSeparately(IProject project) {	211	private boolean isDerivedEncodingStoredSeparately(IProject project) {
212	org.osgi.service.prefs.Preferences node = Platform.getPreferencesService().getRootNode().node(ProjectScope.SCOPE);	212	org.osgi.service.prefs.Preferences node = Platform.getPreferencesService().getRootNode().node(ProjectScope.SCOPE);
213	String projectName = (project).getName();	213	String projectName = project.getName();
214	try {	214	try {
215	if (!node.nodeExists(projectName))	215	if (!node.nodeExists(projectName))
216	return false;	216	return false;
Lines 483-490 Link Here
483	verifier.addExpectedChange(b1, IResourceDelta.CHANGED, IResourceDelta.DERIVED_CHANGED);	483	verifier.addExpectedChange(b1, IResourceDelta.CHANGED, IResourceDelta.DERIVED_CHANGED);
484	b1.setDerived(true, getMonitor());	484	b1.setDerived(true, getMonitor());
485	verifier.waitForEvent(10000);	485	verifier.waitForEvent(10000);
486	} catch (CoreException e2) {	486	} catch (CoreException e) {
487	fail("0.1", e2);	487	fail("0.1", e);
488	}	488	}
489	IFile regularPrefs = getResourcesPreferenceFile(project1, false);	489	IFile regularPrefs = getResourcesPreferenceFile(project1, false);
490	IFile derivedPrefs = getResourcesPreferenceFile(project1, true);	490	IFile derivedPrefs = getResourcesPreferenceFile(project1, true);
Lines 517-557 Link Here
517	assertDoesNotExistInWorkspace("2.4", derivedPrefs);	517	assertDoesNotExistInWorkspace("2.4", derivedPrefs);
518		518
519	//3 - setting derived == 'true' for file	519	//3 - setting derived == 'true' for file
520	verifier.reset();
521	verifier.addExpectedChange(a, IResourceDelta.CHANGED, IResourceDelta.DERIVED_CHANGED);
522	backgroundVerifier.reset();
523	backgroundVerifier.addExpectedChange(regularPrefs, IResourceDelta.CHANGED, IResourceDelta.CONTENT);
524	backgroundVerifier.addExpectedChange(derivedPrefs, IResourceDelta.ADDED, 0);
525	try {	520	try {
526	a.setDerived(true, getMonitor());	521	a.setDerived(true, getMonitor());
527	} catch (CoreException e) {	522	} catch (CoreException e) {
528	fail("3.0", e);	523	fail("3.0", e);
529	}	524	}
530	assertTrue("3.1.1", verifier.waitForEvent(10000));	525	//wait for all resource deltas
531	assertTrue("3.1.2.1", backgroundVerifier.waitForEvent(10000));	526	try {
532	assertTrue("3.2.1 " + verifier.getMessage(), verifier.isDeltaValid());	527	Thread.sleep(5000);
533	assertTrue("3.2.2 " + backgroundVerifier.getMessage(), backgroundVerifier.isDeltaValid());	528	} catch (InterruptedException e) {
534	assertExistsInWorkspace("3.3", regularPrefs);	529	fail("3.0.1", e);
535	assertExistsInWorkspace("3.4", derivedPrefs);	530	}
536	assertTrue("3.5", derivedPrefs.isDerived());	531	assertExistsInWorkspace("3.1", regularPrefs);
		532	assertExistsInWorkspace("3.2", derivedPrefs);
		533	assertTrue("3.3", derivedPrefs.isDerived());
537		534
538	//4 - setting derived == 'false' for file	535	//4 - setting derived == 'false' for file
539	verifier.reset();
540	verifier.addExpectedChange(a, IResourceDelta.CHANGED, IResourceDelta.DERIVED_CHANGED);
541	backgroundVerifier.reset();
542	backgroundVerifier.addExpectedChange(regularPrefs, IResourceDelta.CHANGED, IResourceDelta.CONTENT);
543	backgroundVerifier.addExpectedChange(derivedPrefs, IResourceDelta.REMOVED, 0);
544	try {	536	try {
545	a.setDerived(false, getMonitor());	537	a.setDerived(false, getMonitor());
546	} catch (CoreException e) {	538	} catch (CoreException e) {
547	fail("4.0", e);	539	fail("4.0", e);
548	}	540	}
549	assertTrue("4.1.1", verifier.waitForEvent(10000));	541	//wait for all resource deltas
550	assertTrue("4.1.2", backgroundVerifier.waitForEvent(10000));	542	try {
551	assertTrue("4.2.1 " + verifier.getMessage(), verifier.isDeltaValid());	543	Thread.sleep(5000);
552	assertTrue("4.2.2 " + backgroundVerifier.getMessage(), backgroundVerifier.isDeltaValid());	544	} catch (InterruptedException e) {
553	assertExistsInWorkspace("4.3", regularPrefs);	545	fail("4.0.1", e);
554	assertDoesNotExistInWorkspace("4.4", derivedPrefs);	546	}
		547	assertExistsInWorkspace("4.1", regularPrefs);
		548	assertDoesNotExistInWorkspace("4.2", derivedPrefs);
555		549
556	//5 - moving file to derived folder	550	//5 - moving file to derived folder
557	IFile source = project1.getFolder("a1").getFile("a.txt");	551	IFile source = project1.getFolder("a1").getFile("a.txt");
Lines 565-571 Link Here
565	} catch (CoreException e) {	559	} catch (CoreException e) {
566	fail("5.0", e);	560	fail("5.0", e);
567	}	561	}
568	assertTrue("5.1.1", backgroundVerifier.waitForEvent(10000));	562	assertTrue("5.1", backgroundVerifier.waitForEvent(10000));
569	assertTrue("5.2 " + backgroundVerifier.getMessage(), backgroundVerifier.isDeltaValid());	563	assertTrue("5.2 " + backgroundVerifier.getMessage(), backgroundVerifier.isDeltaValid());
570	assertExistsInWorkspace("5.3", regularPrefs);	564	assertExistsInWorkspace("5.3", regularPrefs);
571	assertExistsInWorkspace("5.4", derivedPrefs);	565	assertExistsInWorkspace("5.4", derivedPrefs);