diff options
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-test/src/test/java')
22 files changed, 77 insertions, 100 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java index de265c7281..59df849571 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java @@ -1,30 +1,9 @@ package org.onap.config; -import org.onap.config.test.CLIFallbackAndLookupTest; -import org.onap.config.test.CLITest; -import org.onap.config.test.ConfigSourceLocationTest; -import org.onap.config.test.DynamicConfigurationTest; -import org.onap.config.test.FallbackConfigTest; -import org.onap.config.test.FallbackToGlobalNSTest; -import org.onap.config.test.GlobalAndNSConfigTest; -import org.onap.config.test.JAVAPropertiesConfigTest; -import org.onap.config.test.JSONConfigTest; -import org.onap.config.test.LoadOrderMergeAndOverrideTest; -import org.onap.config.test.ModeAsConfigPropTest; -import org.onap.config.test.MultiTenancyConfigTest; -import org.onap.config.test.NodeSpecificCLITest; -import org.onap.config.test.NotificationForNodeConfigTest; -import org.onap.config.test.NotificationOnPropValTest; -import org.onap.config.test.ResourceChangeNotificationTest; -import org.onap.config.test.UnregisterNotificationTest; -import org.onap.config.test.ValidateDefaultModeTest; -import org.onap.config.test.ValidateNodeConfigTest; -import org.onap.config.test.XMLConfigTest; -import org.onap.config.test.YAMLConfigTest; -import org.onap.config.test.*; import org.junit.AfterClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import org.onap.config.test.*; /** * Created by sheetalm on 10/25/2016. diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java index 1e345aee3d..d5990c8dac 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.Constants; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.TestUtil; -import org.junit.Assert; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import javax.management.JMX; import javax.management.MBeanServerConnection; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java index de863efe5b..18b9c2650b 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java @@ -1,14 +1,14 @@ package org.onap.config.test; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.Constants; -import org.onap.config.api.ConfigurationChangeListener; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import javax.management.JMX; import javax.management.MBeanServerConnection; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java index 6751a5cc31..c997e09f8e 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java @@ -1,19 +1,19 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; -import java.util.Properties; import java.io.OutputStream; -import java.io.FileOutputStream; +import java.util.Properties; /** * Created by sheetalm on 10/14/2016. diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java index 86422d2361..166ba63fab 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java @@ -1,14 +1,14 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationManager; import org.onap.config.api.DynamicConfiguration; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java index 14d74fb040..b70247b040 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java index a0bb51a73f..e4a511064e 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java index ab47765a1c..994bd7260b 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java @@ -1,9 +1,9 @@ package org.onap.config.test; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java index b3fcb730fb..bf6ea5c243 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java @@ -1,9 +1,9 @@ package org.onap.config.test; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java index 244511cbf0..d179edfcfb 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java @@ -1,7 +1,5 @@ package org.onap.config.test; -import static org.onap.config.util.TestUtil.writeFile; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -13,6 +11,8 @@ import org.onap.config.util.TestUtil; import java.io.IOException; +import static org.onap.config.util.TestUtil.writeFile; + /** * Scenario * Check loadorder for merge and overide. Higher loadorder takes precedence for override diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java index 17130d37c1..7c93af0cf1 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import java.io.IOException; import java.util.ArrayList; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java index 8cdd634794..5765c4de2f 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java index 41745d36ff..9bd5788532 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.util.ConfigTestConstant; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Test; import org.onap.config.Constants; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Test; import javax.management.JMX; import javax.management.MBeanServerConnection; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java index 55af6900a6..1486522ca7 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java @@ -1,14 +1,14 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java index c7b93b019a..ca8e812ef4 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java @@ -1,14 +1,14 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java index 54bd339f29..4547e49d95 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java @@ -1,20 +1,18 @@ package org.onap.config.test; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.onap.config.util.ConfigTestConstant; - -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; - import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; /** * Scenario 7 diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java index cdfcfdf22d..687df0e935 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java @@ -1,14 +1,14 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java index f9ce9a37ed..3711322056 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java @@ -1,12 +1,12 @@ package org.onap.config.test; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.ConfigTestConstant; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; import java.io.IOException; import java.util.ArrayList; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java index e4f3a84b05..c3f8719de9 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java index ae6fc3e7b1..22832d378c 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java @@ -1,9 +1,9 @@ package org.onap.config.test; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java index 46240402f4..f0e7ec54f7 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java @@ -1,9 +1,9 @@ package org.onap.config.test; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java index 83f0371c33..59078c2edb 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java @@ -1,16 +1,16 @@ package org.onap.config.util; -import org.onap.config.ConfigurationUtils; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.junit.Assert; - import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.onap.config.ConfigurationUtils; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; + /** * Created by sheetalm on 10/13/2016. */ |