diff --git a/common/src/test/java/ctbrec/recorder/postprocessing/MoveDirectoryTest.java b/common/src/test/java/ctbrec/recorder/postprocessing/MoveDirectoryTest.java index 3ea2c1d2..e2058190 100644 --- a/common/src/test/java/ctbrec/recorder/postprocessing/MoveDirectoryTest.java +++ b/common/src/test/java/ctbrec/recorder/postprocessing/MoveDirectoryTest.java @@ -1,8 +1,9 @@ package ctbrec.recorder.postprocessing; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; +import ctbrec.Config; +import ctbrec.Model; +import ctbrec.Recording; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; @@ -10,11 +11,9 @@ import java.nio.file.Files; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.jupiter.api.Test; - -import ctbrec.Config; -import ctbrec.Model; -import ctbrec.Recording; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; 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.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()); assertEquals(rec.getAbsoluteFile(), rec.getPostProcessedFile()); assertNotEquals(rec.getAbsoluteFile(), original); diff --git a/common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java b/common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java index e6cea17b..d7bd31b4 100644 --- a/common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java +++ b/common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java @@ -1,19 +1,18 @@ package ctbrec.recorder.postprocessing; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; +import ctbrec.Config; +import ctbrec.Model; +import ctbrec.Recording; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.jupiter.api.Test; - -import ctbrec.Config; -import ctbrec.Model; -import ctbrec.Recording; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; 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.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()); assertEquals(rec.getAbsoluteFile(), rec.getPostProcessedFile()); assertNotEquals(rec.getAbsoluteFile(), original); @@ -72,6 +73,6 @@ class MoveSingleFileTest extends AbstractPpTest { assertEquals("move", pp.toString()); pp.getConfig().put(Move.PATH_TEMPLATE, Move.DEFAULT); - assertEquals("move ["+Move.DEFAULT+"]", pp.toString()); + assertEquals("move [" + Move.DEFAULT + "]", pp.toString()); } }