1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 0 insertions, 97 deletions

diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTest.java
deleted file mode 100644
index e63680b4c7..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleStructureESTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Feb 24 13:34:51 GMT 2017
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.shaded.org.mockito.Mockito.*;
-import static org.evosuite.runtime.MockitoExtension.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.asdc.installer.IVfModuleData;
-import org.openecomp.mso.asdc.installer.VfModuleArtifact;
-import org.openecomp.mso.asdc.installer.VfModuleStructure;
-import org.openecomp.mso.asdc.installer.VfResourceStructure;
-import org.openecomp.mso.db.catalog.beans.VfModule;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
-public class VfModuleStructureESTest extends VfModuleStructureESTestscaffolding {
-
-    @Test(timeout = 4000)
-    public void test0()  throws Throwable  {
-        LinkedList<String> linkedList0 = new LinkedList<String>();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn(linkedList0).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleData0);
-        VfModule vfModule0 = new VfModule();
-        vfModule0.setIsBase(1);
-        vfModuleStructure0.setCatalogVfModule(vfModule0);
-        VfModule vfModule1 = vfModuleStructure0.getCatalogVfModule();
-        assertNull(vfModule1.getModelInvariantUuid());
-    }
-
-    @Test(timeout = 4000)
-    public void test1()  throws Throwable  {
-        LinkedList<String> linkedList0 = new LinkedList<String>();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn(linkedList0).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleData0);
-        VfModule vfModule0 = new VfModule();
-        vfModuleStructure0.setCatalogVfModule(vfModule0);
-        VfModule vfModule1 = vfModuleStructure0.getCatalogVfModule();
-        assertNull(vfModule1.getModelVersion());
-    }
- @Test(timeout = 4000)
-    public void test4()  throws Throwable  {
-        LinkedList<String> linkedList0 = new LinkedList<String>();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn(linkedList0).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleData0);
-        Map<String, List<VfModuleArtifact>> map0 = vfModuleStructure0.getArtifactsMap();
-        assertTrue(map0.isEmpty());
-    }
-
-    @Test(timeout = 4000)
-    public void test5()  throws Throwable  {
-        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-        IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-        VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn((List) null).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = null;
-        try {
-            vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleData0);
-            fail("Expecting exception: NullPointerException");
-
-        } catch(NullPointerException e) {
-            //
-            // no message in exception (getMessage() returned null)
-            //
-            verifyException("org.openecomp.mso.asdc.installer.VfModuleStructure", e);
-        }
-    }
-
-    @Test(timeout = 4000)
-    public void test6()  throws Throwable  {
-        LinkedList<String> linkedList0 = new LinkedList<String>();
-        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
-        doReturn(linkedList0).when(iVfModuleData0).getArtifacts();
-        VfModuleStructure vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleData0);
-        VfModule vfModule0 = vfModuleStructure0.getCatalogVfModule();
-        assertNull(vfModule0);
-    }
-}