X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ONAP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcomponents%2FMicroServicePolicyTest.java;h=35c99f770f02ac4bed702f85e486baabe023cb1f;hb=349714f2b187d55560fd8ed9a461f64cac233743;hp=462b7a9b302708ed178712e8af09124f96eac1b2;hpb=232424b155d8c1c005f059e1e7d5f1da5bbfcf89;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/MicroServicePolicyTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/MicroServicePolicyTest.java
index 462b7a9b3..35c99f770 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/MicroServicePolicyTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/MicroServicePolicyTest.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
  * 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.
@@ -17,46 +17,73 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.pap.xacml.rest.components;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import com.att.research.xacml.api.pap.PAPException;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.AdviceExpressionsType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
-import com.att.research.xacml.api.pap.PAPException;
 
 public class MicroServicePolicyTest {
-	@Rule
+    @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-	@Test
-	public void testConstructor1() {
-		thrown.expect(NullPointerException.class);
-		MicroServiceConfigPolicy policy = new MicroServiceConfigPolicy();
-		policy.getCorrectPolicyDataObject();
-		fail("Expected an exception");
-	}
-	
-	@Test
-	public void testConstructor2() {
-		PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
-		MicroServiceConfigPolicy policy = new MicroServiceConfigPolicy(policyAdapter);
-		assertNull(policy.getCorrectPolicyDataObject());
-	}
-	
-	@Test
-	public void testPrepareToSave() throws PAPException {
-		thrown.expect(NullPointerException.class);
-		PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
-		MicroServiceConfigPolicy policy = new MicroServiceConfigPolicy(policyAdapter);
-		policyAdapter.setHighestVersion(1);
-		policyAdapter.setPolicyType("Config");
-		policyAdapter.setNewFileName("foo.xml");
-		policyAdapter.setJsonBody("{ \"version\": \"1.0\"}");
-		policyAdapter.setServiceType("foo");
-		policy.prepareToSave();
-		fail("Expected an exception");
-	}
-}
\ No newline at end of file
+    @Test
+    public void testConstructor1() {
+        thrown.expect(NullPointerException.class);
+        MicroServiceConfigPolicy policy = new MicroServiceConfigPolicy();
+        policy.getCorrectPolicyDataObject();
+        fail("Expected an exception");
+    }
+
+    @Test
+    public void testConstructor2() {
+        PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
+        MicroServiceConfigPolicy policy = new MicroServiceConfigPolicy(policyAdapter);
+        assertNull(policy.getCorrectPolicyDataObject());
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testSave() throws PAPException {
+        PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
+        PolicyType policyType = new PolicyType();
+        policyAdapter.setPolicyID("id");
+        policyAdapter.setHighestVersion(1);
+        policyAdapter.setPolicyType("Config");
+        policyAdapter.setNewFileName("newfile");
+        policyAdapter.setData(policyType);
+        policyAdapter.setJsonBody("{\"key\":\"value\"}");
+        policyAdapter.setServiceType("svcType");
+        MicroServiceConfigPolicy policy = new MicroServiceConfigPolicy(policyAdapter);
+
+        policy.savePolicies();
+    }
+
+    @Test
+    public void testAdvice() {
+        PolicyType policyType = new PolicyType();
+        PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
+        policyAdapter.setPolicyID("id");
+        policyAdapter.setHighestVersion(1);
+        policyAdapter.setPolicyType("Config");
+        policyAdapter.setNewFileName("newfile");
+        policyAdapter.setData(policyType);
+        policyAdapter.setJsonBody("{\"key\":\"value\"}");
+        policyAdapter.setServiceType("svcType");
+
+        MicroServiceConfigPolicy policy = new MicroServiceConfigPolicy(policyAdapter);
+        assertThatThrownBy(() -> policy.savePolicies()).isInstanceOf(NullPointerException.class);
+
+        AdviceExpressionsType expType = policy.getAdviceExpressions(1, "filename");
+        assertEquals(1, expType.getAdviceExpression().size());
+    }
+}