Attachment 188657 Details for Bug 336686 – Fix for tests

Fix for tests

patch_62547_fix_test.txt (text/plain), 2.69 KB, created by Malgorzata Janczarska

on 2011-02-10 03:50:20 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Malgorzata Janczarska

Created: 2011-02-10 03:50:20 EST

Size: 2.69 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.tests.cvs.core
>Index: src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java,v
>retrieving revision 1.25
>diff -u -r1.25 IsModifiedTests.java
>--- src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java	4 Feb 2011 11:13:17 -0000	1.25
>+++ src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java	9 Feb 2011 18:04:32 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Path;
> import org.eclipse.team.core.TeamException;
> import org.eclipse.team.internal.ccvs.core.CVSException;
>@@ -357,7 +358,14 @@
> 		project.getFile("folder2/a.txt").copy(project.getFile("folder1/a.txt").getFullPath(), false, DEFAULT_MONITOR);
> 		assertModificationState(project, new String[] {".", "folder2/", "folder2/a.txt"}, true);
> 		addResources(new IResource[] {project.getFile("folder2/a.txt")});
>-		commitProject(project);
>+		try {
>+			commitProject(project);
>+		} catch (CVSException e) {
>+			// Some CVS servers return info about resetting date
>+			if (e.getStatus().getSeverity() == IStatus.ERROR) {
>+				fail("Committing deleted and restored file failed", e);
>+			}
>+		}
> 		assertModificationState(project, null, true);
> 	}
> 	
>@@ -493,7 +501,14 @@
> 		project.getFolder("folder2/folder3/").copy(project.getFolder("folder1/folder3").getFullPath(), false, DEFAULT_MONITOR);
> 		assertModificationState(project, new String[] {".", "folder2/", "folder2/folder3/", "folder2/folder3/file.txt"}, true);
> 		addResources(new IResource[] {project.getFolder("folder2/folder3/")});
>-		commitProject(project);
>+		try {
>+			commitProject(project);
>+		} catch (CVSException e) {
>+			// Some CVS servers return info about resetting date
>+			if (e.getStatus().getSeverity() == IStatus.ERROR) {
>+				fail("Committing deleted and restored file failed", e);
>+			}
>+		}
> 		assertModificationState(project, null, true);
> 	}
> 	
>@@ -577,6 +592,8 @@
> 				new ByteArrayInputStream("Sample text 2".getBytes("UTF-8")),
> 				true, true, getMonitor());
> 		long currentTime = System.currentTimeMillis();
>+		// Decrease precision: java has greater precision than most file systems
>+		currentTime = currentTime - currentTime % 1000;
> 		new File(project.getFile("file1.txt").getLocationURI())
> 				.setLastModified(currentTime);
> 		project.getFile("file1.txt").refreshLocal(1, getMonitor());

Actions: View

Attachments on bug 336686: 188657 | 188762 | 188828 | 188829