From a85029f8ce86497b570c955d84fb60f6324bdd20 Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Fri, 17 Nov 2017 10:49:05 +0100 Subject: Bug 527379 - Remove references to update.configurator Change-Id: Iaba644ee46cb1adaad9c9d7359cceacf847d01fa Signed-off-by: Karsten Thoms --- .../p2/tests/publisher/actions/ProductFileAdviceTest.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox') diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java index 2bac1f095..14e04dc0f 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java @@ -81,14 +81,11 @@ public class ProductFileAdviceTest extends AbstractProvisioningTest { */ public void testGetBundles() { BundleInfo[] bundles = productFileAdviceWin32.getBundles(); - assertEquals("1.0", 4, bundles.length); - for (int i = 0; i < 4; i++) { + assertEquals("1.0", 3, bundles.length); + for (int i = 0; i < 3; i++) { if (bundles[i].getSymbolicName().equals("org.eclipse.equinox.common")) { assertEquals(2, bundles[i].getStartLevel()); assertEquals(true, bundles[i].isMarkedAsStarted()); - } else if (bundles[i].getSymbolicName().equals("org.eclipse.update.configurator")) { - assertEquals(3, bundles[i].getStartLevel()); - assertEquals(true, bundles[i].isMarkedAsStarted()); } else if (bundles[i].getSymbolicName().equals("org.eclipse.core.runtime")) { // nothing yet } else if (bundles[i].getSymbolicName().equals("org.eclipse.swt.win32.win32.x86")) { @@ -208,7 +205,6 @@ public class ProductFileAdviceTest extends AbstractProvisioningTest { StringBuffer buffer = new StringBuffer(); buffer.append("org.eclipse.equinox.common,3.5.100.v20090817,plugins/org.eclipse.equinox.common_3.5.100.v20090817.jar,2,true\n"); - buffer.append("org.eclipse.update.configurator,3.3.100.v20090813,plugins/org.eclipse.update.configurator_3.3.100.v20090813.jar,4,false\n"); buffer.append("org.eclipse.equinox.simpleconfigurator,1.0.200.v20090729-1800,plugins/org.eclipse.equinox.simpleconfigurator_1.0.200.v20090729-1800.jar,1,true\n"); writeBuffer(new File(rootFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), buffer); @@ -220,9 +216,6 @@ public class ProductFileAdviceTest extends AbstractProvisioningTest { if (bundles[i].getSymbolicName().equals("org.eclipse.equinox.common")) { assertEquals("equinox.common start level", 2, bundles[i].getStartLevel()); assertEquals("equinox.common started", true, bundles[i].isMarkedAsStarted()); - } else if (bundles[i].getSymbolicName().equals("org.eclipse.update.configurator")) { - assertEquals("update.configurator start level", 4, bundles[i].getStartLevel()); - assertEquals("update.configurator started", false, bundles[i].isMarkedAsStarted()); } } } -- cgit v1.2.3