diff options
author | mmis <michael.morris@ericsson.com> | 2018-03-16 14:42:22 +0000 |
---|---|---|
committer | mmis <michael.morris@ericsson.com> | 2018-03-20 10:48:42 +0000 |
commit | 5492c1dd9d7052781ae5cab28bf5bcc829ae9c9e (patch) | |
tree | ec204aa0d662c87cdfc780b2c1a84ab40211a63c /common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java | |
parent | 7edd9111caddfed6867b7d5dca580c8eba34df44 (diff) |
Removed checkstyle warnings
Removed checkstyle warnings in policy/common/logging
Some warnings remain that required renaming of classes and public methods.
These will be taken separately
Issue-ID: POLICY-695
Change-Id: Id604c66708917de390c556b50f6266f929b09134
Signed-off-by: mmis <michael.morris@ericsson.com>
Diffstat (limited to 'common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java')
-rw-r--r-- | common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java | 61 |
1 files changed, 34 insertions, 27 deletions
diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java index b4fd5362..d97df4ce 100644 --- a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java +++ b/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/PropertyUtilTest.java @@ -17,98 +17,105 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.common.logging.flexlogger; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.util.Properties; import java.util.Set; + import org.junit.After; import org.junit.Before; import org.junit.Test; import org.onap.policy.common.logging.flexlogger.PropertyUtil.Listener; public class PropertyUtilTest { - + private static final File FILE = new File("target/test.properties"); private TestListener testListener = new TestListener(); - + + /** + * Perform test case set up. + */ @Before - public void setUp() throws IOException{ + public void setUp() throws IOException { FileOutputStream fileOutputStream = new FileOutputStream(FILE); Properties properties = new Properties(); properties.put("testProperty", "testValue"); properties.store(fileOutputStream, ""); fileOutputStream.close(); } - + @After - public void tearDown() throws IOException{ + public void tearDown() throws IOException { PropertyUtil.stopListening(FILE, testListener); FILE.delete(); - } - + } + @Test - public void testGetProperties() throws IOException{ + public void testGetProperties() throws IOException { FileOutputStream fileOutputStream = new FileOutputStream(FILE); Properties properties = new Properties(); properties.put("testProperty", "testValue"); properties.store(fileOutputStream, ""); fileOutputStream.close(); - + Properties readProperties = PropertyUtil.getProperties(FILE, testListener); assertEquals("testValue", readProperties.getProperty("testProperty")); } - + @Test - public void testPropertiesChanged() throws IOException, InterruptedException{ + public void testPropertiesChanged() throws IOException, InterruptedException { PropertyUtil.getProperties(FILE, testListener); - + FileOutputStream fileOutputStream = new FileOutputStream(FILE); Properties newProperties = new Properties(); newProperties.put("testProperty", "testValueNew"); newProperties.store(fileOutputStream, ""); - + assertTrue(testListener.isPropertiesChangedInvoked()); - + } - + @Test - public void testStopListening() throws IOException{ + public void testStopListening() throws IOException { FileOutputStream fileOutputStream = new FileOutputStream(FILE); Properties properties = new Properties(); properties.put("testProperty", "testValue"); properties.store(fileOutputStream, ""); - + Properties readProperties = PropertyUtil.getProperties(FILE, testListener); assertEquals("testValue", readProperties.getProperty("testProperty")); - + PropertyUtil.stopListening(FILE, testListener); - + properties.put("testProperty", "testValueNew"); properties.store(fileOutputStream, ""); fileOutputStream.close(); readProperties = PropertyUtil.getProperties(FILE, testListener); - // If stopListening did not remove the listener, the properties file will not be re-read until poll expires and + // If stopListening did not remove the listener, the properties file will not be re-read + // until poll expires and // hence "testValue" will be returned here instead of "testNewValue" - assertEquals("testValueNew", readProperties.getProperty("testProperty")); + assertEquals("testValueNew", readProperties.getProperty("testProperty")); } - + private class TestListener implements Listener { - + boolean propertiesChangedInvoked = false; @Override public void propertiesChanged(Properties properties, Set<String> changedKeys) { propertiesChangedInvoked = true; } - - public boolean isPropertiesChangedInvoked() throws InterruptedException{ - for (int i =0; i<20; i++){ - if (propertiesChangedInvoked){ + + public boolean isPropertiesChangedInvoked() throws InterruptedException { + for (int i = 0; i < 20; i++) { + if (propertiesChangedInvoked) { return true; } Thread.sleep(1000); |