Fix new eclipse warnings in policy-api

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

diff --git a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java
index 76825b2..582b7d4 100644 (file)
--- a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java
@@ -3,6 +3,7 @@
  * ONAP Policy API
  * ================================================================================
  * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,14 +33,14 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.api.main.parameters.ApiParameterGroup;
 import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.common.utils.coder.StandardCoder;
+import org.onap.policy.common.utils.coder.StandardYamlCoder;
 import org.onap.policy.common.utils.resources.ResourceUtils;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.provider.PolicyModelsProviderParameters;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 
 /**
- * This class performs unit test of {@link PolicyTypeProvider}
+ * This class performs unit test of {@link PolicyTypeProvider}.
  *
  * @author Chenfei Gao (cgao@research.att.com)
  */
@@ -49,10 +50,10 @@ public class TestPolicyTypeProvider {
     private static PolicyProvider policyProvider;
     private static PolicyModelsProviderParameters providerParams;
     private static ApiParameterGroup apiParamGroup;
-    private static StandardCoder standardCoder;
+    private static StandardYamlCoder standardYamlCoder;
 
-    private static final String POLICY_RESOURCE = "policies/vCPE.policy.monitoring.input.tosca.json";
-    private static final String POLICY_TYPE_RESOURCE = "policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.json";
+    private static final String POLICY_RESOURCE = "policies/vCPE.policy.monitoring.input.tosca.yaml";
+    private static final String POLICY_TYPE_RESOURCE = "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml";
 
     /**
      * Initializes parameters.
@@ -62,8 +63,9 @@ public class TestPolicyTypeProvider {
     @BeforeClass
     public static void setupParameters() throws PfModelException {
 
-        standardCoder = new StandardCoder();
+        standardYamlCoder = new StandardYamlCoder();
         providerParams = new PolicyModelsProviderParameters();
+        providerParams.setDatabaseDriver("org.h2.Driver");
         providerParams.setDatabaseUrl("jdbc:h2:mem:testdb");
         providerParams.setDatabaseUser("policy");
         providerParams.setDatabasePassword(Base64.getEncoder().encodeToString("P01icY".getBytes()));
@@ -116,11 +118,10 @@ public class TestPolicyTypeProvider {
     public void testCreatePolicyType() {
 
         assertThatCode(() -> {
-            String policyTypeString = ResourceUtils.getResourceAsString(POLICY_TYPE_RESOURCE);
-            ToscaServiceTemplate policyTypeServiceTemplate =
-                    standardCoder.decode(policyTypeString, ToscaServiceTemplate.class);
+            ToscaServiceTemplate policyTypeServiceTemplate = standardYamlCoder.decode(
+                    ResourceUtils.getResourceAsString(POLICY_TYPE_RESOURCE), ToscaServiceTemplate.class);
             ToscaServiceTemplate serviceTemplate = policyTypeProvider.createPolicyType(policyTypeServiceTemplate);
-            assertFalse(serviceTemplate.getPolicyTypes().get(0).isEmpty());
+            assertFalse(serviceTemplate.getPolicyTypes().isEmpty());
         }).doesNotThrowAnyException();
     }
 
@@ -128,29 +129,34 @@ public class TestPolicyTypeProvider {
     public void testDeletePolicyType() {
 
         assertThatCode(() -> {
-            String policyString = ResourceUtils.getResourceAsString(POLICY_RESOURCE);
-            ToscaServiceTemplate policyServiceTemplate =
-                    standardCoder.decode(policyString, ToscaServiceTemplate.class);
-            policyProvider.createPolicy(
-                    "onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0", policyServiceTemplate);
+            ToscaServiceTemplate policyTypeServiceTemplate = standardYamlCoder.decode(
+                    ResourceUtils.getResourceAsString(POLICY_TYPE_RESOURCE), ToscaServiceTemplate.class);
+            ToscaServiceTemplate serviceTemplate = policyTypeProvider.createPolicyType(policyTypeServiceTemplate);
+            assertFalse(serviceTemplate.getPolicyTypes().isEmpty());
+        }).doesNotThrowAnyException();
+
+        assertThatCode(() -> {
+            ToscaServiceTemplate policyServiceTemplate = standardYamlCoder.decode(
+                    ResourceUtils.getResourceAsString(POLICY_RESOURCE), ToscaServiceTemplate.class);
+            policyProvider.createPolicy("onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0", policyServiceTemplate);
         }).doesNotThrowAnyException();
 
         String exceptionMessage = "policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 "
-            + "cannot be deleted as it is parameterized by policies onap.restart.tca:1.0.0";
+                + "cannot be deleted as it is parameterized by policies onap.restart.tca:1.0.0";
         assertThatThrownBy(() -> {
             policyTypeProvider.deletePolicyType("onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0");
         }).hasMessage(exceptionMessage);
 
         assertThatCode(() -> {
-            ToscaServiceTemplate serviceTemplate = policyProvider.deletePolicy(
-                    "onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0", "onap.restart.tca", "1.0.0");
+            ToscaServiceTemplate serviceTemplate = policyProvider
+                    .deletePolicy("onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0", "onap.restart.tca", "1.0.0");
             assertFalse(serviceTemplate.getToscaTopologyTemplate().getPolicies().get(0).isEmpty());
         }).doesNotThrowAnyException();
 
         assertThatCode(() -> {
-            ToscaServiceTemplate serviceTemplate = policyTypeProvider.deletePolicyType(
-                    "onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0");
-            assertFalse(serviceTemplate.getPolicyTypes().get(0).isEmpty());
+            ToscaServiceTemplate serviceTemplate =
+                    policyTypeProvider.deletePolicyType("onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0");
+            assertFalse(serviceTemplate.getPolicyTypes().isEmpty());
         }).doesNotThrowAnyException();
 
         assertThatThrownBy(() -> {