Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaeubi2019-08-20 10:24:11 -0400
committerlaeubi2019-08-20 11:19:51 -0400
commit0dd5e1572083de96d41ada9c2cacfdbc8052a158 (patch)
tree80d86a43c551d5aa43041e3530ac5c14fdf623e8 /tycho-extras-its/src
parent870bcddbad115547a16a5d744671233eba294726 (diff)
downloadorg.eclipse.tycho.extras-master.tar.gz
org.eclipse.tycho.extras-master.tar.xz
org.eclipse.tycho.extras-master.zip
Bug 490886 remove depndency to .project files, add itegrationtestHEADmaster
Change-Id: Ib6c1cc3c15115d062fd5c3a9962b20288e6d1e7d Signed-off-by: laeubi <laeubi@laeubi-soft.de>
Diffstat (limited to 'tycho-extras-its/src')
-rw-r--r--tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/TychoPomlessITest.java11
-rw-r--r--tycho-extras-its/src/test/resources/testpomless/pom.xml1
-rw-r--r--tycho-extras-its/src/test/resources/testpomless/site1/category.xml7
3 files changed, 17 insertions, 2 deletions
diff --git a/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/TychoPomlessITest.java b/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/TychoPomlessITest.java
index 86f439c..d3fb35f 100644
--- a/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/TychoPomlessITest.java
+++ b/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/TychoPomlessITest.java
@@ -34,8 +34,15 @@ public class TychoPomlessITest extends AbstractTychoExtrasIntegrationTest {
assertThat(new File(baseDir, "bundle1.tests/target/pomless.bundle.tests-1.0.1.jar"), isFile());
assertThat(new File(baseDir, "feature/target/pomless.feature-1.0.0-SNAPSHOT.jar"), isFile());
assertThat(new File(baseDir, "product/target/my.test.product.pomless-1.0.0.zip"), isFile());
- assertThat(new File(baseDir, "product/target/repository/artifacts.jar"), isFile());
- assertThat(new File(baseDir, "product/target/repository/content.jar"), isFile());
+ isRepository(baseDir, "product");
+ assertThat(new File(baseDir, "site1/target/testparent.site1.eclipse-repository-0.0.1-SNAPSHOT.zip"), isFile());
+ isRepository(baseDir, "site1");
+
+ }
+
+ private void isRepository(File baseDir, String subdir) {
+ assertThat(new File(baseDir, subdir + "/target/repository/artifacts.jar"), isFile());
+ assertThat(new File(baseDir, subdir + "/target/repository/content.jar"), isFile());
}
}
diff --git a/tycho-extras-its/src/test/resources/testpomless/pom.xml b/tycho-extras-its/src/test/resources/testpomless/pom.xml
index 4a2c160..95ef4fc 100644
--- a/tycho-extras-its/src/test/resources/testpomless/pom.xml
+++ b/tycho-extras-its/src/test/resources/testpomless/pom.xml
@@ -46,6 +46,7 @@
<module>bundle1</module>
<module>bundle1.tests</module>
<module>feature</module>
+ <module>site1</module>
<module>product</module>
</modules>
diff --git a/tycho-extras-its/src/test/resources/testpomless/site1/category.xml b/tycho-extras-its/src/test/resources/testpomless/site1/category.xml
new file mode 100644
index 0000000..76e0d3a
--- /dev/null
+++ b/tycho-extras-its/src/test/resources/testpomless/site1/category.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature id="pomless.feature" version="1.0.0.qualifier">
+ <category name="myCategory"/>
+ </feature>
+ <category-def name="myCategory" label="A Category"/>
+</site>

Back to the top