Fixes running of unit tests for Java 11

jqno · Dec 15, 2024 · 49bb988 · 49bb988
1 parent 441cacb
commit 49bb988
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/.../extended_contract/JavaFxClassesTest.java → .../extended_contract/JavaFxClassesTest.java b/.../extended_contract/JavaFxClassesTest.java → .../extended_contract/JavaFxClassesTest.java
@@ -5,29 +5,17 @@
 
 import java.util.Map;
 import java.util.Objects;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.FloatProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.LongProperty;
-import javafx.beans.property.MapProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SetProperty;
-import javafx.beans.property.StringProperty;
+
+import javafx.beans.property.*;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
 import javafx.collections.ObservableSet;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.testhelpers.types.Point;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnJre;
-import org.junit.jupiter.api.condition.JRE;
 
 // CHECKSTYLE OFF: ParameterNumber
 
-@DisabledOnJre(value = JRE.JAVA_8, disabledReason = "JavaFX requires Java 11 or higher")
 public class JavaFxClassesTest {
 
     @Test

diff --git a/...ternal/instantiation/vintage/prefabvalues/factoryproviders/JavaFxFactoryProviderTest.java b/...ternal/instantiation/vintage/prefabvalues/factoryproviders/JavaFxFactoryProviderTest.java
@@ -15,9 +15,12 @@
 import nl.jqno.equalsverifier.testhelpers.types.Point;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
 import org.objenesis.ObjenesisStd;
 
 @SuppressWarnings("rawtypes")
+@DisabledOnJre(JRE.JAVA_8)
 public class JavaFxFactoryProviderTest {
 
     private VintageValueProvider valueProvider;

diff --git a/pom.xml b/pom.xml
@@ -239,6 +239,27 @@
 
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>1.7</version>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>add-test-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>src/test/java</source>
+                                        <source>src/test/java-11</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>