davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into XxInvictus-patch

This commit is contained in:
XxInvictus 2023-12-07 12:11:32 +10:30
parent 13d2999eba f3039b6b55
commit bf7a77bde2
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/test/java/ctbrec/io/json/ObjectMapperRecordingTest.java
View File

@ -7,7 +7,8 @@ import ctbrec.io.json.dto.RecordingDto;
import org.json.JSONObject; import org.json.JSONObject;
import org.junit.jupiter.api.Test; 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.Instant;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.Set; import java.util.Set;
@ -19,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
class ObjectMapperRecordingTest { class ObjectMapperRecordingTest {
@Test @Test
void recordingToJson() throws JsonProcessingException { void recordingToJson() throws IOException {
RecordingDto rec = prepareRecording(); RecordingDto rec = prepareRecording();
ObjectMapper mapper = ObjectMapperFactory.getMapper(); ObjectMapper mapper = ObjectMapperFactory.getMapper();
@ -36,7 +37,7 @@ class ObjectMapperRecordingTest {
assertEquals(rec.isPinned(), j.getBoolean("pinned")); assertEquals(rec.isPinned(), j.getBoolean("pinned"));
assertEquals(rec.getNote(), j.getString("note")); assertEquals(rec.getNote(), j.getString("note"));
assertTrue(j.getJSONArray("associatedFiles").toList().containsAll(Set.of("a", "b", "c"))); 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.getPostProcessedFile().toString(), j.getString("postProcessedFile"));
assertEquals(rec.getSelectedResolution(), j.getInt("selectedResolution")); assertEquals(rec.getSelectedResolution(), j.getInt("selectedResolution"));
} }
@ -52,19 +53,20 @@ class ObjectMapperRecordingTest {
} }
private RecordingDto prepareRecording() { private RecordingDto prepareRecording() {
String root = FileSystems.getDefault().getRootDirectories().iterator().next().toString();
RecordingDto recording = new RecordingDto(); RecordingDto recording = new RecordingDto();
recording.setId(UUID.randomUUID().toString()); recording.setId(UUID.randomUUID().toString());
recording.setStartDate(Instant.now().truncatedTo(ChronoUnit.MILLIS)); recording.setStartDate(Instant.now().truncatedTo(ChronoUnit.MILLIS));
recording.setStatus(Recording.State.RECORDING); recording.setStatus(Recording.State.RECORDING);
recording.setProgress(42); recording.setProgress(42);
recording.setSizeInByte(23456789); recording.setSizeInByte(23456789);
recording.setMetaDataFile("/tmp/meta.json"); recording.setMetaDataFile(FileSystems.getDefault().getPath(root, "tmp", "meta.json").toString());
recording.setSingleFile(true); recording.setSingleFile(true);
recording.setPinned(true); recording.setPinned(true);
recording.setNote("note"); recording.setNote("note");
recording.setAssociatedFiles(Set.of("a", "b", "c")); recording.setAssociatedFiles(Set.of("a", "b", "c"));
recording.setAbsoluteFile(new File("/tmp/test.rec.ts").getAbsoluteFile()); recording.setAbsoluteFile(FileSystems.getDefault().getPath(root, "tmp", "test.rec.ts").toFile());
recording.setPostProcessedFile(new File("/tmp/pp.ts").getAbsoluteFile()); recording.setPostProcessedFile(FileSystems.getDefault().getPath(root, "tmp", "pp.ts").toFile());
recording.setSelectedResolution(2); recording.setSelectedResolution(2);
return recording; return recording;
} }

19
common/src/test/java/ctbrec/recorder/postprocessing/MoveDirectoryTest.java
View File

@ -1,8 +1,9 @@
package ctbrec.recorder.postprocessing; package ctbrec.recorder.postprocessing;
import static org.junit.jupiter.api.Assertions.*; import ctbrec.Config;
import static org.mockito.ArgumentMatchers.*; import ctbrec.Model;
import static org.mockito.Mockito.*; import ctbrec.Recording;
import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -10,11 +11,9 @@ import java.nio.file.Files;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import ctbrec.Config; import static org.mockito.Mockito.*;
import ctbrec.Model;
import ctbrec.Recording;
class MoveDirectoryTest extends AbstractPpTest { class MoveDirectoryTest extends AbstractPpTest {
@ -30,7 +29,9 @@ class MoveDirectoryTest extends AbstractPpTest {
pp.getConfig().put(Move.PATH_TEMPLATE, new File(baseDir.toFile(), Move.DEFAULT).getAbsolutePath()); pp.getConfig().put(Move.PATH_TEMPLATE, new File(baseDir.toFile(), Move.DEFAULT).getAbsolutePath());
pp.postprocess(createPostProcessingContext(rec, recordingManager, config)); pp.postprocess(createPostProcessingContext(rec, recordingManager, config));
Matcher m = Pattern.compile(baseDir.toString() + "/Mockita_Boobilicious/\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}/original").matcher(rec.getAbsoluteFile().getCanonicalPath()); String fileSepator = Pattern.quote(File.separator);
String regex = Pattern.quote(baseDir.toString()) + fileSepator + "Mockita_Boobilicious" + fileSepator + "\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}" + fileSepator + "original";
Matcher m = Pattern.compile(regex).matcher(rec.getAbsoluteFile().getCanonicalPath());
assertTrue(m.matches()); assertTrue(m.matches());
assertEquals(rec.getAbsoluteFile(), rec.getPostProcessedFile()); assertEquals(rec.getAbsoluteFile(), rec.getPostProcessedFile());
assertNotEquals(rec.getAbsoluteFile(), original); assertNotEquals(rec.getAbsoluteFile(), original);

19
common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java
View File

@ -1,19 +1,18 @@
package ctbrec.recorder.postprocessing; package ctbrec.recorder.postprocessing;
import static org.junit.jupiter.api.Assertions.*; import ctbrec.Config;
import static org.mockito.ArgumentMatchers.*; import ctbrec.Model;
import static org.mockito.Mockito.*; import ctbrec.Recording;
import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import ctbrec.Config; import static org.mockito.Mockito.*;
import ctbrec.Model;
import ctbrec.Recording;
class MoveSingleFileTest extends AbstractPpTest { class MoveSingleFileTest extends AbstractPpTest {
@ -30,7 +29,9 @@ class MoveSingleFileTest extends AbstractPpTest {
pp.getConfig().put(Move.PATH_TEMPLATE, new File(baseDir.toFile(), Move.DEFAULT).getAbsolutePath()); pp.getConfig().put(Move.PATH_TEMPLATE, new File(baseDir.toFile(), Move.DEFAULT).getAbsolutePath());
pp.postprocess(createPostProcessingContext(rec, recordingManager, config)); pp.postprocess(createPostProcessingContext(rec, recordingManager, config));
Matcher m = Pattern.compile(baseDir.toFile() + "/Mockita_Boobilicious/\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}/original\\.ts").matcher(rec.getAbsoluteFile().toString()); String fileSepator = Pattern.quote(File.separator);
String regex = Pattern.quote(baseDir.toString()) + fileSepator + "Mockita_Boobilicious" + fileSepator + "\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}" + fileSepator + "original\\.ts";
Matcher m = Pattern.compile(regex).matcher(rec.getAbsoluteFile().getCanonicalPath());
assertTrue(m.matches()); assertTrue(m.matches());
assertEquals(rec.getAbsoluteFile(), rec.getPostProcessedFile()); assertEquals(rec.getAbsoluteFile(), rec.getPostProcessedFile());
assertNotEquals(rec.getAbsoluteFile(), original); assertNotEquals(rec.getAbsoluteFile(), original);