Added the new versioning validation for policy and policy type

[policy/api.git] / main / src / test / java / org / onap / policy / api / main / rest / provider / TestLegacyOperationalPolicyProvider.java

diff --git a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java
index 31e22e3..72e57a9 100644 (file)
--- a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy API
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -74,6 +74,8 @@ public class TestLegacyOperationalPolicyProvider {
     private static StandardYamlCoder standardYamlCoder;
 
     private static final String POLICY_RESOURCE = "policies/vCPE.policy.operational.input.json";
+    private static final String POLICY_RESOURCE_WITH_NO_VERSION =
+            "policies/vDNS.policy.operational.no.policyversion.json";
     private static final String POLICY_TYPE_RESOURCE = "policytypes/onap.policies.controlloop.Operational.yaml";
     private static final String POLICY_TYPE_ID = "onap.policies.controlloop.Operational:1.0.0";
     private static final String POLICY_ID = "operational.restart:1.0.0";
@@ -119,7 +121,7 @@ public class TestLegacyOperationalPolicyProvider {
     }
 
     @Test
-    public void testFetchOperationalPolicy() {
+    public void testFetchOperationalPolicy() throws Exception {
 
         assertThatThrownBy(() -> {
             operationalPolicyProvider.fetchOperationalPolicy("dummy", null);
@@ -129,31 +131,24 @@ public class TestLegacyOperationalPolicyProvider {
             operationalPolicyProvider.fetchOperationalPolicy("dummy", "dummy");
         }).hasMessage("legacy policy version is not an integer");
 
-        assertThatCode(() -> {
-            ToscaServiceTemplate policyTypeServiceTemplate = standardYamlCoder.decode(
-                    ResourceUtils.getResourceAsString(POLICY_TYPE_RESOURCE), ToscaServiceTemplate.class);
-            policyTypeProvider.createPolicyType(policyTypeServiceTemplate);
-
-            String policyString = ResourceUtils.getResourceAsString(POLICY_RESOURCE);
-            LegacyOperationalPolicy policyToCreate = standardCoder.decode(policyString, LegacyOperationalPolicy.class);
-            LegacyOperationalPolicy createdPolicy = operationalPolicyProvider.createOperationalPolicy(policyToCreate);
-            assertNotNull(createdPolicy);
+        ToscaServiceTemplate policyTypeServiceTemplate = standardYamlCoder.decode(
+                ResourceUtils.getResourceAsString(POLICY_TYPE_RESOURCE), ToscaServiceTemplate.class);
+        policyTypeProvider.createPolicyType(policyTypeServiceTemplate);
 
-            policyString = ResourceUtils.getResourceAsString(POLICY_RESOURCE);
-            policyToCreate = standardCoder.decode(policyString, LegacyOperationalPolicy.class);
-            createdPolicy = operationalPolicyProvider.createOperationalPolicy(policyToCreate);
-            assertNotNull(createdPolicy);
+        String policyString = ResourceUtils.getResourceAsString(POLICY_RESOURCE);
+        LegacyOperationalPolicy policyToCreate = standardCoder.decode(policyString, LegacyOperationalPolicy.class);
+        LegacyOperationalPolicy createdPolicy = operationalPolicyProvider.createOperationalPolicy(policyToCreate);
+        assertNotNull(createdPolicy);
 
-            LegacyOperationalPolicy firstVersion =
-                    operationalPolicyProvider.fetchOperationalPolicy("operational.restart", "1");
-            assertNotNull(firstVersion);
-            assertEquals("1", firstVersion.getPolicyVersion());
+        LegacyOperationalPolicy firstVersion =
+                operationalPolicyProvider.fetchOperationalPolicy("operational.restart", "1");
+        assertNotNull(firstVersion);
+        assertEquals("1", firstVersion.getPolicyVersion());
 
-            LegacyOperationalPolicy latestVersion =
-                    operationalPolicyProvider.fetchOperationalPolicy("operational.restart", null);
-            assertNotNull(latestVersion);
-            assertEquals("2", latestVersion.getPolicyVersion());
-        }).doesNotThrowAnyException();
+        LegacyOperationalPolicy latestVersion =
+                operationalPolicyProvider.fetchOperationalPolicy("operational.restart", null);
+        assertNotNull(latestVersion);
+        assertEquals("1", latestVersion.getPolicyVersion());
 
         assertThatThrownBy(() -> {
             operationalPolicyProvider.fetchOperationalPolicy("operational.restart", "1.0.0");
@@ -163,11 +158,8 @@ public class TestLegacyOperationalPolicyProvider {
             operationalPolicyProvider.fetchOperationalPolicy("operational.restart", "latest");;
         }).hasMessage("legacy policy version is not an integer");
 
-        assertThatCode(() -> {
-            operationalPolicyProvider.deleteOperationalPolicy("operational.restart", "1");
-            operationalPolicyProvider.deleteOperationalPolicy("operational.restart", "2");
-            policyTypeProvider.deletePolicyType("onap.policies.controlloop.Operational", "1.0.0");
-        }).doesNotThrowAnyException();
+        operationalPolicyProvider.deleteOperationalPolicy("operational.restart", "1");
+        policyTypeProvider.deletePolicyType("onap.policies.controlloop.Operational", "1.0.0");
     }
 
     @Test
@@ -263,7 +255,7 @@ public class TestLegacyOperationalPolicyProvider {
     }
 
     @Test
-    public void testCreateOperationalPolicy() {
+    public void testCreateOperationalPolicy() throws Exception {
 
         assertThatThrownBy(() -> {
             String policyString = ResourceUtils.getResourceAsString(POLICY_RESOURCE);
@@ -271,18 +263,30 @@ public class TestLegacyOperationalPolicyProvider {
             operationalPolicyProvider.createOperationalPolicy(policyToCreate);
         }).hasMessage("policy type " + POLICY_TYPE_ID + " for policy " + POLICY_ID + " does not exist");
 
-        assertThatCode(() -> {
-            ToscaServiceTemplate policyTypeServiceTemplate = standardYamlCoder.decode(
-                    ResourceUtils.getResourceAsString(POLICY_TYPE_RESOURCE), ToscaServiceTemplate.class);
-            policyTypeProvider.createPolicyType(policyTypeServiceTemplate);
+        ToscaServiceTemplate policyTypeServiceTemplate = standardYamlCoder.decode(
+                ResourceUtils.getResourceAsString(POLICY_TYPE_RESOURCE), ToscaServiceTemplate.class);
+        policyTypeProvider.createPolicyType(policyTypeServiceTemplate);
 
-            String policyString = ResourceUtils.getResourceAsString(POLICY_RESOURCE);
-            LegacyOperationalPolicy policyToCreate = standardCoder.decode(policyString, LegacyOperationalPolicy.class);
-            LegacyOperationalPolicy createdPolicy = operationalPolicyProvider.createOperationalPolicy(policyToCreate);
-            assertNotNull(createdPolicy);
-            assertEquals("operational.restart", createdPolicy.getPolicyId());
-            assertTrue(createdPolicy.getContent().startsWith("controlLoop%3A%0A%20%20version%3A%202.0.0%0A%20%20"));
-        }).doesNotThrowAnyException();
+        String policyString = ResourceUtils.getResourceAsString(POLICY_RESOURCE);
+        LegacyOperationalPolicy policyToCreate = standardCoder.decode(policyString, LegacyOperationalPolicy.class);
+        LegacyOperationalPolicy createdPolicy = operationalPolicyProvider.createOperationalPolicy(policyToCreate);
+        assertNotNull(createdPolicy);
+        assertEquals("operational.restart", createdPolicy.getPolicyId());
+        assertTrue(createdPolicy.getContent().startsWith("controlLoop%3A%0A%20%20version%3A%202.0.0%0A%20%20"));
+
+        assertThatThrownBy(() -> {
+            String badPolicyString = ResourceUtils.getResourceAsString(POLICY_RESOURCE_WITH_NO_VERSION);
+            LegacyOperationalPolicy badPolicyToCreate =
+                    standardCoder.decode(badPolicyString, LegacyOperationalPolicy.class);
+            operationalPolicyProvider.createOperationalPolicy(badPolicyToCreate);
+        }).hasMessage("mandatory field 'policy-version' is missing in the policy: operational.scaleout");
+
+        assertThatThrownBy(() -> {
+            String duplicatePolicyString = ResourceUtils.getResourceAsString(POLICY_RESOURCE);
+            LegacyOperationalPolicy duplicatePolicyToCreate =
+                    standardCoder.decode(duplicatePolicyString, LegacyOperationalPolicy.class);
+            operationalPolicyProvider.createOperationalPolicy(duplicatePolicyToCreate);
+        }).hasMessage("operational policy operational.restart:1 already exists; its latest version is 1");
     }
 
     @Test