Bug 576097 - Investigate removing CVS dependency in PDE
Fix P2Tests.
Change-Id: Ib71b3bb6fe5a53694393b581b3b5c9f4204f7821
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.build/+/188735
Tested-by: PDE Bot <pde-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
index 5da1589..6bbbea1 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
@@ -541,7 +541,7 @@
IFolder repo = Utils.createFolder(buildFolder, "repo");
String repoLocation = "file:" + repo.getLocation().toOSString();
- Utils.generateFeature(buildFolder, "F", new String[] { "org.eclipse.cvs" }, null);
+ Utils.generateFeature(buildFolder, "F", new String[] { "org.eclipse.tips.feature" }, null);
Properties properties = BuildConfiguration.getBuilderProperties(buildFolder);
properties.put("topLevelElementId", "F");
properties.put("generate.p2.metadata", "true");
@@ -553,12 +553,12 @@
runBuild(buildFolder);
IMetadataRepository metadata = loadMetadataRepository(repoLocation);
- IInstallableUnit iu = getIU(metadata, "org.eclipse.cvs");
+ IInstallableUnit iu = getIU(metadata, "org.eclipse.tips.core");
assertNotNull(iu);
// bug 289866
StringBuffer buffer = new StringBuffer();
- buffer.append("pack.excludes=plugins/org.eclipse.cvs_" + iu.getVersion() + ".jar\n");
+ buffer.append("pack.excludes=plugins/org.eclipse.tips.feature_" + iu.getVersion() + ".jar\n");
Utils.writeBuffer(repo.getFile("pack.properties"), buffer);
assertResourceFile(buildFolder, "repo/artifacts.xml");
@@ -596,7 +596,7 @@
for (IArtifactKey key : keys) {
IArtifactDescriptor[] descriptors = repository.getArtifactDescriptors(key);
- if (key.getClassifier().equals("osgi.bundle") && key.getId().equals("org.eclipse.cvs")) {
+ if (key.getClassifier().equals("osgi.bundle") && key.getId().equals("org.eclipse.tips.feature")) {
assertEquals(descriptors.length, 1);
continue;
}
