Make testXjc attach test sources

Fixes #134
mojohaus · Apr 14, 2024 · 9357430 · 9357430
1 parent 3f89990
commit 9357430
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 12 deletions.
diff --git a/src/main/java/org/codehaus/mojo/jaxb2/AbstractJaxbMojo.java b/src/main/java/org/codehaus/mojo/jaxb2/AbstractJaxbMojo.java
@@ -358,10 +358,17 @@ public final void execute() throws MojoExecutionException, MojoFailureException
             }
 
             // Add the output Directory.
-            getProject().addCompileSourceRoot(canonicalPathToOutputDirectory);
+            addGeneratedSourcesToProjectSourceRoot(canonicalPathToOutputDirectory);
         }
     }
 
+    /**
+     * Adds any directories containing the generated XJC classes to the appropriate Project compilation sources;
+     * either {@code TestCompileSourceRoot} or {@code CompileSourceRoot} depending on the exact Mojo implementation
+     * of this AbstractJavaGeneratorMojo.
+     */
+    protected abstract void addGeneratedSourcesToProjectSourceRoot(String canonicalPathToOutputDirectory);
+
     /**
      * Implement this method to check if this AbstractJaxbMojo should skip executing altogether.
      *

diff --git a/src/main/java/org/codehaus/mojo/jaxb2/javageneration/AbstractJavaGeneratorMojo.java b/src/main/java/org/codehaus/mojo/jaxb2/javageneration/AbstractJavaGeneratorMojo.java
@@ -528,7 +528,8 @@ protected boolean performExecution() throws MojoExecutionException, MojoFailureE
             }
 
             // Add the generated source root to the project, enabling tooling and other plugins to see them.
-            addGeneratedSourcesToProjectSourceRoot();
+            String canonicalPathToOutputDirectory = FileSystemUtilities.getCanonicalPath(getOutputDirectory());
+            addGeneratedSourcesToProjectSourceRoot(canonicalPathToOutputDirectory);
 
             // Copy all source XSDs to the resulting artifact?
             if (xsdPathWithinArtifact != null) {
@@ -604,13 +605,6 @@ protected boolean performExecution() throws MojoExecutionException, MojoFailureE
      */
     protected abstract List<File> getSourceXJBs();
 
-    /**
-     * Adds any directories containing the generated XJC classes to the appropriate Project compilation sources;
-     * either {@code TestCompileSourceRoot} or {@code CompileSourceRoot} depending on the exact Mojo implementation
-     * of this AbstractJavaGeneratorMojo.
-     */
-    protected abstract void addGeneratedSourcesToProjectSourceRoot();
-
     //
     // Private helpers
     //

diff --git a/src/main/java/org/codehaus/mojo/jaxb2/javageneration/TestXjcMojo.java b/src/main/java/org/codehaus/mojo/jaxb2/javageneration/TestXjcMojo.java
@@ -326,7 +326,7 @@ protected List<String> getClasspath() throws MojoExecutionException {
      * {@inheritDoc}
      */
     @Override
-    protected void addGeneratedSourcesToProjectSourceRoot() {
+    protected void addGeneratedSourcesToProjectSourceRoot(String canonicalPathToOutputDirectory) {
         getProject().addTestCompileSourceRoot(getOutputDirectory().getAbsolutePath());
     }
 

diff --git a/src/main/java/org/codehaus/mojo/jaxb2/javageneration/XjcMojo.java b/src/main/java/org/codehaus/mojo/jaxb2/javageneration/XjcMojo.java
@@ -332,8 +332,8 @@ protected List<String> getClasspath() throws MojoExecutionException {
      * {@inheritDoc}
      */
     @Override
-    protected void addGeneratedSourcesToProjectSourceRoot() {
-        getProject().addCompileSourceRoot(FileSystemUtilities.getCanonicalPath(getOutputDirectory()));
+    protected void addGeneratedSourcesToProjectSourceRoot(String canonicalPathToOutputDirectory) {
+        getProject().addCompileSourceRoot(canonicalPathToOutputDirectory);
     }
 
     /**

diff --git a/src/main/java/org/codehaus/mojo/jaxb2/schemageneration/SchemaGenerationMojo.java b/src/main/java/org/codehaus/mojo/jaxb2/schemageneration/SchemaGenerationMojo.java
@@ -244,6 +244,14 @@ protected List<String> getClasspath() throws MojoExecutionException {
         return toReturn;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void addGeneratedSourcesToProjectSourceRoot(String canonicalPathToOutputDirectory) {
+        getProject().addCompileSourceRoot(canonicalPathToOutputDirectory);
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/src/main/java/org/codehaus/mojo/jaxb2/schemageneration/TestSchemaGenerationMojo.java b/src/main/java/org/codehaus/mojo/jaxb2/schemageneration/TestSchemaGenerationMojo.java
@@ -215,6 +215,14 @@ protected List<String> getClasspath() throws MojoExecutionException {
         return toReturn;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void addGeneratedSourcesToProjectSourceRoot(String canonicalPathToOutputDirectory) {
+        getProject().addTestCompileSourceRoot(canonicalPathToOutputDirectory);
+    }
+
     /**
      * {@inheritDoc}
      */