Major test package refactoring to try to fix JPMS issues (#1505)

Author: cowtowncoder

pom.xml

@@ -138,7 +138,6 @@ tools.jackson.core.*;version=${project.version}
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${version.plugin.surefire}</version>
         <configuration>
           <includes>
             <include>**/*IT.java</include>

src/main/java/module-info.java

@@ -18,19 +18,8 @@
     exports tools.jackson.core.util;
 
     // But opens only for unit test suite; as well as some extra exports
-    opens tools.jackson.core to tools.jackson.core.testutil;
-    opens tools.jackson.core.async to tools.jackson.core.testutil;
-    opens tools.jackson.core.base to tools.jackson.core.testutil;
-    opens tools.jackson.core.exc to tools.jackson.core.testutil;
-    opens tools.jackson.core.filter to tools.jackson.core.testutil;
-    opens tools.jackson.core.io to tools.jackson.core.testutil;
-    exports tools.jackson.core.io.schubfach to tools.jackson.core.testutil;
-    opens tools.jackson.core.json to tools.jackson.core.testutil;
-    opens tools.jackson.core.json.async to tools.jackson.core.testutil;
-    opens tools.jackson.core.sym to tools.jackson.core.testutil;
-    opens tools.jackson.core.tree to tools.jackson.core.testutil;
-    opens tools.jackson.core.type to tools.jackson.core.testutil;
-    opens tools.jackson.core.util to tools.jackson.core.testutil;
+    exports tools.jackson.core.io.schubfach to tools.jackson.core.unittest;
+    opens tools.jackson.core.json to tools.jackson.core.unittest;
 
     provides tools.jackson.core.TokenStreamFactory with
         tools.jackson.core.json.JsonFactory;

src/test/java/module-info.java

@@ -1,6 +1,6 @@
 // jackson-core test Module descriptor: used both for tests and to
 // to produce "test-jar" for other Jackson components to use
-module tools.jackson.core.testutil
+module tools.jackson.core.unittest
 {
     // Additional test lib/framework dependencies
     requires org.assertj.core;
@@ -11,10 +11,10 @@
     requires tools.jackson.core;
 
     // Exports/opens a small set of Classes for downstream Jackson components
-    exports tools.jackson.core.testutil;
-    exports tools.jackson.core.testutil.failure;
-    opens tools.jackson.core.testutil;
-    opens tools.jackson.core.testutil.failure;
+    exports tools.jackson.core.unittest.testutil;
+    exports tools.jackson.core.unittest.testutil.failure;
+    opens tools.jackson.core.unittest.testutil;
+    opens tools.jackson.core.unittest.testutil.failure;
 
     // Additional test opens for Unit tests
 

src/test/java/tools/jackson/core/unittest/JacksonCoreTestBase.java

@@ -10,10 +10,10 @@
 import tools.jackson.core.TokenStreamFactory;
 import tools.jackson.core.json.JsonFactory;
 import tools.jackson.core.json.JsonFactoryBuilder;
-import tools.jackson.core.testutil.JacksonTestUtilBase;
-import tools.jackson.core.testutil.MockDataInput;
-import tools.jackson.core.testutil.ThrottledInputStream;
-import tools.jackson.core.testutil.ThrottledReader;
+import tools.jackson.core.unittest.testutil.JacksonTestUtilBase;
+import tools.jackson.core.unittest.testutil.MockDataInput;
+import tools.jackson.core.unittest.testutil.ThrottledInputStream;
+import tools.jackson.core.unittest.testutil.ThrottledReader;
 
 /**
  * Base class for Jackson-core unit tests, using JUnit 5.

src/test/java/tools/jackson/core/unittest/async/AsyncTestBase.java

@@ -5,10 +5,10 @@
 import tools.jackson.core.ObjectReadContext;
 import tools.jackson.core.TokenStreamFactory;
 import tools.jackson.core.json.JsonFactory;
-import tools.jackson.core.testutil.AsyncReaderWrapper;
-import tools.jackson.core.testutil.AsyncReaderWrapperForByteArray;
-import tools.jackson.core.testutil.AsyncReaderWrapperForByteBuffer;
 import tools.jackson.core.unittest.*;
+import tools.jackson.core.unittest.testutil.AsyncReaderWrapper;
+import tools.jackson.core.unittest.testutil.AsyncReaderWrapperForByteArray;
+import tools.jackson.core.unittest.testutil.AsyncReaderWrapperForByteBuffer;
 
 public abstract class AsyncTestBase extends JacksonCoreTestBase
 {

src/test/java/tools/jackson/core/unittest/base64/Base64GenerationTest.java

@@ -13,8 +13,8 @@
 import tools.jackson.core.ObjectReadContext;
 import tools.jackson.core.ObjectWriteContext;
 import tools.jackson.core.json.JsonFactory;
-import tools.jackson.core.testutil.ThrottledInputStream;
 import tools.jackson.core.unittest.*;
+import tools.jackson.core.unittest.testutil.ThrottledInputStream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

src/test/java/tools/jackson/core/unittest/constraints/LargeDocReadTest.java

@@ -8,8 +8,8 @@
 import tools.jackson.core.StreamReadConstraints;
 import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.core.json.JsonFactory;
-import tools.jackson.core.testutil.AsyncReaderWrapper;
 import tools.jackson.core.unittest.async.AsyncTestBase;
+import tools.jackson.core.unittest.testutil.AsyncReaderWrapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;

src/test/java/tools/jackson/core/unittest/fuzz/Fuzz32208UTF32ParseTest.java

@@ -12,8 +12,8 @@
 import tools.jackson.core.exc.JacksonIOException;
 import tools.jackson.core.io.UTF32Reader;
 import tools.jackson.core.json.JsonFactory;
-import tools.jackson.core.testutil.ThrottledInputStream;
 import tools.jackson.core.unittest.*;
+import tools.jackson.core.unittest.testutil.ThrottledInputStream;
 
 import static org.junit.jupiter.api.Assertions.fail;
 

src/test/java/tools/jackson/core/unittest/fuzz/Fuzz52688ParseTest.java

@@ -10,8 +10,8 @@
 import tools.jackson.core.ObjectReadContext;
 import tools.jackson.core.exc.StreamReadException;
 import tools.jackson.core.json.JsonFactory;
-import tools.jackson.core.testutil.ThrottledInputStream;
 import tools.jackson.core.unittest.*;
+import tools.jackson.core.unittest.testutil.ThrottledInputStream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;

src/test/java/tools/jackson/core/unittest/json/JsonParserClosedCaseTest.java

@@ -12,8 +12,8 @@
 import tools.jackson.core.*;
 import tools.jackson.core.io.SerializedString;
 import tools.jackson.core.json.JsonFactory;
-import tools.jackson.core.testutil.MockDataInput;
 import tools.jackson.core.unittest.JacksonCoreTestBase;
+import tools.jackson.core.unittest.testutil.MockDataInput;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;