Fix Policy import/export on gui

Issue-ID: POLICY-2545
Change-Id: I25fe8c415a0c9a9b15c97feb93c2ce3e9c975ed2
Signed-off-by: uj426b <uj426b@att.com>

2 files changed, 7 insertions, 12 deletions

diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java
index 50b806a37..e349d53ac 100644
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -855,6 +854,7 @@ public class PolicyManagerServletTest extends Mockito {
             }
         };
         HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class);
+        HttpServletResponse mockResp = Mockito.mock(HttpServletResponse.class);
         FileItem mockFileItem = Mockito.mock(FileItem.class);
         InputStream mockInputStream = Mockito.mock(InputStream.class);
 
@@ -862,18 +862,18 @@ public class PolicyManagerServletTest extends Mockito {
         when(mockFileItem.getInputStream()).thenReturn(mockInputStream);
         when(mockFileItem.getSize()).thenReturn(fileSizeLimit + 1);
 
-        Whitebox.invokeMethod(servlet, "processFormFile", mockRequest, mockFileItem);
+        Whitebox.invokeMethod(servlet, "processFormFile", mockRequest, mockFileItem, mockResp);
         verify(mockFileItem, atLeast(1)).getName();
         verify(mockFileItem, atLeast(1)).getSize();
 
         when(mockFileItem.getName()).thenReturn("testFileName.txt");
-        Whitebox.invokeMethod(servlet, "processFormFile", mockRequest, mockFileItem);
+        Whitebox.invokeMethod(servlet, "processFormFile", mockRequest, mockFileItem, mockResp);
         verify(mockFileItem, atLeast(1)).getName();
 
         when(mockFileItem.getSize()).thenReturn(fileSizeLimit);
         when(mockFileItem.getName()).thenReturn("testFileName.xls");
         when(mockFileItem.getInputStream()).thenThrow(IOException.class);
-        Whitebox.invokeMethod(servlet, "processFormFile", mockRequest, mockFileItem);
+        Whitebox.invokeMethod(servlet, "processFormFile", mockRequest, mockFileItem, mockResp);
         verify(mockFileItem, atLeast(1)).getName();
         verify(mockFileItem, atLeast(1)).getInputStream();
         verify(mockFileItem, atLeast(1)).getSize();
diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyExportAndImportControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyExportAndImportControllerTest.java
index 4b348cf2b..37145655c 100644
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyExportAndImportControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyExportAndImportControllerTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -26,18 +26,13 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
-
 import com.mockrunner.mock.web.MockHttpServletRequest;
 import com.mockrunner.mock.web.MockHttpServletResponse;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
@@ -106,7 +101,7 @@ public class PolicyExportAndImportControllerTest {
         // Test negative case
         String file = new File(classLoader.getResource("Config_BRMS_Raw_TestBRMSRawPolicy.1.xml").getFile())
                 .getAbsolutePath();
-        JSONObject json = controller.importRepositoryFile(file, request);
+        String json = controller.importRepositoryFile(file, request);
         assertNull(json);
 
         // Another negative case