*** empty log message ***
diff --git a/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/solver/Projector.java b/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/solver/Projector.java
index cc6e854..83ee843 100644
--- a/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/solver/Projector.java
+++ b/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/solver/Projector.java
@@ -243,10 +243,10 @@
if (matches.isEmpty()) {
missingRequirement(iu, req);
} else {
- if (req.getArity() == 1) {
- InstallableUnit[] array = new InstallableUnit[matches.size()];
- dependencyHelper.atMost(new Explanation.Singleton(array), 1, array);
- }
+ // if (req.getArity() == 1) {
+ // InstallableUnit[] array = new InstallableUnit[matches.size()];
+ // dependencyHelper.atMost(new Explanation.Singleton(array), 1, array);
+ // }
InstallableUnit reqIu = (InstallableUnit) matches.iterator().next();
Explanation explanation = new Explanation.IUToInstall(reqIu);
createImplication(iu, matches, explanation);
diff --git a/org.eclipse.equinox.p2.cudf/tests/org/eclipse/equinox/p2/cudf/tests/AllTests.java b/org.eclipse.equinox.p2.cudf/tests/org/eclipse/equinox/p2/cudf/tests/AllTests.java
index 5be8042..f8fa3a0 100644
--- a/org.eclipse.equinox.p2.cudf/tests/org/eclipse/equinox/p2/cudf/tests/AllTests.java
+++ b/org.eclipse.equinox.p2.cudf/tests/org/eclipse/equinox/p2/cudf/tests/AllTests.java
@@ -5,13 +5,16 @@
public class AllTests extends TestCase {
public static Test suite() {
TestSuite suite = new TestSuite(AllTests.class.getName());
-// suite.addTestSuite(TestAutomaticProvide.class);
+ suite.addTestSuite(CheckAllPassingInstances.class);
+ suite.addTestSuite(ParserTest.class);
+ // suite.addTestSuite(TestAutomaticProvide.class);
suite.addTestSuite(TestInstall.class);
-// suite.addTestSuite(TestInstallUpdateConflict.class);
-// suite.addTestSuite(TestNegationInDepends.class);
-// suite.addTestSuite(TestNegationInRequest.class);
+ // suite.addTestSuite(TestInstallUpdateConflict.class);
+ // suite.addTestSuite(TestNegationInDepends.class);
+ // suite.addTestSuite(TestNegationInRequest.class);
+ suite.addTestSuite(TestOptional.class);
suite.addTestSuite(TestRemoval.class);
return suite;
}
-
+
}
diff --git a/org.eclipse.equinox.p2.cudf/tests/testData/instances/expectedFailure/virtualPackageConficts.cudf b/org.eclipse.equinox.p2.cudf/tests/testData/instances/expectedFailure/virtualPackageConficts.cudf
new file mode 100644
index 0000000..c6efa35
--- /dev/null
+++ b/org.eclipse.equinox.p2.cudf/tests/testData/instances/expectedFailure/virtualPackageConficts.cudf
@@ -0,0 +1,13 @@
+package: a
+version: 1
+provides: virtual-foo
+conflicts: virtual-foo
+
+package: b
+version: 1
+provides: virtual-foo
+conflicts: virtual-foo
+
+request:
+install: a, b
+
