Sync Integ to Master

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / servlets / AbstractValidationsServletTest.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/AbstractValidationsServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/AbstractValidationsServletTest.java
index cee856d..be43fa7 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/AbstractValidationsServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/AbstractValidationsServletTest.java
@@ -20,9 +20,17 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
+import fj.data.Either;
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.sdc.be.model.UploadResourceInfo;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.exception.ResponseFormat;
+import org.slf4j.Logger;
 
+import javax.ws.rs.core.Response;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -32,73 +40,60 @@ import java.nio.file.Paths;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.Response;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
-import org.apache.commons.codec.binary.Base64;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.sdc.be.model.UploadResourceInfo;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.common.datastructure.Wrapper;
-import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
+public class AbstractValidationsServletTest {
+    private static AbstractValidationsServlet servlet = new AbstractValidationsServlet() {};
 
-import fj.data.Either;
+    private static final String BASIC_TOSCA_TEMPLATE = "tosca_definitions_version: tosca_simple_yaml_%s";
 
-public class AbstractValidationsServletTest {
-       private static AbstractValidationsServlet servlet = new AbstractValidationsServlet() {
-       };
+    @Before
+    public void setUp() throws Exception {
+        servlet.initLog(mock(Logger.class));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testGetScarFromPayload() {
 
-       private static final String BASIC_TOSCA_TEMPLATE = "tosca_definitions_version: tosca_simple_yaml_%s";
+        String payloadName = "valid_vf.csar";
+        String rootPath = System.getProperty("user.dir");
+        Path path = null;
+        byte[] data = null;
+        String payloadData = null;
+        Either<Map<String, byte[]>, ResponseFormat> returnValue = null;
+        try {
+            path = Paths.get(rootPath + "/src/test/resources/valid_vf.csar");
+            data = Files.readAllBytes(path);
+            payloadData = Base64.encodeBase64String(data);
+            UploadResourceInfo resourceInfo = new UploadResourceInfo();
+            resourceInfo.setPayloadName(payloadName);
+            resourceInfo.setPayloadData(payloadData);
+            Method privateMethod = null;
+            privateMethod = AbstractValidationsServlet.class.getDeclaredMethod("getScarFromPayload", UploadResourceInfo.class);
+            privateMethod.setAccessible(true);
+            returnValue = (Either<Map<String, byte[]>, ResponseFormat>) privateMethod.invoke(servlet, resourceInfo);
+        } catch (IOException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        assertTrue(returnValue.isLeft());
+        Map<String, byte[]> csar = returnValue.left().value();
+        assertTrue(csar != null);
+    }
 
-       @Before
-       public void setUp() throws Exception {
-               servlet.initLog(mock(Logger.class));
-       }
+    @Test
+    public void testValidToscaVersion() throws Exception {
+        Stream.of("1_0", "1_0_0", "1_1", "1_1_0").forEach(this::testValidToscaVersion);
+    }
 
-       
-       @SuppressWarnings("unchecked")
-       @Test
-       public void testGetScarFromPayload() {
 
-               String payloadName = "valid_vf.csar";
-               String rootPath = System.getProperty("user.dir");
-               Path path = null;
-               byte[] data = null;
-               String payloadData = null;
-               Either<Map<String, byte[]>, ResponseFormat> returnValue = null;
-               try {
-                       path = Paths.get(rootPath + "/src/test/resources/valid_vf.csar");
-                       data = Files.readAllBytes(path);
-                       payloadData = Base64.encodeBase64String(data);
-                       UploadResourceInfo resourceInfo = new UploadResourceInfo();
-                       resourceInfo.setPayloadName(payloadName);
-                       resourceInfo.setPayloadData(payloadData);
-                       Method privateMethod = null;
-                       privateMethod = AbstractValidationsServlet.class.getDeclaredMethod("getScarFromPayload",
-                                       UploadResourceInfo.class);
-                       privateMethod.setAccessible(true);
-                       returnValue = (Either<Map<String, byte[]>, ResponseFormat>) privateMethod.invoke(servlet, resourceInfo);
-               } catch (IOException | NoSuchMethodException | SecurityException | IllegalAccessException
-                               | IllegalArgumentException | InvocationTargetException e) {
-                       e.printStackTrace();
-               }
-               assertTrue(returnValue.isLeft());
-               Map<String, byte[]> csar = returnValue.left().value();
-               assertTrue(csar != null);
-       }
+    private void testValidToscaVersion(String version)  {
+        Wrapper<Response> responseWrapper = new Wrapper<>();
+        servlet.validatePayloadIsTosca(responseWrapper, new UploadResourceInfo(), new User(), String.format(BASIC_TOSCA_TEMPLATE, version));
+        assertTrue(responseWrapper.isEmpty());
+    }
 
-       @Test
-       public void testValidToscaVersion() throws Exception {
-               Stream.of("1_0", "1_0_0", "1_1", "1_1_0").forEach(this::testValidToscaVersion);
-       }
 
-       private void testValidToscaVersion(String version) {
-               Wrapper<Response> responseWrapper = new Wrapper<>();
-               servlet.validatePayloadIsTosca(responseWrapper, new UploadResourceInfo(), new User(),
-                               String.format(BASIC_TOSCA_TEMPLATE, version));
-               assertTrue(responseWrapper.isEmpty());
-       }
 
-       
 }