diff options
6 files changed, 131 insertions, 3 deletions
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 0d9ebfba2..76cbc1b6a 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 000000000..e0b38b666 --- /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/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 9ce936e4e..63c129d85 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/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 000000000..8c0c6c4e0 --- /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 68b4d9266..e73ff4d24 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 b0e8205a6..70ad8b5d5 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -2,9 +2,11 @@ FROM ubuntu:14.04 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} +ARG POLICY_LOGS=/var/log/policy ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY +ENV POLICY_LOGS ${POLICY_LOGS} RUN \ apt-get clean && \ @@ -29,7 +31,8 @@ RUN \ 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 |