From f3039b6b556d034396587ddb4b8a51526301eefc Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sun, 3 Dec 2023 15:34:58 +0100 Subject: [PATCH] Fix path problems in ObjectMapperRecordingTest on windows --- .../ctbrec/io/json/ObjectMapperRecordingTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/common/src/test/java/ctbrec/io/json/ObjectMapperRecordingTest.java b/common/src/test/java/ctbrec/io/json/ObjectMapperRecordingTest.java index 6095bf27..b87d5d8c 100644 --- a/common/src/test/java/ctbrec/io/json/ObjectMapperRecordingTest.java +++ b/common/src/test/java/ctbrec/io/json/ObjectMapperRecordingTest.java @@ -7,7 +7,8 @@ import ctbrec.io.json.dto.RecordingDto; import org.json.JSONObject; import org.junit.jupiter.api.Test; -import java.io.File; +import java.io.IOException; +import java.nio.file.FileSystems; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.Set; @@ -19,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; class ObjectMapperRecordingTest { @Test - void recordingToJson() throws JsonProcessingException { + void recordingToJson() throws IOException { RecordingDto rec = prepareRecording(); ObjectMapper mapper = ObjectMapperFactory.getMapper(); @@ -36,7 +37,7 @@ class ObjectMapperRecordingTest { assertEquals(rec.isPinned(), j.getBoolean("pinned")); assertEquals(rec.getNote(), j.getString("note")); assertTrue(j.getJSONArray("associatedFiles").toList().containsAll(Set.of("a", "b", "c"))); - assertEquals(rec.getAbsoluteFile().toString(), j.getString("absoluteFile")); + assertEquals(rec.getAbsoluteFile().getCanonicalPath(), j.getString("absoluteFile")); assertEquals(rec.getPostProcessedFile().toString(), j.getString("postProcessedFile")); assertEquals(rec.getSelectedResolution(), j.getInt("selectedResolution")); } @@ -52,19 +53,20 @@ class ObjectMapperRecordingTest { } private RecordingDto prepareRecording() { + String root = FileSystems.getDefault().getRootDirectories().iterator().next().toString(); RecordingDto recording = new RecordingDto(); recording.setId(UUID.randomUUID().toString()); recording.setStartDate(Instant.now().truncatedTo(ChronoUnit.MILLIS)); recording.setStatus(Recording.State.RECORDING); recording.setProgress(42); recording.setSizeInByte(23456789); - recording.setMetaDataFile("/tmp/meta.json"); + recording.setMetaDataFile(FileSystems.getDefault().getPath(root, "tmp", "meta.json").toString()); recording.setSingleFile(true); recording.setPinned(true); recording.setNote("note"); recording.setAssociatedFiles(Set.of("a", "b", "c")); - recording.setAbsoluteFile(new File("/tmp/test.rec.ts")); - recording.setPostProcessedFile(new File("/tmp/pp.ts")); + recording.setAbsoluteFile(FileSystems.getDefault().getPath(root, "tmp", "test.rec.ts").toFile()); + recording.setPostProcessedFile(FileSystems.getDefault().getPath(root, "tmp", "pp.ts").toFile()); recording.setSelectedResolution(2); return recording; }