org.onap migration

Change-Id: I5e2d01a6da21d4003c910b5fe0702b35c2089a77
Issue-ID: VID-86
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>

9 files changed, 0 insertions, 758 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java
deleted file mode 100644
index 548c4804..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.onap.vid.controller;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.json.simple.JSONObject;
-import org.junit.Test;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.servlet.ModelAndView;
-
-public class AaiControllerTest {
-
-	private AaiController createTestSubject() {
-		return new AaiController();
-	}
-
-	@Test
-	public void testWelcome() throws Exception {
-		AaiController testSubject;
-		HttpServletRequest request = null;
-		ModelAndView result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.welcome(request);
-	}
-
-
-	@Test
-	public void testGetTargetProvStatus() throws Exception {
-		AaiController testSubject;
-		ResponseEntity<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTargetProvStatus();
-	}
-
-	@Test
-	public void testViewEditGetTenantsFromServiceType() throws Exception {
-		AaiController testSubject;
-		HttpServletRequest request = null;
-		String globalCustomerId = "";
-		String serviceType = "";
-		ResponseEntity<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.viewEditGetTenantsFromServiceType(request, globalCustomerId, serviceType);
-	}
-
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/HealthCheckControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/HealthCheckControllerTest.java
deleted file mode 100644
index ddbe4e88..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/HealthCheckControllerTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.onap.vid.controller;
-
-import org.junit.Test;
-import org.onap.vid.controller.HealthCheckController.HealthStatus;
-
-public class HealthCheckControllerTest {
-
-	private HealthCheckController createTestSubject() {
-		return new HealthCheckController();
-	}
-
-	@Test
-	public void testGetProfileCount() throws Exception {
-		HealthCheckController testSubject;
-		String driver = "";
-		String URL = "";
-		String username = "";
-		String password = "";
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getProfileCount(driver, URL, username, password);
-	}
-
-	@Test
-	public void testGethealthCheckStatusforIDNS() throws Exception {
-		HealthCheckController testSubject;
-		HealthStatus result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.gethealthCheckStatusforIDNS();
-	}
-
-	@Test
-	public void testGetHealthCheck() throws Exception {
-		HealthCheckController testSubject;
-		String UserAgent = "";
-		String ECOMPRequestID = "";
-		HealthStatus result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getHealthCheck(UserAgent, ECOMPRequestID);
-	}
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/LocalWebConfig.java b/vid-app-common/src/test/java/org/onap/vid/controller/LocalWebConfig.java
deleted file mode 100644
index 9b6a3e7b..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/LocalWebConfig.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.onap.vid.controller;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.io.IOUtils;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.onap.vid.aai.AaiClient;
-import org.onap.vid.aai.AaiClientInterface;
-import org.onap.vid.asdc.AsdcClient;
-import org.onap.vid.asdc.local.LocalAsdcClient;
-import org.onap.vid.asdc.parser.ToscaParserImpl2;
-import org.onap.vid.controller.VidController;
-import org.onap.vid.services.AaiService;
-import org.onap.vid.services.AaiServiceImpl;
-import org.onap.vid.services.VidService;
-import org.onap.vid.services.VidServiceImpl;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-@Configuration
-public class LocalWebConfig {
-
-    /**
-     * Gets the object mapper.
-     *
-     * @return the object mapper
-     */
-    @Bean
-    public ObjectMapper getObjectMapper() {
-        return new ObjectMapper();
-    }
-
-
-    @Bean
-    public VidService vidService(AsdcClient asdcClient) {
-        return new VidServiceImpl(asdcClient);
-    }
-
-    @Bean
-    public AaiService getAaiService() {
-        return new AaiServiceImpl();
-    }
-
-    @Bean
-    public AaiClientInterface getAaiClientInterface() {
-        return new AaiClient();
-    }
-
-    @Bean
-    public AsdcClient asdcClient() throws IOException {
-
-
-        final InputStream asdcServicesFile = VidController.class.getClassLoader().getResourceAsStream("sdcservices.json");
-
-        final JSONTokener jsonTokener = new JSONTokener(IOUtils.toString(asdcServicesFile));
-        final JSONObject sdcServicesCatalog = new JSONObject(jsonTokener);
-
-        return new LocalAsdcClient.Builder().catalog(sdcServicesCatalog).build();
-
-    }
-
-    @Bean
-    public ToscaParserImpl2 getToscaParser() {
-        return new ToscaParserImpl2();
-    }
-
-}
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerTest.java
deleted file mode 100644
index 6ca6a9f0..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.onap.vid.controller;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.onap.vid.controller.MsoConfig;
-import org.onap.vid.controller.MsoController;
-import org.onap.vid.domain.mso.RequestInfo;
-import org.onap.vid.factories.MsoRequestFactory;
-import org.onap.vid.mso.rest.Request;
-import org.onap.vid.mso.rest.RequestDetails;
-import org.onap.vid.mso.rest.Task;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.testng.Assert;
-import org.testng.Assert.*;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-
-@WebAppConfiguration
-@ContextConfiguration(classes = {SystemProperties.class, MsoConfig.class})
-public class MsoControllerTest extends AbstractTestNGSpringContextTests {
-
-    @Autowired
-    MsoRequestFactory msoRequestFactory;
-
-    @Test(enabled = false)
-    public void testInstanceCreationNew() throws Exception {
-
-        RequestDetails requestDetails = msoRequestFactory.createMsoRequest("msoRequest.json");
-        MsoController msoController = new MsoController(null);
-        //TODO: make ths test to really test something
-        //ResponseEntity<String> responseEntityNew = msoController.createSvcInstanceNew(null, requestDetails);
-        ResponseEntity<String> responseEntity = msoController.createSvcInstance(null, requestDetails);
-        //Assert.assertEquals(responseEntityNew, responseEntity);
-
-    }
-
-    @Test(enabled = false)
-    public void testInstanceCreationLocalWithRest() throws Exception {
-
-        RequestDetails requestDetails = msoRequestFactory.createMsoRequest("msoRequest.json");
-        MsoController msoController = new MsoController(null);
-        ResponseEntity<String> responseEntityNew = msoController.createSvcInstance(null, requestDetails);
-        //TODO: make ths test to really test something
-//        ResponseEntity<String> responseEntityRest = msoController.createSvcInstanceNewRest(null, requestDetails);
-//
-//        Assert.assertEquals(responseEntityNew.getBody(), responseEntityRest.getBody());
-
-    }
-
-    @Test(enabled = false)
-    public void testInstanceCreation() throws Exception {
-
-        RequestDetails requestDetails = msoRequestFactory.createMsoRequest("msoRequest.json");
-        MsoController msoController = new MsoController(null);
-        ResponseEntity<String> responseEntity = msoController.createSvcInstance(null, requestDetails);
-
-
-        Assert.assertEquals(responseEntity.getBody(), "{ \"status\": 200, \"entity\": {\n" +
-                "  \"requestReferences\": {\n" +
-                "    \"instanceId\": \"ba00de9b-3c3e-4b0a-a1ad-0c5489e711fb\",\n" +
-                "    \"requestId\": \"311cc766-b673-4a50-b9c5-471f68914586\"\n" +
-                "  }\n" +
-                "}}");
-
-    }
-
-    @Test(enabled = false)
-    public void testGetOrchestrationRequestsForDashboard() throws Exception {
-        MsoController msoController = new MsoController(null);
-        List<Request> orchestrationRequestsForDashboard = msoController.getOrchestrationRequestsForDashboard();
-
-        Assert.assertEquals(orchestrationRequestsForDashboard.size(), 2);
-    }
-
-    @Test(enabled = false)
-    public void testGetManualTasksByRequestId() throws Exception {
-        MsoController msoController = new MsoController(null);
-        List<Task> orchestrationRequestsForDashboard = msoController.getManualTasksByRequestId("za1234d1-5a33-55df-13ab-12abad84e335");
-
-        Assert. assertEquals(orchestrationRequestsForDashboard.get(0).getTaskId(), "daf4dd84-b77a-42da-a051-3239b7a9392c");
-    }
-
-
-    public void testCompleteManualTask() throws Exception { // TODO not done yet
-        RequestInfo requestInfo = new RequestInfo();
-        requestInfo.setResponseValue("rollback");
-        requestInfo.setRequestorId("abc");
-        requestInfo.setSource("VID");
-        RequestDetails requestDetails = new RequestDetails();
-        requestDetails.setRequestInfo(requestInfo);
-        MsoController msoController = new MsoController(null);
-        ResponseEntity<String> responseEntity = msoController.manualTaskComplete("daf4dd84-b77a-42da-a051-3239b7a9392c", requestDetails);
-        String assertString = "{ \\\"status\\\": 200, \\\"entity\\\": {\\n\" +\n" +
-                "                \"  \\\"taskRequestReference\\\": {\\n\" +\n" +
-                "                \"     \\\"taskId\\\": \\\"daf4dd84-b77a-42da-a051-3239b7a9392c\\\"\\n\" +\n" +
-                "                \"      }\\n\" +\n" +
-                "                \"}\\n\" +\n" +
-                "                \"}";
-        Assert.assertEquals(responseEntity.getBody(), StringEscapeUtils.unescapeJava(assertString));
-    }
-
-
-}
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/PromiseEcompRequestIdFilterTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/PromiseEcompRequestIdFilterTest.java
deleted file mode 100644
index 245d8bbd..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/PromiseEcompRequestIdFilterTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.onap.vid.controller;
-
-import com.google.common.collect.ImmutableMap;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import org.mockito.stubbing.Answer;
-import org.openecomp.portalsdk.core.web.support.UserUtils;
-import org.onap.vid.controller.filter.PromiseEcompRequestIdFilter;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.testng.annotations.Test;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.*;
-import java.util.function.Function;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.openecomp.portalsdk.core.util.SystemProperties.ECOMP_REQUEST_ID;
-
-@Test
-public class PromiseEcompRequestIdFilterTest {
-
-    private final String anotherHeader = "ANDREI_RUBLEV";
-    private final String anotherValue = "foo value";
-    private final String mixedCaseHeader = "x-ecomp-REQUESTID";
-
-    @Test
-    public void givenRequestIdHeader_headerValueNotChanged() throws IOException, ServletException {
-
-        final String someTxId = "863850e2-8545-4efd-94b8-afba5f52b3d5";
-
-        final ImmutableMap<String, String> incomingRequestHeaders = ImmutableMap.of(
-                anotherHeader, anotherValue,
-                ECOMP_REQUEST_ID, someTxId
-        );
-
-        buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(incomingRequestHeaders, specificTxId(someTxId));
-    }
-
-    @Test
-    public void givenMixedCaseRequestIdHeader_headerValueNotChanged() throws IOException, ServletException {
-
-        final String someTxId = "729bbd8d-b0c2-4809-a794-dcccd9cda2c0";
-
-        final ImmutableMap<String, String> incomingRequestHeaders = ImmutableMap.of(
-                mixedCaseHeader, someTxId,
-                anotherHeader, anotherValue
-        );
-
-        buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(incomingRequestHeaders, specificTxId(someTxId));
-    }
-
-    @Test
-    public void givenNoRequestIdHeader_headerValueWasGenerated() throws IOException, ServletException {
-
-        final ImmutableMap<String, String> incomingRequestHeaders = ImmutableMap.of(
-                anotherHeader, anotherValue
-        );
-
-        buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(incomingRequestHeaders, UserUtils::getRequestId);
-    }
-
-    
-    private void buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(
-            ImmutableMap<String, String> originalRequestHeaders,
-            Function<HttpServletRequest, String> txIdExtractor
-    ) throws IOException, ServletException {
-        HttpServletRequest servletRequest = createMockedHttpServletRequest(originalRequestHeaders);
-        HttpServletResponse servletResponse = createMockedHttpServletResponse();
-
-        final FilterChain capturingFilterChain = Mockito.mock(FilterChain.class);
-
-        //////////////////
-        //
-        // doFilter() is the function under test
-        //
-        new PromiseEcompRequestIdFilter().doFilter(servletRequest, servletResponse, capturingFilterChain);
-        //
-        //////////////////
-
-        final ServletRequest capturedServletRequest = extractCapturedServletRequest(capturingFilterChain);
-        final ServletResponse capturedServletResponse = extractCapturedServletResponse(capturingFilterChain);
-        final String expectedTxId = txIdExtractor.apply((HttpServletRequest) capturedServletRequest);
-
-        assertRequestObjectHeaders(capturedServletRequest, expectedTxId);
-        assertResponseObjectHeaders(capturedServletResponse, expectedTxId);
-    }
-
-
-    private void assertRequestObjectHeaders(ServletRequest request, String expectedTxId) {
-        /*
-        Assert that:
-        - Two headers are in place
-        - Direct value extraction is as expected
-        - UserUtils.getRequestId() returns correct and valid value
-         */
-        final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
-
-        assertThat(Collections.list(httpServletRequest.getHeaderNames()),
-                containsInAnyOrder(equalToIgnoringCase(ECOMP_REQUEST_ID), equalToIgnoringCase(anotherHeader)));
-
-        assertThat(httpServletRequest.getHeader(anotherHeader), is(anotherValue));
-
-        assertThat(httpServletRequest.getHeader(ECOMP_REQUEST_ID), is(expectedTxId));
-        assertThat(httpServletRequest.getHeader(mixedCaseHeader), is(expectedTxId));
-
-        assertThat(UserUtils.getRequestId(httpServletRequest), is(expectedTxId));
-        assertThat(UserUtils.getRequestId(httpServletRequest), is(not(emptyOrNullString())));
-    }
-
-    private void assertResponseObjectHeaders(ServletResponse response, String txId) {
-        final String REQUEST_ID_HEADER_NAME_IN_RESPONSE = mixedCaseHeader + "-echo";
-        final HttpServletResponse httpServletResponse = (HttpServletResponse) response;
-
-        assertThat("header " + REQUEST_ID_HEADER_NAME_IN_RESPONSE.toLowerCase() + " in response must be provided",
-                httpServletResponse.getHeader(REQUEST_ID_HEADER_NAME_IN_RESPONSE), is(txId));
-    }
-
-
-
-    private HttpServletRequest createMockedHttpServletRequest(Map<String, String> requestHeaders) {
-        HttpServletRequest servletRequest = Mockito.mock(HttpServletRequest.class);
-        requestHeaders.forEach((k, v) -> {
-            Mockito.when(servletRequest.getHeader(argThat(equalToIgnoringCase(k)))).thenReturn(v);
-            Mockito.when(servletRequest.getHeaders(argThat(equalToIgnoringCase(k)))).then(returnEnumerationAnswer(v));
-        });
-        Mockito.when(servletRequest.getHeaderNames()).then(returnEnumerationAnswer(requestHeaders.keySet()));
-        return servletRequest;
-    }
-
-    private HttpServletResponse createMockedHttpServletResponse() {
-        return new MockHttpServletResponse();
-    }
-
-    private static Answer<Enumeration<String>> returnEnumerationAnswer(String ... items) {
-        return returnEnumerationAnswer(Arrays.asList(items));
-    }
-
-    private static Answer<Enumeration<String>> returnEnumerationAnswer(Collection<String> items) {
-        return invocation -> Collections.enumeration(items);
-    }
-
-    private Function<HttpServletRequest, String> specificTxId(String someTxId) {
-        return r -> someTxId;
-    }
-
-    private ServletRequest extractCapturedServletRequest(FilterChain capturingFilterChain) throws IOException, ServletException {
-        ArgumentCaptor<ServletRequest> captor = ArgumentCaptor.forClass(ServletRequest.class);
-        Mockito.verify(capturingFilterChain).doFilter(captor.capture(), any());
-        return captor.getValue();
-    }
-
-    private ServletResponse extractCapturedServletResponse(FilterChain capturingFilterChain) throws IOException, ServletException {
-        ArgumentCaptor<ServletResponse> captor = ArgumentCaptor.forClass(ServletResponse.class);
-        Mockito.verify(capturingFilterChain).doFilter(any(), captor.capture());
-        return captor.getValue();
-    }
-
-}
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java
deleted file mode 100644
index e9c2e61b..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.onap.vid.controller;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.junit.Test;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.servlet.ModelAndView;
-
-public class PropertyControllerTest {
-
-	private PropertyController createTestSubject() {
-		return new PropertyController();
-	}
-
-	@Test
-	public void testWelcome() throws Exception {
-		PropertyController testSubject;
-		HttpServletRequest request = null;
-		ModelAndView result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.welcome(request);
-	}
-
-
-	@Test
-	public void testGetProperty() throws Exception {
-		PropertyController testSubject;
-		String name = "";
-		String defaultvalue = "";
-		HttpServletRequest request = null;
-		ResponseEntity<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getProperty(name, defaultvalue, request);
-	}
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/ToscaParserMockHelper.java b/vid-app-common/src/test/java/org/onap/vid/controller/ToscaParserMockHelper.java
deleted file mode 100644
index 36a17910..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/ToscaParserMockHelper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.onap.vid.controller;
-
-import org.onap.vid.model.NewServiceModel;
-
-/**
- * Created by moriya1 on 04/07/2017.
- */
-public class ToscaParserMockHelper {
-
-    private String uuid;
-    private String filePath;
-    private NewServiceModel newServiceModel;
-
-    public ToscaParserMockHelper(String uuid, String filePath) {
-        this.uuid = uuid;
-        this.filePath = filePath;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getFilePath() {
-        return filePath;
-    }
-
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
-    public NewServiceModel getNewServiceModel() {
-        return newServiceModel;
-    }
-
-    public void setNewServiceModel(NewServiceModel newServiceModel) {
-        this.newServiceModel = newServiceModel;
-    }
-}
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java
deleted file mode 100644
index b443e1f0..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.onap.vid.controller;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import net.javacrumbs.jsonunit.JsonAssert;
-import org.apache.commons.io.IOUtils;
-import org.onap.vid.asdc.AsdcCatalogException;
-import org.onap.vid.asdc.AsdcClient;
-import org.onap.vid.asdc.parser.ToscaParserImpl2;
-import org.onap.vid.model.*;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mock.web.MockServletContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import static org.onap.vid.testUtils.TestUtils.assertJsonStringEqualsIgnoreNulls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.UUID;
-
-//import org.junit.Assert;
-//import org.junit.Ignore;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@ContextConfiguration(classes = {LocalWebConfig.class, SystemProperties.class})
-//@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-
-public class VidControllerTest extends AbstractTestNGSpringContextTests {
-
-    @Autowired
-    MockServletContext context;
-    @Autowired
-    private AsdcClient asdcClient;
-    private ToscaParserImpl2 p2 = new ToscaParserImpl2();
-    private ObjectMapper om = new ObjectMapper();
-
-
-    @Test
-    public void assertEqualsBetweenServices() throws Exception {
-        for (ToscaParserMockHelper mockHelper : getExpectedServiceModel()) {
-            Service expectedService = mockHelper.getNewServiceModel().getService();
-            Service actualService = p2.makeServiceModel(getCsarPath(mockHelper.getUuid()), getServiceByUuid(mockHelper.getUuid())).getService();
-            assertJsonStringEqualsIgnoreNulls(om.writeValueAsString(expectedService), om.writeValueAsString(actualService));
-        }
-    }
-
-//    @Test
-//    public void assertEqualBetweenObjects() throws Exception {
-//        for (ToscaParserMockHelper mockHelper : getExpectedServiceModel()) {
-//            final Path csarPath = getCsarPath(mockHelper.getUuid());
-//            System.out.println("Comparing for csar " + csarPath);
-//            ServiceModel actualServiceModel = p2.makeServiceModel(csarPath, getServiceByUuid(mockHelper.getUuid()));
-//            assertJsonStringEqualsIgnoreNulls(om.writeValueAsString(mockHelper.getNewServiceModel()), om.writeValueAsString(actualServiceModel));
-//        }
-//    }
-
-//    @Test
-//    public void assertEqualsBetweenNetworkNodes() throws Exception {
-//        for (ToscaParserMockHelper mockHelper : getExpectedServiceModel()) {
-//            Map<String, Network> expectedNetworksMap = mockHelper.getNewServiceModel().getNetworks();
-//            Map<String, Network> actualNetworksMap = p2.makeServiceModel(getCsarPath(mockHelper.getUuid()), getServiceByUuid(mockHelper.getUuid())).getNetworks();
-//            for (Map.Entry<String, Network> entry : expectedNetworksMap.entrySet()) {
-//                Network expectedNetwork = entry.getValue();
-//                Network actualNetwork = actualNetworksMap.get(entry.getKey());
-//                Assert.assertEquals(expectedNetwork.getModelCustomizationName(), actualNetwork.getModelCustomizationName());
-//                verifyBaseNodeProperties(expectedNetwork, actualNetwork);
-//                compareProperties(expectedNetwork.getProperties(), actualNetwork.getProperties());
-//            }
-//        }
-//    }
-
-    //Because we are not supporting the old flow, the JSON are different by definition.
-    @Test
-    public void assertEqualsBetweenVnfsOfTosca() throws Exception {
-        for (ToscaParserMockHelper mockHelper : getExpectedServiceModel()) {
-            Map<String, VNF> expectedVnfsMap = mockHelper.getNewServiceModel().getVnfs();
-            Map<String, VNF> actualVnfsMap = p2.makeServiceModel(getCsarPath(mockHelper.getUuid()), getServiceByUuid(mockHelper.getUuid())).getVnfs();
-            for (Map.Entry<String, VNF> entry : expectedVnfsMap.entrySet()) {
-                VNF expectedVnf = entry.getValue();
-                VNF actualVnf = actualVnfsMap.get(entry.getKey());
-                verifyBaseNodeProperties(expectedVnf, actualVnf);
-                Assert.assertEquals(expectedVnf.getModelCustomizationName(), actualVnf.getModelCustomizationName());
-                compareProperties(expectedVnf.getProperties(), actualVnf.getProperties());
-                assertJsonStringEqualsIgnoreNulls(om.writeValueAsString(expectedVnf), om.writeValueAsString(actualVnf));
-            }
-        }
-    }
-
-    @Test
-    public void assertEqualsBetweenVolumeGroups() throws Exception {
-        for (ToscaParserMockHelper mockHelper : getExpectedServiceModel()) {
-            Map<String, VolumeGroup> actualVolumeGroups = p2.makeServiceModel(getCsarPath(mockHelper.getUuid()), getServiceByUuid(mockHelper.getUuid())).getVolumeGroups();
-            Map<String, VolumeGroup> expectedVolumeGroups = mockHelper.getNewServiceModel().getVolumeGroups();
-            JsonAssert.assertJsonEquals(actualVolumeGroups, expectedVolumeGroups);
-        }
-    }
-
-    @Test
-    public void assertEqualsBetweenVfModules() throws Exception {
-        for (ToscaParserMockHelper mockHelper : getExpectedServiceModel()) {
-            Map<String, VfModule> actualVfModules = p2.makeServiceModel(getCsarPath(mockHelper.getUuid()), getServiceByUuid(mockHelper.getUuid())).getVfModules();
-            Map<String, VfModule> expectedVfModules = mockHelper.getNewServiceModel().getVfModules();
-            JsonAssert.assertJsonEquals(actualVfModules, expectedVfModules);
-        }
-    }
-
-    @Test
-    public void assertEqualsBetweenPolicyConfigurationNodes() throws Exception {
-        for (ToscaParserMockHelper mockHelper : getExpectedServiceModel()) {
-            Map<String, PortMirroringConfig> actualConfigurations = p2.makeServiceModel(getCsarPath(mockHelper.getUuid()), getServiceByUuid(mockHelper.getUuid())).getConfigurations();
-            Map<String, PortMirroringConfig> expectedConfigurations = mockHelper.getNewServiceModel().getConfigurations();
-            JsonAssert.assertJsonEquals(actualConfigurations, expectedConfigurations);
-        }
-    }
-
-    @Test
-    public void assertEqualsBetweenServiceProxyNodes() throws Exception {
-        for (ToscaParserMockHelper mockHelper : getExpectedServiceModel()) {
-            Map<String, ServiceProxy> actualServiceProxies = p2.makeServiceModel(getCsarPath(mockHelper.getUuid()), getServiceByUuid(mockHelper.getUuid())).getServiceProxies();
-            Map<String, ServiceProxy> expectedServiceProxies = mockHelper.getNewServiceModel().getServiceProxies();
-            JsonAssert.assertJsonEquals(actualServiceProxies, expectedServiceProxies);
-        }
-    }
-
-    private void verifyBaseNodeProperties(Node expectedNode, Node actualNode) {
-        Assert.assertEquals(expectedNode.getName(), actualNode.getName());
-        Assert.assertEquals(expectedNode.getCustomizationUuid(), actualNode.getCustomizationUuid());
-        Assert.assertEquals(expectedNode.getDescription(), actualNode.getDescription());
-        Assert.assertEquals(expectedNode.getInvariantUuid(), actualNode.getInvariantUuid());
-        Assert.assertEquals(expectedNode.getUuid(), actualNode.getUuid());
-        Assert.assertEquals(expectedNode.getVersion(), actualNode.getVersion());
-    }
-
-    private void compareProperties(Map<String, String> expectedProperties, Map<String, String> actualProperties) {
-        for (Map.Entry<String, String> property : expectedProperties.entrySet()) {
-            String expectedValue = property.getValue();
-            String key = property.getKey();
-            String actualValue = actualProperties.get(key);
-            Assert.assertEquals(expectedValue, actualValue);
-        }
-    }
-
-    private ToscaParserMockHelper[] getExpectedServiceModel() throws IOException {
-        ToscaParserMockHelper[] mockHelpers = {
-                new ToscaParserMockHelper(Constants.vlUuid, Constants.vlFilePath),
-                new ToscaParserMockHelper(Constants.vfUuid, Constants.vfFilePath),
-                new ToscaParserMockHelper(Constants.configurationUuid, Constants.configurationFilePath),
-        };
-        for (ToscaParserMockHelper mockHelper : mockHelpers) {
-            InputStream jsonFile = VidControllerTest.class.getClassLoader().getResourceAsStream(mockHelper.getFilePath());
-            String expectedJsonAsString = IOUtils.toString(jsonFile);
-            NewServiceModel newServiceModel1 = om.readValue(expectedJsonAsString, NewServiceModel.class);
-            mockHelper.setNewServiceModel(newServiceModel1);
-        }
-        return mockHelpers;
-    }
-
-    private Path getCsarPath(String uuid) throws AsdcCatalogException {
-        return asdcClient.getServiceToscaModel(UUID.fromString(uuid));
-    }
-
-    private org.onap.vid.asdc.beans.Service getServiceByUuid(String uuid) throws AsdcCatalogException {
-        return asdcClient.getService(UUID.fromString(uuid));
-    }
-
-    public class Constants {
-        public static final String configurationUuid = "ee6d61be-4841-4f98-8f23-5de9da846ca7";
-        public static final String configurationFilePath = "policy-configuration-csar.JSON";
-        static final String vfUuid = "48a52540-8772-4368-9cdb-1f124ea5c931";
-        static final String vlUuid = "cb49608f-5a24-4789-b0f7-2595473cb997";
-        //        public static final String PNFUuid = "68101369-6f08-4e99-9a28-fa6327d344f3";
-        static final String vfFilePath = "vf-csar.JSON";
-        static final String vlFilePath = "vl-csar.JSON";
-//        public static final String PNFFilePath = "/Users/Oren/Git/Att/vid_internal/vid-app-common/src/main/resources/pnf.csar";
-
-    }
-
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/ViewEditSubControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/ViewEditSubControllerTest.java
deleted file mode 100644
index 061b359c..00000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/ViewEditSubControllerTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-//package org.onap.vid.controller;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//import org.junit.Test;
-//import org.springframework.web.servlet.ModelAndView;
-//
-//public class ViewEditSubControllerTest {
-//
-//	private ViewEditSubController createTestSubject() {
-//		return new ViewEditSubController();
-//	}
-//
-//	@Test
-//	public void testWelcome() throws Exception {
-//		ViewEditSubController testSubject;
-//		HttpServletRequest request = null;
-//		ModelAndView result;
-//
-//		// default test
-//		testSubject = createTestSubject();
-//		result = testSubject.welcome(request);
-//	}
-//
-//
-//	@Test
-//	public void testGetViewName() throws Exception {
-//		ViewEditSubController testSubject;
-//		String result;
-//
-//		// default test
-//		testSubject = createTestSubject();
-//		result = testSubject.getViewName();
-//	}
-//
-//	@Test
-//	public void testSetViewName() throws Exception {
-//		ViewEditSubController testSubject;
-//		String viewName = "";
-//
-//		// default test
-//		testSubject = createTestSubject();
-//		testSubject.setViewName(viewName);
-//	}
-//}
\ No newline at end of file