diff options
| author | Michael Valenta | 2002-03-19 14:50:30 +0000 |
|---|---|---|
| committer | Michael Valenta | 2002-03-19 14:50:30 +0000 |
| commit | 54bcb2995720459dd4f61b12e902429ce7ea1d65 (patch) | |
| tree | 3c4164a4c073c9b2aaf9c1da2b958a3602736373 /tests | |
| parent | 7f5a41ebe25cdd9e91c3aba65fbf9383f4672382 (diff) | |
| download | eclipse.platform.team-54bcb2995720459dd4f61b12e902429ce7ea1d65.tar.gz eclipse.platform.team-54bcb2995720459dd4f61b12e902429ce7ea1d65.tar.xz eclipse.platform.team-54bcb2995720459dd4f61b12e902429ce7ea1d65.zip | |
*** empty log message ***
Diffstat (limited to 'tests')
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/SameResultEnv.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/SameResultEnv.java index 7690c44bb..b752ce956 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/SameResultEnv.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/SameResultEnv.java @@ -348,6 +348,8 @@ public final class SameResultEnv extends JUnitTestCase { */ private static void assertEquals(ICVSFile mFile1, ICVSFile mFile2) throws CVSException { + if (mFile1.getName().equals(".project")) return; + // Check the permissions on disk assertEquals(mFile1.isReadOnly(), mFile2.isReadOnly()); @@ -363,8 +365,8 @@ public final class SameResultEnv extends JUnitTestCase { in2.read(buffer2); in1.close(); in2.close(); - assertEquals(buffer1.length,buffer2.length); - assertEquals(new String(buffer1),new String(buffer2)); + assertEquals("Length differs for file " + mFile1.getName(), buffer1.length, buffer2.length); + assertEquals("Contents differs for file " + mFile1.getName(), new String(buffer1),new String(buffer2)); } catch (IOException e) { throw new CVSException("Error in TestCase"); } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java index d13746c42..621883f6d 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java @@ -18,7 +18,6 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.team.ccvs.core.*; import org.eclipse.team.ccvs.core.CVSTag; import org.eclipse.team.ccvs.core.ICVSResource; import org.eclipse.team.core.TeamException; @@ -26,7 +25,6 @@ import org.eclipse.team.core.sync.ILocalSyncElement; import org.eclipse.team.core.sync.IRemoteResource; import org.eclipse.team.core.sync.IRemoteSyncElement; import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Session; import org.eclipse.team.internal.ccvs.core.client.Update; import org.eclipse.team.internal.ccvs.core.resources.CVSRemoteSyncElement; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; @@ -283,7 +281,7 @@ public class SyncElementTest extends EclipseTest { JUnitTestCase.waitMsec(1500); // Wait so that timestamp of modified file differs from original appendText(file, "prefix\n", true); file = copy.getFile("folder1/a.txt"); - file.setContents(getRandomContents(), false, false, null); + file.setContents(new ByteArrayInputStream("Use a custom string to avoid intermitant errors!".getBytes()), false, false, null); getProvider(copy).checkin(new IResource[] {copy}, IResource.DEPTH_INFINITE, DEFAULT_MONITOR); // Make the same modifications to the original (We need to test both M and C!!!) |