Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2010-02-17 01:02:31 +0000
committerPascal Rapicault2010-02-17 01:02:31 +0000
commit001e375cbb133f08d1f419f8837514458a8aa39e (patch)
treeeb0b2d591bfe31b9b0c6581dc38fb64765522540 /bundles/org.eclipse.equinox.p2.tests
parent04bf644b7baa6f90dc9259bae309bec9a764226d (diff)
downloadrt.equinox.p2-001e375cbb133f08d1f419f8837514458a8aa39e.tar.gz
rt.equinox.p2-001e375cbb133f08d1f419f8837514458a8aa39e.tar.xz
rt.equinox.p2-001e375cbb133f08d1f419f8837514458a8aa39e.zip
Bug 302582 - [planner] P2 does not pick up higher version of already installed plug-in from dropins
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AllTests.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug302582d.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug300104bis.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/bug302582d/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1264604331453.profile.gz (renamed from bundles/org.eclipse.equinox.p2.tests/testData/bug300104bis/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1264604331453.profile.gz)bin4637813 -> 4637813 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/bug302582d/repo/content.xml (renamed from bundles/org.eclipse.equinox.p2.tests/testData/bug300104bis/repo/content.xml)0
4 files changed, 10 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AllTests.java
index 80ef67b86..6a8b02d68 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AllTests.java
@@ -44,6 +44,10 @@ public class AllTests extends TestCase {
suite.addTestSuite(Bug271954.class);
// suite.addTestSuite(Bug272251.class);
suite.addTestSuite(Bug278668.class);
+ suite.addTestSuite(Bug302582.class);
+ suite.addTestSuite(Bug302582b.class);
+ suite.addTestSuite(Bug302582c.class);
+ suite.addTestSuite(Bug302582d.class);
suite.addTestSuite(DependencyOnSelf.class);
suite.addTestSuite(DisabledExplanation.class);
suite.addTestSuite(DropinsScenario.class);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug300104bis.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug302582d.java
index 15760b715..8c0e7532f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug300104bis.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug302582d.java
@@ -10,24 +10,24 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;
-import org.eclipse.equinox.p2.planner.IPlanner;
-
import java.io.File;
import java.util.Iterator;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.internal.provisional.p2.director.*;
+import org.eclipse.equinox.internal.provisional.p2.director.PlannerHelper;
+import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
import org.eclipse.equinox.p2.core.*;
import org.eclipse.equinox.p2.engine.IProfileRegistry;
import org.eclipse.equinox.p2.engine.IProvisioningPlan;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.metadata.Version;
import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
+import org.eclipse.equinox.p2.planner.IPlanner;
import org.eclipse.equinox.p2.query.IQueryResult;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
-public class Bug300104bis extends AbstractProvisioningTest {
+public class Bug302582d extends AbstractProvisioningTest {
String profileLoadedId = "bootProfile";
IMetadataRepository repo = null;
IProvisioningAgent agent = null;
@@ -35,7 +35,7 @@ public class Bug300104bis extends AbstractProvisioningTest {
protected void setUp() throws Exception {
super.setUp();
- File reporegistry1 = getTestData("test data bug 300104bis", "testData/bug300104bis/p2");
+ File reporegistry1 = getTestData("test data bug 302582d", "testData/bug302582d/p2");
File tempFolder = new File(getTempFolder(), "p2");
copy("0.2", reporegistry1, tempFolder);
@@ -54,7 +54,7 @@ public class Bug300104bis extends AbstractProvisioningTest {
public void testInstall() {
IMetadataRepositoryManager mgr = (IMetadataRepositoryManager) agent.getService(IMetadataRepositoryManager.SERVICE_NAME);
try {
- repo = mgr.loadRepository(getTestData("test data bug 300104bis repo", "testData/bug300104bis/repo").toURI(), null);
+ repo = mgr.loadRepository(getTestData("test data bug bug302582d repo", "testData/bug302582d/repo").toURI(), null);
} catch (ProvisionException e) {
assertNull(e); //This guarantees that the error does not go unnoticed
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/bug300104bis/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1264604331453.profile.gz b/bundles/org.eclipse.equinox.p2.tests/testData/bug302582d/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1264604331453.profile.gz
index 89284ee2e..89284ee2e 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/bug300104bis/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1264604331453.profile.gz
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/bug302582d/p2/org.eclipse.equinox.p2.engine/profileRegistry/bootProfile.profile/1264604331453.profile.gz
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/bug300104bis/repo/content.xml b/bundles/org.eclipse.equinox.p2.tests/testData/bug302582d/repo/content.xml
index 44cb42875..44cb42875 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/bug300104bis/repo/content.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/bug302582d/repo/content.xml

Back to the top