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=1038e5de05ca8accc550e15e7f8212ba27c68f38;hb=249699f8fb908359213697055b66637c9baeda99;hp=54a7a4a72471e76b1a12f751a493405eaaae6511;hpb=e63aa2efcd5dff2af82b39368d5989763c9cdd6f;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 54a7a4a7..1038e5de 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
@@ -5,16 +5,16 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
@@ -26,7 +26,7 @@ package org.onap.clamp.clds.model.prop;
 import org.onap.clamp.clds.transform.TransformUtil;
 import org.junit.Assert;
 import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
 import java.io.IOException;
 
 /**
@@ -41,33 +41,54 @@ public class ModelPropertiesTest {
         String modName = "example-model-name";
         String controlName = "example-control-name";
 
-        ModelProperties prop = new ModelProperties(modName, controlName, null, modelBpmnProp, modelProp);
+        ModelProperties prop = new ModelProperties(modName, controlName, null, true, modelBpmnProp, modelProp);
         Assert.assertEquals(modName, prop.getModelName());
         Assert.assertEquals(controlName, prop.getControlName());
         Assert.assertEquals(null, prop.getActionCd());
 
         Global g = prop.getGlobal();
-        Assert.assertEquals("df6fcd2b-1932-429e-bb13-0cd0d32113cb", g.getService());
-        Assert.assertEquals("[SNDGCA64, ALPRGAED]", g.getLocation().toString());
-        Assert.assertEquals("[4b49acee-cf70-4b20-b956-a4fe0c1a8239]", g.getResourceVf().toString());
-
-        Collector c = prop.getCollector();
-        Assert.assertEquals("Collector_", c.getId());
-        Assert.assertEquals("DCAE-COLLECTOR-UCSNMP", c.getTopicPublishes());
+        Assert.assertEquals("0f983e18-4603-4bb4-a98c-e29691fb16a1", g.getService());
+        Assert.assertEquals("[SNDGCA64]", g.getLocation().toString());
+        Assert.assertEquals("[6c7aaec2-59eb-41d9-8681-b7f976ab668d]", g.getResourceVf().toString());
 
-        StringMatch sm = prop.getStringMatch();
+        StringMatch sm = prop.getType(StringMatch.class);
         Assert.assertEquals("StringMatch_", sm.getId());
-        Assert.assertEquals("DCAE-CL-EVENT", sm.getTopicPublishes());
 
-        Policy p = prop.getPolicy();
+        Policy p = prop.getType(Policy.class);
         Assert.assertEquals("Policy_", p.getId());
         Assert.assertEquals(null, p.getTopicPublishes());
-        Assert.assertEquals("DCAE-CL-EVENT", p.getTopicSubscribes());
-        Assert.assertEquals(500, p.getTimeout().intValue());
-        
-        Tca t = prop.getTca();
+        Assert.assertEquals(null, p.getTopicSubscribes());
+
+        Tca t = prop.getType(Tca.class);
         Assert.assertEquals("Narra", t.getTcaItems().get(0).getTcaName());
         Assert.assertEquals(Integer.valueOf(4), t.getTcaItems().get(0).getTcaThreshholds().get(0).getThreshhold());
     }
 
+    @Test
+	public void testPolicy() throws IOException {
+
+		String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnPropForPolicy.json");
+		System.out.println(modelBpmnProp);
+
+		String modelProp = TransformUtil.getResourceAsString("example/modelPropForPolicy.json");
+		System.out.println(modelProp);
+
+		ModelProperties prop = new ModelProperties("example-model-name", "example-control-name", null, true, modelBpmnProp, modelProp);
+		System.out.println("attempting prop.getGlobal()...");
+		Global g = prop.getGlobal();
+		System.out.println("attempting prop.getStringMatch()...");
+		StringMatch stringMatch = prop.getType(StringMatch.class);
+		if(stringMatch.isFound()){
+			System.out.println("stringMatch json object is present...");
+			assertEquals("1", stringMatch.getResourceGroups().get(0).getPolicyId());
+		}
+		System.out.println("attempting prop.getPolicy()...");
+		Policy policy = prop.getType(Policy.class);
+		if(policy.isFound()){
+			System.out.println("policy json object is present...");
+			assertEquals("1", policy.getPolicyChains().get(0).getPolicyId());
+		}
+	}
+
+
 }
\ No newline at end of file