X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FActionDictionaryJpaTest.java;h=501c7fd9233e98602f0e661c37549e623ffad767;hp=047053a835f2d6924dcd03d96e878f1dfb92ab94;hb=d4e3a1b394715c6386f963130e4e081d421ecd1b;hpb=e4ac1ef3c51fc9afe44849ada5bea8c3d6057897

diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java
index 047053a83..501c7fd92 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java
@@ -23,6 +23,7 @@ package org.onap.policy.rest.jpa;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -98,9 +99,10 @@ public class ActionDictionaryJpaTest {
         assertTrue(data.getFunctionDefinition() != null);
         data.setId(1);
         assertTrue(1 == data.getId());
-        data.isBag();
-        data.toString();
+        assertFalse(data.isBag());
+        assertEquals("FunctionArgument(id=1", data.toString().substring(0, 21));
         data.setIsBag(1);
+        assertTrue(data.isBag());
         assertTrue(1 == data.getIsBag());
         new FunctionArgument(data);
     }
@@ -116,10 +118,10 @@ public class ActionDictionaryJpaTest {
         assertTrue(data.getDatatypeBean() != null);
         data.setFunctionArguments(new ArrayList<>());
         assertTrue(data.getFunctionArguments() != null);
-        data.setHigherOrderArg_LB(1);
-        assertTrue(1 == data.getHigherOrderArg_LB());
-        data.setHigherOrderArg_UB(1);
-        assertTrue(1 == data.getHigherOrderArg_UB());
+        data.setHigherOrderArgLb(1);
+        assertTrue(1 == data.getHigherOrderArgLb());
+        data.setHigherOrderArgUb(1);
+        assertTrue(1 == data.getHigherOrderArgUb());
         data.setId(1);
         assertTrue(1 == data.getId());
         data.setIsBagReturn(1);
@@ -130,11 +132,19 @@ public class ActionDictionaryJpaTest {
         assertTrue("Test".equals(data.getShortname()));
         data.setXacmlid("Test");
         assertTrue("Test".equals(data.getXacmlid()));
-        data.toString();
-        data.isBagReturn();
-        data.isHigherOrder();
-        data.addFunctionArgument(new FunctionArgument());
-        data.removeFunctionArgument(new FunctionArgument());
+        assertTrue(data.toString().startsWith("FunctionDefinition(id=1"));
+        assertTrue(data.isBagReturn());
+        data.setIsBagReturn(0);
+        assertTrue(data.isHigherOrder());
+        assertFalse(data.isBagReturn());
+        data.setIsHigherOrder(0);
+        assertFalse(data.isHigherOrder());
+        FunctionArgument functionArgument = new FunctionArgument();
+        functionArgument.setId(12345);
+        data.addFunctionArgument(functionArgument);
+        assertEquals(12345, data.getFunctionArguments().iterator().next().getId());
+        data.removeFunctionArgument(functionArgument);
+        assertTrue(data.getFunctionArguments().isEmpty());
     }
 
     @Test
@@ -219,13 +229,19 @@ public class ActionDictionaryJpaTest {
 
     @Test
     public void testObadvice() {
-        Obadvice data = new Obadvice();
         new Obadvice();
         new Obadvice("Test", "Test");
+        new Obadvice(new DummyIdentifier(), "Test");
+        Obadvice data = new Obadvice();
         data.clone();
         data.addObadviceExpression(new ObadviceExpression());
+        assertNotNull(data.clone());
         data.removeObadviceExpression(new ObadviceExpression());
         data.removeAllExpressions();
+        assertEquals(0, data.getObadviceExpressions().size());
+        data.setObadviceExpressions(null);
+        assertNull(data.getObadviceExpressions());
+        data.removeAllExpressions();
         data.prePersist();
         data.preUpdate();
         data.setId(1);
@@ -244,6 +260,7 @@ public class ActionDictionaryJpaTest {
         assertTrue("Test".equals(data.getType()));
         data.setXacmlId("Test");
         assertTrue("Test".equals(data.getXacmlId()));
+
     }
 
     @Test
@@ -272,6 +289,13 @@ public class ActionDictionaryJpaTest {
         data.setXacmlId("Test");
         assertTrue("Test".equals(data.getXacmlId()));
         data.toString();
+
+        RuleAlgorithms ra0 = new RuleAlgorithms(new DummyIdentifier());
+        assertTrue(ra0.isStandard());
+        assertFalse(ra0.isCustom());
+        RuleAlgorithms ra1 = new RuleAlgorithms(new DummyIdentifier(), 'C');
+        assertFalse(ra1.isStandard());
+        assertTrue(ra1.isCustom());
     }
 
     @Test
@@ -340,5 +364,13 @@ public class ActionDictionaryJpaTest {
         assertTrue("Test".equals(data.getXacmlId()));
         data.setIsStandard(PolicyAlgorithms.STANDARD);
         assertTrue(data.isStandard());
+        assertFalse(data.isCustom());
+        data.setIsStandard(PolicyAlgorithms.CUSTOM);
+        assertFalse(data.isStandard());
+        assertTrue(data.isCustom());
+
+        DummyIdentifier identifier = new DummyIdentifier();
+        assertNotNull(new PolicyAlgorithms(identifier));
+        assertNotNull(new PolicyAlgorithms(identifier, 'C'));
     }
 }