From e112aa2fecd2f2f823b5c2af78322f5de231dcf5 Mon Sep 17 00:00:00 2001
From: Jason Faust <jason.faust@gmail.com>
Date: Sat, 26 Mar 2022 23:55:15 -0400
Subject: [PATCH] Minimal test for issue 230

---
 .../pom.xml                                   | 30 ++++++++++
 .../src/main/java/ex/A.java                   |  2 +
 .../src/main/java/module-info.java            |  1 +
 .../src/test/java/ex/ATest.java               |  2 +
 .../compiler/MavenCompilerPluginTest.java     | 57 +++++++++++--------
 5 files changed, 67 insertions(+), 25 deletions(-)
 create mode 100644 tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/pom.xml
 create mode 100644 tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/main/java/ex/A.java
 create mode 100644 tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/main/java/module-info.java
 create mode 100644 tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/test/java/ex/ATest.java

diff --git a/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/pom.xml b/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/pom.xml
new file mode 100644
index 0000000000..1e21ca14c4
--- /dev/null
+++ b/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/pom.xml
@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>tycho-its-project.compiler.mavenCompilerPlugin.moduleWithTests</groupId>
+	<artifactId>c.m.m</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.10.1</version>
+					<configuration>
+						<compilerId>jdt</compilerId>
+					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-compiler-jdt</artifactId>
+							<version>${tycho-version}</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+</project>
\ No newline at end of file
diff --git a/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/main/java/ex/A.java b/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/main/java/ex/A.java
new file mode 100644
index 0000000000..89537b5e3b
--- /dev/null
+++ b/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/main/java/ex/A.java
@@ -0,0 +1,2 @@
+package ex;
+public class A {}
\ No newline at end of file
diff --git a/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/main/java/module-info.java b/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/main/java/module-info.java
new file mode 100644
index 0000000000..8d4c35cf59
--- /dev/null
+++ b/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/main/java/module-info.java
@@ -0,0 +1 @@
+module ex {}
\ No newline at end of file
diff --git a/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/test/java/ex/ATest.java b/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/test/java/ex/ATest.java
new file mode 100644
index 0000000000..fd09f60793
--- /dev/null
+++ b/tycho-its/projects/compiler.mavenCompilerPlugin.moduleWithTests/src/test/java/ex/ATest.java
@@ -0,0 +1,2 @@
+package ex;
+class ATest {}
\ No newline at end of file
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MavenCompilerPluginTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MavenCompilerPluginTest.java
index 806a044d08..591407a2d0 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MavenCompilerPluginTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MavenCompilerPluginTest.java
@@ -21,30 +21,37 @@
 
 public class MavenCompilerPluginTest extends AbstractTychoIntegrationTest {
 
-    @Test
-    public void testJDTCompilerId() throws Exception {
-        Verifier verifier = getVerifier("compiler.mavenCompilerPlugin", false);
-        try {
-            verifier.executeGoal("compile");
-            Assert.fail();
-        } catch (VerificationException e) {
-            // expected
-            verifier.verifyTextInLog("field Foo.unused is not used");
-        }
-    }
-
-    @Test
-    public void testAdditionalBundles() throws Exception {
-        Verifier verifier = getVerifier("compiler.additional.bundles", true);
-        verifier.executeGoal("compile");
-        verifier.verifyErrorFreeLog();
-    }
-
-    @Test
-    public void testLimitModules() throws Exception {
-        Verifier verifier = getVerifier("compiler.limit.modules", true);
-        verifier.executeGoal("compile");
-        verifier.verifyErrorFreeLog();
-    }
+	@Test
+	public void testJDTCompilerId() throws Exception {
+		Verifier verifier = getVerifier("compiler.mavenCompilerPlugin", false);
+		try {
+			verifier.executeGoal("compile");
+			Assert.fail();
+		} catch (VerificationException e) {
+			// expected
+			verifier.verifyTextInLog("field Foo.unused is not used");
+		}
+	}
+
+	@Test
+	public void testMavenCompilerPluginModuleWithTests() throws Exception {
+		Verifier verifier = getVerifier("compiler.mavenCompilerPlugin.moduleWithTests", false);
+		verifier.executeGoal("verify");
+		verifier.verifyErrorFreeLog();
+	}
+
+	@Test
+	public void testAdditionalBundles() throws Exception {
+		Verifier verifier = getVerifier("compiler.additional.bundles", true);
+		verifier.executeGoal("compile");
+		verifier.verifyErrorFreeLog();
+	}
+
+	@Test
+	public void testLimitModules() throws Exception {
+		Verifier verifier = getVerifier("compiler.limit.modules", true);
+		verifier.executeGoal("compile");
+		verifier.verifyErrorFreeLog();
+	}
 
 }