View | Details | Raw Unified | Return to bug 274332 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java (-3 / +2 lines)
Lines 1672-1683 Link Here
1672
	 */
1672
	 */
1673
	public void deleteResource(IResource resource) throws CoreException {
1673
	public void deleteResource(IResource resource) throws CoreException {
1674
		int retryCount = 0; // wait 1 minute at most
1674
		int retryCount = 0; // wait 1 minute at most
1675
		while (++retryCount <= 60) {
1675
		while (++retryCount <= 6) {
1676
			if (org.eclipse.jdt.core.tests.util.Util.delete(resource)) {
1676
			if (org.eclipse.jdt.core.tests.util.Util.delete(resource)) {
1677
				return;
1677
				return;
1678
			} else {
1679
				System.gc();
1680
			}
1678
			}
1679
			System.gc();
1681
		}
1680
		}
1682
		throw new RuntimeException("Could not delete " + resource.getFullPath());
1681
		throw new RuntimeException("Could not delete " + resource.getFullPath());
1683
	}
1682
	}
(-)src/org/eclipse/jdt/core/tests/model/ClasspathTests.java (-1 / +6 lines)
Lines 4182-4194 Link Here
4182
	IJavaProject project = this.createJavaProject("P", new String[] {"src"}, "bin");
4182
	IJavaProject project = this.createJavaProject("P", new String[] {"src"}, "bin");
4183
	IClasspathEntry[] originalCP= project.getRawClasspath();
4183
	IClasspathEntry[] originalCP= project.getRawClasspath();
4184
4184
4185
	IFile classpathFile = null;
4185
	try {
4186
	try {
4186
		IClasspathEntry newEntry= JavaCore.newSourceEntry(project.getProject().getFullPath().append("extra"));
4187
		IClasspathEntry newEntry= JavaCore.newSourceEntry(project.getProject().getFullPath().append("extra"));
4187
		IClasspathEntry[] newCP= new IClasspathEntry[originalCP.length + 1];
4188
		IClasspathEntry[] newCP= new IClasspathEntry[originalCP.length + 1];
4188
		System.arraycopy(originalCP, 0 , newCP, 0, originalCP.length);
4189
		System.arraycopy(originalCP, 0 , newCP, 0, originalCP.length);
4189
		newCP[originalCP.length]= newEntry;
4190
		newCP[originalCP.length]= newEntry;
4190
		
4191
		
4191
		org.eclipse.jdt.internal.core.util.Util.setReadOnly(getFile("/P/.classpath"), true);
4192
		classpathFile = getFile("/P/.classpath");
4193
		org.eclipse.jdt.internal.core.util.Util.setReadOnly(classpathFile, true);
4192
		JavaModelException expected = null;
4194
		JavaModelException expected = null;
4193
		try {
4195
		try {
4194
			project.setRawClasspath(newCP, null);
4196
			project.setRawClasspath(newCP, null);
Lines 4198-4203 Link Here
4198
		assertExceptionEquals("Unexpected exception", "File /P/.classpath is read-only.", expected);
4200
		assertExceptionEquals("Unexpected exception", "File /P/.classpath is read-only.", expected);
4199
	} finally {
4201
	} finally {
4200
		// cleanup
4202
		// cleanup
4203
		if (classpathFile != null) {
4204
			org.eclipse.jdt.internal.core.util.Util.setReadOnly(classpathFile, false);
4205
		}
4201
		this.deleteProject("P");
4206
		this.deleteProject("P");
4202
	}
4207
	}
4203
}
4208
}

Return to bug 274332