SetNodeExecutor nulling feature enhancement

Add special handling for clear a single array element or an entire array

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

1 files changed, 105 insertions, 56 deletions

diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SetNodeExecutorTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SetNodeExecutorTest.java
index 1333d070..c400bf5d 100644
--- a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SetNodeExecutorTest.java
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SetNodeExecutorTest.java
@@ -1,56 +1,105 @@
-package org.onap.ccsdk.sli.core.sli.provider;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNull;

-import java.util.LinkedList;

-import org.junit.Test;

-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;

-import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;

-import org.onap.ccsdk.sli.core.sli.SvcLogicNode;

-import org.onap.ccsdk.sli.core.sli.SvcLogicParser;

-

-public class SetNodeExecutorTest {

-    @Test

-    public void clearProperties() throws Exception {

-        SetNodeExecutor sne = new SetNodeExecutor();

-        SvcLogicContext ctx = new SvcLogicContext();

-

-        SvcLogicParser slp = new SvcLogicParser();

-        LinkedList<SvcLogicGraph> graph = slp.parse("src/test/resources/clearValues.xml");

-        SvcLogicNode root = graph.getFirst().getRootNode();

-        SvcLogicNode nodeOne = root.getOutcomeValue("1");

-        SvcLogicNode nodeTwo = root.getOutcomeValue("2");

-

-        sne.execute(nodeOne, ctx);

-        sne.execute(nodeTwo, ctx);

-

-        assertNull(ctx.getAttribute("si.field1"));

-        assertNull(ctx.getAttribute("si.field2"));

-        assertNull(ctx.getAttribute("si.field3"));

-        assertEquals("6", ctx.getAttribute("search1"));

-        assertEquals("KeepMe!", ctx.getAttribute("simonSays"));

-    }

-

-    @Test

-    public void subtreeCopy() throws Exception {

-        SetNodeExecutor sne = new SetNodeExecutor();

-        SvcLogicContext ctx = new SvcLogicContext();

-

-        SvcLogicParser slp = new SvcLogicParser();

-        LinkedList<SvcLogicGraph> graph = slp.parse("src/test/resources/copyValues.xml");

-        SvcLogicNode root = graph.getFirst().getRootNode();

-        SvcLogicNode nodeOne = root.getOutcomeValue("1");

-        SvcLogicNode nodeTwo = root.getOutcomeValue("2");

-

-        sne.execute(nodeOne, ctx);

-        sne.execute(nodeTwo, ctx);

-   

-        assertEquals("1",ctx.getAttribute("si.field1"));

-        assertEquals("2",ctx.getAttribute("si.field2"));

-        assertEquals("3",ctx.getAttribute("si.field3"));

-        assertEquals("1",ctx.getAttribute("rootTwo.field1"));

-        assertEquals("2",ctx.getAttribute("rootTwo.field2"));

-        assertEquals("3",ctx.getAttribute("rootTwo.field3"));

-    }

-

-}

+package org.onap.ccsdk.sli.core.sli.provider;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import java.util.LinkedList;
+import org.junit.Test;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
+import org.onap.ccsdk.sli.core.sli.SvcLogicNode;
+import org.onap.ccsdk.sli.core.sli.SvcLogicParser;
+
+public class SetNodeExecutorTest {
+    @Test
+    public void clearProperties() throws Exception {
+        SetNodeExecutor sne = new SetNodeExecutor();
+        SvcLogicContext ctx = new SvcLogicContext();
+
+        SvcLogicParser slp = new SvcLogicParser();
+        LinkedList<SvcLogicGraph> graph = slp.parse("src/test/resources/clearValues.xml");
+        SvcLogicNode root = graph.getFirst().getRootNode();
+        SvcLogicNode nodeOne = root.getOutcomeValue("1");
+        SvcLogicNode nodeTwo = root.getOutcomeValue("2");
+
+        sne.execute(nodeOne, ctx);
+        sne.execute(nodeTwo, ctx);
+
+        assertNull(ctx.getAttribute("si.field1"));
+        assertNull(ctx.getAttribute("si.field2"));
+        assertNull(ctx.getAttribute("si.field3"));
+        assertEquals("6", ctx.getAttribute("search1"));
+        assertEquals("KeepMe!", ctx.getAttribute("simonSays"));
+    }
+
+    @Test
+    public void clearMultipleArrayProperties() throws Exception {
+        SetNodeExecutor sne = new SetNodeExecutor();
+        SvcLogicContext ctx = new SvcLogicContext();
+
+        SvcLogicParser slp = new SvcLogicParser();
+        LinkedList<SvcLogicGraph> graph = slp.parse("src/test/resources/clearArrayValues.xml");
+        SvcLogicNode root = graph.getFirst().getRootNode();
+        SvcLogicNode nodeOne = root.getOutcomeValue("1");
+        SvcLogicNode nodeTwo = root.getOutcomeValue("2");
+
+        sne.execute(nodeOne, ctx);
+        sne.execute(nodeTwo, ctx);
+
+        assertNull(ctx.getAttribute("si[0].field1"));
+        assertNull(ctx.getAttribute("si[1].field2"));
+        assertNull(ctx.getAttribute("si[2].field3"));
+        assertEquals("6", ctx.getAttribute("search1"));
+        assertEquals("KeepMe!", ctx.getAttribute("simonSays"));
+    }
+    
+    @Test
+    public void clearSingleArrayProperties() throws Exception {
+        SetNodeExecutor sne = new SetNodeExecutor();
+        SvcLogicContext ctx = new SvcLogicContext();
+
+        SvcLogicParser slp = new SvcLogicParser();
+        LinkedList<SvcLogicGraph> graph = slp.parse("src/test/resources/clearSingleArrayValues.xml");
+        SvcLogicNode root = graph.getFirst().getRootNode();
+        SvcLogicNode nodeOne = root.getOutcomeValue("1");
+        SvcLogicNode nodeTwo = root.getOutcomeValue("2");
+
+        sne.execute(nodeOne, ctx);
+        sne.execute(nodeTwo, ctx);
+
+        assertNull(ctx.getAttribute("si[0].field1"));
+        assertEquals("2",ctx.getAttribute("si[1].field2"));
+        assertEquals("3", ctx.getAttribute("si[2].field3"));
+        assertEquals("6", ctx.getAttribute("search1"));
+        assertEquals("KeepMe!", ctx.getAttribute("simonSays"));
+    }
+
+    @Test
+    public void arrayPattern() {
+        SetNodeExecutor sne = new SetNodeExecutor();
+        String source = "one.two[0].three[0].four";
+        assertEquals("one.two.three.four", source.replaceAll(sne.arrayPattern, ""));
+    }
+
+    @Test
+    public void subtreeCopy() throws Exception {
+        SetNodeExecutor sne = new SetNodeExecutor();
+        SvcLogicContext ctx = new SvcLogicContext();
+
+        SvcLogicParser slp = new SvcLogicParser();
+        LinkedList<SvcLogicGraph> graph = slp.parse("src/test/resources/copyValues.xml");
+        SvcLogicNode root = graph.getFirst().getRootNode();
+        SvcLogicNode nodeOne = root.getOutcomeValue("1");
+        SvcLogicNode nodeTwo = root.getOutcomeValue("2");
+
+        sne.execute(nodeOne, ctx);
+        sne.execute(nodeTwo, ctx);
+
+        assertEquals("1", ctx.getAttribute("si.field1"));
+        assertEquals("2", ctx.getAttribute("si.field2"));
+        assertEquals("3", ctx.getAttribute("si.field3"));
+        assertEquals("1", ctx.getAttribute("rootTwo.field1"));
+        assertEquals("2", ctx.getAttribute("rootTwo.field2"));
+        assertEquals("3", ctx.getAttribute("rootTwo.field3"));
+    }
+
+}