refactor: use new writer APIs in all remaining tests

Author: Pfeil

src/test/java/edu/kit/datamanager/ro_crate/crate/OtherFilesTest.java

@@ -2,9 +2,8 @@
 
 import edu.kit.datamanager.ro_crate.HelpFunctions;
 import edu.kit.datamanager.ro_crate.RoCrate;
-import edu.kit.datamanager.ro_crate.writer.FolderWriter;
-import edu.kit.datamanager.ro_crate.writer.RoCrateWriter;
 
+import edu.kit.datamanager.ro_crate.writer.Writers;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -41,8 +40,8 @@ void testOtherFiles(@TempDir Path tempDir) throws IOException, URISyntaxExceptio
     HelpFunctions.compareCrateJsonToFileInResources(roCrate, "/json/crate/simple.json");
 
     // write the crate in the temp dir
-    RoCrateWriter writer = new RoCrateWriter(new FolderWriter());
-    writer.save(roCrate, crate.toFile().getAbsolutePath());
+    Writers.newFolderWriter()
+            .save(roCrate, crate.toFile().getAbsolutePath());
 
     HelpFunctions.compareCrateJsonToFileInResources(new File(Objects.requireNonNull(OtherFilesTest.class.getResource("/json/crate/simple.json")).toURI()), crate.resolve("ro-crate-metadata.json").toFile());
 

src/test/java/edu/kit/datamanager/ro_crate/crate/ReadAndWriteTest.java

@@ -6,9 +6,8 @@
 import edu.kit.datamanager.ro_crate.preview.StaticPreview;
 import edu.kit.datamanager.ro_crate.reader.CrateReader;
 import edu.kit.datamanager.ro_crate.reader.Readers;
-import edu.kit.datamanager.ro_crate.writer.FolderWriter;
-import edu.kit.datamanager.ro_crate.writer.RoCrateWriter;
 
+import edu.kit.datamanager.ro_crate.writer.Writers;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -36,8 +35,8 @@ void testReadingAndWriting(@TempDir Path path) throws IOException {
 
     Path writeDir = path.resolve("crate");
 
-    RoCrateWriter writer = new RoCrateWriter(new FolderWriter());
-    writer.save(crate, writeDir.toAbsolutePath().toString());
+    Writers.newFolderWriter()
+            .save(crate, writeDir.toAbsolutePath().toString());
 
     CrateReader<String> reader = Readers.newFolderReader();
     Crate newCrate = reader.readCrate(writeDir.toAbsolutePath().toString());
@@ -48,6 +47,7 @@ void testReadingAndWriting(@TempDir Path path) throws IOException {
     HelpFunctions.compareTwoCrateJson(newCrate, crate);
   }
 
+  @SuppressWarnings("DataFlowIssue")
   @Test
   void testReadCrateWithHasPartHierarchy() {
     CrateReader<String> reader = Readers.newFolderReader();

src/test/java/edu/kit/datamanager/ro_crate/crate/preview/PreviewCrateTest.java

@@ -1,5 +1,7 @@
 package edu.kit.datamanager.ro_crate.crate.preview;
 
+import edu.kit.datamanager.ro_crate.writer.CrateWriter;
+import edu.kit.datamanager.ro_crate.writer.Writers;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -8,8 +10,6 @@
 import edu.kit.datamanager.ro_crate.preview.AutomaticPreview;
 import edu.kit.datamanager.ro_crate.preview.CustomPreview;
 import edu.kit.datamanager.ro_crate.preview.StaticPreview;
-import edu.kit.datamanager.ro_crate.writer.FolderWriter;
-import edu.kit.datamanager.ro_crate.writer.RoCrateWriter;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -27,8 +27,8 @@ void testAutomaticPreview(@TempDir Path temp) {
         RoCrate crate = new RoCrate.RoCrateBuilder("name", "description", "2024", "https://creativecommons.org/licenses/by-nc-sa/3.0/au/")
                 .setPreview(new AutomaticPreview())
                 .build();
-        RoCrateWriter writer = new RoCrateWriter(new FolderWriter());
-        writer.save(crate, location.toFile().getAbsolutePath());
+        Writers.newFolderWriter()
+                .save(crate, location.toFile().getAbsolutePath());
         assertTrue(Files.isRegularFile(location.resolve("ro-crate-preview.html")));
     }
 
@@ -38,7 +38,7 @@ void testAutomaticPreviewAddingLater(@TempDir Path temp) {
         RoCrate crate = new RoCrate.RoCrateBuilder("name", "description", "2024", "https://creativecommons.org/licenses/by-nc-sa/3.0/au/")
                 .setPreview(null)//disable preview to allow to compare folders before and after
                 .build();
-        RoCrateWriter writer = new RoCrateWriter(new FolderWriter());
+        CrateWriter<String> writer = Writers.newFolderWriter();
         writer.save(crate, location.toFile().toString());
         assertFalse(location.resolve("ro-crate-preview.html").toFile().exists());
         crate.setRoCratePreview(new AutomaticPreview());
@@ -52,8 +52,8 @@ void testCustomPreview(@TempDir Path temp) {
         RoCrate crate = new RoCrate.RoCrateBuilder("name", "description", "2024", "https://creativecommons.org/licenses/by-nc-sa/3.0/au/")
                 .setPreview(new CustomPreview())
                 .build();
-        RoCrateWriter writer = new RoCrateWriter(new FolderWriter());
-        writer.save(crate, location.toFile().getAbsolutePath());
+        Writers.newFolderWriter()
+                .save(crate, location.toFile().getAbsolutePath());
         assertTrue(Files.isRegularFile(location.resolve("ro-crate-preview.html")));
     }
 
@@ -65,8 +65,8 @@ void testStaticPreviewOnlyHtmlFile(@TempDir Path temp) throws IOException {
         RoCrate crate = new RoCrate.RoCrateBuilder("name", "description", "2024", "https://creativecommons.org/licenses/by-nc-sa/3.0/au/")
                 .setPreview(new StaticPreview(previewFile.toFile()))
                 .build();
-        RoCrateWriter writer = new RoCrateWriter(new FolderWriter());
-        writer.save(crate, location.toFile().toString());
+        Writers.newFolderWriter()
+                .save(crate, location.toFile().getAbsolutePath());
         assertTrue(location.resolve("ro-crate-preview.html").toFile().exists());
     }
 
@@ -81,8 +81,8 @@ void testStaticPreviewHtmlFileWithOtherFiles(@TempDir Path temp) throws IOExcept
         RoCrate crate = new RoCrate.RoCrateBuilder("name", "description", "2024", "https://creativecommons.org/licenses/by-nc-sa/3.0/au/")
                 .setPreview(new StaticPreview(previewFile.toFile(), dirHtml.toFile()))
                 .build();
-        RoCrateWriter writer = new RoCrateWriter(new FolderWriter());
-        writer.save(crate, location.toFile().toString());
+        Writers.newFolderWriter()
+                .save(crate, location.toFile().getAbsolutePath());
         assertTrue(location.resolve("ro-crate-preview.html").toFile().exists());
         assertTrue(location.resolve("ro-crate-preview_files").toFile().exists());
         assertTrue(location.resolve("ro-crate-preview_files").resolve("test.css").toFile().exists());

src/test/java/edu/kit/datamanager/ro_crate/crate/realexamples/WorkflowHubTest.java

@@ -4,9 +4,8 @@
 import edu.kit.datamanager.ro_crate.HelpFunctions;
 import edu.kit.datamanager.ro_crate.reader.CrateReader;
 import edu.kit.datamanager.ro_crate.reader.Readers;
-import edu.kit.datamanager.ro_crate.writer.FolderWriter;
-import edu.kit.datamanager.ro_crate.writer.RoCrateWriter;
 
+import edu.kit.datamanager.ro_crate.writer.Writers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -16,14 +15,14 @@
 
 public class WorkflowHubTest {
 
+  @SuppressWarnings("DataFlowIssue")
   @Test
   void testImportZip(@TempDir Path temp) throws IOException {
     CrateReader<String> reader = Readers.newZipPathReader();
     Crate crate = reader.readCrate(WorkflowHubTest.class.getResource("/crates/workflowhub/workflow-109-5.crate.zip").getPath());
 
     HelpFunctions.compareCrateJsonToFileInResources(crate, "/crates/workflowhub/workflow1/ro-crate-metadata.json");
-    RoCrateWriter writer = new RoCrateWriter(new FolderWriter());
-    writer.save(crate, temp.toString());
+    Writers.newFolderWriter().save(crate, temp.toString());
     HelpFunctions.compareTwoDir(temp.toFile(), new File(WorkflowHubTest.class.getResource("/crates/workflowhub/workflow1/").getPath()));
   }
 }