Adjust excludes and min tests version for some integration tests

filiphr · Sep 3, 2024 · 9ab2bf8 · 9ab2bf8
1 parent 6186d89
commit 9ab2bf8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/...t/src/test/java/org/mapstruct/itest/tests/FullFeatureCompilationExclusionCliEnhancer.java b/...t/src/test/java/org/mapstruct/itest/tests/FullFeatureCompilationExclusionCliEnhancer.java
@@ -30,6 +30,10 @@ public Collection<String> getAdditionalCommandLineArguments(ProcessorTest.Proces
 
  switch ( currentJreVersion ) {
  case JAVA_8:
+ additionalExcludes.add( "org/mapstruct/ap/test/*/spring/**/*.java" );
+ additionalExcludes.add( "org/mapstruct/ap/test/bugs/_880/**/*.java" );
+ additionalExcludes.add( "org/mapstruct/ap/test/bugs/_1395/**/*.java" );
+ additionalExcludes.add( "org/mapstruct/ap/test/bugs/_2807/**/*.java" );
  additionalExcludes.add( "org/mapstruct/ap/test/injectionstrategy/cdi/**/*.java" );
  additionalExcludes.add( "org/mapstruct/ap/test/injectionstrategy/jakarta_cdi/**/*.java" );
  additionalExcludes.add( "org/mapstruct/ap/test/annotatewith/deprecated/jdk11/*.java" );
@@ -42,6 +46,11 @@ public Collection<String> getAdditionalCommandLineArguments(ProcessorTest.Proces
  // TODO find out why this fails:
  additionalExcludes.add( "org/mapstruct/ap/test/collection/wildcard/BeanMapper.java" );
  break;
+ case JAVA_11:
+ additionalExcludes.add( "org/mapstruct/ap/test/*/spring/**/*.java" );
+ additionalExcludes.add( "org/mapstruct/ap/test/bugs/_880/**/*.java" );
+ additionalExcludes.add( "org/mapstruct/ap/test/bugs/_1395/**/*.java" );
+ additionalExcludes.add( "org/mapstruct/ap/test/bugs/_2807/**/*.java" );
  default:
  }
 

diff --git a/integrationtest/src/test/java/org/mapstruct/itest/tests/MavenIntegrationTest.java b/integrationtest/src/test/java/org/mapstruct/itest/tests/MavenIntegrationTest.java
@@ -80,6 +80,7 @@ void jakartaJaxbTest() {
  }
 
  @ProcessorTest(baseDir = "jsr330Test")
+ @EnabledForJreRange(min = JRE.JAVA_17)
  void jsr330Test() {
  }
 
@@ -156,6 +157,7 @@ void defaultPackageTest() {
  }
 
  @ProcessorTest(baseDir = "springTest")
+ @EnabledForJreRange(min = JRE.JAVA_17)
  void springTest() {
  }
 

diff --git a/integrationtest/src/test/resources/fullFeatureTest/pom.xml b/integrationtest/src/test/resources/fullFeatureTest/pom.xml
@@ -27,6 +27,11 @@
  <additionalExclude4>x</additionalExclude4>
  <additionalExclude5>x</additionalExclude5>
  <additionalExclude6>x</additionalExclude6>
+ <additionalExclude7>x</additionalExclude7>
+ <additionalExclude8>x</additionalExclude8>
+ <additionalExclude9>x</additionalExclude9>
+ <additionalExclude10>x</additionalExclude10>
+ <additionalExclude11>x</additionalExclude11>
  </properties>
 
  <build>
@@ -49,6 +54,11 @@
  <exclude>${additionalExclude4}</exclude>
  <exclude>${additionalExclude5}</exclude>
  <exclude>${additionalExclude6}</exclude>
+ <exclude>${additionalExclude7}</exclude>
+ <exclude>${additionalExclude8}</exclude>
+ <exclude>${additionalExclude9}</exclude>
+ <exclude>${additionalExclude10}</exclude>
+ <exclude>${additionalExclude11}</exclude>
  </excludes>
  </configuration>
  </plugin>