remove static bool

Don't use static boolean for legacy enumeration mapping, add additional parameter to the function

Change-Id: I5d8963a208f3ffdd3af83216aa55f7d34ee39eb9
Issue-ID: CCSDK-396
Signed-off-by: Smokowski, Kevin (ks6305) <ks6305@att.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
index d5ca04d7..307c69c7 100644
--- a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
@@ -147,7 +147,6 @@ public class MdsalHelperTest extends TestCase {
     // During the default enumeration mapping no properties file is needed, the yang value is returned
     // by the java object
     public void testDefaultEnumerationMapping() throws Exception {
-        MdsalHelper.useLegacyEnumerationMapping(false);
         Properties props = new Properties();
         MdsalHelper.toProperties(props, new WrapperObj());
         assertEquals("4COS", props.getProperty("wrapper-obj.cos-model-type"));
@@ -156,9 +155,8 @@ public class MdsalHelperTest extends TestCase {
     // When no properties file exists the default java value will be returned if legacy enumeration
     // mapping is enabled
     public void testLegacyEnumerationMappingNoProperties() throws Exception {
-        MdsalHelper.useLegacyEnumerationMapping(true);
         Properties props = new Properties();
-        MdsalHelper.toProperties(props, new WrapperObj());
+        MdsalHelper.toProperties(props, new WrapperObj(), true);
         assertEquals("_4COS", props.getProperty("wrapper-obj.cos-model-type"));
     }
 
@@ -166,9 +164,8 @@ public class MdsalHelperTest extends TestCase {
     // properties file should be returned
     public void testLegacyEnumerationMappingWithProperties() throws Exception {
         MdsalHelper.loadProperties("src/test/resources/EnumerationMapping.properties");
-        MdsalHelper.useLegacyEnumerationMapping(true);
         Properties props = new Properties();
-        MdsalHelper.toProperties(props, new WrapperObj());
+        MdsalHelper.toProperties(props, new WrapperObj(), true);
         assertEquals("HelloWorld", props.getProperty("wrapper-obj.cos-model-type"));
     }
 }