Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java')
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java270
1 files changed, 136 insertions, 134 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java
index 416a37a18..a1c451d32 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java
@@ -10,23 +10,23 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.director;
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
+import org.eclipse.equinox.p2.metadata.Version;
+import org.eclipse.equinox.p2.metadata.VersionRange;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.*;
import org.eclipse.equinox.internal.p2.director.OperationGenerator;
import org.eclipse.equinox.internal.p2.metadata.ResolvedInstallableUnit;
-import org.eclipse.equinox.internal.provisional.p2.engine.InstallableUnitOperand;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
+import org.eclipse.equinox.p2.engine.InstallableUnitOperand;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
public class OperationGenerationTest extends AbstractProvisioningTest {
public void testInstallUninstall() {
- IInstallableUnit a1 = createIU("a", new Version(1, 0, 0), false);
- IInstallableUnit a2 = createIU("a", new Version(2, 0, 0), false);
- IInstallableUnit a3 = createIU("a", new Version(3, 0, 0), false);
+ IInstallableUnit a1 = createIU("a", Version.createOSGi(1, 0, 0), false);
+ IInstallableUnit a2 = createIU("a", Version.createOSGi(2, 0, 0), false);
+ IInstallableUnit a3 = createIU("a", Version.createOSGi(3, 0, 0), false);
Collection from;
from = new ArrayList();
@@ -38,16 +38,16 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to.add(a1);
to.add(a3);
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
// 1 x install
// 1 x uninstall
- assertEquals(2, operands.length);
+ assertEquals(2, operands.size());
}
public void test1() {
- IInstallableUnit a1 = createIU("a", new Version(1, 0, 0), false);
- IInstallableUnit a2 = createIU("a", new Version(2, 0, 0), false);
- IInstallableUnit a3 = createIU("a", new Version(3, 0, 0), false);
+ IInstallableUnit a1 = createIU("a", Version.createOSGi(1, 0, 0), false);
+ IInstallableUnit a2 = createIU("a", Version.createOSGi(2, 0, 0), false);
+ IInstallableUnit a3 = createIU("a", Version.createOSGi(3, 0, 0), false);
Collection from;
from = new ArrayList();
@@ -60,15 +60,15 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to.add(a3);
to.add(a2);
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
// 1 x install
- assertEquals(1, operands.length);
+ assertEquals(1, operands.size());
}
public void test2() {
- IInstallableUnit a1 = createIU("a", new Version(1, 0, 0), false);
- IInstallableUnit a2 = createIU("a", new Version(2, 0, 0), false);
- IInstallableUnit a3 = createIU("a", new Version(3, 0, 0), false);
+ IInstallableUnit a1 = createIU("a", Version.createOSGi(1, 0, 0), false);
+ IInstallableUnit a2 = createIU("a", Version.createOSGi(2, 0, 0), false);
+ IInstallableUnit a3 = createIU("a", Version.createOSGi(3, 0, 0), false);
Collection from;
from = new ArrayList();
@@ -81,17 +81,17 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to.add(a1);
to.add(a3);
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
// 1 x uninstall
- assertEquals(1, operands.length);
+ assertEquals(1, operands.size());
}
public void testUpdate1() {
- IInstallableUnit a = createIU("a", new Version(1, 0, 0), false);
+ IInstallableUnit a = createIU("a", Version.createOSGi(1, 0, 0), false);
InstallableUnitDescription b = new MetadataFactory.InstallableUnitDescription();
b.setId("b");
- b.setVersion(new Version(1, 0, 0));
+ b.setVersion(Version.createOSGi(1, 0, 0));
b.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor("a", new VersionRange("[1.0.0, 2.0.0)"), IUpdateDescriptor.NORMAL, null));
Collection from;
@@ -102,18 +102,18 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to = new ArrayList();
to.add(MetadataFactory.createInstallableUnit(b));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
// 1 x upgrade
- assertEquals(1, operands.length);
+ assertEquals(1, operands.size());
}
public void testUpdate2() {
- IInstallableUnit a1 = createIU("a", new Version(1, 0, 0), false);
- IInstallableUnit a2 = createIU("a", new Version(2, 0, 0), false);
+ IInstallableUnit a1 = createIU("a", Version.createOSGi(1, 0, 0), false);
+ IInstallableUnit a2 = createIU("a", Version.createOSGi(2, 0, 0), false);
InstallableUnitDescription b = new MetadataFactory.InstallableUnitDescription();
b.setId("b");
- b.setVersion(new Version(1, 0, 0));
+ b.setVersion(Version.createOSGi(1, 0, 0));
b.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor("a", new VersionRange("[1.0.0, 3.0.0)"), IUpdateDescriptor.NORMAL, null));
Collection from;
@@ -125,24 +125,24 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to = new ArrayList();
to.add(MetadataFactory.createInstallableUnit(b));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
// 1 x install
// 2 x uninstall
- assertEquals(3, operands.length);
+ assertEquals(3, operands.size());
}
public void testUpdate3() {
- IInstallableUnit a1 = createIU("a", new Version(1, 0, 0), false);
- IInstallableUnit a2 = createIU("a", new Version(2, 0, 0), false);
+ IInstallableUnit a1 = createIU("a", Version.createOSGi(1, 0, 0), false);
+ IInstallableUnit a2 = createIU("a", Version.createOSGi(2, 0, 0), false);
InstallableUnitDescription b = new MetadataFactory.InstallableUnitDescription();
b.setId("b");
- b.setVersion(new Version(1, 0, 0));
+ b.setVersion(Version.createOSGi(1, 0, 0));
b.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor("a", new VersionRange("[1.0.0, 2.0.0)"), IUpdateDescriptor.NORMAL, null));
InstallableUnitDescription c = new MetadataFactory.InstallableUnitDescription();
c.setId("c");
- c.setVersion(new Version(1, 0, 0));
+ c.setVersion(Version.createOSGi(1, 0, 0));
c.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor("a", new VersionRange("[2.0.0, 2.3.0)"), IUpdateDescriptor.NORMAL, null));
Collection from;
@@ -155,19 +155,19 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to.add(MetadataFactory.createInstallableUnit(b));
to.add(MetadataFactory.createInstallableUnit(c));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
// 2 x update
- assertEquals(2, operands.length);
+ assertEquals(2, operands.size());
}
public void testUpdate4() {
- IInstallableUnit a1 = createIU("a", new Version(1, 0, 0), false);
- IInstallableUnit a2 = createIU("a", new Version(2, 0, 0), false);
- IInstallableUnit b1 = createIU("b", new Version(1, 0, 0), false);
+ IInstallableUnit a1 = createIU("a", Version.createOSGi(1, 0, 0), false);
+ IInstallableUnit a2 = createIU("a", Version.createOSGi(2, 0, 0), false);
+ IInstallableUnit b1 = createIU("b", Version.createOSGi(1, 0, 0), false);
InstallableUnitDescription b2 = new MetadataFactory.InstallableUnitDescription();
b2.setId("b");
- b2.setVersion(new Version(2, 0, 0));
+ b2.setVersion(Version.createOSGi(2, 0, 0));
b2.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor("b", new VersionRange("[1.0.0, 2.0.0)"), IUpdateDescriptor.NORMAL, null));
Collection from;
@@ -182,19 +182,19 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to.add(a2);
to.add(MetadataFactory.createInstallableUnit(b2));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
// 1 x update
- assertEquals(1, operands.length);
+ assertEquals(1, operands.size());
}
public void testUpdate5() {
- IInstallableUnit a1 = createIU("a", new Version(1, 0, 0), false);
- IInstallableUnit a2 = createIU("a", new Version(2, 0, 0), false);
- IInstallableUnit b1 = createIU("b", new Version(1, 0, 0), false);
+ IInstallableUnit a1 = createIU("a", Version.createOSGi(1, 0, 0), false);
+ IInstallableUnit a2 = createIU("a", Version.createOSGi(2, 0, 0), false);
+ IInstallableUnit b1 = createIU("b", Version.createOSGi(1, 0, 0), false);
InstallableUnitDescription b2 = new MetadataFactory.InstallableUnitDescription();
b2.setId("b");
- b2.setVersion(new Version(2, 0, 0));
+ b2.setVersion(Version.createOSGi(2, 0, 0));
b2.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor("b", new VersionRange("[1.0.0, 2.0.0)"), IUpdateDescriptor.NORMAL, null));
Collection from;
@@ -208,21 +208,21 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to.add(a1);
to.add(MetadataFactory.createInstallableUnit(b2));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
// 1 x update
// 1 x uninstall
- assertEquals(2, operands.length);
+ assertEquals(2, operands.size());
}
public void test248468b() {
String id = "myBundle";
- IUpdateDescriptor update = createUpdateDescriptor(id, new Version("1.0.0"));
- IInstallableUnit one = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
- IUpdateDescriptor update2 = createUpdateDescriptor(id, new Version("2.0.0"));
- IInstallableUnit two = createIU(id, new Version("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update2, null);
+ IUpdateDescriptor update = createUpdateDescriptor(id, Version.create("1.0.0"));
+ IInstallableUnit one = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
+ IUpdateDescriptor update2 = createUpdateDescriptor(id, Version.create("2.0.0"));
+ IInstallableUnit two = createIU(id, Version.create("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update2, null);
- IUpdateDescriptor update3 = createUpdateDescriptor(id, new Version("3.0.0"));
- IInstallableUnit three = createIU(id, new Version("3.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update3, null);
+ IUpdateDescriptor update3 = createUpdateDescriptor(id, Version.create("3.0.0"));
+ IInstallableUnit three = createIU(id, Version.create("3.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update3, null);
Collection from = new ArrayList();
from.add(MetadataFactory.createResolvedInstallableUnit(one, new IInstallableUnitFragment[0]));
@@ -232,27 +232,27 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
Collection to = new ArrayList();
to.add(MetadataFactory.createResolvedInstallableUnit(three, new IInstallableUnitFragment[0]));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
//We are uninstalling myBundle 1.0 and 2.0. 3.0 stays unchanged.
- for (int i = 0; i < operands.length; i++) {
- assertNotSame("3.0", three, operands[i].first());
- assertNotSame("3.0.1", three, operands[i].second());
+ for (int i = 0; i < operands.size(); i++) {
+ assertNotSame("3.0", three, operands.get(i).first());
+ assertNotSame("3.0.1", three, operands.get(i).second());
}
- assertEquals("3.1", one, operands[0].first());
- assertNull("3.2", operands[0].second());
- assertEquals("3.3", two, operands[1].first());
- assertNull("3.4", operands[1].second());
+ assertEquals("3.1", one, operands.get(0).first());
+ assertNull("3.2", operands.get(0).second());
+ assertEquals("3.3", two, operands.get(1).first());
+ assertNull("3.4", operands.get(1).second());
}
public void test248468d() {
String id = "myBundle";
- IUpdateDescriptor update = createUpdateDescriptor(id, new Version("1.0.0"));
- IInstallableUnit one = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
- update = createUpdateDescriptor(id, new Version("2.0.0"));
- IInstallableUnit two = createIU(id, new Version("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
+ IUpdateDescriptor update = createUpdateDescriptor(id, Version.create("1.0.0"));
+ IInstallableUnit one = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
+ update = createUpdateDescriptor(id, Version.create("2.0.0"));
+ IInstallableUnit two = createIU(id, Version.create("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
- IUpdateDescriptor update3 = createUpdateDescriptor(id, new Version("3.0.0"));
- IInstallableUnit three = createIU("anotherBundle", new Version("3.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update3, null);
+ IUpdateDescriptor update3 = createUpdateDescriptor(id, Version.create("3.0.0"));
+ IInstallableUnit three = createIU("anotherBundle", Version.create("3.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update3, null);
Collection from = new ArrayList();
from.add(MetadataFactory.createResolvedInstallableUnit(one, new IInstallableUnitFragment[0]));
@@ -262,28 +262,28 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to.add(MetadataFactory.createResolvedInstallableUnit(two, new IInstallableUnitFragment[0]));
to.add(MetadataFactory.createResolvedInstallableUnit(three, new IInstallableUnitFragment[0]));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
//Two is already in the system therefore it will not be in the operands
- for (int i = 0; i < operands.length; i++) {
- assertNotSame("2.0", two, operands[i].first());
- assertNotSame("2.1", two, operands[i].second());
+ for (int i = 0; i < operands.size(); i++) {
+ assertNotSame("2.0", two, operands.get(i).first());
+ assertNotSame("2.1", two, operands.get(i).second());
}
//three is an update of one
- assertEquals("2.2", 1, operands.length);
- assertEquals("2.4", one, operands[0].first());
- assertEquals("2.5", three, operands[0].second());
+ assertEquals("2.2", 1, operands.size());
+ assertEquals("2.4", one, operands.get(0).first());
+ assertEquals("2.5", three, operands.get(0).second());
}
public void test248468c() {
String id = "myBundle";
- IUpdateDescriptor update = createUpdateDescriptor(id, new Version("1.0.0"));
- IInstallableUnit one = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
- update = createUpdateDescriptor(id, new Version("2.0.0"));
- IInstallableUnit two = createIU(id, new Version("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
+ IUpdateDescriptor update = createUpdateDescriptor(id, Version.create("1.0.0"));
+ IInstallableUnit one = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
+ update = createUpdateDescriptor(id, Version.create("2.0.0"));
+ IInstallableUnit two = createIU(id, Version.create("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
- IUpdateDescriptor update3 = MetadataFactory.createUpdateDescriptor(id, new VersionRange(new Version(2, 0, 0), true, new Version(3, 0, 0), false), IUpdateDescriptor.HIGH, "desc");
- // IUpdateDescriptor update3 = createUpdateDescriptor(id, new Version("3.0.0"));
- IInstallableUnit three = createIU("anotherBundle", new Version("3.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update3, null);
+ IUpdateDescriptor update3 = MetadataFactory.createUpdateDescriptor(id, new VersionRange(Version.createOSGi(2, 0, 0), true, Version.createOSGi(3, 0, 0), false), IUpdateDescriptor.HIGH, "desc");
+ // IUpdateDescriptor update3 = createUpdateDescriptor(id, Version.create("3.0.0"));
+ IInstallableUnit three = createIU("anotherBundle", Version.create("3.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update3, null);
Collection from = new ArrayList();
from.add(MetadataFactory.createResolvedInstallableUnit(one, new IInstallableUnitFragment[0]));
@@ -293,26 +293,26 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to.add(MetadataFactory.createResolvedInstallableUnit(two, new IInstallableUnitFragment[0]));
to.add(MetadataFactory.createResolvedInstallableUnit(three, new IInstallableUnitFragment[0]));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
//Two is already in the system therefore it will not be in the operands
- for (int i = 0; i < operands.length; i++) {
- assertNotSame("2.0", two, operands[i].first());
- assertNotSame("2.1", two, operands[i].second());
+ for (int i = 0; i < operands.size(); i++) {
+ assertNotSame("2.0", two, operands.get(i).first());
+ assertNotSame("2.1", two, operands.get(i).second());
}
//We install three and uninstall one
- assertEquals("2.2", 2, operands.length);
- assertNull("2.3", operands[0].first());
- assertEquals("2.4", three, operands[0].second());
- assertEquals("2.5", one, operands[1].first());
- assertNull("2.6", operands[1].second());
+ assertEquals("2.2", 2, operands.size());
+ assertNull("2.3", operands.get(0).first());
+ assertEquals("2.4", three, operands.get(0).second());
+ assertEquals("2.5", one, operands.get(1).first());
+ assertNull("2.6", operands.get(1).second());
}
public void test248468() {
String id = "myBundle";
- IUpdateDescriptor update = createUpdateDescriptor(id, new Version("1.0.0"));
- IInstallableUnit one = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
- update = createUpdateDescriptor(id, new Version("2.0.0"));
- IInstallableUnit two = createIU(id, new Version("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
+ IUpdateDescriptor update = createUpdateDescriptor(id, Version.create("1.0.0"));
+ IInstallableUnit one = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
+ update = createUpdateDescriptor(id, Version.create("2.0.0"));
+ IInstallableUnit two = createIU(id, Version.create("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, update, null);
Collection from = new ArrayList();
from.add(MetadataFactory.createResolvedInstallableUnit(one, new IInstallableUnitFragment[0]));
@@ -321,20 +321,20 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
Collection to = new ArrayList();
to.add(MetadataFactory.createResolvedInstallableUnit(two, new IInstallableUnitFragment[0]));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
- assertEquals("1.0", 1, operands.length);
- assertEquals("1.1", one, operands[0].first());
- assertNull("1.2", operands[0].second());
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
+ assertEquals("1.0", 1, operands.size());
+ assertEquals("1.1", one, operands.get(0).first());
+ assertNull("1.2", operands.get(0).second());
}
public void testConfigurationChange1() {
String id = "myBundle";
String cuId = "cu";
- IInstallableUnit anIU = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
- IInstallableUnit anotherIU = createIU("misc", new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
- IInstallableUnit anotherIU2 = createIU("misc2", new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
- IInstallableUnitFragment cu1 = createIUFragment(anIU, cuId, new Version("1.0.0"));
- IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, new Version("2.0.0"));
+ IInstallableUnit anIU = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
+ IInstallableUnit anotherIU = createIU("misc", Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
+ IInstallableUnit anotherIU2 = createIU("misc2", Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
+ IInstallableUnitFragment cu1 = createIUFragment(anIU, cuId, Version.create("1.0.0"));
+ IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, Version.create("2.0.0"));
Collection from = new ArrayList();
ResolvedInstallableUnit fromResolved = (ResolvedInstallableUnit) MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[] {cu1});
@@ -346,16 +346,17 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
to.add(toResolved);
to.add(MetadataFactory.createResolvedInstallableUnit(anotherIU2, new IInstallableUnitFragment[0]));
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
- assertEquals("1.0", 3, operands.length);
+ assertEquals("1.0", 3, operands.size());
assertContainsConfigurationChange("2.0", operands);
assertContainsInstallableUnitOperand("3.0", operands, new InstallableUnitOperand(fromResolved, toResolved));
}
- private void assertContainsInstallableUnitOperand(String message, InstallableUnitOperand[] operands, InstallableUnitOperand operand) {
- for (int i = 0; i < operands.length; i++) {
- if (operands[i].first() != null && operands[i].first().equals(operand.first()) && operands[i].second() != null && operands[i].second().equals(operand.second()))
+ private void assertContainsInstallableUnitOperand(String message, List<InstallableUnitOperand> operands, InstallableUnitOperand operand) {
+ for (int i = 0; i < operands.size(); i++) {
+ InstallableUnitOperand cmp = operands.get(i);
+ if (cmp.first() != null && cmp.first().equals(operand.first()) && cmp.second() != null && cmp.second().equals(operand.second()))
return;
}
fail(message);
@@ -364,8 +365,8 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
public void testConfigurationChange2() {
String id = "myBundle";
String cuId = "cu";
- IInstallableUnit anIU = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
- IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, new Version("2.0.0"));
+ IInstallableUnit anIU = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
+ IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, Version.create("2.0.0"));
Collection from = new ArrayList();
ResolvedInstallableUnit fromResolved = (ResolvedInstallableUnit) MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[0]);
@@ -375,17 +376,17 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
IInstallableUnit toResolved = MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[] {cu2});
to.add(toResolved);
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
- assertEquals("1.0", 1, operands.length);
+ assertEquals("1.0", 1, operands.size());
assertContainsInstallableUnitOperand("3.0", operands, new InstallableUnitOperand(fromResolved, toResolved));
}
public void testConfigurationChange3() {
String id = "myBundle";
String cuId = "cu";
- IInstallableUnit anIU = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
- IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, new Version("2.0.0"));
+ IInstallableUnit anIU = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
+ IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, Version.create("2.0.0"));
Collection from = new ArrayList();
ResolvedInstallableUnit fromResolved = (ResolvedInstallableUnit) MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[] {cu2});
@@ -395,17 +396,17 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
IInstallableUnit toResolved = MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[0]);
to.add(toResolved);
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
- assertEquals("1.0", 1, operands.length);
+ assertEquals("1.0", 1, operands.size());
assertContainsInstallableUnitOperand("3.0", operands, new InstallableUnitOperand(fromResolved, toResolved));
}
public void testConfigurationChange4() {
String id = "myBundle";
String cuId = "cu";
- IInstallableUnit anIU = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
- IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, new Version("2.0.0"));
+ IInstallableUnit anIU = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
+ IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, Version.create("2.0.0"));
Collection from = new ArrayList();
ResolvedInstallableUnit fromResolved = (ResolvedInstallableUnit) MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[] {cu2});
@@ -415,17 +416,17 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
IInstallableUnit toResolved = MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[] {cu2});
to.add(toResolved);
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
- assertEquals("1.0", 0, operands.length);
+ assertEquals("1.0", 0, operands.size());
}
public void testConfigurationChange5() {
String id = "myBundle";
String cuId = "cu";
- IInstallableUnit anIU = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
- IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, new Version("2.0.0"));
- IInstallableUnitFragment cu1 = createIUFragment(anIU, cuId, new Version("1.0.0"));
+ IInstallableUnit anIU = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
+ IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, Version.create("2.0.0"));
+ IInstallableUnitFragment cu1 = createIUFragment(anIU, cuId, Version.create("1.0.0"));
Collection from = new ArrayList();
ResolvedInstallableUnit fromResolved = (ResolvedInstallableUnit) MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[] {cu1, cu2});
@@ -435,18 +436,18 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
IInstallableUnit toResolved = MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[] {cu2, cu1});
to.add(toResolved);
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
- assertEquals("1.0", 0, operands.length);
+ assertEquals("1.0", 0, operands.size());
}
public void testConfigurationChange6() {
String id = "myBundle";
String cuId = "cu";
- IInstallableUnit anIU = createIU(id, new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
- IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, new Version("2.0.0"));
- IInstallableUnitFragment cu1 = createIUFragment(anIU, cuId, new Version("1.0.0"));
- IInstallableUnitFragment cu3 = createIUFragment(anIU, cuId, new Version("3.0.0"));
+ IInstallableUnit anIU = createIU(id, Version.create("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, null);
+ IInstallableUnitFragment cu2 = createIUFragment(anIU, cuId, Version.create("2.0.0"));
+ IInstallableUnitFragment cu1 = createIUFragment(anIU, cuId, Version.create("1.0.0"));
+ IInstallableUnitFragment cu3 = createIUFragment(anIU, cuId, Version.create("3.0.0"));
Collection from = new ArrayList();
ResolvedInstallableUnit fromResolved = (ResolvedInstallableUnit) MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[] {cu1, cu2});
@@ -456,9 +457,9 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
IInstallableUnit toResolved = MetadataFactory.createResolvedInstallableUnit(anIU, new IInstallableUnitFragment[] {cu1, cu3});
to.add(toResolved);
- InstallableUnitOperand[] operands = new OperationGenerator().generateOperation(from, to);
+ List<InstallableUnitOperand> operands = new OperationGenerator().generateOperation(from, to);
- assertEquals("1.0", 1, operands.length);
+ assertEquals("1.0", 1, operands.size());
assertContainsInstallableUnitOperand("3.0", operands, new InstallableUnitOperand(fromResolved, toResolved));
}
@@ -470,9 +471,10 @@ public class OperationGenerationTest extends AbstractProvisioningTest {
fail(message + "Can't find " + expected);
}
- public void assertContainsConfigurationChange(String message, InstallableUnitOperand[] ops) {
- for (int i = 0; i < ops.length; i++) {
- if (ops[i].first() != null && ops[i].first().equals(ops[i].second())) {
+ public void assertContainsConfigurationChange(String message, List<InstallableUnitOperand> ops) {
+ for (int i = 0; i < ops.size(); i++) {
+ InstallableUnitOperand op = ops.get(i);
+ if (op.first() != null && op.first().equals(op.second())) {
return;
}
}

Back to the top