Attachment 193699 Details for Bug 341073 – Patch v.0.1

[patch] Patch v.0.1

patch341073.txt (text/plain), 4.27 KB, created by Szymon Ptaszkiewicz

on 2011-04-20 09:57:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Ptaszkiewicz

Created: 2011-04-20 09:57:34 EDT

Size: 4.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.tests.resources
>Index: src/org/eclipse/core/tests/resources/CharsetTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java,v
>retrieving revision 1.39
>diff -u -r1.39 CharsetTest.java
>--- src/org/eclipse/core/tests/resources/CharsetTest.java	31 Mar 2011 10:40:49 -0000	1.39
>+++ src/org/eclipse/core/tests/resources/CharsetTest.java	20 Apr 2011 13:52:59 -0000
>@@ -210,7 +210,7 @@
> 
> 	private boolean isDerivedEncodingStoredSeparately(IProject project) {
> 		org.osgi.service.prefs.Preferences node = Platform.getPreferencesService().getRootNode().node(ProjectScope.SCOPE);
>-		String projectName = (project).getName();
>+		String projectName = project.getName();
> 		try {
> 			if (!node.nodeExists(projectName))
> 				return false;
>@@ -483,8 +483,8 @@
> 				verifier.addExpectedChange(b1, IResourceDelta.CHANGED, IResourceDelta.DERIVED_CHANGED);
> 				b1.setDerived(true, getMonitor());
> 				verifier.waitForEvent(10000);
>-			} catch (CoreException e2) {
>-				fail("0.1", e2);
>+			} catch (CoreException e) {
>+				fail("0.1", e);
> 			}
> 			IFile regularPrefs = getResourcesPreferenceFile(project1, false);
> 			IFile derivedPrefs = getResourcesPreferenceFile(project1, true);
>@@ -517,41 +517,35 @@
> 			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);
> 			}
>-			assertTrue("3.1.1", verifier.waitForEvent(10000));
>-			assertTrue("3.1.2.1", backgroundVerifier.waitForEvent(10000));
>-			assertTrue("3.2.1 " + verifier.getMessage(), verifier.isDeltaValid());
>-			assertTrue("3.2.2 " + backgroundVerifier.getMessage(), backgroundVerifier.isDeltaValid());
>-			assertExistsInWorkspace("3.3", regularPrefs);
>-			assertExistsInWorkspace("3.4", derivedPrefs);
>-			assertTrue("3.5", derivedPrefs.isDerived());
>+			//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);
> 			}
>-			assertTrue("4.1.1", verifier.waitForEvent(10000));
>-			assertTrue("4.1.2", backgroundVerifier.waitForEvent(10000));
>-			assertTrue("4.2.1 " + verifier.getMessage(), verifier.isDeltaValid());
>-			assertTrue("4.2.2 " + backgroundVerifier.getMessage(), backgroundVerifier.isDeltaValid());
>-			assertExistsInWorkspace("4.3", regularPrefs);
>-			assertDoesNotExistInWorkspace("4.4", derivedPrefs);
>+			//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");
>@@ -565,7 +559,7 @@
> 			} catch (CoreException e) {
> 				fail("5.0", e);
> 			}
>-			assertTrue("5.1.1", backgroundVerifier.waitForEvent(10000));
>+			assertTrue("5.1", backgroundVerifier.waitForEvent(10000));
> 			assertTrue("5.2 " + backgroundVerifier.getMessage(), backgroundVerifier.isDeltaValid());
> 			assertExistsInWorkspace("5.3", regularPrefs);
> 			assertExistsInWorkspace("5.4", derivedPrefs);

Actions: View | Diff

Attachments on bug 341073: 193699 | 195214