-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed Default property loading issue as reported in #494.
- Loading branch information
1 parent
9086103
commit e17e425
Showing
2 changed files
with
100 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
...titenant/src/test/java/org/universAAL/ri/gateway/configuration/ConfigurationFileTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| package org.universAAL.ri.gateway.configuration; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.PrintWriter; | ||
| import java.util.Map.Entry; | ||
| import java.util.Properties; | ||
| import java.util.Set; | ||
|
|
||
| import org.junit.AfterClass; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
|
|
||
| public class ConfigurationFileTest { | ||
|
|
||
| private static final File test_prop_file = new File("./target/test.properties"); | ||
|
|
||
| @AfterClass | ||
| public static void tearDownAfterClass() throws Exception { | ||
| test_prop_file.delete(); | ||
| } | ||
|
|
||
| @Test | ||
| public void test0FiledoesNotExist() { | ||
| ConfigurationFile cf = new ConfigurationFile(test_prop_file); | ||
| checkDefaults(cf, true); | ||
| } | ||
|
|
||
| @Test | ||
| public void test1emptyFileExists() throws IOException { | ||
| test_prop_file.delete(); | ||
| assertTrue(test_prop_file.createNewFile()); | ||
| ConfigurationFile cf = new ConfigurationFile(test_prop_file); | ||
| checkDefaults(cf, true); | ||
| } | ||
|
|
||
| @Test | ||
| public void test2FileExistsWithNonDefaultProperties() throws IOException { | ||
| test_prop_file.delete(); | ||
| assertTrue(test_prop_file.createNewFile()); | ||
| PrintWriter out = new PrintWriter(test_prop_file); | ||
| String testValue = "localhost"; | ||
| out.println(ConfigurationFile.REMOTE_HOST + "=" +testValue); | ||
| out.flush(); | ||
| out.close(); | ||
| ConfigurationFile cf = new ConfigurationFile(test_prop_file); | ||
| // check defaults are loaded | ||
| checkDefaults(cf, true); | ||
| // check value | ||
| assertEquals(testValue, cf.getProperty(ConfigurationFile.REMOTE_HOST)); | ||
| } | ||
|
|
||
| @Test | ||
| public void test3FileExistsWithDefaultPropertiesOverriten() throws IOException { | ||
| test_prop_file.delete(); | ||
| assertTrue(test_prop_file.createNewFile()); | ||
| PrintWriter out = new PrintWriter(test_prop_file); | ||
| String testValue = "5"; | ||
| out.println(ConfigurationFile.QUEUES + "=" +testValue); | ||
| out.flush(); | ||
| out.close(); | ||
| ConfigurationFile cf = new ConfigurationFile(test_prop_file); | ||
| // check defaults are loaded | ||
| checkDefaults(cf, false); | ||
| // check value | ||
| assertEquals(testValue, cf.getProperty(ConfigurationFile.QUEUES)); | ||
| } | ||
| private void checkDefaults(ConfigurationFile cf, boolean checkValues) { | ||
|
|
||
| Properties defaults = new Properties(); | ||
| cf.addDefaults(defaults); | ||
|
|
||
| Set<Entry<Object, Object>> dfaultEntries = defaults.entrySet(); | ||
| for (Entry<Object, Object> e : dfaultEntries) { | ||
| System.out.println(e.getKey()+" -> " + e.getValue()); | ||
| String actualValue = cf.getProperty((String)e.getKey()); | ||
| System.out.println(actualValue); | ||
| assertTrue( actualValue != null && !actualValue.isEmpty()); | ||
| if (checkValues) { | ||
| assertEquals(e.getValue(), actualValue); | ||
| } | ||
| } | ||
| } | ||
| } |