Attachment 188762 Details for Bug 336686 – Corrected tests

[patch] Corrected tests

patch_62547_fix_test_1.txt (text/plain), 3.99 KB, created by Malgorzata Janczarska

on 2011-02-11 06:23:06 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Malgorzata Janczarska

Created: 2011-02-11 06:23:06 EST

Size: 3.99 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	11 Feb 2011 11:13:34 -0000
>@@ -13,7 +13,6 @@
> import java.io.ByteArrayInputStream;
> import java.io.File;
> import java.io.IOException;
>-import java.io.UnsupportedEncodingException;
> import java.util.ArrayList;
> import java.util.HashMap;
> import java.util.HashSet;
>@@ -30,6 +29,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 +357,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) {
>+				throw e;
>+			}
>+		}
> 		assertModificationState(project, null, true);
> 	}
> 	
>@@ -493,7 +500,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) {
>+				throw e;
>+			}
>+		}
> 		assertModificationState(project, null, true);
> 	}
> 	
>@@ -565,29 +579,19 @@
> 		assertModificationState(copy, null, true);
> 	}
> 
>-	public void testBug62547() throws TeamException, CoreException,
>-			UnsupportedEncodingException {
>+	public void testBug62547() throws TeamException, CoreException {
> 		IProject project = createProject("testBug62547Project", new String[] {
> 				"file1.txt", "file2.txt" });
> 
>-		project.getFile("file1.txt").setContents(
>-				new ByteArrayInputStream("Sample text 1".getBytes("UTF-8")),
>-				true, true, getMonitor());
>-		project.getFile("file2.txt").setContents(
>-				new ByteArrayInputStream("Sample text 2".getBytes("UTF-8")),
>-				true, true, getMonitor());
>-		long currentTime = System.currentTimeMillis();
>-		new File(project.getFile("file1.txt").getLocationURI())
>-				.setLastModified(currentTime);
>-		project.getFile("file1.txt").refreshLocal(1, getMonitor());
>+		setContentsAndEnsureModified(project.getFile("file1.txt"));
>+		setContentsAndEnsureModified(project.getFile("file2.txt"));
> 
>-		assertEquals(currentTime, project.getFile("file1.txt")
>+		File file2 = new File(project.getFile("file2.txt").getLocationURI());
>+		file2.setLastModified(project.getFile("file1.txt")
> 				.getLocalTimeStamp());
>-
>-		new File(project.getFile("file2.txt").getLocationURI())
>-				.setLastModified(currentTime);
> 		project.getFile("file2.txt").refreshLocal(1, getMonitor());
>-		assertEquals(currentTime, project.getFile("file2.txt")
>+		assertEquals(project.getFile("file1.txt")
>+				.getLocalTimeStamp(), project.getFile("file2.txt")
> 				.getLocalTimeStamp());
> 
> 		commitResources(project, new String[] { "file1.txt", "file2.txt" });

Actions: View | Diff

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