initial commit of testing of grabbing cvnfc cust

initial commit of testing of grabbing cvnfc cust
Update SQL so it properly inserts test data
remove unnecessary test in mso catalog db
updated tosca resource installer to use list not set
fixed compilation issue in asdc rest interface test

Issue-ID: SO-2769
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I9c6e7b6cbb96d9f395903a5a54b5af567eba62f8

1 files changed, 3 insertions, 8 deletions

diff --git a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepositoryTest.java b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepositoryTest.java
index e8addc4aa8..a13deae159 100644
--- a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepositoryTest.java
+++ b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepositoryTest.java
@@ -23,14 +23,10 @@ package org.onap.so.db.catalog.data.repository;
 import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import org.junit.Assert;
 import org.junit.Test;
 import org.onap.so.db.catalog.BaseTest;
-import org.onap.so.db.catalog.beans.ConfigurationResource;
-import org.onap.so.db.catalog.beans.CvnfcConfigurationCustomization;
 import org.onap.so.db.catalog.beans.CvnfcCustomization;
 import org.onap.so.db.catalog.beans.VfModule;
 import org.onap.so.db.catalog.beans.VfModuleCustomization;
@@ -45,6 +41,7 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest {
     @Autowired
     private CvnfcCustomizationRepository cvnfcCustomizationRepository;
 
+
     @Test
     public void findAllTest() throws Exception {
         List<CvnfcCustomization> cvnfcCustomizationList = cvnfcCustomizationRepository.findAll();
@@ -125,14 +122,12 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest {
         vnfResourceCustomization.setVnfResources(vnfResource);
 
 
-
         VnfcCustomization vnfcCustomization = setUpVnfcCustomization();
         vnfcCustomization.setModelCustomizationUUID("d95d704a-9ff2-11e8-98d0-529269fb1459");
 
-
-
         cvnfcCustomizationRepository.save(cvnfcCustomization);
 
+
         List<CvnfcCustomization> cvnfcCustomizationList =
                 cvnfcCustomizationRepository.findByModelCustomizationUUID("cf9f6efc-9f14-11e8-98d0-529269fb1459");
         boolean matchFound = false;
@@ -173,7 +168,7 @@ public class CvnfcCustomizationRepositoryTest extends BaseTest {
         vnfResourceCustomization.setModelCustomizationUUID("cf9f6efc-9f14-11e8-98d0-529269fb1459");
         vnfResourceCustomization.setModelInstanceName("testModelInstanceName");
 
-        List<VnfResourceCustomization> vnfResourceCustomizations = new ArrayList();
+        List<VnfResourceCustomization> vnfResourceCustomizations = new ArrayList<>();
         vnfResourceCustomizations.add(vnfResourceCustomization);
         vnfResourceCustomization.setVnfResources(vnfResource);