Merge "Sonar Major"
authorJorge Hernandez <jh1730@att.com>
Thu, 8 Mar 2018 19:32:54 +0000 (19:32 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 8 Mar 2018 19:32:54 +0000 (19:32 +0000)
BRMSGateway/pom.xml
BRMSGateway/src/test/java/org/onap/policy/brmsInterface/BRMSGatewayTest.java [new file with mode: 0644]
POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
PolicyEngineAPI/src/test/java/org/onap/policy/std/ManualClientEndDMAAPTest.java [new file with mode: 0644]
packages/docker/pom.xml
packages/docker/src/main/docker/Dockerfile

index 0d9ebfb..76cbc1b 100644 (file)
                        <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 (file)
index 0000000..e0b38b6
--- /dev/null
@@ -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);
+               }
+       }
+}
index 9ce936e..63c129d 100644 (file)
@@ -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 (file)
index 0000000..8c0c6c4
--- /dev/null
@@ -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);
+               }
+       }
+}
index 68b4d92..e73ff4d 100644 (file)
@@ -82,7 +82,6 @@
                                                        <resources>          
                                                                <resource>
                                                                        <directory>src/main/docker</directory>
-                                                                       <filtering>true</filtering>
                                                                </resource>
                                                        </resources>              
                                                </configuration>            
index b0e8205..70ad8b5 100644 (file)
@@ -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