Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Oberlies2015-04-08 03:34:16 -0400
committerTobias Oberlies2015-04-09 08:08:20 -0400
commitfc29c6986ccfa19bad5f2908946f07dd4ba37e29 (patch)
tree67651ab25a2753cfb20c940a6047d68ddeed2b11
parent3755bb739dba4a7cb1fb3f469d4962d419a1f377 (diff)
downloadorg.eclipse.tycho-fc29c6986ccfa19bad5f2908946f07dd4ba37e29.tar.gz
org.eclipse.tycho-fc29c6986ccfa19bad5f2908946f07dd4ba37e29.tar.xz
org.eclipse.tycho-fc29c6986ccfa19bad5f2908946f07dd4ba37e29.zip
[cleanup] Group license feature related ITs
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/license.feature/build.properties (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/build.properties)0
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/license.feature/feature.properties (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/feature.properties)0
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/license.feature/feature.xml (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/feature.xml)0
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/license.feature/license.txt (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/license.txt)0
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/license.feature/pom.xml (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/pom.xml)2
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/other.feature/build.properties (renamed from tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/build.properties)0
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/other.feature/feature.properties (renamed from tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/feature.properties)0
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/other.feature/feature.xml (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/feature.xml)0
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/other.feature/pom.xml (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/pom.xml)2
-rw-r--r--tycho-its/projects/licenseFeature.setVersion/pom.xml (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/pom.xml)2
-rw-r--r--tycho-its/projects/licenseFeature/feature.conflicting-dependencies/build.properties (renamed from tycho-its/projects/368985_licenseFeature/feature/build.properties)0
-rw-r--r--tycho-its/projects/licenseFeature/feature.conflicting-dependencies/feature.properties (renamed from tycho-its/projects/368985_licenseFeature/feature/feature.properties)0
-rw-r--r--tycho-its/projects/licenseFeature/feature.conflicting-dependencies/feature.xml (renamed from tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/feature.xml)0
-rw-r--r--tycho-its/projects/licenseFeature/feature.conflicting-dependencies/pom.xml (renamed from tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/pom.xml)2
-rw-r--r--tycho-its/projects/licenseFeature/feature.license/build.properties (renamed from tycho-its/projects/368985_licenseFeature/feature.license/build.properties)0
-rw-r--r--tycho-its/projects/licenseFeature/feature.license/feature.properties (renamed from tycho-its/projects/368985_licenseFeature/feature.license/feature.properties)0
-rw-r--r--tycho-its/projects/licenseFeature/feature.license/feature.xml (renamed from tycho-its/projects/368985_licenseFeature/feature.license/feature.xml)0
-rw-r--r--tycho-its/projects/licenseFeature/feature.license/file1.txt (renamed from tycho-its/projects/368985_licenseFeature/feature.license/file1.txt)0
-rw-r--r--tycho-its/projects/licenseFeature/feature.license/file2.txt (renamed from tycho-its/projects/368985_licenseFeature/feature.license/file2.txt)0
-rw-r--r--tycho-its/projects/licenseFeature/feature.license/pom.xml (renamed from tycho-its/projects/368985_licenseFeature/feature.license/pom.xml)2
-rw-r--r--tycho-its/projects/licenseFeature/feature/build.properties (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/build.properties)0
-rw-r--r--tycho-its/projects/licenseFeature/feature/feature.properties (renamed from tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/feature.properties)0
-rw-r--r--tycho-its/projects/licenseFeature/feature/feature.xml (renamed from tycho-its/projects/368985_licenseFeature/feature/feature.xml)0
-rw-r--r--tycho-its/projects/licenseFeature/feature/pom.xml (renamed from tycho-its/projects/368985_licenseFeature/feature/pom.xml)2
-rw-r--r--tycho-its/projects/licenseFeature/pom.xml (renamed from tycho-its/projects/368985_licenseFeature/pom.xml)2
-rw-r--r--tycho-its/projects/licenseFeature/repository/pom.xml (renamed from tycho-its/projects/368985_licenseFeature/repository/pom.xml)2
-rw-r--r--tycho-its/projects/licenseFeature/repository/repository.product (renamed from tycho-its/projects/368985_licenseFeature/repository/repository.product)0
-rw-r--r--tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/LicenseFeatureTest.java (renamed from tycho-its/src/test/java/org/eclipse/tycho/test/bug368985_licenseFeature/LicenseFeatureTest.java)10
-rw-r--r--tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/SetLicenseFeatureVersionTest.java (renamed from tycho-its/src/test/java/org/eclipse/tycho/test/bug424945_setLicenseFeatureVersion/SetLicenseFeatureVersionTest.java)7
29 files changed, 19 insertions, 14 deletions
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/build.properties b/tycho-its/projects/licenseFeature.setVersion/license.feature/build.properties
index e00773a0c..e00773a0c 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/build.properties
+++ b/tycho-its/projects/licenseFeature.setVersion/license.feature/build.properties
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/feature.properties b/tycho-its/projects/licenseFeature.setVersion/license.feature/feature.properties
index 99ceb262d..99ceb262d 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/feature.properties
+++ b/tycho-its/projects/licenseFeature.setVersion/license.feature/feature.properties
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/feature.xml b/tycho-its/projects/licenseFeature.setVersion/license.feature/feature.xml
index 7930f1a71..7930f1a71 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/feature.xml
+++ b/tycho-its/projects/licenseFeature.setVersion/license.feature/feature.xml
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/license.txt b/tycho-its/projects/licenseFeature.setVersion/license.feature/license.txt
index 654d970ac..654d970ac 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/license.txt
+++ b/tycho-its/projects/licenseFeature.setVersion/license.feature/license.txt
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/pom.xml b/tycho-its/projects/licenseFeature.setVersion/license.feature/pom.xml
index 2169e2015..22a3f68a1 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/license.feature/pom.xml
+++ b/tycho-its/projects/licenseFeature.setVersion/license.feature/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>bug424945</groupId>
+ <groupId>tycho-its-project.licenseFeature.setVersion</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/build.properties b/tycho-its/projects/licenseFeature.setVersion/other.feature/build.properties
index e8fab85dc..e8fab85dc 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/build.properties
+++ b/tycho-its/projects/licenseFeature.setVersion/other.feature/build.properties
diff --git a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/feature.properties b/tycho-its/projects/licenseFeature.setVersion/other.feature/feature.properties
index c05c750c6..c05c750c6 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/feature.properties
+++ b/tycho-its/projects/licenseFeature.setVersion/other.feature/feature.properties
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/feature.xml b/tycho-its/projects/licenseFeature.setVersion/other.feature/feature.xml
index 75e9e781c..75e9e781c 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/feature.xml
+++ b/tycho-its/projects/licenseFeature.setVersion/other.feature/feature.xml
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/pom.xml b/tycho-its/projects/licenseFeature.setVersion/other.feature/pom.xml
index befba9324..921ef5ee9 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/pom.xml
+++ b/tycho-its/projects/licenseFeature.setVersion/other.feature/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>bug424945</groupId>
+ <groupId>tycho-its-project.licenseFeature.setVersion</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/pom.xml b/tycho-its/projects/licenseFeature.setVersion/pom.xml
index edf92eef4..6d5e4f538 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/pom.xml
+++ b/tycho-its/projects/licenseFeature.setVersion/pom.xml
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>bug424945</groupId>
+ <groupId>tycho-its-project.licenseFeature.setVersion</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/tycho-its/projects/368985_licenseFeature/feature/build.properties b/tycho-its/projects/licenseFeature/feature.conflicting-dependencies/build.properties
index e8fab85dc..e8fab85dc 100644
--- a/tycho-its/projects/368985_licenseFeature/feature/build.properties
+++ b/tycho-its/projects/licenseFeature/feature.conflicting-dependencies/build.properties
diff --git a/tycho-its/projects/368985_licenseFeature/feature/feature.properties b/tycho-its/projects/licenseFeature/feature.conflicting-dependencies/feature.properties
index c05c750c6..c05c750c6 100644
--- a/tycho-its/projects/368985_licenseFeature/feature/feature.properties
+++ b/tycho-its/projects/licenseFeature/feature.conflicting-dependencies/feature.properties
diff --git a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/feature.xml b/tycho-its/projects/licenseFeature/feature.conflicting-dependencies/feature.xml
index 620172396..620172396 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/feature.xml
+++ b/tycho-its/projects/licenseFeature/feature.conflicting-dependencies/feature.xml
diff --git a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/pom.xml b/tycho-its/projects/licenseFeature/feature.conflicting-dependencies/pom.xml
index eeadfc640..71938bcb0 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.conflicting-dependencies/pom.xml
+++ b/tycho-its/projects/licenseFeature/feature.conflicting-dependencies/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>licenseFeature</groupId>
+ <groupId>tycho-its-project.licenseFeature</groupId>
<artifactId>licenseFeature</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/tycho-its/projects/368985_licenseFeature/feature.license/build.properties b/tycho-its/projects/licenseFeature/feature.license/build.properties
index cd95e59a8..cd95e59a8 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.license/build.properties
+++ b/tycho-its/projects/licenseFeature/feature.license/build.properties
diff --git a/tycho-its/projects/368985_licenseFeature/feature.license/feature.properties b/tycho-its/projects/licenseFeature/feature.license/feature.properties
index 18d12de5d..18d12de5d 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.license/feature.properties
+++ b/tycho-its/projects/licenseFeature/feature.license/feature.properties
diff --git a/tycho-its/projects/368985_licenseFeature/feature.license/feature.xml b/tycho-its/projects/licenseFeature/feature.license/feature.xml
index d56853f65..d56853f65 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.license/feature.xml
+++ b/tycho-its/projects/licenseFeature/feature.license/feature.xml
diff --git a/tycho-its/projects/368985_licenseFeature/feature.license/file1.txt b/tycho-its/projects/licenseFeature/feature.license/file1.txt
index 654d970ac..654d970ac 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.license/file1.txt
+++ b/tycho-its/projects/licenseFeature/feature.license/file1.txt
diff --git a/tycho-its/projects/368985_licenseFeature/feature.license/file2.txt b/tycho-its/projects/licenseFeature/feature.license/file2.txt
index b051be55c..b051be55c 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.license/file2.txt
+++ b/tycho-its/projects/licenseFeature/feature.license/file2.txt
diff --git a/tycho-its/projects/368985_licenseFeature/feature.license/pom.xml b/tycho-its/projects/licenseFeature/feature.license/pom.xml
index 5e4401b00..f0ff34f8e 100644
--- a/tycho-its/projects/368985_licenseFeature/feature.license/pom.xml
+++ b/tycho-its/projects/licenseFeature/feature.license/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>licenseFeature</groupId>
+ <groupId>tycho-its-project.licenseFeature</groupId>
<artifactId>licenseFeature</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/build.properties b/tycho-its/projects/licenseFeature/feature/build.properties
index e8fab85dc..e8fab85dc 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/build.properties
+++ b/tycho-its/projects/licenseFeature/feature/build.properties
diff --git a/tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/feature.properties b/tycho-its/projects/licenseFeature/feature/feature.properties
index c05c750c6..c05c750c6 100644
--- a/tycho-its/projects/424945_setLicenseFeatureVersion/other.feature/feature.properties
+++ b/tycho-its/projects/licenseFeature/feature/feature.properties
diff --git a/tycho-its/projects/368985_licenseFeature/feature/feature.xml b/tycho-its/projects/licenseFeature/feature/feature.xml
index dbc3e05a3..dbc3e05a3 100644
--- a/tycho-its/projects/368985_licenseFeature/feature/feature.xml
+++ b/tycho-its/projects/licenseFeature/feature/feature.xml
diff --git a/tycho-its/projects/368985_licenseFeature/feature/pom.xml b/tycho-its/projects/licenseFeature/feature/pom.xml
index 2d00dfbd1..d9f8e3011 100644
--- a/tycho-its/projects/368985_licenseFeature/feature/pom.xml
+++ b/tycho-its/projects/licenseFeature/feature/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>licenseFeature</groupId>
+ <groupId>tycho-its-project.licenseFeature</groupId>
<artifactId>licenseFeature</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/tycho-its/projects/368985_licenseFeature/pom.xml b/tycho-its/projects/licenseFeature/pom.xml
index e357c67c1..eab58845b 100644
--- a/tycho-its/projects/368985_licenseFeature/pom.xml
+++ b/tycho-its/projects/licenseFeature/pom.xml
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>licenseFeature</groupId>
+ <groupId>tycho-its-project.licenseFeature</groupId>
<artifactId>licenseFeature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/tycho-its/projects/368985_licenseFeature/repository/pom.xml b/tycho-its/projects/licenseFeature/repository/pom.xml
index 98c1da88f..0d6a65073 100644
--- a/tycho-its/projects/368985_licenseFeature/repository/pom.xml
+++ b/tycho-its/projects/licenseFeature/repository/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>licenseFeature</groupId>
+ <groupId>tycho-its-project.licenseFeature</groupId>
<artifactId>licenseFeature</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/tycho-its/projects/368985_licenseFeature/repository/repository.product b/tycho-its/projects/licenseFeature/repository/repository.product
index a05c031cd..a05c031cd 100644
--- a/tycho-its/projects/368985_licenseFeature/repository/repository.product
+++ b/tycho-its/projects/licenseFeature/repository/repository.product
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/bug368985_licenseFeature/LicenseFeatureTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/LicenseFeatureTest.java
index affb9e75c..7a882c61d 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/bug368985_licenseFeature/LicenseFeatureTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/LicenseFeatureTest.java
@@ -8,14 +8,13 @@
* Contributors:
* Sonatype Inc. - initial API and implementation
*******************************************************************************/
-package org.eclipse.tycho.test.bug368985_licenseFeature;
+package org.eclipse.tycho.test.licenseFeature;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
import java.util.Properties;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
@@ -27,12 +26,15 @@ import org.eclipse.tycho.test.util.ResourceUtil;
import org.junit.Assert;
import org.junit.Test;
+// tests the license feature support (bug 368985)
+@SuppressWarnings("unchecked")
public class LicenseFeatureTest extends AbstractTychoIntegrationTest {
+
@Test
public void test() throws Exception {
- Verifier verifier = getVerifier("/368985_licenseFeature", false);
+ Verifier verifier = getVerifier("/licenseFeature", false);
verifier.getCliOptions().add("-De342-repo=" + ResourceUtil.P2Repositories.ECLIPSE_342.toString());
- verifier.executeGoals(Arrays.asList("clean", "install"));
+ verifier.executeGoal("verify");
verifier.verifyErrorFreeLog();
assertFeatureJar(new File(verifier.getBasedir(),
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/bug424945_setLicenseFeatureVersion/SetLicenseFeatureVersionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/SetLicenseFeatureVersionTest.java
index 68ef102c4..3c2c62251 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/bug424945_setLicenseFeatureVersion/SetLicenseFeatureVersionTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/SetLicenseFeatureVersionTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Andreas Sewe - initial API and implementation
*******************************************************************************/
-package org.eclipse.tycho.test.bug424945_setLicenseFeatureVersion;
+package org.eclipse.tycho.test.licenseFeature;
import static org.junit.Assert.assertEquals;
@@ -20,6 +20,9 @@ import org.eclipse.tycho.model.Feature;
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
import org.junit.Test;
+// tests that license feature references are updated by the versions-plugin (bug 424945)
+// TODO make this a unit test
+@SuppressWarnings("unchecked")
public class SetLicenseFeatureVersionTest extends AbstractTychoIntegrationTest {
private static final String NEW_MAVEN_VERSION = "1.0.1-SNAPSHOT";
@@ -27,7 +30,7 @@ public class SetLicenseFeatureVersionTest extends AbstractTychoIntegrationTest {
@Test
public void test() throws Exception {
- Verifier verifier = getVerifier("/424945_setLicenseFeatureVersion", false);
+ Verifier verifier = getVerifier("/licenseFeature.setVersion", false);
verifier.getCliOptions().add("-DnewVersion=" + NEW_MAVEN_VERSION);
verifier.executeGoal("org.eclipse.tycho:tycho-versions-plugin:" + TychoVersion.getTychoVersion()

Back to the top