Add skeleton tests for extension descriptor

I've also corrected (because the tests caught it, yay!) a missing brace on one of the "please don't complain" properties. I haven't tested the bootstrap extension descriptor since it is deprecated, but we could copy things across fairly easily if we think it's worthwhile. I also haven't tested everything the descriptor does, but now that we have a skeleton which drives the mojo, we can add new tests more easily.
igorregis · Oct 16, 2022 · fa41bf2 · fa41bf2
1 parent 7a20626
commit fa41bf2
Show file tree

Hide file tree

Showing 10 changed files with 712 additions and 7 deletions.
diff --git a/independent-projects/bootstrap/bom-test/pom.xml b/independent-projects/bootstrap/bom-test/pom.xml
@@ -39,6 +39,30 @@
                 <scope>test</scope>
                 <version>${shrinkwrap-depchain.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugin-testing</groupId>
+                <artifactId>maven-plugin-testing-harness</artifactId>
+                <version>3.3.0</version>
+                <scope>test</scope>
+                <exclusions>
+                    <!-- let's prefer the plexus-utils pulled by maven-resolver-provider -->
+                    <exclusion>
+                        <groupId>org.codehaus.plexus</groupId>
+                        <artifactId>plexus-utils</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-io</groupId>
+                        <artifactId>commons-io</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <!-- maven compat is needed because the maven testing harness still uses maven 2 APIs -->
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-compat</artifactId>
+                <version>${maven.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
@@ -201,7 +201,7 @@ public static class RemovedResources {
     @Parameter(required = false, defaultValue = "${skipExtensionValidation}")
     private boolean skipExtensionValidation;
 
-    @Parameter(required = false, defaultValue = "${ignoreNotDetectedQuarkusCoreVersion")
+    @Parameter(required = false, defaultValue = "${ignoreNotDetectedQuarkusCoreVersion}")
     boolean ignoreNotDetectedQuarkusCoreVersion;
 
     @Parameter

diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml
@@ -39,6 +39,12 @@
         <junit.jupiter.version>5.9.0</junit.jupiter.version>
     </properties>
     <build>
+        <testResources>
+                <testResource>
+                    <directory>src/test/resources</directory>
+                    <filtering>true</filtering>
+                </testResource>
+        </testResources>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -48,6 +54,20 @@
                         <doclint>none</doclint>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <!-- The tests cause generated files to appear in the test-data projects, so clean them up when we clean -->
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <configuration>
+                        <filesets>
+                            <fileset>
+                                <directory>src/test/resources</directory>
+                                <includes>
+                                    <include>**/target/**</include>
+                                </includes>
+                            </fileset>
+                        </filesets>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
@@ -188,6 +208,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-bom-test</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!-- Jackson dependencies, imported as a BOM -->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
@@ -196,6 +223,7 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -238,6 +266,29 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugin-testing</groupId>
+            <artifactId>maven-plugin-testing-harness</artifactId>
+            <scope>test</scope>
+        </dependency>
+       <!-- maven compat is needed because the maven testing harness still uses maven 2 APIs -->
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-compat</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-invoker</artifactId>
+            <version>3.2.0</version>
+            <scope>test</scope>
+            <exclusions>
+              <exclusion>
+                <groupId>javax.inject</groupId>
+                <artifactId>javax.inject</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

diff --git a/...ojects/extension-maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/...ojects/extension-maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
@@ -103,7 +103,7 @@ public static class RemovedResources {
      * @component
      */
     @Component
-    private RepositorySystem repoSystem;
+    RepositorySystem repoSystem;
 
     @Component
     RemoteRepositoryManager remoteRepoManager;
@@ -121,7 +121,7 @@ public static class RemovedResources {
      * @readonly
      */
     @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
-    private RepositorySystemSession repoSession;
+    RepositorySystemSession repoSession;
 
     /**
      * The project's remote repositories to use for the resolution of artifacts and
@@ -213,7 +213,7 @@ public static class RemovedResources {
      * Whether to ignore failure detecting the Quarkus core version used to build the extension,
      * which would be recorded in the extension's metadata.
      */
-    @Parameter(required = false, defaultValue = "${ignoreNotDetectedQuarkusCoreVersion")
+    @Parameter(required = false, defaultValue = "${ignoreNotDetectedQuarkusCoreVersion}")
     boolean ignoreNotDetectedQuarkusCoreVersion;
 
     /**