Merge "Sonar Major"
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 0d9ebfb..76cbc1b 100644
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -123,6 +123,19 @@
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>1.7.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>1.7.3</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/BRMSGateway/src/test/java/org/onap/policy/brmsInterface/BRMSGatewayTest.java b/BRMSGateway/src/test/java/org/onap/policy/brmsInterface/BRMSGatewayTest.java
new file mode 100644
index 0000000..e0b38b6
--- /dev/null
+++ b/BRMSGateway/src/test/java/org/onap/policy/brmsInterface/BRMSGatewayTest.java
@@ -0,0 +1,61 @@
+/*-
+ * ============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.assertNull;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+@RunWith(PowerMockRunner.class)
+public class BRMSGatewayTest {
+ @Test
+ public void testGet() {
+ assertNull(BRMSGateway.getPolicyEngine());
+ }
+
+ @PrepareForTest({Thread.class, BRMSGateway.class})
+ @Test
+ public void testMain() throws Exception {
+ // Mock Thread
+ PowerMockito.spy(Thread.class);
+ PowerMockito.doNothing().when(Thread.class);
+ Thread.sleep(1000);
+
+ // Mock handler
+ BRMSHandler handler = Mockito.mock(BRMSHandler.class);
+ PowerMockito.whenNew(BRMSHandler.class).withArguments(any()).thenReturn(handler);
+
+ // Run app
+ try {
+ String[] args = null;
+ BRMSGateway.main(args);
+ }
+ catch (Exception ex) {
+ fail("Not expected an exception: " + ex);
+ }
+ }
+}
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 0000000..8e15cdf
--- /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-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PolicyEngineImportServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PolicyEngineImportServiceTest.java
new file mode 100644
index 0000000..9a90cc4
--- /dev/null
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PolicyEngineImportServiceTest.java
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PAP-REST
+ * ================================================================================
+ * 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.pdp.rest.api.services;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+public class PolicyEngineImportServiceTest {
+ @Test
+ public final void negativeTestService1() {
+ // Negative test constructor
+ String json = "testJson";
+ MultipartFile file = null;
+ String id = "testID";
+ PolicyEngineImportService service = new PolicyEngineImportService(json, file, id);
+
+ // Test gets
+ assertNotNull(service.getResult());
+ assertEquals(service.getResponseCode().value(), 400);
+ }
+
+ @Test
+ public final void negativeTestService2() {
+ // Negative test constructor
+ String json = "{\n\"serviceName\": \"testVal\"\n}\n";
+ byte[] content = "bar".getBytes();
+ MultipartFile file = new MockMultipartFile("foo", content);
+ String id = "testID";
+ PolicyEngineImportService service = new PolicyEngineImportService(json, file, id);
+
+ // Test gets
+ assertNotNull(service.getResult());
+ assertEquals(service.getResponseCode().value(), 400);
+ }
+}
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/config/PDPRestInitializerTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/config/PDPRestInitializerTest.java
new file mode 100644
index 0000000..b2dc98a
--- /dev/null
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/config/PDPRestInitializerTest.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PAP-REST
+ * ================================================================================
+ * 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.pdp.rest.config;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class PDPRestInitializerTest {
+ @Test
+ public void testNegativeStartup() throws ServletException {
+ try {
+ PDPRestInitializer init = new PDPRestInitializer();
+ ServletContext container = Mockito.mock(ServletContext.class);
+ init.onStartup(container);
+ fail("Expecting an exception.");
+ }
+ catch (Exception ex) {
+ // Expecting an exception
+ assertTrue(true);
+ }
+ }
+}
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/impl/test/XACMLPdpPIPFinderFactoryTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/impl/test/XACMLPdpPIPFinderFactoryTest.java
new file mode 100644
index 0000000..d10d3a7
--- /dev/null
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/impl/test/XACMLPdpPIPFinderFactoryTest.java
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PDP-REST
+ * ================================================================================
+ * 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.pdp.rest.impl.test;
+
+import static org.junit.Assert.assertNotNull;
+import java.util.Properties;
+import org.junit.Test;
+import org.onap.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory;
+import com.att.research.xacml.api.pip.PIPException;
+import com.att.research.xacml.api.pip.PIPFinder;
+
+public class XACMLPdpPIPFinderFactoryTest {
+ @Test
+ public void testGets() throws PIPException {
+ // Test constructors
+ Properties props = new Properties();
+ XACMLPdpPIPFinderFactory blankFactory = new XACMLPdpPIPFinderFactory();
+ assertNotNull(blankFactory);
+ XACMLPdpPIPFinderFactory factory = new XACMLPdpPIPFinderFactory(props);
+ assertNotNull(factory);
+
+ // Test get
+ PIPFinder finder = factory.getFinder();
+ assertNotNull(finder);
+ finder = blankFactory.getFinder(props);
+ assertNotNull(finder);
+ }
+}
diff --git a/ONAP-SDK-APP/src/test/java/org/onap/portalapp/filter/SecurityXssFilterTest.java b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/filter/SecurityXssFilterTest.java
new file mode 100644
index 0000000..210b1d9
--- /dev/null
+++ b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/filter/SecurityXssFilterTest.java
@@ -0,0 +1,52 @@
+/*-
+ * ================================================================================
+ * ONAP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property
+ * ================================================================================
+ * 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.
+ * ================================================================================
+ */
+
+package org.onap.portalapp.filter;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import java.io.IOException;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import org.junit.Test;
+import org.mockito.Mockito;
+import com.mockrunner.mock.web.MockHttpServletRequest;
+import com.mockrunner.mock.web.MockHttpServletResponse;
+
+public class SecurityXssFilterTest {
+ @Test
+ public void testGets() throws ServletException, IOException {
+ SecurityXssFilter filter = new SecurityXssFilter();
+ assertNotNull(filter);
+
+ MockHttpServletRequest request = new MockHttpServletRequest();
+ request.setMethod("POST");
+ request.setBodyContent("testBody");
+ request.setupAddParameter("testKey", "testVal");
+ request.setAttribute("testKey", "testVal");
+ request.setRequestURI("testVal");
+ request.setRequestURL("testVal");
+ MockHttpServletResponse response = new MockHttpServletResponse();
+ FilterChain filterChain = Mockito.mock(FilterChain.class);
+ filter.doFilterInternal(request, response, filterChain);
+ assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
+ }
+}
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
index 9ce936e..63c129d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
@@ -80,7 +80,7 @@
ng-model="temp.policy.version"
ng-options="option for option in microServiceModelsDictionaryVersionDatas track by option"
ng-init="addDataToFields(temp.policy.serviceType, temp.policy.version);"
- ng-click="addDataToFields(temp.policy.serviceType, temp.policy.version);"
+ ng-change="addDataToFields(temp.policy.serviceType, temp.policy.version);"
title="Select the dropdown value driven based on MicroService Models (MicroService Policy)Dictionary selection."></select>
</div>
</div>
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 0000000..358108f
--- /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 0000000..49249ca
--- /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 0000000..1134320
--- /dev/null
+++ b/POLICY-SDK-APP/src/test/resources/PolicyExport.xls
Binary files differ
diff --git a/PolicyEngineAPI/src/test/java/org/onap/policy/std/ManualClientEndDMAAPTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/ManualClientEndDMAAPTest.java
new file mode 100644
index 0000000..8c0c6c4
--- /dev/null
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/ManualClientEndDMAAPTest.java
@@ -0,0 +1,52 @@
+/*-
+ * ============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.std;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PDPNotification;
+
+public class ManualClientEndDMAAPTest {
+ @Test
+ public void testStaticMethods() {
+ // Negative test result
+ PDPNotification notification = ManualClientEndDMAAP.result(NotificationScheme.AUTO_ALL_NOTIFICATIONS);
+ assertNull(notification);
+
+ // Negative test create and start
+ String topic = "testTopic";
+ String uniqueID = "testID";
+ List<String> dmaapList = new ArrayList<String>();
+ String aafLogin = "testLogin";
+ String aafPassword = "testPassword";
+ try {
+ ManualClientEndDMAAP.createTopic(topic, uniqueID, dmaapList, aafLogin, aafPassword);
+ ManualClientEndDMAAP.start(dmaapList, topic, aafLogin, aafPassword, uniqueID);
+ }
+ catch (Exception ex) {
+ fail("Not expecting any exception: " + ex);
+ }
+ }
+}
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 68b4d92..e73ff4d 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -82,7 +82,6 @@
<resources>
<resource>
<directory>src/main/docker</directory>
- <filtering>true</filtering>
</resource>
</resources>
</configuration>
diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index b0e8205..c6536c8 100644
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -2,9 +2,11 @@
ARG HTTP_PROXY=${HTTP_PROXY}
ARG HTTPS_PROXY=${HTTPS_PROXY}
+ARG POLICY_LOGS=/var/log/ONAP/policy
ENV http_proxy $HTTP_PROXY
ENV https_proxy $HTTPS_PROXY
+ENV POLICY_LOGS ${POLICY_LOGS}
RUN \
apt-get clean && \
@@ -29,7 +31,8 @@
apt-get update && \
apt-get install -y mariadb-client
-RUN mkdir -p /opt/app/policy /tmp/policy-install && chown policy /opt/app/policy /tmp/policy-install
+RUN mkdir -p /opt/app/policy /tmp/policy-install ${POLICY_LOGS} && \
+ chown policy /opt/app/policy /tmp/policy-install ${POLICY_LOGS}
WORKDIR /tmp/policy-install