diff --git a/src/main/java/io/huangsam/photohaul/Main.java b/src/main/java/io/huangsam/photohaul/Main.java index ee6d8a2..3e3d1ae 100644 --- a/src/main/java/io/huangsam/photohaul/Main.java +++ b/src/main/java/io/huangsam/photohaul/Main.java @@ -19,7 +19,7 @@ public class Main { private static final Logger LOG = getLogger(Main.class); - private static final Settings SETTINGS = new Settings(); + private static final Settings SETTINGS = new Settings("config.properties"); public static void main(String[] args) { PhotoPathVisitor pathVisitor = new PhotoPathVisitor(); diff --git a/src/main/java/io/huangsam/photohaul/Settings.java b/src/main/java/io/huangsam/photohaul/Settings.java index b7f2c39..0c5a693 100644 --- a/src/main/java/io/huangsam/photohaul/Settings.java +++ b/src/main/java/io/huangsam/photohaul/Settings.java @@ -9,9 +9,9 @@ public class Settings { private final Properties properties; - public Settings() { + public Settings(String name) { properties = new Properties(); - try (InputStream input = this.getClass().getClassLoader().getResourceAsStream("config.properties")) { + try (InputStream input = this.getClass().getClassLoader().getResourceAsStream(name)) { properties.load(input); } catch (IOException e) { throw new RuntimeException(e); diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties index 7ef40c5..0bb337e 100644 --- a/src/main/resources/config.properties +++ b/src/main/resources/config.properties @@ -1,2 +1,2 @@ -source.root=Pictures/Dummy PNG -target.root=Pictures/Dummy FIN +source.root=Pictures/Source +target.root=Pictures/Target diff --git a/src/main/resources/path-example.properties b/src/main/resources/path-example.properties new file mode 100644 index 0000000..4b454a1 --- /dev/null +++ b/src/main/resources/path-example.properties @@ -0,0 +1,2 @@ +source.root=Dummy/Source +target.root=Dummy/Target diff --git a/src/test/java/io/huangsam/photohaul/TestSettings.java b/src/test/java/io/huangsam/photohaul/TestSettings.java new file mode 100644 index 0000000..f4c85c4 --- /dev/null +++ b/src/test/java/io/huangsam/photohaul/TestSettings.java @@ -0,0 +1,19 @@ +package io.huangsam.photohaul; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class TestSettings { + private static final Settings SETTINGS = new Settings("path-example.properties"); + + @Test + void testGetSourceRoot() { + assertTrue(SETTINGS.getSourceRoot().endsWith("Dummy/Source")); + } + + @Test + void testGetTargetRoot() { + assertTrue(SETTINGS.getTargetRoot().endsWith("Dummy/Target")); + } +}