Bug 576097 - Remove special CVS handling from API tests

Change-Id: Ie158332d9ada18dd5ccf056a53c8b7a790cf6965
Signed-off-by: Lars Vogel <[email protected]>
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.ui/+/188324
Tested-by: PDE Bot <[email protected]>
Reviewed-by: Alexander Kurtakov <[email protected]>

Author: vogella

apitools/org.eclipse.pde.api.tools.tests/API Tools Plugin Test Suite.launch

@@ -257,12 +257,6 @@
 <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
 <mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
 <mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>

apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiBuilderTest.java

@@ -25,7 +25,6 @@
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
@@ -327,7 +326,7 @@ protected void createExistingProjects(String projectsdir, boolean buildimmediate
 		assertTrue("Test data directory does not exist: " + path.toOSString(), dir.exists()); //$NON-NLS-1$
 		File[] files = dir.listFiles();
 		for (File file : files) {
-			if (file.isDirectory() && !file.getName().equals("CVS")) { //$NON-NLS-1$
+			if (file.isDirectory()) {
 				createExistingProject(file, importfiles, usetestcompliance);
 			}
 		}
@@ -412,11 +411,7 @@ protected void createExistingProject(File projectDir, boolean importfiles, boole
 			// import operation to import project files
 			File importSource = new File(locationURI);
 			List<?> filesToImport = FileSystemStructureProvider.INSTANCE.getChildren(importSource);
-			for (Iterator<?> iterator = filesToImport.iterator(); iterator.hasNext();) {
-				if (((File) iterator.next()).getName().equals("CVS")) { //$NON-NLS-1$
-					iterator.remove();
-				}
-			}
+
 			ImportOperation operation = new ImportOperation(project.getFullPath(), importSource, FileSystemStructureProvider.INSTANCE, pathString -> IOverwriteQuery.ALL, filesToImport);
 			operation.setOverwriteResources(true);
 			operation.setCreateContainerStructure(false);

apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/model/tests/TestSuiteHelper.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2017 IBM Corporation and others.
+ * Copyright (c) 2007, 2021 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -339,14 +339,11 @@ public static IApiBaseline createTestingBaseline(String baselineid, IPath testDi
 			List<IApiComponent> components = new ArrayList<>();
 			Set<String> requiredComponents = new HashSet<>();
 			for (File bundle : files) {
-				if (!bundle.getName().equals("CVS")) { //$NON-NLS-1$
-					// ignore CVS folder
 					IApiComponent component = ApiModelFactory.newApiComponent(baseline, bundle.getAbsolutePath());
 					if (component != null) {
 						components.add(component);
 						requiredComponents.add(component.getSymbolicName());
 					}
-				}
 			}
 			// collect required components
 			IApiComponent[] base = components.toArray(new IApiComponent[components.size()]);
@@ -644,17 +641,10 @@ public static void copy(File file, File dest) {
 	private static void copy0(File f, File dest) {
 		dest.mkdirs();
 		if (f.isDirectory()) {
-			String dirName = f.getName();
-			if ("CVS".equals(dirName)) { //$NON-NLS-1$
-				return;
-			}
 			File[] files = f.listFiles();
 			for (File file : files) {
 				if (file.isDirectory()) {
 					String name = file.getName();
-					if ("CVS".equals(name)) { //$NON-NLS-1$
-						continue;
-					}
 					copy0(new File(f, name), new File(dest, name));
 				} else {
 					copy0(file, dest);

apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/util/tests/UtilTests.java

@@ -485,7 +485,6 @@ public IReferenceCollection getExternalDependencies() {
 				"org.eclipse.ecf.provider.filetransfer", //$NON-NLS-1$
 				"org.eclipse.equinox.preferences", //$NON-NLS-1$
 				"org.eclipse.equinox.p2.reconciler.dropins", //$NON-NLS-1$
-				"org.eclipse.team.cvs.ui", //$NON-NLS-1$
 				"org.eclipse.equinox.p2.metadata.generator", //$NON-NLS-1$
 				"org.eclipse.equinox.registry", //$NON-NLS-1$
 				"org.eclipse.swt", //$NON-NLS-1$
@@ -530,7 +529,6 @@ public IReferenceCollection getExternalDependencies() {
 				"org.eclipse.core.resources", //$NON-NLS-1$
 				"org.eclipse.pde.launching", //$NON-NLS-1$
 				"org.eclipse.ui.externaltools", //$NON-NLS-1$
-				"org.eclipse.cvs", //$NON-NLS-1$
 				"org.eclipse.equinox.p2.repository", //$NON-NLS-1$
 				"org.eclipse.core.resources.win32.x86", //$NON-NLS-1$
 				"org.eclipse.pde.ui", //$NON-NLS-1$
@@ -575,7 +573,6 @@ public IReferenceCollection getExternalDependencies() {
 				"org.eclipse.core.filesystem", //$NON-NLS-1$
 				"org.eclipse.jdt.junit.core", //$NON-NLS-1$
 				"org.eclipse.jdt.junit.runtime", //$NON-NLS-1$
-				"org.eclipse.team.cvs.ssh2", //$NON-NLS-1$
 				"org.eclipse.core.variables", //$NON-NLS-1$
 				"org.eclipse.platform.doc.user", //$NON-NLS-1$
 				"org.eclipse.equinox.p2.operations", //$NON-NLS-1$
@@ -585,7 +582,6 @@ public IReferenceCollection getExternalDependencies() {
 				"org.eclipse.equinox.p2.metadata.repository", //$NON-NLS-1$
 				"org.eclipse.pde.ds.core", //$NON-NLS-1$
 				"org.eclipse.jdt.apt.pluggable.core", //$NON-NLS-1$
-				"org.eclipse.team.cvs.core", //$NON-NLS-1$
 				"org.mortbay.jetty.server", //$NON-NLS-1$
 				"org.eclipse.text", //$NON-NLS-1$
 				"org.eclipse.jdt.compiler.apt", //$NON-NLS-1$