Fix GradleTest

Author: cowtowncoder

pom.xml

@@ -107,6 +107,10 @@
       <groupId>tools.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-smile</artifactId>
     </dependency>
+    <dependency>
+      <groupId>tools.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-toml</artifactId>
+    </dependency>
     <dependency>
       <groupId>tools.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
@@ -211,6 +215,11 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>

src/main/java/module-info.java

@@ -19,6 +19,7 @@
     requires transitive tools.jackson.dataformat.smile;
     requires transitive tools.jackson.dataformat.xml;
     requires transitive tools.jackson.dataformat.yaml;
+    requires transitive tools.jackson.dataformat.toml;
 
     // Base modules
 

src/test/java/tools/jackson/integtest/BaseTest.java

@@ -22,6 +22,8 @@
 import tools.jackson.dataformat.protobuf.ProtobufMapper;
 import tools.jackson.dataformat.smile.SmileFactory;
 import tools.jackson.dataformat.smile.SmileMapper;
+import tools.jackson.dataformat.toml.TomlFactory;
+import tools.jackson.dataformat.toml.TomlMapper;
 import tools.jackson.dataformat.xml.XmlFactory;
 import tools.jackson.dataformat.xml.XmlMapper;
 import tools.jackson.dataformat.yaml.YAMLFactory;
@@ -266,6 +268,18 @@ protected static JavaPropsMapper propsMapper() {
         return propsMapperBuilder().build();
     }
 
+    protected static TomlMapper.Builder tomlMapperBuilder() {
+        return TomlMapper.builder();
+    }
+
+    protected static TomlMapper.Builder tomlMapperBuilder(TomlFactory f) {
+        return TomlMapper.builder(f);
+    }
+
+    protected static TomlMapper tomlMapper() {
+        return tomlMapperBuilder().build();
+    }
+
     protected static XmlMapper.Builder xmlMapperBuilder() {
         return XmlMapper.builder();
     }

src/test/java/tools/jackson/integtest/df/basic/BasicReadWriteIonTest.java

@@ -0,0 +1,21 @@
+package tools.jackson.integtest.df.basic;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.ObjectMapper;
+
+import tools.jackson.integtest.BaseTest;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class BasicReadWriteIonTest extends BaseTest
+{
+    @Test
+    public void testSimple() throws Exception
+    {
+        ObjectMapper mapper = ionMapper();
+
+        // !!! 23-Feb-2016, tatu: Trivial to avoid using any Schema
+        assertNotNull(mapper);
+    }
+}

src/test/java/tools/jackson/integtest/df/basic/BasicReadWriteTomlTest.java

@@ -0,0 +1,21 @@
+package tools.jackson.integtest.df.basic;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.ObjectMapper;
+
+import tools.jackson.integtest.BaseTest;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class BasicReadWriteTomlTest extends BaseTest
+{
+    @Test
+    public void testSimple() throws Exception
+    {
+        ObjectMapper mapper = tomlMapper();
+
+        // !!! 23-Feb-2016, tatu: Trivial to avoid using any Schema
+        assertNotNull(mapper);
+    }
+}

src/test/java/tools/jackson/integtest/gradle/GradleTest.java

@@ -1,6 +1,7 @@
 package tools.jackson.integtest.gradle;
 
 import java.io.*;
+import java.net.URL;
 import java.nio.file.Files;
 
 import org.junit.jupiter.api.Test;
@@ -12,9 +13,6 @@
 
 public class GradleTest
 {
-    @TempDir
-    public File testFolder;
-
     /**
      * This test calls the Gradle build in 'src/test/resources/com/fasterxml/jackson/integtest/gradle' which:
      * - Collects all entries from the latest Jackson BOM
@@ -27,19 +25,24 @@ public class GradleTest
      * <a href="https://blog.gradle.org/alignment-with-gradle-module-metadata">blog.gradle.org/alignment-with-gradle-module-metadata</a>
      */
     @Test
-    public void testJacksonBomDependency() throws Exception {
-        copyToTestFolder("settings.gradle.kts");
-        copyToTestFolder("build.gradle.kts");
-        build(":checkMetadata");
+    public void testJacksonBomDependency(@TempDir File tempDir) throws Exception {
+        copyToTestFolder(tempDir, "settings.gradle.kts");
+        copyToTestFolder(tempDir, "build.gradle.kts");
+        build(tempDir, ":checkMetadata");
     }
 
-    private void copyToTestFolder(String fileName) throws IOException {
-        Files.copy(new File(requireNonNull(getClass().getResource(fileName)).getFile()).toPath(),
+    private void copyToTestFolder(File testFolder, String fileName) throws IOException {
+        URL resource = getClass().getResource(fileName);
+        assertNotNull(resource, "Null resource '"+fileName+"', from `"+getClass()+"`");
+        Files.copy(new File(resource.getFile()).toPath(),
                 new File(testFolder, fileName).toPath());
     }
 
-    private void build(String task) throws Exception {
-        String gradlew = requireNonNull(getClass().getResource("gradlew")).getFile();
+    private void build(File testFolder, String task) throws Exception {
+        String fileName = "gradlew";
+        URL resource = getClass().getResource(fileName);
+        assertNotNull(resource, "Null resource '"+fileName+"', from `"+getClass()+"`");
+        String gradlew = resource.getFile();
         Runtime.getRuntime().exec("chmod a+x " + gradlew).waitFor();
         ProcessBuilder bp = new ProcessBuilder(gradlew, task, "-q",
                 "--project-dir", testFolder.getAbsolutePath());