Adjusts tests to use proc:full since it has been changed since Java 22

filiphr · Sep 15, 2024 · 4855d66 · 4855d66
1 parent ddc6181
commit 4855d66
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 4 deletions.
diff --git a/integrationtest/src/test/java/org/mapstruct/itest/tests/MavenIntegrationTest.java b/integrationtest/src/test/java/org/mapstruct/itest/tests/MavenIntegrationTest.java
@@ -5,6 +5,7 @@
  */
 package org.mapstruct.itest.tests;
 
+import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.parallel.Execution;
@@ -80,6 +81,7 @@ void jakartaJaxbTest() {
  }
 
  @ProcessorTest(baseDir = "jsr330Test")
+ @DisabledOnJre( JRE.OTHER )
  void jsr330Test() {
  }
 
@@ -163,6 +165,7 @@ void defaultPackageTest() {
  }
 
  @ProcessorTest(baseDir = "springTest")
+ @DisabledOnJre( JRE.OTHER )
  void springTest() {
  }
 

diff --git a/integrationtest/src/test/resources/faultyAstModifyingAnnotationProcessorTest/usage/pom.xml b/integrationtest/src/test/resources/faultyAstModifyingAnnotationProcessorTest/usage/pom.xml
@@ -44,6 +44,18 @@
  <compilerArg>-XprintRounds</compilerArg>
  </compilerArgs>
  <testCompilerArgument>-proc:none</testCompilerArgument>
+ <annotationProcessorPaths>
+ <annotationProcessorPath>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>${mapstruct.version}</version>
+ </annotationProcessorPath>
+ <annotationProcessorPath>
+ <groupId>org.mapstruct.itest</groupId>
+ <artifactId>itest-faultyAstModifyingProcessor-generator</artifactId>
+ <version>1.0.0</version>
+ </annotationProcessorPath>
+ </annotationProcessorPaths>
  </configuration>
  </plugin>
  </plugins>

diff --git a/integrationtest/src/test/resources/pom.xml b/integrationtest/src/test/resources/pom.xml
@@ -45,6 +45,9 @@
  <compilerArgument
  combine.self="override"></compilerArgument>
  <compilerId>\${compiler-id}</compilerId>
+ <compilerArgs>
+ <compilerArg>-proc:full</compilerArg>
+ </compilerArgs>
  </configuration>
  <dependencies>
  <dependency>

diff --git a/integrationtest/src/test/resources/recordsTest/pom.xml b/integrationtest/src/test/resources/recordsTest/pom.xml
@@ -34,7 +34,10 @@
  <compilerArgument
  combine.self="override"></compilerArgument>
  <compilerId>\${compiler-id}</compilerId>
- <compilerArgs>--enable-preview</compilerArgs>
+ <compilerArgs>
+ <compilerArg>--enable-preview</compilerArg>
+ <compilerArg>-proc:full</compilerArg>
+ </compilerArgs>
  </configuration>
  <dependencies>
  <dependency>
@@ -72,6 +75,7 @@
  <fork>true</fork>
  <compilerArgs>
  <arg>--enable-preview</arg>
+ <arg>-proc:full</arg>
  <arg>-J-Xdebug</arg>
  <arg>-J-Xnoagent</arg>
  <arg>-J-Djava.compiler=NONE</arg>

diff --git a/integrationtest/src/test/resources/sealedSubclassTest/pom.xml b/integrationtest/src/test/resources/sealedSubclassTest/pom.xml
@@ -34,7 +34,10 @@
  <compilerArgument
  combine.self="override"></compilerArgument>
  <compilerId>\${compiler-id}</compilerId>
- <compilerArgs>--enable-preview</compilerArgs>
+ <compilerArgs>
+ <compilerArg>--enable-preview</compilerArg>
+ <compilerArg>-proc:full</compilerArg>
+ </compilerArgs>
  </configuration>
  <dependencies>
  <dependency>
@@ -72,6 +75,7 @@
  <fork>true</fork>
  <compilerArgs>
  <arg>--enable-preview</arg>
+ <arg>-proc:full</arg>
  <arg>-J-Xdebug</arg>
  <arg>-J-Xnoagent</arg>
  <arg>-J-Djava.compiler=NONE</arg>

diff --git a/integrationtest/src/test/resources/superTypeGenerationTest/usage/pom.xml b/integrationtest/src/test/resources/superTypeGenerationTest/usage/pom.xml
@@ -38,12 +38,23 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
  <configuration>
  <compilerArgs>
  <compilerArg>-XprintProcessorInfo</compilerArg>
  <compilerArg>-XprintRounds</compilerArg>
  </compilerArgs>
+ <annotationProcessorPaths>
+ <annotationProcessorPath>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>${mapstruct.version}</version>
+ </annotationProcessorPath>
+ <annotationProcessorPath>
+ <groupId>org.mapstruct.itest</groupId>
+ <artifactId>itest-supertypegeneration-generator</artifactId>
+ <version>1.0.0</version>
+ </annotationProcessorPath>
+ </annotationProcessorPaths>
  </configuration>
  </plugin>
  </plugins>

diff --git a/integrationtest/src/test/resources/targetTypeGenerationTest/usage/pom.xml b/integrationtest/src/test/resources/targetTypeGenerationTest/usage/pom.xml
@@ -38,12 +38,23 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
  <configuration>
  <compilerArgs>
  <compilerArg>-XprintProcessorInfo</compilerArg>
  <compilerArg>-XprintRounds</compilerArg>
  </compilerArgs>
+ <annotationProcessorPaths>
+ <annotationProcessorPath>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>${mapstruct.version}</version>
+ </annotationProcessorPath>
+ <annotationProcessorPath>
+ <groupId>org.mapstruct.itest</groupId>
+ <artifactId>itest-targettypegeneration-generator</artifactId>
+ <version>1.0.0</version>
+ </annotationProcessorPath>
+ </annotationProcessorPaths>
  </configuration>
  </plugin>
  </plugins>

diff --git a/integrationtest/src/test/resources/usesTypeGenerationTest/usage/pom.xml b/integrationtest/src/test/resources/usesTypeGenerationTest/usage/pom.xml
@@ -44,6 +44,18 @@
  <compilerArg>-XprintRounds</compilerArg>
  </compilerArgs>
  <testCompilerArgument>-proc:none</testCompilerArgument>
+ <annotationProcessorPaths>
+ <annotationProcessorPath>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>${mapstruct.version}</version>
+ </annotationProcessorPath>
+ <annotationProcessorPath>
+ <groupId>org.mapstruct.itest</groupId>
+ <artifactId>itest-usestypegeneration-generator</artifactId>
+ <version>1.0.0</version>
+ </annotationProcessorPath>
+ </annotationProcessorPaths>
  </configuration>
  </plugin>
  </plugins>