X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fmodel%2Fprop%2FModelPropertiesTest.java;h=60056d42f7b416fb16deba47899f9063df45a4b2;hb=bc25b72025a7b92c2b1bb7a3f0cfcd9ddedba001;hp=02e27ea8f44c6788b5ae823da673b4676c811b96;hpb=30da9b030700cdb7fb71ccf684ccdc1726b4713f;p=clamp.git

diff --git a/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java b/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java
index 02e27ea8..60056d42 100644
--- a/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java
+++ b/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java
@@ -32,6 +32,7 @@ import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.clamp.clds.model.CldsModel;
 import org.onap.clamp.clds.util.ResourceFileUtil;
 
 /**
@@ -53,27 +54,16 @@ public class ModelPropertiesTest {
         ModelProperties prop = new ModelProperties("example-model-name", "example-control-name", null, true, modelBpmn,
                 modelBpmnProp);
 
-        StringMatch stringMatch = prop.getType(StringMatch.class);
-        assertTrue(stringMatch.isFound());
-        assertEquals("1505133578560", stringMatch.getResourceGroups().get(0).getGroupNumber());
-        assertEquals("0", stringMatch.getResourceGroups().get(0).getPolicyId());
-        assertEquals(1, stringMatch.getResourceGroups().get(0).getServiceConfigurations().size());
-        List<String> aaiMathcingFields = new ArrayList<String>();
-        aaiMathcingFields.add("complex.city");
-        assertEquals(aaiMathcingFields,
-                stringMatch.getResourceGroups().get(0).getServiceConfigurations().get(0).getaaiMatchingFields());
-        assertEquals("1600", stringMatch.getResourceGroups().get(0).getServiceConfigurations().get(0).getAgeLimit());
-        assertEquals(1, stringMatch.getResourceGroups().get(0).getServiceConfigurations().get(0).getStringSet().size());
-
-        Collector collector = prop.getType(Collector.class);
-        assertTrue(collector.isFound());
-        assertEquals("DCAE-COLLECTOR-UCSNMP", collector.getTopicPublishes());
-
         Policy policy = prop.getType(Policy.class);
         assertTrue(policy.isFound());
         assertEquals(1, policy.getPolicyChains().size());
         assertEquals("0", policy.getPolicyChains().get(0).getPolicyId());
         assertEquals(1, policy.getPolicyChains().get(0).getPolicyItems().size());
+        assertEquals("resourceid", policy.getPolicyChains().get(0).getPolicyItems().get(0).getTargetResourceId());
+        assertEquals(180, policy.getPolicyChains().get(0).getPolicyItems().get(0).getRetryTimeLimit());
+        assertEquals(3, policy.getPolicyChains().get(0).getPolicyItems().get(0).getMaxRetries());
+        assertEquals("", policy.getPolicyChains().get(0).getPolicyItems().get(0).getParentPolicy());
+        assertEquals(null, policy.getPolicyChains().get(0).getPolicyItems().get(0).getParentPolicyConditions());
 
         Tca tca = prop.getType(Tca.class);
         assertTrue(tca.isFound());
@@ -85,4 +75,12 @@ public class ModelPropertiesTest {
         assertEquals("policy1", holmes.getOperationalPolicy());
         assertEquals("blabla", holmes.getCorrelationLogic());
     }
+
+    @Test
+    public void testGetVf() throws IOException {
+        CldsModel cldsModel = new CldsModel();
+        cldsModel.setPropText(
+                ResourceFileUtil.getResourceAsString("example/model-properties/modelBpmnPropWithGlobal.json"));
+        assertEquals("f5213e3a-9191-4362-93b5-b67f8d770e44", ModelProperties.getVf(cldsModel));
+    }
 }
\ No newline at end of file