Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-03-01 16:35:26 -0500
committerMichael Valenta2002-03-01 16:35:26 -0500
commit176cecc4397e3b9175d7ac255dd8e0a3cf422cc3 (patch)
tree75b2c6de28ba49594c648233ec4bc83032669490
parent7d517e6ffe0c8e3e1ce863c114e98f195153350d (diff)
downloadeclipse.platform.team-176cecc4397e3b9175d7ac255dd8e0a3cf422cc3.tar.gz
eclipse.platform.team-176cecc4397e3b9175d7ac255dd8e0a3cf422cc3.tar.xz
eclipse.platform.team-176cecc4397e3b9175d7ac255dd8e0a3cf422cc3.zip
FIxed bug in test cases testDeletionConflicts
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java4
1 files changed, 3 insertions, 1 deletions
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 68922d9ac..507ea68fc 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
@@ -431,7 +431,7 @@ public class SyncElementTest extends EclipseTest {
// Create a test project (which commits it as well) and delete the resource without committing
IProject project = createProject("testDeletionConflictsA", new String[] { "delete1.txt", "delete2.txt", "delete3.txt", "delete4.txt", "delete5.txt"});
- IFile file = project.getFile("delete1.txt");
+ IFile file = project.getFile("delete1.txt"); // WARNING: This does a "cvs remove"!!!
file.delete(false, DEFAULT_MONITOR);
deleteResources(project, new String[] {"delete2.txt"}, false);
file = project.getFile("delete3.txt");
@@ -465,6 +465,8 @@ public class SyncElementTest extends EclipseTest {
IRemoteSyncElement.IN_SYNC });
// Catch up to remote changes.
+ // XXX SPECIAL CASE: delete1.txt must be unmanaged before the catch-up
+ makeIncoming(tree, new String[] {"delete1.txt"});
// XXX SPECIAL CASE: delete2.txt must be unmanaged before the catch-up
makeIncoming(tree, new String[] {"delete2.txt"});
// XXX SPECIAL CASE: delete3.txt must ignore local changes (and -C doesn't work so we'll unmanage and delete the local resource)

Back to the top