### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core.tests.model
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.232
diff -u -r1.232 AbstractJavaModelTests.java
--- src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java	4 Mar 2009 09:31:10 -0000	1.232
+++ src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java	3 May 2009 08:22:55 -0000
@@ -1672,12 +1672,11 @@
 	 */
 	public void deleteResource(IResource resource) throws CoreException {
 		int retryCount = 0; // wait 1 minute at most
-		while (++retryCount <= 60) {
+		while (++retryCount <= 6) {
 			if (org.eclipse.jdt.core.tests.util.Util.delete(resource)) {
 				return;
-			} else {
-				System.gc();
 			}
+			System.gc();
 		}
 		throw new RuntimeException("Could not delete " + resource.getFullPath());
 	}
Index: src/org/eclipse/jdt/core/tests/model/ClasspathTests.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ClasspathTests.java,v
retrieving revision 1.198
diff -u -r1.198 ClasspathTests.java
--- src/org/eclipse/jdt/core/tests/model/ClasspathTests.java	28 Apr 2009 17:46:10 -0000	1.198
+++ src/org/eclipse/jdt/core/tests/model/ClasspathTests.java	3 May 2009 08:22:57 -0000
@@ -4182,13 +4182,15 @@
 	IJavaProject project = this.createJavaProject("P", new String[] {"src"}, "bin");
 	IClasspathEntry[] originalCP= project.getRawClasspath();
 
+	IFile classpathFile = null;
 	try {
 		IClasspathEntry newEntry= JavaCore.newSourceEntry(project.getProject().getFullPath().append("extra"));
 		IClasspathEntry[] newCP= new IClasspathEntry[originalCP.length + 1];
 		System.arraycopy(originalCP, 0 , newCP, 0, originalCP.length);
 		newCP[originalCP.length]= newEntry;
 		
-		org.eclipse.jdt.internal.core.util.Util.setReadOnly(getFile("/P/.classpath"), true);
+		classpathFile = getFile("/P/.classpath");
+		org.eclipse.jdt.internal.core.util.Util.setReadOnly(classpathFile, true);
 		JavaModelException expected = null;
 		try {
 			project.setRawClasspath(newCP, null);
@@ -4198,6 +4200,9 @@
 		assertExceptionEquals("Unexpected exception", "File /P/.classpath is read-only.", expected);
 	} finally {
 		// cleanup
+		if (classpathFile != null) {
+			org.eclipse.jdt.internal.core.util.Util.setReadOnly(classpathFile, false);
+		}
 		this.deleteProject("P");
 	}
 }