From 1902963bbc9d35fc16562b815b8a3f1950b048c9 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 8 Jan 2020 17:04:50 +0000 Subject: Update tosca utils to remove code duplication Refactored the ToscaUtils class to remove code duplication. Issue-ID: POLICY-2315 Change-Id: Ic06a0881d1797dbb3c45ae1903a150fbda421e72 Signed-off-by: liamfallon --- .../policy/models/tosca/utils/ToscaUtilsTest.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'models-tosca/src/test') diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/utils/ToscaUtilsTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/utils/ToscaUtilsTest.java index 82636940c..ebe01a65c 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/utils/ToscaUtilsTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/utils/ToscaUtilsTest.java @@ -47,7 +47,7 @@ public class ToscaUtilsTest { assertFalse(ToscaUtils.doDataTypesExist(jpaToscaServiceTemplate)); assertEquals("no data types specified on service template", - ToscaUtils.checkDataTypesExist(jpaToscaServiceTemplate)); + ToscaUtils.checkDataTypesExist().check(jpaToscaServiceTemplate)); assertThatThrownBy(() -> { ToscaUtils.assertDataTypesExist(jpaToscaServiceTemplate); }).hasMessage("no data types specified on service template"); @@ -56,7 +56,7 @@ public class ToscaUtilsTest { assertFalse(ToscaUtils.doDataTypesExist(jpaToscaServiceTemplate)); assertEquals("list of data types specified on service template is empty", - ToscaUtils.checkDataTypesExist(jpaToscaServiceTemplate)); + ToscaUtils.checkDataTypesExist().check(jpaToscaServiceTemplate)); assertThatThrownBy(() -> { ToscaUtils.assertDataTypesExist(jpaToscaServiceTemplate); }).hasMessage("list of data types specified on service template is empty"); @@ -64,7 +64,7 @@ public class ToscaUtilsTest { jpaToscaServiceTemplate.getDataTypes().getConceptMap().put(new PfConceptKey(), null); assertTrue(ToscaUtils.doDataTypesExist(jpaToscaServiceTemplate)); - assertEquals(null, ToscaUtils.checkDataTypesExist(jpaToscaServiceTemplate)); + assertEquals(null, ToscaUtils.checkDataTypesExist().check(jpaToscaServiceTemplate)); assertThatCode(() -> { ToscaUtils.assertDataTypesExist(jpaToscaServiceTemplate); }).doesNotThrowAnyException(); @@ -77,7 +77,7 @@ public class ToscaUtilsTest { assertFalse(ToscaUtils.doPolicyTypesExist(jpaToscaServiceTemplate)); assertEquals("no policy types specified on service template", - ToscaUtils.checkPolicyTypesExist(jpaToscaServiceTemplate)); + ToscaUtils.checkPolicyTypesExist().check(jpaToscaServiceTemplate)); assertThatThrownBy(() -> { ToscaUtils.assertPolicyTypesExist(jpaToscaServiceTemplate); }).hasMessage("no policy types specified on service template"); @@ -86,7 +86,7 @@ public class ToscaUtilsTest { assertFalse(ToscaUtils.doPolicyTypesExist(jpaToscaServiceTemplate)); assertEquals("list of policy types specified on service template is empty", - ToscaUtils.checkPolicyTypesExist(jpaToscaServiceTemplate)); + ToscaUtils.checkPolicyTypesExist().check(jpaToscaServiceTemplate)); assertThatThrownBy(() -> { ToscaUtils.assertPolicyTypesExist(jpaToscaServiceTemplate); }).hasMessage("list of policy types specified on service template is empty"); @@ -94,7 +94,7 @@ public class ToscaUtilsTest { jpaToscaServiceTemplate.getPolicyTypes().getConceptMap().put(new PfConceptKey(), null); assertTrue(ToscaUtils.doPolicyTypesExist(jpaToscaServiceTemplate)); - assertEquals(null, ToscaUtils.checkPolicyTypesExist(jpaToscaServiceTemplate)); + assertEquals(null, ToscaUtils.checkPolicyTypesExist().check(jpaToscaServiceTemplate)); assertThatCode(() -> { ToscaUtils.assertPolicyTypesExist(jpaToscaServiceTemplate); }).doesNotThrowAnyException(); @@ -106,7 +106,7 @@ public class ToscaUtilsTest { assertFalse(ToscaUtils.doPoliciesExist(jpaToscaServiceTemplate)); assertEquals("topology template not specified on service template", - ToscaUtils.checkPoliciesExist(jpaToscaServiceTemplate)); + ToscaUtils.checkPoliciesExist().check(jpaToscaServiceTemplate)); assertThatThrownBy(() -> { ToscaUtils.assertPoliciesExist(jpaToscaServiceTemplate); }).hasMessage("topology template not specified on service template"); @@ -115,7 +115,7 @@ public class ToscaUtilsTest { assertFalse(ToscaUtils.doPoliciesExist(jpaToscaServiceTemplate)); assertEquals("no policies specified on topology template of service template", - ToscaUtils.checkPoliciesExist(jpaToscaServiceTemplate)); + ToscaUtils.checkPoliciesExist().check(jpaToscaServiceTemplate)); assertThatThrownBy(() -> { ToscaUtils.assertPoliciesExist(jpaToscaServiceTemplate); }).hasMessage("no policies specified on topology template of service template"); @@ -124,7 +124,7 @@ public class ToscaUtilsTest { assertFalse(ToscaUtils.doPoliciesExist(jpaToscaServiceTemplate)); assertEquals("list of policies specified on topology template of service template is empty", - ToscaUtils.checkPoliciesExist(jpaToscaServiceTemplate)); + ToscaUtils.checkPoliciesExist().check(jpaToscaServiceTemplate)); assertThatThrownBy(() -> { ToscaUtils.assertPoliciesExist(jpaToscaServiceTemplate); }).hasMessage("list of policies specified on topology template of service template is empty"); @@ -132,7 +132,7 @@ public class ToscaUtilsTest { jpaToscaServiceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(new PfConceptKey(), null); assertTrue(ToscaUtils.doPoliciesExist(jpaToscaServiceTemplate)); - assertEquals(null, ToscaUtils.checkPoliciesExist(jpaToscaServiceTemplate)); + assertEquals(null, ToscaUtils.checkPoliciesExist().check(jpaToscaServiceTemplate)); assertThatCode(() -> { ToscaUtils.assertPoliciesExist(jpaToscaServiceTemplate); }).doesNotThrowAnyException(); -- cgit 1.2.3-korg