From b2e6f020b09fd80fe52f993ddaa1539e534787d3 Mon Sep 17 00:00:00 2001 From: LO Kam Tao Leo Date: Sun, 16 Oct 2022 18:56:31 +0100 Subject: [PATCH] Updated unit test --- .gitignore | 1 + .idea/workspace.xml | 162 --------------------- .../org/leolo/nrdatad/ConfigurationManager.java | 4 +- .../java/org/leolo/nrdatad/ConfigurationTest.java | 9 +- 4 files changed, 11 insertions(+), 165 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore index f712fe6..2d69fec 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ build/ /nrdatad.conf ri_log* test-*.tmp +.idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 952647c..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1665904334835 - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/org/leolo/nrdatad/ConfigurationManager.java b/src/main/java/org/leolo/nrdatad/ConfigurationManager.java index c4a9ea8..70eb9d8 100644 --- a/src/main/java/org/leolo/nrdatad/ConfigurationManager.java +++ b/src/main/java/org/leolo/nrdatad/ConfigurationManager.java @@ -27,7 +27,9 @@ public final class ConfigurationManager { public void loadConfiguration(String configPath) throws IOException{ logger.atInfo().log("Loading configuration file {}.", configPath); - prop.load(new FileReader(configPath)); + try(FileReader reader = new FileReader(configPath)) { + prop.load(reader); + } logger.atInfo().log("Loaded {} setting(s)", prop.size()); } diff --git a/src/test/java/org/leolo/nrdatad/ConfigurationTest.java b/src/test/java/org/leolo/nrdatad/ConfigurationTest.java index 63a5e38..67b290b 100644 --- a/src/test/java/org/leolo/nrdatad/ConfigurationTest.java +++ b/src/test/java/org/leolo/nrdatad/ConfigurationTest.java @@ -9,6 +9,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintWriter; +import java.nio.file.Files; import java.util.Random; import static org.junit.Assert.*; @@ -76,8 +77,12 @@ public class ConfigurationTest { } @After public void cleanUpEach(){ - if(new File(fileName).delete()) - log.always().log("Removed file {}", fileName); + try { + Files.deleteIfExists(new File(fileName).toPath()); + log.atInfo().log("Removed file {}", fileName); + } catch (IOException e) { + log.always().withThrowable(e).log("Unable to remove file"); + } ConfigurationManager.getInstance().clear(); }