aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbobbymander <bobby.mander@att.com>2018-03-05 09:05:13 -0500
committerbobbymander <bobby.mander@att.com>2018-03-05 09:09:48 -0500
commit1e48f43d43382f444d1401be8130eea9bbc6cddc (patch)
tree7e7f079df3536f939501ded03a661a01d58b9e10
parent87102d3e68569b81709633935dbd31070ce24a8b (diff)
JUnit addition/fix for PAP-REST
Issue-ID: POLICY-600 Change-Id: I342bc97f85739f73b0dac6aaea19f6f4b2ded470 Signed-off-by: bobbymander <bobby.mander@att.com>
-rw-r--r--ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/MicroServicePolicyTest.java29
1 files changed, 21 insertions, 8 deletions
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 e99debd1e..d16264909 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
@@ -19,15 +19,25 @@
*/
package org.onap.policy.pap.xacml.rest.components;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+import static org.mockito.Matchers.any;
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.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.onap.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
import org.onap.policy.rest.adapter.PolicyRestAdapter;
-import com.att.research.xacml.api.pap.PAPException;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(MicroServiceConfigPolicy.class)
public class MicroServicePolicyTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
@@ -47,10 +57,13 @@ public class MicroServicePolicyTest {
assertNull(policy.getCorrectPolicyDataObject());
}
- @Ignore
@Test
- public void testPrepareToSave() throws PAPException {
- thrown.expect(NullPointerException.class);
+ public void testPrepareToSave() throws Exception {
+ // Need to mock internal dictionary retrieval
+ CommonClassDaoImpl impl = Mockito.mock(CommonClassDaoImpl.class);
+ PowerMockito.whenNew(CommonClassDaoImpl.class).withNoArguments().thenReturn(impl);
+ when(impl.getDataById(any(), anyString(), anyString())).thenReturn(null);
+
PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
MicroServiceConfigPolicy policy = new MicroServiceConfigPolicy(policyAdapter);
policyAdapter.setHighestVersion(1);
@@ -59,6 +72,6 @@ public class MicroServicePolicyTest {
policyAdapter.setJsonBody("{ \"version\": \"1.0\"}");
policyAdapter.setServiceType("foo");
policy.prepareToSave();
- fail("Expected an exception");
+ assertEquals(policy.isPreparedToSave(), true);
}
} \ No newline at end of file