Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Valenta2002-09-06 19:22:09 +0000
committerMichael Valenta2002-09-06 19:22:09 +0000
commit94b8b1790c9bf2ff24bb9f6b795b5d3a442e790e (patch)
tree303bbc57d91bc513e9fcd127f9e7464825a1cb63 /tests
parentc56a50c5387d5ade821da80f8166a5343a6a788e (diff)
downloadeclipse.platform.team-94b8b1790c9bf2ff24bb9f6b795b5d3a442e790e.tar.gz
eclipse.platform.team-94b8b1790c9bf2ff24bb9f6b795b5d3a442e790e.tar.xz
eclipse.platform.team-94b8b1790c9bf2ff24bb9f6b795b5d3a442e790e.zip
23232: [CVS Core] Performance problem related to empty directories
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java6
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/SyncElementTest.java14
2 files changed, 11 insertions, 9 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
index a3b9735b9..116f7b9cb 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
@@ -294,9 +294,9 @@ public class EclipseTest extends EclipseWorkspaceTest {
IPath path = parent.append(container1.getName());
assertEquals(path, container1.getFolderSyncInfo(), container2.getFolderSyncInfo(), includeTags);
assertTrue("The number of resource in " + path.toString() + " differs",
- container1.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.FOLDER_MEMBERS).length
- == container2.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.FOLDER_MEMBERS).length);
- ICVSResource[] resources = container1.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.FOLDER_MEMBERS);
+ container1.members(ICVSFolder.ALL_EXISTING_MEMBERS).length
+ == container2.members(ICVSFolder.ALL_EXISTING_MEMBERS).length);
+ ICVSResource[] resources = container1.members(ICVSFolder.ALL_EXISTING_MEMBERS);
for (int i= 0;i <resources.length;i++) {
assertEquals(path, resources[i], container2.getChild(resources[i].getName()), includeTimestamps, includeTags);
}
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 cfb2823d7..640420346 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
@@ -119,7 +119,9 @@ public class SyncElementTest extends EclipseTest {
public void assertDeleted(String message, IRemoteSyncElement tree, String[] resources) throws CoreException, TeamException {
for (int i=0;i<resources.length;i++) {
try {
- getChild(tree, new Path(resources[i]));
+ ILocalSyncElement element = getChild(tree, new Path(resources[i]));
+ if (! element.getLocal().exists())
+ break;
} catch (AssertionFailedError e) {
break;
}
@@ -821,13 +823,13 @@ public class SyncElementTest extends EclipseTest {
ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor(project.getFolder("folder1"));
assertTrue("Deleted folder not in proper state", ! folder.exists() && folder.isManaged());
- // The folders and files should show up as outgoing deletions
+ // The files should show up as outgoing deletions
IRemoteSyncElement tree = CVSWorkspaceRoot.getRemoteSyncTree(project, CVSTag.DEFAULT, DEFAULT_MONITOR);
assertSyncEquals("testFolderDeletion sync check", tree,
new String[] { "folder1", "folder1/a.txt", "folder1/folder2", "folder1/folder2/file.txt"},
- new int[] { IRemoteSyncElement.OUTGOING | IRemoteSyncElement.DELETION,
- IRemoteSyncElement.OUTGOING | IRemoteSyncElement.DELETION,
+ new int[] { IRemoteSyncElement.IN_SYNC,
IRemoteSyncElement.OUTGOING | IRemoteSyncElement.DELETION,
+ IRemoteSyncElement.IN_SYNC,
IRemoteSyncElement.OUTGOING | IRemoteSyncElement.DELETION});
// commit folder1/a.txt
@@ -837,8 +839,8 @@ public class SyncElementTest extends EclipseTest {
tree = CVSWorkspaceRoot.getRemoteSyncTree(project, CVSTag.DEFAULT, DEFAULT_MONITOR);
assertSyncEquals("testFolderDeletion sync check", tree,
new String[] { "folder1", "folder1/folder2", "folder1/folder2/file.txt"},
- new int[] { IRemoteSyncElement.OUTGOING | IRemoteSyncElement.DELETION,
- IRemoteSyncElement.OUTGOING | IRemoteSyncElement.DELETION,
+ new int[] { IRemoteSyncElement.IN_SYNC,
+ IRemoteSyncElement.IN_SYNC,
IRemoteSyncElement.OUTGOING | IRemoteSyncElement.DELETION});
assertDeleted("testFolderDeletion", tree, new String[] {"folder1/a.txt"});

Back to the top