test for eclipse-tycho#1281

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
cdietrich · Aug 25, 2022 · b99b3ee · b99b3ee
1 parent abac7fe
commit b99b3ee
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/tycho-its/projects/feature.dependency/feature/feature.xml b/tycho-its/projects/feature.dependency/feature/feature.xml
@@ -5,6 +5,7 @@
 
    <requires>
       <import plugin="com.google.guava"/>
+      <import feature="org.eclipse.emf.sdk" version="2.29.0" match="greaterOrEqual"/>
    </requires>
 
 </feature>
diff --git a/tycho-its/projects/feature.dependency/pom.xml b/tycho-its/projects/feature.dependency/pom.xml
@@ -10,6 +10,7 @@
 		<tycho-version>3.0.0-SNAPSHOT</tycho-version>
 		<orbit-url>https://download.eclipse.org/tools/orbit/downloads/2022-03/</orbit-url>
 		<includePlugins>false</includePlugins>
+		<includeFeatures>false</includeFeatures>
 	</properties>
 
 	<repositories>
@@ -44,6 +45,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<includeRequiredPlugins>${includePlugins}</includeRequiredPlugins>
+					<includeRequiredFeatures>${includeFeatures}</includeRequiredFeatures>
 				</configuration>
 			</plugin>
 		</plugins>

diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithDependenciesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithDependenciesTest.java
@@ -29,14 +29,31 @@ public void testFeatureRestrictionWithIncludePluginsEnabled() throws Exception {
 		verifier.verifyErrorFreeLog();
 		File targetdir = new File(verifier.getBasedir(), "site/target");
 		assertFileExists(targetdir, "repository/plugins/com.google.guava_*.jar");
+		assertFileDoesNotExist(targetdir, "repository/plugins/org.eclipse.emf.common_2*.jar");
+		assertFileDoesNotExist(targetdir, "repository/features/org.eclipse.emf.sdk_*.jar");
 	}
 
 	@Test
-	public void testFeatureRestrictionWithIncludePluginsDisabled() throws Exception {
+	public void testFeatureRestrictionWithIncludeFeaturesEnabled() throws Exception {
 		Verifier verifier = getVerifier("feature.dependency", false, true);
+		verifier.setSystemProperty("includePlugins", "false");
+		verifier.setSystemProperty("includeFeatures", "true");
 		verifier.executeGoals(List.of("clean", "package"));
 		verifier.verifyErrorFreeLog();
 		File targetdir = new File(verifier.getBasedir(), "site/target");
 		assertFileDoesNotExist(targetdir, "repository/plugins/com.google.guava_*.jar");
+		assertFileExists(targetdir, "repository/plugins/org.eclipse.emf.common_2*.jar");
+		assertFileExists(targetdir, "repository/features/org.eclipse.emf.sdk_*.jar");
+	}
+
+	@Test
+	public void testFeatureRestrictionWithIncludePluginsAndFeaturesDisabled() throws Exception {
+		Verifier verifier = getVerifier("feature.dependency", false, true);
+		verifier.executeGoals(List.of("clean", "package"));
+		verifier.verifyErrorFreeLog();
+		File targetdir = new File(verifier.getBasedir(), "site/target");
+		assertFileDoesNotExist(targetdir, "repository/plugins/com.google.guava_*.jar");
+		assertFileDoesNotExist(targetdir, "repository/plugins/org.eclipse.emf.common_2.*.jar");
+		assertFileDoesNotExist(targetdir, "repository/features/org.eclipse.emf.sdk_*.jar");
 	}
 }