Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Wagenknecht2015-04-08 12:38:33 -0400
committerTobias Oberlies2015-04-20 05:14:01 -0400
commitd0c7a30fc076952e9a5d8d71803a6d863dbed308 (patch)
treefb95b5a97eb75b7578654639a2c3e354cdd50d56
parentd44d8e976b233703dedfdcbef4d05ed6c55428d5 (diff)
downloadorg.eclipse.tycho-d0c7a30fc076952e9a5d8d71803a6d863dbed308.tar.gz
org.eclipse.tycho-d0c7a30fc076952e9a5d8d71803a6d863dbed308.tar.xz
org.eclipse.tycho-d0c7a30fc076952e9a5d8d71803a6d863dbed308.zip
371983 Use a regex based match query for testing IU inclusion
Bug: 371983 Change-Id: I2d4943a1009e44192791d8a622057d2ccce94676 Signed-off-by: Gunnar Wagenknecht <gunnar@wagenknecht.org>
-rw-r--r--tycho-its/projects/p2Repository/category.xml13
-rw-r--r--tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java5
2 files changed, 6 insertions, 12 deletions
diff --git a/tycho-its/projects/p2Repository/category.xml b/tycho-its/projects/p2Repository/category.xml
index a578fd049..d8c28657f 100644
--- a/tycho-its/projects/p2Repository/category.xml
+++ b/tycho-its/projects/p2Repository/category.xml
@@ -2,18 +2,11 @@
<!-- includes three bundles in different ways; note: the bundles do not require each other -->
<site>
<bundle id="osgi.enterprise" version="0.0.0"/>
- <iu>
- <query>
- <expression type="match">
- <![CDATA[
- id == $0
- ]]>
- </expression>
- <param>org.eclipse.equinox.app</param>
- </query>
+ <iu id="org.apache.felix.gogo.runtime" version="0.0.0">
<category name="Test Category" />
</iu>
- <iu id="org.apache.felix.gogo.runtime" version="0.0.0">
+ <iu>
+ <query><expression type="match">id ~= /javax.*/</expression></query>
<category name="Test Category" />
</iu>
<category-def label="Test Category Label" name="Test Category">
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java
index 15b42121f..95b03221e 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java
@@ -60,10 +60,10 @@ public class BasicP2RepositoryIntegrationTest extends AbstractTychoIntegrationTe
@Test
public void testIncludeIUViaMatchQuery() throws Exception {
- assertThat(p2Repo.getAllUnitIds(), hasItem("org.eclipse.equinox.app"));
+ assertThat(p2Repo.getAllUnitIds(), hasItem("javax.xml"));
IU categoryIU = p2Repo.getUniqueIU("Test Category");
- assertThat(categoryIU.getRequiredIds(), hasItem("org.eclipse.equinox.app"));
+ assertThat(categoryIU.getRequiredIds(), hasItem("javax.xml"));
}
@Test
@@ -80,4 +80,5 @@ public class BasicP2RepositoryIntegrationTest extends AbstractTychoIntegrationTe
assertThat(aboutFile, isFile());
assertThat(FileUtils.fileRead(aboutFile).trim(), equalTo("About testrepo"));
}
+
}

Back to the top