leolo
/
NR-data
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Updated unit test

feature-basic-conf
LO Kam Tao Leo 3 years ago
parent
f866ca44f9
commit
b2e6f020b0
4 changed files with 11 additions and 165 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 162
      .idea/workspace.xml
  3. 4
      src/main/java/org/leolo/nrdatad/ConfigurationManager.java
  4. 9
      src/test/java/org/leolo/nrdatad/ConfigurationTest.java

1
.gitignore vendored
Unescape View File

@ -41,3 +41,4 @@ build/
/nrdatad.conf /nrdatad.conf
ri_log* ri_log*
test-*.tmp test-*.tmp
.idea/workspace.xml

162
.idea/workspace.xml
Unescape View File

@ -1,162 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="b9554e7b-3332-419c-960c-8bfbee0d5311" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/test/java/org/leolo/nrdatad/ConfigurationTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/org/leolo/nrdatad/App.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/leolo/nrdatad/App.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/org/leolo/nrdatad/ConfigurationManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/leolo/nrdatad/ConfigurationManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/log4j2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/log4j2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/org/leolo/AppTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/org/leolo/nrdatad/AppTest.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="2GCtKiOdhwqUrJrlolmjYzZXLwa" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="flattenPackages" value="true" />
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "D:/IdeaProjects/OSM extract"
}
}]]></component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\IdeaProjects\nr-data-damon\src\main\resources" />
<recent name="D:\IdeaProjects\nr-data-damon\src\main\java" />
<recent name="D:\IdeaProjects\nr-data-damon" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="org.leolo.nrdatad" />
</key>
</component>
<component name="RunManager" selected="JUnit.ConfigurationTest">
<configuration name="Main" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.leolo.nrdatad.App" />
<module name="nr-data-damon" />
<extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
<option name="credential" />
<option name="region" />
<option name="useCurrentConnection" value="false" />
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="ConfigurationTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="nr-data-damon" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.leolo.nrdatad.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="org.leolo.nrdatad" />
<option name="MAIN_CLASS_NAME" value="org.leolo.nrdatad.ConfigurationTest" />
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="ConfigurationTest.basicLoad" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="nr-data-damon" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.leolo.nrdatad.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="org.leolo.nrdatad" />
<option name="MAIN_CLASS_NAME" value="org.leolo.nrdatad.ConfigurationTest" />
<option name="METHOD_NAME" value="basicLoad" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="ConfigurationTest.notExistFile" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="nr-data-damon" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.leolo.nrdatad.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="org.leolo.nrdatad" />
<option name="MAIN_CLASS_NAME" value="org.leolo.nrdatad.ConfigurationTest" />
<option name="METHOD_NAME" value="notExistFile" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="Application.Main" />
<item itemvalue="JUnit.ConfigurationTest" />
<item itemvalue="JUnit.ConfigurationTest.basicLoad" />
<item itemvalue="JUnit.ConfigurationTest.notExistFile" />
</list>
<recent_temporary>
<list>
<item itemvalue="JUnit.ConfigurationTest" />
<item itemvalue="JUnit.ConfigurationTest.notExistFile" />
<item itemvalue="JUnit.ConfigurationTest.basicLoad" />
</list>
</recent_temporary>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="b9554e7b-3332-419c-960c-8bfbee0d5311" name="Changes" comment="" />
<created>1665904334835</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1665904334835</updated>
<workItem from="1665904336661" duration="10525000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="UnknownFeatures">
<option featureType="com.intellij.fileTypeFactory" implementationName="*.conf" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
</component>
</project>

4
src/main/java/org/leolo/nrdatad/ConfigurationManager.java
Unescape View File

@ -27,7 +27,9 @@ public final class ConfigurationManager {
public void loadConfiguration(String configPath) throws IOException{ public void loadConfiguration(String configPath) throws IOException{
logger.atInfo().log("Loading configuration file {}.", configPath); 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()); logger.atInfo().log("Loaded {} setting(s)", prop.size());
} }

9
src/test/java/org/leolo/nrdatad/ConfigurationTest.java
Unescape View File

@ -9,6 +9,7 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.nio.file.Files;
import java.util.Random; import java.util.Random;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -76,8 +77,12 @@ public class ConfigurationTest {
} }
@After public void cleanUpEach(){ @After public void cleanUpEach(){
if(new File(fileName).delete()) try {
log.always().log("Removed file {}", fileName); 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(); ConfigurationManager.getInstance().clear();
} }

Write Preview
Loading…
Cancel
Save