1 files changed, 55 insertions, 9 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..fa4bd20f5 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,28 @@
  */
 package org.onap.policy.pap.xacml.rest.components;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+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;
+import java.io.File;
+import java.util.Collections;
 
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({MicroServiceConfigPolicy.class, CreateNewMicroServiceModel.class})
 public class MicroServicePolicyTest {
 	@Rule
     public ExpectedException thrown = ExpectedException.none();
@@ -47,10 +60,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 +75,36 @@ public class MicroServicePolicyTest {
 		policyAdapter.setJsonBody("{ \"version\": \"1.0\"}");
 		policyAdapter.setServiceType("foo");
 		policy.prepareToSave();
-		fail("Expected an exception");
+		assertEquals(policy.isPreparedToSave(), true);
+	}
+	
+	@Test
+	public void testCreateConstructor1() {
+		CreateNewMicroServiceModel model = new CreateNewMicroServiceModel(null, null, null, null);
+		assertNotNull(model);
+	}
+	
+	@Test
+	public void testCreateModel() throws Exception {
+		// Mock file retrieval
+		File testFile = new File("testFile");
+		File[] testList = new File[1];
+		testList[0] = testFile;
+		File impl = Mockito.mock(File.class);
+		PowerMockito.whenNew(File.class).withAnyArguments().thenReturn(impl);
+		when(impl.listFiles()).thenReturn(testList);
+		when(impl.isFile()).thenReturn(true);
+
+		// Mock internal dictionary retrieval
+		CommonClassDaoImpl daoImpl = Mockito.mock(CommonClassDaoImpl.class);
+		PowerMockito.whenNew(CommonClassDaoImpl.class).withNoArguments().thenReturn(daoImpl);
+		when(daoImpl.getDataById(any(), anyString(), anyString())).thenReturn(Collections.emptyList());
+
+		// Test create methods
+		String testFileName = "testFile.zip";
+		String testVal = "testVal";
+		CreateNewMicroServiceModel model = new CreateNewMicroServiceModel(testFileName, testVal, testVal, testVal, testVal);
+		model.addValuesToNewModel();
+		model.saveImportService();
 	}
-}
\ No newline at end of file
+}