From ff1b29770a38e58c7b8e59e567339c3f7921aa5c Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Wed, 13 Sep 2017 16:21:38 +0200 Subject: Add test to Holmes New test for holmes and refactor of the application.java class according to Sonar reports Change-Id: I2117b403c18e2cb2cd902018db951025a1db9bae Issue-ID: CLAMP-54 Signed-off-by: Determe, Sebastien (sd378r) --- .../clamp/clds/model/prop/ModelPropertiesTest.java | 88 +++++++++++----------- 1 file changed, 42 insertions(+), 46 deletions(-) (limited to 'src/test/java/org') 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 22b3ba0c..02e27ea8 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 @@ -24,69 +24,65 @@ package org.onap.clamp.clds.model.prop; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; -import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.onap.clamp.clds.util.ResourceFileUtil; - /** * Test org.onap.clamp.ClampDesigner.model.prop package using ModelProperties. */ public class ModelPropertiesTest { - @Test - public void testJsonParse() throws IOException { - String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json"); - String modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json"); - String modName = "example-model-name"; - String controlName = "example-control-name"; - - 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 global = prop.getGlobal(); - Assert.assertEquals("0f983e18-4603-4bb4-a98c-e29691fb16a1", global.getService()); - Assert.assertEquals("[SNDGCA64]", global.getLocation().toString()); - Assert.assertEquals("[6c7aaec2-59eb-41d9-8681-b7f976ab668d]", global.getResourceVf().toString()); - StringMatch sm = prop.getType(StringMatch.class); - Assert.assertEquals("StringMatch_", sm.getId()); - Policy policy = prop.getType(Policy.class); - Assert.assertEquals("Policy_", policy.getId()); - Assert.assertEquals(null, policy.getTopicPublishes()); - Assert.assertEquals(null, policy.getTopicSubscribes()); - - Tca tca = prop.getType(Tca.class); - Assert.assertEquals("Narra", tca.getTcaItems().get(0).getTcaName()); - Assert.assertEquals(Integer.valueOf(4), tca.getTcaItems().get(0).getTcaThreshholds().get(0).getThreshhold()); + @Before + public void registerNewClasses() { + ModelProperties.registerModelElement(Holmes.class, Holmes.getType()); } @Test - public void testPolicy() throws IOException { + public void testHolmes() throws IOException { - String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnPropForPolicy.json"); - System.out.println(modelBpmnProp); + String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/model-properties/modelBpmnProp.json"); + String modelBpmn = ResourceFileUtil.getResourceAsString("example/model-properties/modelBpmn.json"); + + ModelProperties prop = new ModelProperties("example-model-name", "example-control-name", null, true, modelBpmn, + modelBpmnProp); - String modelProp = ResourceFileUtil.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 global = 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()..."); + 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 aaiMathcingFields = new ArrayList(); + 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); - if (policy.isFound()) { - System.out.println("policy json object is present..."); - assertEquals("1", policy.getPolicyChains().get(0).getPolicyId()); - } + assertTrue(policy.isFound()); + assertEquals(1, policy.getPolicyChains().size()); + assertEquals("0", policy.getPolicyChains().get(0).getPolicyId()); + assertEquals(1, policy.getPolicyChains().get(0).getPolicyItems().size()); + + Tca tca = prop.getType(Tca.class); + assertTrue(tca.isFound()); + assertEquals(1, tca.getTcaItems().size()); + assertEquals(0, tca.getTcaItems().get(0).getTcaThreshholds().size()); + + Holmes holmes = prop.getType(Holmes.class); + assertTrue(holmes.isFound()); + assertEquals("policy1", holmes.getOperationalPolicy()); + assertEquals("blabla", holmes.getCorrelationLogic()); } } \ No newline at end of file -- cgit 1.2.3-korg