summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2012-04-28 13:52:36 (EDT)
committerPascal Rapicault2012-04-28 13:52:36 (EDT)
commitc47e8ec243ef0d5a5e80be1e5af0633700c7b2c4 (patch)
treece3c03e64937280b260c99f24c9ae82cf944cd9a
parent76bef3927a83bb4885e9cc599184ca23dfd52289 (diff)
downloadrt.equinox.p2-c47e8ec243ef0d5a5e80be1e5af0633700c7b2c4.zip
rt.equinox.p2-c47e8ec243ef0d5a5e80be1e5af0633700c7b2c4.tar.gz
rt.equinox.p2-c47e8ec243ef0d5a5e80be1e5af0633700c7b2c4.tar.bz2
Check for segments in the filter instead of the complete filter itselfv20120428-1752
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java
index f23fc9d..9a2c8f0 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java
@@ -108,7 +108,10 @@ public class EquinoxExecutableActionTest extends ActionTest {
verifyExecIU(iuList, idBase, configSpec);
verifyEclipseIU(iuList, idBase, configSpec);
verifyCU(iuList, idBase, configSpec);
- assertTrue(iuList.size() == 3);
+ if (configSpec.contains("macosx"))
+ assertTrue(iuList.size() == 4);
+ else
+ assertTrue(iuList.size() == 3);
}
@SuppressWarnings("hiding")
@@ -127,7 +130,10 @@ public class EquinoxExecutableActionTest extends ActionTest {
Collection<IRequirement> requiredCapability = fragment.getHost();
verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, idBase + ".executable." + configSpec, new VersionRange(version, true, version, true)); //$NON-NLS-1$
assertTrue(requiredCapability.size() == 1);
- assertTrue(fragment.getFilter().equals(InstallableUnit.parseFilter("(& (osgi.ws=" + ws + ")(osgi.os=" + os + ")(osgi.arch=" + arch + "))"))); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
+
+ assertTrue(fragment.getFilter().getParameters()[0].toString().indexOf("(osgi.ws=" + ws + ")") != -1);
+ assertTrue(fragment.getFilter().getParameters()[0].toString().indexOf("(osgi.os=" + os + ")") != -1);
+ assertTrue(fragment.getFilter().getParameters()[0].toString().indexOf("(osgi.arch=" + arch + ")") != -1);
assertTrue(fragment.getProperty("org.eclipse.equinox.p2.type.fragment").equals("true")); //$NON-NLS-1$ //$NON-NLS-2$
return;//pass
}