X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=properties-node%2Fprovider%2Fsrc%2Ftest%2Fjava%2Fjtest%2Forg%2Fonap%2Fccsdk%2Fsli%2Fplugins%2Fprop%2FTestPropertiesNode.java;h=a858c49b35069ffbfb0d8e812b5bc5625bb0d803;hb=57bfbb05e485fb11b620b1bf12e70aa063aaa3c8;hp=aa3f89d123dbbe6e80356ec043b210027e5963a6;hpb=788e651b9234fbfeb2bb4cc052fecb06a10ef70f;p=ccsdk%2Fsli%2Fplugins.git

diff --git a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java b/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java
index aa3f89d1..a858c49b 100644
--- a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java
+++ b/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java
@@ -5,7 +5,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import static org.junit.Assert.assertEquals;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
@@ -16,6 +18,8 @@ import org.slf4j.LoggerFactory;
 public class TestPropertiesNode {
 
     private static final Logger log = LoggerFactory.getLogger(TestPropertiesNode.class);
+    @Rule
+    public EnvironmentVariables environmentVariables = new EnvironmentVariables();
     
     @Test
     public void testJSONFileParsing() throws SvcLogicException {
@@ -129,6 +133,10 @@ public class TestPropertiesNode {
 
     @Test
     public void testTXTFileParsing() throws SvcLogicException {
+
+        environmentVariables.set("deployer_pass", "sdncp-123");
+        assertEquals("sdncp-123", System.getenv("deployer_pass"));
+
         SvcLogicContext ctx = new SvcLogicContext();
 
         Map<String, String> p = new HashMap<String, String>();
@@ -147,6 +155,7 @@ public class TestPropertiesNode {
                                               "access-information.l1-customer-handoff"),"_1000BASELX");
         assertEquals(ctx.getAttribute("test-txt.service-data.avpn-ip-port-information.avpn-" +
                                               "access-information.vlan-tag-control"),"_1Q");
+        assertEquals(ctx.getAttribute("test-txt.obfuscated-var"), "sdncp-123");
     }
 
     @Test
@@ -293,7 +302,7 @@ public class TestPropertiesNode {
         assertEquals(ctx.getAttribute("test-xml.project.dependencies.dependency.scope"),"provided");
         assertEquals(ctx.getAttribute("test-xml.project.build.pluginManagement.plugins.plugin.configuration" +
                                               ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." +
-                                              "pluginExecutionFilter.versionRange"),"[1.2.0.100-SNAPSHOT,)");
+                                              "pluginExecutionFilter.versionRange"),"[1.2.0.100,)");
         assertEquals(ctx.getAttribute("test-xml.project.build.plugins.plugin.configuration." +
                                               "instructions.Import-Package"),"*");
     }
@@ -314,7 +323,7 @@ public class TestPropertiesNode {
         assertEquals(ctx.getAttribute("project.dependencies.dependency.scope"),"provided");
         assertEquals(ctx.getAttribute("project.build.pluginManagement.plugins.plugin.configuration" +
                                               ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." +
-                                              "pluginExecutionFilter.versionRange"),"[1.2.0.100-SNAPSHOT,)");
+                                              "pluginExecutionFilter.versionRange"),"[1.2.0.100,)");
         assertEquals(ctx.getAttribute("project.build.plugins.plugin.configuration." +
                                               "instructions.Import-Package"),"*");
     }
@@ -334,7 +343,7 @@ public class TestPropertiesNode {
         assertEquals(ctx.getAttribute("project.dependencies.dependency.scope"),"provided");
         assertEquals(ctx.getAttribute("project.build.pluginManagement.plugins.plugin.configuration" +
                                               ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." +
-                                              "pluginExecutionFilter.versionRange"),"[1.2.0.100-SNAPSHOT,)");
+                                              "pluginExecutionFilter.versionRange"),"[1.2.0.100,)");
         assertEquals(ctx.getAttribute("project.build.plugins.plugin.configuration." +
                                               "instructions.Import-Package"),"*");
     }
@@ -355,7 +364,7 @@ public class TestPropertiesNode {
         assertEquals(ctx.getAttribute("project.dependencies.dependency.scope"),"provided");
         assertEquals(ctx.getAttribute("project.build.pluginManagement.plugins.plugin.configuration" +
                                               ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." +
-                                              "pluginExecutionFilter.versionRange"),"[1.2.0.100-SNAPSHOT,)");
+                                              "pluginExecutionFilter.versionRange"),"[1.2.0.100,)");
         assertEquals(ctx.getAttribute("project.build.plugins.plugin.configuration." +
                                               "instructions.Import-Package"),"*");
         assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1");