summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BRMSGateway/src/test/java/org/onap/policy/brmsInterface/BRMSHandlerTest.java93
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java2
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java2
-rw-r--r--POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyExportAndImportControllerTest.java108
-rw-r--r--POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyNotificationControllerTest.java74
-rw-r--r--POLICY-SDK-APP/src/test/resources/PolicyExport.xlsbin0 -> 33792 bytes
6 files changed, 277 insertions, 2 deletions
diff --git a/BRMSGateway/src/test/java/org/onap/policy/brmsInterface/BRMSHandlerTest.java b/BRMSGateway/src/test/java/org/onap/policy/brmsInterface/BRMSHandlerTest.java
new file mode 100644
index 000000000..8e15cdf28
--- /dev/null
+++ b/BRMSGateway/src/test/java/org/onap/policy/brmsInterface/BRMSHandlerTest.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine
+ * ================================================================================
+ * Copyright (C) 2018 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.brmsInterface;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.onap.policy.api.NotificationType;
+import org.onap.policy.std.StdPDPNotification;
+import org.onap.policy.utils.BackUpMonitor;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+@RunWith(PowerMockRunner.class)
+public class BRMSHandlerTest {
+ @PrepareForTest({Persistence.class, BackUpMonitor.class})
+ @Test
+ public void negativeTestNotifications() throws Exception {
+ // Mock emf, persistence, and query
+ EntityManagerFactory emf = Mockito.mock(EntityManagerFactory.class);
+ EntityManager em = Mockito.mock(EntityManager.class);
+ Mockito.when(emf.createEntityManager()).thenReturn(em);
+ PowerMockito.mockStatic(Persistence.class);
+ PowerMockito.when(Persistence.createEntityManagerFactory(any(), any())).thenReturn(emf);
+ EntityTransaction et = Mockito.mock(EntityTransaction.class);
+ Mockito.when(em.getTransaction()).thenReturn(et);
+ Query query = Mockito.mock(Query.class);
+ Mockito.when(em.createQuery(Mockito.anyString())).thenReturn(query);
+
+ // Mock backup monitor
+ PowerMockito.mockStatic(BackUpMonitor.class);
+ BackUpMonitor monitor = Mockito.mock(BackUpMonitor.class);
+ PowerMockito.when(BackUpMonitor.getInstance(any(), any(), any(), any())).thenReturn(monitor);
+
+ // Test constructor
+ StdPDPNotification notification = new StdPDPNotification();
+ String propFile = "config.properties";
+ BRMSHandler handler = new BRMSHandler(propFile);
+ BRMSPush brmsPush = new BRMSPush(propFile, handler);
+ handler.setBRMSPush(brmsPush);
+ assertNotNull(handler);
+ assertNotNull(brmsPush);
+ assertNull(handler.getPolicyEngine());
+
+ try {
+ // Test update
+ notification.setNotificationType(NotificationType.UPDATE);
+ handler.runOnNotification(notification);
+ handler.notificationReceived(notification);
+
+ // Test remove
+ notification.setNotificationType(NotificationType.REMOVE);
+ handler.runOnNotification(notification);
+ handler.notificationReceived(notification);
+
+ // Test both
+ notification.setNotificationType(NotificationType.BOTH);
+ handler.runOnNotification(notification);
+ handler.notificationReceived(notification);
+ }
+ catch (Exception ex) {
+ fail("Not expecting an exception: " + ex);
+ }
+ }
+}
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
index 2fb636732..71eb1156f 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
@@ -358,7 +358,7 @@ public class PolicyDBDao {
} catch(Exception e2){
PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e2, policyDBDaoVar, "COULD NOT CREATE DATABASELOCK ROW. WILL TRY ONE MORE TIME");
}
- em = null;
+
em = emf.createEntityManager();
try{
startTransactionSynced(em, 1000);
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
index 59bf50071..d87e75f71 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
@@ -166,7 +166,7 @@ public class ElkConnectorImpl implements ElkConnector{
String errorMessage = result.getErrorMessage();
if (errorMessage != null && !errorMessage.isEmpty()) {
- String xMessage = errorMessage;
+ String xMessage;
if (errorMessage.contains("TokenMgrError")) {
int indexError = errorMessage.lastIndexOf("TokenMgrError");
xMessage = "Invalid Search Expression. Details: " + errorMessage.substring(indexError);
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
new file mode 100644
index 000000000..358108fa1
--- /dev/null
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyExportAndImportControllerTest.java
@@ -0,0 +1,108 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine
+ * ================================================================================
+ * Copyright (C) 2018 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.controller;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.when;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+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;
+import org.onap.policy.daoImp.CommonClassDaoImpl;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.policy.rest.jpa.ConfigurationDataEntity;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.web.support.UserUtils;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import com.mockrunner.mock.web.MockHttpServletRequest;
+import com.mockrunner.mock.web.MockHttpServletResponse;
+
+@RunWith(PowerMockRunner.class)
+public class PolicyExportAndImportControllerTest {
+ @Test
+ public void testSetAndGet(){
+ PolicyExportAndImportController controller = new PolicyExportAndImportController();
+ PolicyController policyController = new PolicyController();
+ controller.setPolicyController(policyController);
+ assertEquals(controller.getPolicyController(), policyController);
+ CommonClassDao commonClassDao = new CommonClassDaoImpl();
+ PolicyExportAndImportController.setCommonClassDao(commonClassDao);
+ assertEquals(PolicyExportAndImportController.getCommonClassDao(), commonClassDao);
+ }
+
+ @Test
+ public void testExport() throws IOException {
+ PolicyExportAndImportController controller = new PolicyExportAndImportController();
+ MockHttpServletRequest request = new MockHttpServletRequest();
+ request.setBodyContent("{\n\"exportData\": {}\n}\n");
+ MockHttpServletResponse response = new MockHttpServletResponse();
+
+ // Test negative case
+ controller.exportPolicy(request, response);
+ assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
+ }
+
+ @PrepareForTest({UserUtils.class})
+ @Test
+ public void testImport() throws IOException {
+ // Mock user utilities
+ PowerMockito.mockStatic(UserUtils.class);
+ User user = new User();
+ when(UserUtils.getUserSession(any())).thenReturn(user);
+
+ // Mock dao
+ UserInfo info = new UserInfo();
+ ConfigurationDataEntity configEntity = new ConfigurationDataEntity();
+ CommonClassDao commonClassDao = Mockito.mock(CommonClassDaoImpl.class);
+ when(commonClassDao.getEntityItem(eq(UserInfo.class), any(), any())).thenReturn(info);
+ when(commonClassDao.getEntityItem(eq(ConfigurationDataEntity.class), any(), any())).thenReturn(configEntity);
+ when(commonClassDao.getDataById(any(), any(), any())).thenReturn(Collections.emptyList());
+
+ // Test import
+ ClassLoader classLoader = getClass().getClassLoader();
+ PolicyController policyController = new PolicyController();
+ PolicyController.setCommonClassDao(commonClassDao);
+ PolicyExportAndImportController controller = new PolicyExportAndImportController();
+ PolicyExportAndImportController.setCommonClassDao(commonClassDao);
+ controller.setPolicyController(policyController);
+ HttpServletRequest request = new MockHttpServletRequest();
+
+ // Test negative case
+ String file = new File(classLoader.getResource("Config_BRMS_Raw_TestBRMSRawPolicy.1.xml").getFile()).getAbsolutePath();
+ JSONObject json = controller.importRepositoryFile(file, request);
+ assertNull(json);
+
+ // Another negative case
+ file = new File(classLoader.getResource("PolicyExport.xls").getFile()).getAbsolutePath();
+ json = controller.importRepositoryFile(file, request);
+ assertNull(json);
+ }
+}
diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyNotificationControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyNotificationControllerTest.java
new file mode 100644
index 000000000..49249cad3
--- /dev/null
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyNotificationControllerTest.java
@@ -0,0 +1,74 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine
+ * ================================================================================
+ * Copyright (C) 2018 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.controller;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.util.Collections;
+import javax.servlet.http.HttpServletResponse;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.web.support.UserUtils;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.springframework.web.servlet.ModelAndView;
+import com.mockrunner.mock.web.MockHttpServletRequest;
+import com.mockrunner.mock.web.MockHttpServletResponse;
+
+@RunWith(PowerMockRunner.class)
+public class PolicyNotificationControllerTest {
+ @PrepareForTest({UserUtils.class})
+ @Test
+ public void testWatch() throws IOException{
+ // Mock user utilities
+ PowerMockito.mockStatic(UserUtils.class);
+ User user = new User();
+ user.setOrgUserId("testID");
+ when(UserUtils.getUserSession(any())).thenReturn(user);
+
+ // Mock database
+ CommonClassDao dao = Mockito.mock(CommonClassDao.class);
+ Mockito.when(dao.getDataByQuery(any(), any())).thenReturn(Collections.emptyList());
+
+ // Test watch
+ PolicyNotificationController controller = new PolicyNotificationController();
+ controller.commonClassDao = dao;
+ MockHttpServletRequest request = new MockHttpServletRequest();
+ request.setBodyContent("{\n\"watchData\": {\"name\": \"testVal\",\"path\": \"testPath\"\n}}\n");
+ MockHttpServletResponse response = new MockHttpServletResponse();
+ ModelAndView model = controller.watchPolicy(request, response);
+ assertNull(model);
+ assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
+
+ // Negative test watch
+ request.setBodyContent("{\n\"watchData\": {\"name\": \"testVal\",\"nopath\": \"testPath\"\n}}\n");
+ response = new MockHttpServletResponse();
+ model = controller.watchPolicy(request, response);
+ assertNull(model);
+ assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
+ }
+}
diff --git a/POLICY-SDK-APP/src/test/resources/PolicyExport.xls b/POLICY-SDK-APP/src/test/resources/PolicyExport.xls
new file mode 100644
index 000000000..113432090
--- /dev/null
+++ b/POLICY-SDK-APP/src/test/resources/PolicyExport.xls
Binary files differ