13098: Error 'override and update' on outgoing folder deletion

- includes refactoring of ICVSFolder getFiles() and getFolders()
to be a single members(int flags) method

2 files changed, 14 insertions, 33 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 07e8b9010..5befa8e8c 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
@@ -295,14 +295,14 @@ public class EclipseTest extends EclipseWorkspaceTest {
 	protected void assertEquals(IPath parent, ICVSFolder container1, ICVSFolder container2, boolean includeTimestamps, boolean includeTags) throws CoreException, CVSException, IOException {
 		IPath path = parent.append(container1.getName());
 		assertEquals(path, container1.getFolderSyncInfo(), container2.getFolderSyncInfo(), includeTags);
-		assertTrue("The numder of folders in " + path.toString() + " differs", container1.getFolders().length == container2.getFolders().length);
-		assertTrue("The numder of files in " + path.toString() + " differs", container1.getFiles().length == container2.getFiles().length);
-		ICVSFolder[] folders = container1.getFolders();
-		for (int i= 0;i <folders.length;i++)
-			assertEquals(path, folders[i], container2.getFolder(folders[i].getName()), includeTimestamps, includeTags);
-		ICVSFile[] files = container1.getFiles();
-		for (int i= 0;i <files.length;i++)
-			assertEquals(path, files[i], container2.getFile(files[i].getName()), includeTimestamps, 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);
+		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/compatible/SameResultEnv.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/SameResultEnv.java
index 4fc56c29a..79bffdf5b 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
@@ -447,38 +447,19 @@ public final class SameResultEnv extends JUnitTestCase {
 			assertEquals(mFolder1.getFolderSyncInfo().getTag(),mFolder2.getFolderSyncInfo().getTag());
 		}
 		
-		ICVSResource[] resourceList1;
-		ICVSResource[] resourceList2;
-		boolean fileFound;
-		
-		resourceList1 = mFolder1.getFiles();
-		resourceList2 = mFolder2.getFiles();
-		assertEquals(resourceList1.length,resourceList2.length);
-		for (int i=0; i<resourceList1.length; i++) {
-			fileFound = false;
-			for (int j=0; j<resourceList2.length; j++) {
-				if (resourceList1[i].getName().equals(resourceList2[j].getName())) {
-					assertEquals(resourceList1[i], resourceList2[j]);
-					fileFound = true;
-					break;
-				}
-			}
-			assertTrue("File " + resourceList1[i].getName() + " not found in the list",fileFound);
-		}
-		
-		resourceList1 = mFolder1.getFolders();
-		resourceList2 = mFolder2.getFolders();
-		assertEquals(resourceList1.length,resourceList2.length);
+		ICVSResource[] resourceList1 = mFolder1.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.FOLDER_MEMBERS);
+		ICVSResource[] resourceList2 = mFolder2.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.FOLDER_MEMBERS);
+		assertEquals(resourceList1.length, resourceList2.length);
 		for (int i=0; i<resourceList1.length; i++) {
-			fileFound = false;
+			boolean resourceFound = false;
 			for (int j=0; j<resourceList2.length; j++) {
 				if (resourceList1[i].getName().equals(resourceList2[j].getName())) {
 					assertEquals(resourceList1[i], resourceList2[j]);
-					fileFound = true;
+					resourceFound = true;
 					break;
 				}
 			}
-			assertTrue("Folder " + resourceList1[i].getName() + " not found in the list",fileFound);
+			assertTrue("Resource " + resourceList1[i].getName() + " not found in the list",resourceFound);
 		}
 	}