Merge "ClientEndpoint needs to be instantiabe"
authorJorge Hernandez <jh1730@att.com>
Fri, 9 Mar 2018 16:12:01 +0000 (16:12 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 9 Mar 2018 16:12:01 +0000 (16:12 +0000)
BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PolicyEngineImportServiceTest.java [new file with mode: 0644]
ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/config/PDPRestInitializerTest.java [new file with mode: 0644]
ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/impl/test/XACMLPdpPIPFinderFactoryTest.java [new file with mode: 0644]
ONAP-SDK-APP/src/test/java/org/onap/portalapp/filter/SecurityXssFilterTest.java [new file with mode: 0644]
packages/docker/src/main/docker/Dockerfile

index b76812b..fd864fd 100644 (file)
@@ -571,14 +571,17 @@ public class BRMSPush {
         String fileName = "rule.jar";
         try {
             website = new URL(artifact.getResourceURI());
-            ReadableByteChannel rbc = Channels.newChannel(website.openStream());
-            FileOutputStream fos = new FileOutputStream(fileName);
-            fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-            fos.close();
-            extractJar(fileName, dirName);
-            new File(fileName).delete();
-        } catch (IOException e) {
-            LOGGER.error("Error while downloading the project to File System. " + e.getMessage(), e);
+            try( ReadableByteChannel rbc = Channels.newChannel(website.openStream());
+                       FileOutputStream fos = new FileOutputStream(fileName)){
+               fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+                extractJar(fileName, dirName);
+                new File(fileName).delete();
+            }catch (IOException e) {
+         LOGGER.error("Error while downloading the project to File System. " + e.getMessage(), e);
+                       }
+          
+        } catch (IOException e1) {
+            LOGGER.error("Error while retrieve the artifact. " + e1.getMessage(), e1);
         }
     }
 
index af78956..d5233ce 100644 (file)
@@ -192,7 +192,7 @@ public class CreateNewMicroServiceModel {
                        dependency = utils.getFullDependencyList(dependency, classMap);
                        if (!dependency.isEmpty()){
                                for (String element : dependency){
-                                       MSAttributeObject temp = new MSAttributeObject();
+                                   MSAttributeObject temp;
                                        if (classMap.containsKey(element)){
                                                temp = classMap.get(element);
                                                mainClass.addAllRefAttribute(temp.getRefAttribute());
index 2fb6367..71eb115 100644 (file)
@@ -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-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 (file)
index 0000000..9a90cc4
--- /dev/null
@@ -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 (file)
index 0000000..b2dc98a
--- /dev/null
@@ -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 (file)
index 0000000..d10d3a7
--- /dev/null
@@ -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 (file)
index 0000000..210b1d9
--- /dev/null
@@ -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);
+       }
+}
index 70ad8b5..c6536c8 100644 (file)
@@ -2,7 +2,7 @@ FROM ubuntu:14.04
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
-ARG POLICY_LOGS=/var/log/policy
+ARG POLICY_LOGS=/var/log/ONAP/policy
 
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY