From 8e72cabd763c8f6cfba63b9aaf9502ca15a3092f Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Sat, 26 Jun 2021 21:01:16 +0200 Subject: Moved PathValidation to the util package --- .../java/musichub/business/PathValidation.java | 39 ---------------------- src/main/java/musichub/main/Main.java | 2 +- src/main/java/musichub/util/PathValidation.java | 39 ++++++++++++++++++++++ .../java/musichub/business/PathValidationTest.java | 26 --------------- .../java/musichub/util/PathValidationTest.java | 26 +++++++++++++++ 5 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 src/main/java/musichub/business/PathValidation.java create mode 100644 src/main/java/musichub/util/PathValidation.java delete mode 100644 src/test/java/musichub/business/PathValidationTest.java create mode 100644 src/test/java/musichub/util/PathValidationTest.java diff --git a/src/main/java/musichub/business/PathValidation.java b/src/main/java/musichub/business/PathValidation.java deleted file mode 100644 index b0281ba..0000000 --- a/src/main/java/musichub/business/PathValidation.java +++ /dev/null @@ -1,39 +0,0 @@ -package musichub.business; - -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -/** - * Class offering a path validation method. - * - * @author Aimeric ADJUTOR - * @version 1.0 - */ - -public final class PathValidation { - - /** - * Method that just throws an AssertionError if the class is called - * - * @throws AssertionError you can't instantiate this class - * @author Aimeric ADJUTOR - */ - - public PathValidation() { - throw new AssertionError("You just can't instantiate this class."); - } - - /** - * Method that checks the validity of a given path - * - * @param inputPath the path given by the user - * @return a boolean - */ - - public static boolean isPathValid(String inputPath) { - Path path = Paths.get(inputPath); - return Files.exists(path); - } - -} \ No newline at end of file diff --git a/src/main/java/musichub/main/Main.java b/src/main/java/musichub/main/Main.java index e2e4731..e06d056 100644 --- a/src/main/java/musichub/main/Main.java +++ b/src/main/java/musichub/main/Main.java @@ -9,7 +9,7 @@ import java.util.Iterator; import java.util.List; import java.util.Scanner; -import static musichub.business.PathValidation.isPathValid; +import static musichub.util.PathValidation.isPathValid; public class Main { public static void main(String[] args) throws UnsupportedAudioFileException, IOException, LineUnavailableException { diff --git a/src/main/java/musichub/util/PathValidation.java b/src/main/java/musichub/util/PathValidation.java new file mode 100644 index 0000000..df11388 --- /dev/null +++ b/src/main/java/musichub/util/PathValidation.java @@ -0,0 +1,39 @@ +package musichub.util; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +/** + * Class offering a path validation method. + * + * @author Aimeric ADJUTOR + * @version 1.0 + */ + +public final class PathValidation { + + /** + * Method that just throws an AssertionError if the class is called + * + * @throws AssertionError you can't instantiate this class + * @author Aimeric ADJUTOR + */ + + public PathValidation() { + throw new AssertionError("You just can't instantiate this class."); + } + + /** + * Method that checks the validity of a given path + * + * @param inputPath the path given by the user + * @return a boolean + */ + + public static boolean isPathValid(String inputPath) { + Path path = Paths.get(inputPath); + return Files.exists(path); + } + +} \ No newline at end of file diff --git a/src/test/java/musichub/business/PathValidationTest.java b/src/test/java/musichub/business/PathValidationTest.java deleted file mode 100644 index fffbdde..0000000 --- a/src/test/java/musichub/business/PathValidationTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package musichub.business; - - -import org.junit.jupiter.api.Test; - -import static musichub.business.PathValidation.isPathValid; -import static org.junit.jupiter.api.Assertions.*; - -public class PathValidationTest { - @Test - void testIsPathValid() { - assertTrue(isPathValid("Song/Side_To_Side.wav")); //the right path - assertFalse(isPathValid("wrong_path/Side_To_Side.wav")); //wrong path - assertFalse(isPathValid("Song/Side_To_Side.mp3")); //wrong extension - } - - @Test - void testPathValidationClass() { - try { - PathValidation pathValidationClass = new PathValidation(); - } catch (Error ex) { - assertTrue(ex instanceof AssertionError); - assertEquals("You just can't instantiate this class.", ex.getMessage()); - } - } -} diff --git a/src/test/java/musichub/util/PathValidationTest.java b/src/test/java/musichub/util/PathValidationTest.java new file mode 100644 index 0000000..4c7a3d6 --- /dev/null +++ b/src/test/java/musichub/util/PathValidationTest.java @@ -0,0 +1,26 @@ +package musichub.util; + + +import org.junit.jupiter.api.Test; + +import static musichub.util.PathValidation.isPathValid; +import static org.junit.jupiter.api.Assertions.*; + +public class PathValidationTest { + @Test + void testIsPathValid() { + assertTrue(isPathValid("Song/Side_To_Side.wav")); //the right path + assertFalse(isPathValid("wrong_path/Side_To_Side.wav")); //wrong path + assertFalse(isPathValid("Song/Side_To_Side.mp3")); //wrong extension + } + + @Test + void testPathValidationClass() { + try { + PathValidation pathValidationClass = new PathValidation(); + } catch (Error ex) { + assertTrue(ex instanceof AssertionError); + assertEquals("You just can't instantiate this class.", ex.getMessage()); + } + } +} -- cgit v1.2.3