[MSO-8] Update the maven dependency

Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes.

Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc
Signed-off-by: xg353y <xg353y@intl.att.com>

10 files changed, 990 insertions, 1624 deletions

diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java
index 23b7a80dbe..63da38d8c1 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -33,7 +33,6 @@ import java.util.UUID;
 
 import org.junit.Test;
 import org.mockito.Mockito;
-
 import org.openecomp.sdc.api.notification.IArtifactInfo;
 import org.openecomp.sdc.api.notification.INotificationData;
 import org.openecomp.sdc.api.notification.IResourceInstance;
@@ -43,20 +42,20 @@ import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;
 import org.openecomp.mso.asdc.installer.ASDCElementInfo;
 import org.openecomp.mso.asdc.installer.VfModuleStructure;
 import org.openecomp.mso.asdc.installer.VfResourceStructure;
-
+import org.openecomp.mso.asdc.installer.IVfModuleData;
 
 public class ASDCElementInfoTest {
-	
+
 	@Test
 	public void createASDCElementInfoWithNullParameterTest() {
 		ASDCElementInfo elementInfoFromNullVfArtifact = ASDCElementInfo.createElementFromVfArtifactInfo(null);
 		ASDCElementInfo elementInfoFromNullVfModuleStructure = ASDCElementInfo.createElementFromVfModuleStructure(null);
 		ASDCElementInfo elementInfoFromNullVfResourceStructure = ASDCElementInfo.createElementFromVfResourceStructure(null);
-		
+
 		elementInfoFromNullVfArtifact.addElementInfo(null, null);
 		elementInfoFromNullVfModuleStructure.addElementInfo(null, "someValue");
 		elementInfoFromNullVfResourceStructure.addElementInfo("someKey", null);
-		
+
 		assertEquals(elementInfoFromNullVfArtifact.toString(), "");
 		assertEquals(elementInfoFromNullVfModuleStructure.toString(), "");
 		assertEquals(elementInfoFromNullVfResourceStructure.toString(), "");
@@ -66,107 +65,107 @@ public class ASDCElementInfoTest {
 		assertNotNull(elementInfoFromNullVfResourceStructure);
 
 		assertNotNull(ASDCElementInfo.EMPTY_INSTANCE);
-		
+
 		assertEquals(elementInfoFromNullVfArtifact, ASDCElementInfo.EMPTY_INSTANCE);
 		assertEquals(elementInfoFromNullVfModuleStructure, ASDCElementInfo.EMPTY_INSTANCE);
 		assertEquals(elementInfoFromNullVfResourceStructure, ASDCElementInfo.EMPTY_INSTANCE);
-		
+
 		assertEquals(ASDCElementInfo.EMPTY_INSTANCE.getType(), "");
 		assertEquals(ASDCElementInfo.EMPTY_INSTANCE.toString(), "");
-		
+
 		assertEquals(elementInfoFromNullVfArtifact.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());
 		assertEquals(elementInfoFromNullVfModuleStructure.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());
 		assertEquals(elementInfoFromNullVfResourceStructure.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());
 	}
-	
+
 	@Test
 	public void createASDCElementInfoFromVfResourceTest() {
-		
+
 		String resourceInstanceName = "Resource 1";
-		
+
 		UUID generatedUUID = UUID.randomUUID();
-		
+
 		INotificationData notificationData = Mockito.mock(INotificationData.class);
 		IResourceInstance resourceInstance = Mockito.mock(IResourceInstance.class);
-		
+
 		Mockito.when(resourceInstance.getResourceInstanceName()).thenReturn(resourceInstanceName);
 		Mockito.when(resourceInstance.getResourceInvariantUUID()).thenReturn(generatedUUID.toString());
-		
+
 		VfResourceStructure vfResourceStructure = new VfResourceStructure(notificationData, resourceInstance);
-		
+
 		ASDCElementInfo elementInfoFromVfResource = ASDCElementInfo.createElementFromVfResourceStructure(vfResourceStructure);
-		
+
 		assertTrue(elementInfoFromVfResource.toString().contains(resourceInstanceName));
 		assertTrue(elementInfoFromVfResource.toString().contains(generatedUUID.toString()));
-		
+
 		assertFalse(ASDCConfiguration.VF_MODULES_METADATA.equals(elementInfoFromVfResource.getType()));
 		assertEquals(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name(), elementInfoFromVfResource.getType());
-		
+
 		assertFalse(elementInfoFromVfResource.toString().contains("MyInfo1: someValue"));
 		elementInfoFromVfResource.addElementInfo("MyInfo1", "someValue");
 		assertTrue(elementInfoFromVfResource.toString().contains("MyInfo1: someValue"));
 	}
-	
+
 	@Test
 	public void createASDCElementInfoFromVfModuleTest() throws ArtifactInstallerException {
-		
+
 		String resourceInstanceName = "Resource 1";
-		
+
 		UUID generatedUUID = UUID.randomUUID();
-		
+
 		INotificationData notificationData = Mockito.mock(INotificationData.class);
 		IResourceInstance resourceInstance = Mockito.mock(IResourceInstance.class);
-		
+
 		Mockito.when(resourceInstance.getResourceInstanceName()).thenReturn(resourceInstanceName);
 		Mockito.when(resourceInstance.getResourceInvariantUUID()).thenReturn(generatedUUID.toString());
-		
+
 		VfResourceStructure vfResourceStructure = new VfResourceStructure(notificationData, resourceInstance);
-		
+
 		// Create module structure now
-		
+
 		String vfModuleModelName = "Module Model XYZ";
-		
+
 		UUID generatedUUIDForModule = UUID.randomUUID();
-		
-		IVfModuleMetadata moduleMetadata = Mockito.mock(IVfModuleMetadata.class);
+
+		IVfModuleData moduleMetadata = Mockito.mock(IVfModuleData.class);
 		Mockito.when(moduleMetadata.getVfModuleModelName()).thenReturn(vfModuleModelName);
 		Mockito.when(moduleMetadata.getVfModuleModelInvariantUUID()).thenReturn(generatedUUIDForModule.toString());
 		Mockito.when(moduleMetadata.getArtifacts()).thenReturn(Collections.<String> emptyList());
-		
+
 		VfModuleStructure vfModuleStructure = new VfModuleStructure(vfResourceStructure, moduleMetadata);
-		
+
 		ASDCElementInfo elementInfoFromVfModule = ASDCElementInfo.createElementFromVfModuleStructure(vfModuleStructure);
-		
+
 		assertTrue(elementInfoFromVfModule.toString().contains(vfModuleModelName));
 		assertTrue(elementInfoFromVfModule.toString().contains(generatedUUIDForModule.toString()));
-		
+
 		assertFalse(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name().equals(elementInfoFromVfModule.getType()));
 		assertEquals(ASDCConfiguration.VF_MODULES_METADATA, elementInfoFromVfModule.getType());
-		
+
 		assertFalse(elementInfoFromVfModule.toString().contains("MyInfo2: someValue"));
 		elementInfoFromVfModule.addElementInfo("MyInfo2", "someValue");
 		assertTrue(elementInfoFromVfModule.toString().contains("MyInfo2: someValue"));
 	}
-	
+
 	@Test
 	public void createASDCElementInfoFromArtifact() {
 		for (String eVal : ASDCConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST) {
 			String generatedArtifactName = eVal + " 1";
 			UUID generatedUUIDForArtifact = UUID.randomUUID();
-			
+
 			IArtifactInfo artifactInfo = Mockito.mock(IArtifactInfo.class);
 			Mockito.when(artifactInfo.getArtifactType()).thenReturn(eVal);
 			Mockito.when(artifactInfo.getArtifactName()).thenReturn(generatedArtifactName);
 			Mockito.when(artifactInfo.getArtifactUUID()).thenReturn(generatedUUIDForArtifact.toString());
-			
+
 			ASDCElementInfo elementInfoFromArtifact = ASDCElementInfo.createElementFromVfArtifactInfo(artifactInfo);
 
 			assertTrue(elementInfoFromArtifact.toString().contains(generatedArtifactName));
 			assertTrue(elementInfoFromArtifact.toString().contains(generatedUUIDForArtifact.toString()));
-			
+
 			assertFalse(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name().equals(elementInfoFromArtifact.getType()));
 			assertEquals(eVal, elementInfoFromArtifact.getType());
-			
+
 			assertFalse(elementInfoFromArtifact.toString().contains("MyInfo3: someValue"));
 			elementInfoFromArtifact.addElementInfo("MyInfo3", "someValue");
 			assertTrue(elementInfoFromArtifact.toString().contains("MyInfo3: someValue"));
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTest.java
deleted file mode 100644
index 8dd5afe7e0..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:35:55 GMT 2016
- */
-
-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.EvoAssertions.*;
-
-import java.util.List;
-import java.util.Map;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.junit.runner.RunWith;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class ASDCElementInfoESTest extends ASDCElementInfoESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iResourceInstance0).getResourceInstanceName();
-      doReturn((String) null).when(iResourceInstance0).getResourceInvariantUUID();
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfResourceStructure(vfResourceStructure0);
-      String string0 = aSDCElementInfo0.getType();
-      assertEquals("VNF_RESOURCE", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfModuleStructure((VfModuleStructure) null);
-      Map<String, String> map0 = aSDCElementInfo0.getElementInfoMap();
-      assertTrue(map0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      Map<String, String> map0 = ASDCElementInfo.EMPTY_INSTANCE.getElementInfoMap();
-      assertTrue(map0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.EMPTY_INSTANCE;
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iArtifactInfo0).getArtifactName();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactType();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
-      ASDCElementInfo aSDCElementInfo1 = ASDCElementInfo.createElementFromVfArtifactInfo(iArtifactInfo0);
-      aSDCElementInfo0.toString();
-      PrivateAccess.setVariable((Class<ASDCElementInfo>) ASDCElementInfo.class, aSDCElementInfo1, "elementInfoMap", (Object) null);
-      aSDCElementInfo0.toString();
-      // Undeclared exception!
-      try { 
-        aSDCElementInfo1.toString();
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.ASDCElementInfo", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.EMPTY_INSTANCE;
-      aSDCElementInfo0.addElementInfo("V$", (String) null);
-      assertEquals("", aSDCElementInfo0.getType());
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfModuleStructure((VfModuleStructure) null);
-      String string0 = aSDCElementInfo0.EMPTY_INSTANCE.getType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, (IResourceInstance) null);
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(iVfModuleMetadata0).getArtifacts();
-      VfModuleStructure vfModuleStructure0 = null;
-      try {
-        vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleMetadata0);
-        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 test08()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      doReturn(" Name").when(iResourceInstance0).getResourceInstanceName();
-      doReturn(" Name").when(iResourceInstance0).getResourceInvariantUUID();
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfResourceStructure(vfResourceStructure0);
-      String string0 = aSDCElementInfo0.toString();
-      assertEquals("Resource Instance Invariant UUID:  Name, Resource Instance Name:  Name", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfArtifactInfo((IArtifactInfo) null);
-      aSDCElementInfo0.addElementInfo((String) null, "");
-      assertEquals("", aSDCElementInfo0.getType());
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iArtifactInfo0).getArtifactName();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactType();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
-      ASDCElementInfo aSDCElementInfo0 = ASDCElementInfo.createElementFromVfArtifactInfo(iArtifactInfo0);
-      String string0 = aSDCElementInfo0.getType();
-      assertNull(string0);
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTestscaffolding.java
deleted file mode 100644
index 075970b066..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/ASDCElementInfoESTestscaffolding.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:35:55 GMT 2016
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class ASDCElementInfoESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.installer.ASDCElementInfo"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(ASDCElementInfoESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.sdc.api.IDistributionClient",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.asdc.installer.VfResourceStructure",
-      "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException",
-      "org.openecomp.mso.db.catalog.beans.VnfResource",
-      "org.openecomp.sdc.api.notification.IVfModuleMetadata",
-      "org.openecomp.mso.db.catalog.beans.VfModule",
-      "org.openecomp.sdc.api.results.IDistributionClientResult",
-      "org.openecomp.sdc.api.notification.IArtifactInfo",
-      "org.openecomp.mso.db.catalog.beans.Service",
-      "org.openecomp.mso.asdc.installer.VfModuleStructure",
-      "org.openecomp.sdc.api.notification.INotificationData",
-      "org.openecomp.mso.asdc.installer.VfModuleArtifact",
-      "org.openecomp.sdc.api.notification.IResourceInstance",
-      "org.openecomp.mso.asdc.installer.ASDCElementInfo",
-      "org.openecomp.sdc.api.results.IDistributionClientDownloadResult",
-      "org.openecomp.mso.asdc.installer.ASDCElementInfo$ASDCElementTypeEnum"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ASDCElementInfoESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.asdc.installer.ASDCElementInfo$ASDCElementTypeEnum",
-      "org.openecomp.mso.asdc.installer.ASDCElementInfo",
-      "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException"
-    );
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTest.java
new file mode 100644
index 0000000000..f87f9068f2
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTest.java
@@ -0,0 +1,517 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Fri Feb 24 16:02:34 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.EvoAssertions.*;
+import java.util.List;
+import java.util.Map;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.PrivateAccess;
+import org.evosuite.runtime.ViolatedAssumptionAnswer;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class VfModuleMetaDataESTest extends VfModuleMetaDataESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      List<Boolean> list0 = (List<Boolean>) mock(List.class, new ViolatedAssumptionAnswer());
+      Integer integer0 = new Integer((-13));
+      vfModuleMetaData0.setAttribute("", integer0);
+      vfModuleMetaData0.setAttribute("", "");
+      Map<Boolean, Boolean> map0 = (Map<Boolean, Boolean>) mock(Map.class, new ViolatedAssumptionAnswer());
+      doReturn((Object) null).when(map0).put(any() , any());
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map0);
+      List<Boolean> list1 = (List<Boolean>) mock(List.class, new ViolatedAssumptionAnswer());
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list1);
+      vfModuleMetaData0.setAttribute("kup1s\"/L_ ", "kup1s\"/L_ ");
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list0);
+      Map<Object, Boolean> map1 = (Map<Object, Boolean>) mock(Map.class, new ViolatedAssumptionAnswer());
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "properties", (Object) map1);
+      Map<Object, Boolean> map2 = (Map<Object, Boolean>) mock(Map.class, new ViolatedAssumptionAnswer());
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map2);
+      Map<String, Integer> map3 = (Map<String, Integer>) mock(Map.class, new ViolatedAssumptionAnswer());
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map3);
+      VfModuleMetaData vfModuleMetaData1 = new VfModuleMetaData();
+      List<String> list2 = (List<String>) mock(List.class, new ViolatedAssumptionAnswer());
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData1, "artifacts", (Object) list2);
+      vfModuleMetaData1.setAttribute((String) null, "");
+      vfModuleMetaData1.setAttribute("", "");
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData1, "properties", (Object) null);
+      vfModuleMetaData1.getProperties();
+      vfModuleMetaData0.setAttribute("", integer0);
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) null);
+      // Undeclared exception!
+      try {
+        vfModuleMetaData1.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      Map<String, String> map0 = vfModuleMetaData0.getProperties();
+      List<Object> list0 = (List<Object>) mock(List.class, new ViolatedAssumptionAnswer());
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list0);
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map0);
+      vfModuleMetaData0.setAttribute(")aPjhY=.[,~@B5", ")aPjhY=.[,~@B5");
+      vfModuleMetaData0.setAttribute(")aPjhY=.[,~@B5", "");
+      vfModuleMetaData0.setAttribute(")aPjhY=.[,~@B5", "");
+      Integer integer0 = new Integer((-6));
+      vfModuleMetaData0.setAttribute(")aPjhY=.[,~@B5", integer0);
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "properties", (Object) map0);
+      Map<Boolean, String> map1 = (Map<Boolean, String>) mock(Map.class, new ViolatedAssumptionAnswer());
+      doReturn((Object) null).when(map1).put(any() , any());
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map1);
+      vfModuleMetaData0.setAttribute((String) null, integer0);
+      Integer integer1 = new Integer((-1));
+      vfModuleMetaData0.setAttribute("&$*6wB^=VXY/.Gj`T", integer1);
+      Map<String, String> map2 = vfModuleMetaData0.getProperties();
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map2);
+      Map<String, String> map3 = vfModuleMetaData0.getProperties();
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "attributesMap", (Object) map3);
+      List<Boolean> list1 = (List<Boolean>) mock(List.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(list1).toString();
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list1);
+      List<String> list2 = vfModuleMetaData0.getArtifacts();
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "properties", (Object) map3);
+      PrivateAccess.setVariable((Class<VfModuleMetaData>) VfModuleMetaData.class, vfModuleMetaData0, "artifacts", (Object) list2);
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.getVfModuleModelUUID();
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.setAttribute("X0s-/&YT>", "X0s-/&YT>");
+      vfModuleMetaData0.getArtifacts();
+      vfModuleMetaData0.setAttribute("vfModuleModelUUID", "");
+      vfModuleMetaData0.setAttribute("RHO{0R!FJsK+:s.q", "");
+      vfModuleMetaData0.setAttribute((String) null, "");
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.getVfModuleModelUUID();
+      vfModuleMetaData0.getArtifacts();
+      vfModuleMetaData0.getProperties();
+      vfModuleMetaData0.getVfModuleModelUUID();
+      vfModuleMetaData0.getArtifacts();
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.getVfModuleModelUUID();
+      vfModuleMetaData0.getArtifacts();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("6NJ#o #-{", "6NJ#o #-{");
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.setAttribute("", "3o(D\" <bgGVHg");
+      vfModuleMetaData0.setAttribute("vfModuleModelVersion", "");
+      vfModuleMetaData0.setAttribute("y", "");
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.getVfModuleModelVersion();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
+      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
+      vfModuleMetaData0.getArtifacts();
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "");
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.setAttribute("z9,}N0\"L]xH@", (Object) null);
+      vfModuleMetaData0.getProperties();
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.setAttribute("", (Object) null);
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.getArtifacts();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.setAttribute((String) null, (Object) null);
+      vfModuleMetaData0.setAttribute("vfModuleModelUUID", "vfModuleModelUUID");
+      vfModuleMetaData0.getProperties();
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.getVfModuleModelUUID();
+      vfModuleMetaData0.getArtifacts();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.getVfModuleModelUUID();
+      VfModuleMetaData vfModuleMetaData1 = new VfModuleMetaData();
+      assertNull(vfModuleMetaData1.getVfModuleModelName());
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("a.8XV,jQU\"Su_&pz", (Object) null);
+      vfModuleMetaData0.setAttribute("<A|K", "vfModuleModelInvariantUUID");
+      vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", "vfModuleModelInvariantUUID");
+      vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", "");
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.setAttribute("vfModuleModelUUID", "vfModuleModelUUID");
+      Map<String, String> map0 = vfModuleMetaData0.getProperties();
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.setAttribute("", "w(f2d");
+      vfModuleMetaData0.setAttribute("", map0);
+      vfModuleMetaData0.setAttribute("<A|K", "");
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
+      Map<String, String> map0 = vfModuleMetaData0.getProperties();
+      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
+      vfModuleMetaData0.setAttribute("vfModuleModelDescription", map0);
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.getArtifacts();
+      vfModuleMetaData0.getProperties();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.getVfModuleModelDescription();
+        fail("Expecting exception: ClassCastException");
+
+      } catch(ClassCastException e) {
+         //
+         // java.util.HashMap cannot be cast to java.lang.String
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("vfModuleModelDescription", "vfModuleModelDescription");
+      vfModuleMetaData0.setAttribute("}U?", "");
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.setAttribute("f78C:y", (Object) null);
+      vfModuleMetaData0.getArtifacts();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.getVfModuleModelUUID();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.getVfModuleModelName();
+      vfModuleMetaData0.getProperties();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("Q> 'piXimPhE", "Q> 'piXimPhE");
+      vfModuleMetaData0.setAttribute("Q> 'piXimPhE", "(");
+      vfModuleMetaData0.setAttribute("D0kbC~", "Q> 'piXimPhE");
+      vfModuleMetaData0.setAttribute("", "D0kbC~");
+      vfModuleMetaData0.setAttribute("(", "");
+      vfModuleMetaData0.setAttribute("vfModuleModelVersion", "][,6>~[xc,");
+      vfModuleMetaData0.setAttribute("", "(");
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.setAttribute("D0kbC~", "vfModuleModelVersion");
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("vfModuleModelUUID", "");
+      vfModuleMetaData0.setAttribute("vfModuleModelCustomizationUUID", "");
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("", "");
+      vfModuleMetaData0.setAttribute("isBase", "isBase");
+      vfModuleMetaData0.setAttribute("isBase", "");
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.getArtifacts();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: ClassCastException");
+
+      } catch(ClassCastException e) {
+         //
+         // java.lang.String cannot be cast to java.lang.Boolean
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("vfModuleModelName", "vfModuleModelName");
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.setAttribute("mp+0S", (Object) null);
+      vfModuleMetaData0.setAttribute("EVNf'G}^Q", "mp+0S");
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.getVfModuleModelName();
+      vfModuleMetaData0.getVfModuleModelName();
+      vfModuleMetaData0.getArtifacts();
+      vfModuleMetaData0.getVfModuleModelName();
+      vfModuleMetaData0.setAttribute("Pw5`cyIph)xX&#zj~'", (Object) null);
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.getVfModuleModelName();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("vfModuleModelName", "vfModuleModelName");
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.setAttribute("", (Object) null);
+      vfModuleMetaData0.setAttribute((String) null, "vfModuleModelName");
+      vfModuleMetaData0.setAttribute("vfModuleModelName", "");
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.getProperties();
+      vfModuleMetaData0.getProperties();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.getVfModuleModelName();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", "vfModuleModelInvariantUUID");
+      vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", "vfModuleModelInvariantUUID");
+      vfModuleMetaData0.getVfModuleModelUUID();
+      vfModuleMetaData0.getVfModuleModelName();
+      vfModuleMetaData0.getProperties();
+      vfModuleMetaData0.setAttribute("k", "k");
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.setAttribute("", (Object) null);
+      VfModuleMetaData vfModuleMetaData1 = new VfModuleMetaData();
+      vfModuleMetaData1.getProperties();
+      // Undeclared exception!
+      try {
+        vfModuleMetaData1.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.setAttribute("y&g B,yQlt!e=p`Q1", "y&g B,yQlt!e=p`Q1");
+      vfModuleMetaData0.setAttribute("vfModuleModelCustomizationUUID", "vfModuleModelCustomizationUUID");
+      vfModuleMetaData0.setAttribute("vfModuleModelCustomizationUUID", "vfModuleModelCustomizationUUID");
+      vfModuleMetaData0.setAttribute("y&g B,yQlt!e=p`Q1", "vfModuleModelCustomizationUUID");
+      vfModuleMetaData0.setAttribute("vfModuleModelCustomizationUUID", (Object) null);
+      vfModuleMetaData0.setAttribute("3m%.ng=pp5", "vfModuleModelCustomizationUUID");
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.setAttribute((String) null, (Object) null);
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.setAttribute((String) null, "vfModuleModelDescription");
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.setAttribute("n8'>kSe2Hv:m| ", "vfModuleModelCustomizationUUID");
+      vfModuleMetaData0.getVfModuleModelUUID();
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.getVfModuleModelName();
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      String string0 = vfModuleMetaData0.getVfModuleModelVersion();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.getVfModuleModelDescription();
+      vfModuleMetaData0.setAttribute((String) null, (Object) null);
+      vfModuleMetaData0.getVfModuleModelName();
+      vfModuleMetaData0.getVfModuleModelVersion();
+      vfModuleMetaData0.setAttribute(".+7u)hv;7kUOz", (Object) null);
+      vfModuleMetaData0.getVfModuleModelCustomizationUUID();
+      vfModuleMetaData0.getVfModuleModelInvariantUUID();
+      String string0 = vfModuleMetaData0.getVfModuleModelUUID();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      String string0 = "$";
+      vfModuleMetaData0.setAttribute("$", "$");
+      vfModuleMetaData0.setAttribute("$", "");
+      vfModuleMetaData0.setAttribute("", "$");
+      // Undeclared exception!
+      try {
+        vfModuleMetaData0.isBase();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+      vfModuleMetaData0.getArtifacts();
+      Map<String, String> map0 = vfModuleMetaData0.getProperties();
+      assertEquals(0, map0.size());
+  }
+}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTestscaffolding.java
new file mode 100644
index 0000000000..39bb3a7227
--- /dev/null
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfModuleMetaDataESTestscaffolding.java
@@ -0,0 +1,78 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Fri Feb 24 16:02:34 GMT 2017
+ */
+
+package org.openecomp.mso.asdc.installer;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+import org.evosuite.runtime.sandbox.Sandbox.SandboxMode;
+
+@EvoSuiteClassExclude
+public class VfModuleMetaDataESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.installer.VfModuleMetaData";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = SandboxMode.RECOMMENDED;
+    Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(VfModuleMetaDataESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.asdc.installer.VfModuleMetaData",
+      "org.openecomp.mso.asdc.installer.IVfModuleData"
+    );
+  }
+
+  private static void resetClasses() {
+  }
+}
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
index f3c20c5eb7..e63680b4c7 100644
--- 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
@@ -1,108 +1,97 @@
 /*
  * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:37:00 GMT 2016
+ * 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.Test;
 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;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
 
-import java.util.LinkedList;
-import java.util.List;
-
-import static org.evosuite.runtime.EvoAssertions.verifyException;
-import static org.evosuite.shaded.org.mockito.Mockito.doReturn;
-import static org.evosuite.shaded.org.mockito.Mockito.mock;
-import static org.junit.Assert.fail;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
 public class VfModuleStructureESTest extends VfModuleStructureESTestscaffolding {
 
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(iVfModuleMetadata0).getArtifacts();
-      VfModuleStructure vfModuleStructure0 = null;
-      try {
-        vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleMetadata0);
-        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 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 test2()  throws Throwable  {
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(iVfModuleMetadata0).getArtifacts();
-      VfModuleStructure vfModuleStructure0 = null;
-      try {
-        vfModuleStructure0 = new VfModuleStructure((VfResourceStructure) null, iVfModuleMetadata0);
-        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 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");
 
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      LinkedList<String> linkedList0 = new LinkedList<String>();
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn(linkedList0).when(iVfModuleMetadata0).getArtifacts();
-      linkedList0.add("");
-      VfModuleStructure vfModuleStructure0 = null;
-      try {
-        vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleMetadata0);
-        fail("Expecting exception: Exception");
-      
-      } catch(Exception e) {
-         //
-         // Artifact (UUID:) referenced in the VFModule UUID list has not been downloaded, cancelling the Resource deployment
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfModuleStructure", e);
-      }
-  }
+        } catch(NullPointerException e) {
+            //
+            // no message in exception (getMessage() returned null)
+            //
+            verifyException("org.openecomp.mso.asdc.installer.VfModuleStructure", e);
+        }
+    }
 
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      vfResourceStructure0.setSuccessfulDeployment();
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(iVfModuleMetadata0).getArtifacts();
-      vfResourceStructure0.setSuccessfulDeployment();
-      VfModuleStructure vfModuleStructure0 = null;
-      try {
-        vfModuleStructure0 = new VfModuleStructure(vfResourceStructure0, iVfModuleMetadata0);
-        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);
+    }
 }
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTest.java
deleted file mode 100644
index 4a27df3a48..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTest.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:29:36 GMT 2016
- */
-
-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.EvoAssertions.*;
-
-import org.openecomp.mso.db.catalog.beans.Service;
-import org.openecomp.mso.db.catalog.beans.VnfResource;
-import java.time.chrono.ChronoLocalDate;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.evosuite.runtime.ViolatedAssumptionAnswer;
-import org.evosuite.runtime.mock.java.time.chrono.MockHijrahDate;
-import org.junit.runner.RunWith;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.impl.DistributionClientDownloadResultImpl;
-import org.openecomp.sdc.impl.mock.DistributionClientDownloadResultStubImpl;
-import org.openecomp.sdc.impl.mock.DistributionClientStubImpl;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class VfResourceStructureESTest extends VfResourceStructureESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesStructureList", (Object) null);
-      vfResourceStructure0.getVfModuleStructure();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      LinkedList<Object> linkedList0 = new LinkedList<Object>();
-      linkedList0.add((Object) vfResourceStructure0);
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesStructureList", (Object) linkedList0);
-      vfResourceStructure0.getVfModuleStructure();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure((INotificationData) null, (IResourceInstance) null);
-      vfResourceStructure0.getResourceInstance();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("").when(iNotificationData0).toString();
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      vfResourceStructure0.getNotification();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      Service service0 = new Service();
-      service0.setId(6);
-      vfResourceStructure0.setCatalogService(service0);
-      vfResourceStructure0.getCatalogService();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      Iterator<ChronoLocalDate> iterator0 = (Iterator<ChronoLocalDate>) mock(Iterator.class, new ViolatedAssumptionAnswer());
-      List<ChronoLocalDate> list0 = (List<ChronoLocalDate>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn((Iterator) null).when(list0).iterator();
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesMetadataList", (Object) list0);
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "isDeployedSuccessfully", (Object) true);
-      List<MockHijrahDate> list1 = (List<MockHijrahDate>) mock(List.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "isDeployedSuccessfully", (Object) true);
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesStructureList", (Object) list1);
-      // Undeclared exception!
-      try { 
-        vfResourceStructure0.createVfModuleStructures();
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfResourceStructure", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      Iterator<ChronoLocalDate> iterator0 = (Iterator<ChronoLocalDate>) mock(Iterator.class, new ViolatedAssumptionAnswer());
-      doReturn(false).when(iterator0).hasNext();
-      List<ChronoLocalDate> list0 = (List<ChronoLocalDate>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn(iterator0).when(list0).iterator();
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesMetadataList", (Object) list0);
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "isDeployedSuccessfully", (Object) true);
-      List<MockHijrahDate> list1 = (List<MockHijrahDate>) mock(List.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "isDeployedSuccessfully", (Object) true);
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesStructureList", (Object) list1);
-      vfResourceStructure0.createVfModuleStructures();
-      IDistributionClient iDistributionClient0 = mock(IDistributionClient.class, new ViolatedAssumptionAnswer());
-      IArtifactInfo iArtifactInfo0 = null;
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.ARTIFACT_NOT_FOUND;
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "");
-      List<Object> list2 = (List<Object>) mock(List.class, new ViolatedAssumptionAnswer());
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesMetadataList", (Object) list2);
-      // Undeclared exception!
-      try { 
-        vfResourceStructure0.addArtifactToStructure(iDistributionClient0, (IArtifactInfo) null, distributionClientDownloadResultImpl0);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      ChronoLocalDate chronoLocalDate0 = mock(ChronoLocalDate.class, new ViolatedAssumptionAnswer());
-      Iterator<ChronoLocalDate> iterator0 = (Iterator<ChronoLocalDate>) mock(Iterator.class, new ViolatedAssumptionAnswer());
-      doReturn(true).when(iterator0).hasNext();
-      doReturn(chronoLocalDate0).when(iterator0).next();
-      List<ChronoLocalDate> list0 = (List<ChronoLocalDate>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn(iterator0).when(list0).iterator();
-      PrivateAccess.setVariable((Class<VfResourceStructure>) VfResourceStructure.class, vfResourceStructure0, "vfModulesMetadataList", (Object) list0);
-      // Undeclared exception!
-      try { 
-        vfResourceStructure0.createVfModuleStructures();
-        fail("Expecting exception: ClassCastException");
-      
-      } catch(ClassCastException e) {
-         //
-         // $java.time.chrono.ChronoLocalDate$$EnhancerByMockitoWithCGLIB$$27d47344 cannot be cast to org.openecomp.sdc.api.notification.IVfModuleMetadata
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfResourceStructure", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      try { 
-        vfResourceStructure0.createVfModuleStructures();
-        fail("Expecting exception: Exception");
-      
-      } catch(Exception e) {
-         //
-         // VfModule Meta DATA could not be decoded properly or was not present in the notification
-         //
-         verifyException("org.openecomp.mso.asdc.installer.VfResourceStructure", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("%[76").when(iArtifactInfo0).getArtifactType();
-      DistributionClientDownloadResultStubImpl distributionClientDownloadResultStubImpl0 = (DistributionClientDownloadResultStubImpl)distributionClientStubImpl0.download(iArtifactInfo0);
-      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultStubImpl0);
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("HEAT_ARTIFACT").when(iArtifactInfo0).getArtifactType();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
-      DistributionClientDownloadResultStubImpl distributionClientDownloadResultStubImpl0 = (DistributionClientDownloadResultStubImpl)distributionClientStubImpl0.download(iArtifactInfo0);
-      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultStubImpl0);
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionClientDownloadResultStubImpl distributionClientDownloadResultStubImpl0 = (DistributionClientDownloadResultStubImpl)distributionClientStubImpl0.download(iArtifactInfo0);
-      IArtifactInfo iArtifactInfo1 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("HEAT").when(iArtifactInfo1).getArtifactType();
-      doReturn("%[76").when(iArtifactInfo1).getArtifactUUID();
-      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo1, distributionClientDownloadResultStubImpl0);
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      DistributionClientDownloadResultStubImpl distributionClientDownloadResultStubImpl0 = (DistributionClientDownloadResultStubImpl)distributionClientStubImpl0.download(iArtifactInfo0);
-      IArtifactInfo iArtifactInfo1 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("HEAT_NET").when(iArtifactInfo1).getArtifactType();
-      doReturn("HEAT_ENV").when(iArtifactInfo1).getArtifactUUID();
-      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo1, distributionClientDownloadResultStubImpl0);
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure((INotificationData) null, iResourceInstance0);
-      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("HEAT_ENV").when(iArtifactInfo0).getArtifactType();
-      doReturn("*Z\"P4rvOA+mW").when(iArtifactInfo0).getArtifactUUID();
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.UEB_KEYS_CREATION_FAILED;
-      byte[] byteArray0 = new byte[6];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "]=)|;N.$hV]d^", "s:h+", byteArray0);
-      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultImpl0);
-      Map<String, VfModuleArtifact> map0 = vfResourceStructure0.getArtifactsMapByUUID();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-      assertFalse(map0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("VF_MODULES_METADATA").when(iArtifactInfo0).getArtifactType();
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.BAD_REQUEST;
-      byte[] byteArray0 = new byte[2];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "<B['", "<B['", byteArray0);
-      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultImpl0);
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      DistributionClientStubImpl distributionClientStubImpl0 = new DistributionClientStubImpl();
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("HEAT_NESTED").when(iArtifactInfo0).getArtifactType();
-      doReturn("HEAT_NESTED").when(iArtifactInfo0).getArtifactUUID();
-      DistributionActionResultEnum distributionActionResultEnum0 = DistributionActionResultEnum.BAD_REQUEST;
-      byte[] byteArray0 = new byte[2];
-      DistributionClientDownloadResultImpl distributionClientDownloadResultImpl0 = new DistributionClientDownloadResultImpl(distributionActionResultEnum0, "<B['", "<B['", byteArray0);
-      vfResourceStructure0.addArtifactToStructure(distributionClientStubImpl0, iArtifactInfo0, distributionClientDownloadResultImpl0);
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      vfResourceStructure0.getCatalogService();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      vfResourceStructure0.getVfModulesStructureList();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      vfResourceStructure0.getArtifactsMapByUUID();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-      
-      vfResourceStructure0.setSuccessfulDeployment();
-      boolean boolean0 = vfResourceStructure0.isDeployedSuccessfully();
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      vfResourceStructure0.getCatalogVnfResource();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      vfResourceStructure0.getVfModuleStructure();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      boolean boolean0 = vfResourceStructure0.isDeployedSuccessfully();
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure((INotificationData) null, iResourceInstance0);
-      vfResourceStructure0.getNotification();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      VnfResource vnfResource0 = new VnfResource();
-      vfResourceStructure0.setCatalogVnfResource(vnfResource0);
-      vfResourceStructure0.getCatalogVnfResource();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      Service service0 = new Service();
-      vfResourceStructure0.setCatalogService(service0);
-      vfResourceStructure0.getCatalogService();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-
-  @Test(timeout = 4000)
-  public void test26()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iResourceInstance0).toString();
-      VfResourceStructure vfResourceStructure0 = new VfResourceStructure(iNotificationData0, iResourceInstance0);
-      vfResourceStructure0.getResourceInstance();
-      assertFalse(vfResourceStructure0.isDeployedSuccessfully());
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTestscaffolding.java
deleted file mode 100644
index f78949eecc..0000000000
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/VfResourceStructureESTestscaffolding.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Fri Nov 25 13:29:36 GMT 2016
- */
-
-package org.openecomp.mso.asdc.installer;
-
-import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
-import org.junit.BeforeClass;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.evosuite.runtime.sandbox.Sandbox;
-
-@EvoSuiteClassExclude
-public class VfResourceStructureESTestscaffolding {
-
-  @org.junit.Rule 
-  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
-
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
-
-  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
-
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.installer.VfResourceStructure"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
-    initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
-
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
-
-  @Before 
-  public void initTestCase(){ 
-    threadStopper.storeCurrentThreads();
-    threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
-
-  @After 
-  public void doneWithTestCase(){ 
-    threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
-
-  private static void initializeClasses() {
-    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(VfResourceStructureESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.sdc.api.IDistributionClient",
-      "org.openecomp.mso.db.catalog.beans.ServiceRecipe",
-      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
-      "org.openecomp.mso.asdc.installer.VfResourceStructure",
-      "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException",
-      "org.openecomp.mso.db.catalog.beans.VnfResource",
-      "org.openecomp.sdc.utils.DistributionActionResultEnum",
-      "org.openecomp.sdc.impl.DistributionClientResultImpl",
-      "org.openecomp.sdc.impl.mock.DistributionClientStubImpl",
-      "org.openecomp.sdc.impl.DistributionClientDownloadResultImpl",
-      "org.openecomp.sdc.api.consumer.IConfiguration",
-      "org.openecomp.sdc.api.notification.IVfModuleMetadata",
-      "org.openecomp.sdc.api.results.IDistributionClientResult",
-      "org.openecomp.mso.db.catalog.beans.Service",
-      "org.openecomp.sdc.api.notification.IArtifactInfo",
-      "org.openecomp.sdc.impl.mock.DistributionClientDownloadResultStubImpl",
-      "org.openecomp.sdc.api.consumer.INotificationCallback",
-      "org.openecomp.mso.asdc.installer.VfModuleStructure",
-      "org.openecomp.sdc.api.notification.INotificationData",
-      "org.openecomp.mso.asdc.installer.VfModuleArtifact",
-      "org.openecomp.sdc.api.notification.IResourceInstance",
-      "org.openecomp.sdc.impl.mock.DistributionClientResultStubImpl",
-      "org.openecomp.sdc.api.results.IDistributionClientDownloadResult",
-      "org.openecomp.sdc.api.consumer.IDistributionStatusMessage"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(VfResourceStructureESTestscaffolding.class.getClassLoader());
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException"
-    );
-  }
-}
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTest.java
index 77c70e015e..2e73096337 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTest.java
@@ -1,6 +1,6 @@
 /*
  * This file was automatically generated by EvoSuite
- * Fri Nov 25 13:31:27 GMT 2016
+ * Mon Mar 13 16:09:00 GMT 2017
  */
 
 package org.openecomp.mso.asdc.util;
@@ -10,737 +10,263 @@ 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.Collection;
-import java.util.Comparator;
-import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.function.Predicate;
+import java.util.Map;
+import java.util.function.UnaryOperator;
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.PrivateAccess;
 import org.evosuite.runtime.ViolatedAssumptionAnswer;
 import org.junit.runner.RunWith;
+import org.openecomp.mso.asdc.installer.IVfModuleData;
+import org.openecomp.mso.asdc.installer.VfModuleMetaData;
+import org.openecomp.mso.asdc.util.ASDCNotificationLogging;
 import org.openecomp.sdc.api.notification.IArtifactInfo;
 import org.openecomp.sdc.api.notification.INotificationData;
 import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
 
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
 public class ASDCNotificationLoggingESTest extends ASDCNotificationLoggingESTestscaffolding {
 
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
-      LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
-      Integer integer0 = new Integer(2147483645);
-      Integer integer1 = new Integer(2147483645);
-      Integer integer2 = new Integer(2147483645);
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iArtifactInfo0).getArtifactChecksum();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactDescription();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactName();
-      doReturn((Integer) null).when(iArtifactInfo0).getArtifactTimeout();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactType();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactURL();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactVersion();
-      doReturn((IArtifactInfo) null).when(iArtifactInfo0).getGeneratedArtifact();
-      doReturn((List) null).when(iArtifactInfo0).getRelatedArtifacts();
-      IArtifactInfo iArtifactInfo1 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("Resource Instance Info:").when(iArtifactInfo1).getArtifactChecksum();
-      doReturn("~1xF'ZQr|qhuc{").when(iArtifactInfo1).getArtifactDescription();
-      doReturn("").when(iArtifactInfo1).getArtifactName();
-      doReturn(integer1).when(iArtifactInfo1).getArtifactTimeout();
-      doReturn("7<\"g").when(iArtifactInfo1).getArtifactType();
-      doReturn("").when(iArtifactInfo1).getArtifactURL();
-      doReturn("").when(iArtifactInfo1).getArtifactUUID();
-      doReturn("7<\"g").when(iArtifactInfo1).getArtifactVersion();
-      doReturn(iArtifactInfo0).when(iArtifactInfo1).getGeneratedArtifact();
-      doReturn(linkedList1, linkedList1).when(iArtifactInfo1).getRelatedArtifacts();
-      LinkedList<IArtifactInfo> linkedList2 = new LinkedList<IArtifactInfo>();
-      Integer integer3 = new Integer(1);
-      LinkedList<IArtifactInfo> linkedList3 = new LinkedList<IArtifactInfo>();
-      IArtifactInfo iArtifactInfo2 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn("-X^ og(1=?-*/%4", "%jgpj", (String) null).when(iArtifactInfo2).getArtifactChecksum();
-      doReturn("7<\"g", "", (String) null).when(iArtifactInfo2).getArtifactDescription();
-      doReturn("7 'W{]65Y%Vh_ynFOr", "]+O?<_o+Mx?P@|^<:|/", (String) null).when(iArtifactInfo2).getArtifactName();
-      doReturn(integer0, integer3, (Integer) null).when(iArtifactInfo2).getArtifactTimeout();
-      doReturn("]+O?<_o+Mx?P@|^<:|/", "", (String) null).when(iArtifactInfo2).getArtifactType();
-      doReturn("i]\r7Wr. <gStwjW", "Ns3ZUZX(", (String) null).when(iArtifactInfo2).getArtifactURL();
-      doReturn("7 'W{]65Y%Vh_ynFOr", "7<\"g", (String) null).when(iArtifactInfo2).getArtifactUUID();
-      doReturn("7 'W{]65Y%Vh_ynFOr", "YuS7'", (String) null).when(iArtifactInfo2).getArtifactVersion();
-      doReturn(iArtifactInfo1, (IArtifactInfo) null, (IArtifactInfo) null).when(iArtifactInfo2).getGeneratedArtifact();
-      doReturn(linkedList2, linkedList2, linkedList3, linkedList3, (List) null).when(iArtifactInfo2).getRelatedArtifacts();
-      linkedList1.add(iArtifactInfo2);
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("~1xF'ZQr|qhuc{").when(iNotificationData0).getDistributionID();
-      doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
-      doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
-      doReturn("").when(iNotificationData0).getServiceDescription();
-      doReturn("").when(iNotificationData0).getServiceInvariantUUID();
-      doReturn("").when(iNotificationData0).getServiceName();
-      doReturn("").when(iNotificationData0).getServiceUUID();
-      doReturn("TvEm!").when(iNotificationData0).getServiceVersion();
-      String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData1).getDistributionID();
-      doReturn(linkedList0, linkedList0).when(iNotificationData1).getResources();
-      doReturn(linkedList1).when(iNotificationData1).getServiceArtifacts();
-      doReturn("").when(iNotificationData1).getServiceDescription();
-      doReturn("Tz)|, ,").when(iNotificationData1).getServiceInvariantUUID();
-      doReturn("").when(iNotificationData1).getServiceName();
-      doReturn("").when(iNotificationData1).getServiceUUID();
-      doReturn("Tz)|, ,").when(iNotificationData1).getServiceVersion();
-      String string1 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
-      assertFalse(string1.equals((Object)string0));
-  }
+    @Test(timeout = 4000)
+    public void test00()  throws Throwable  {
+        LinkedList<IVfModuleData> linkedList0 = new LinkedList<IVfModuleData>();
+        VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+        vfModuleMetaData0.setAttribute("vfModuleModelInvariantUUID", vfModuleMetaData0);
+        linkedList0.add((IVfModuleData) vfModuleMetaData0);
+        // Undeclared exception!
+        try {
+            ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+            fail("Expecting exception: ClassCastException");
+
+        } catch(ClassCastException e) {
+            //
+            // org.openecomp.mso.asdc.installer.VfModuleMetaData cannot be cast to java.lang.String
+            //
+            verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+        }
+    }
+
+    @Test(timeout = 4000)
+    public void test01()  throws Throwable  {
+        List<IArtifactInfo> list0 = (List<IArtifactInfo>) mock(List.class, new ViolatedAssumptionAnswer());
+        doReturn(false).when(list0).isEmpty();
+        doReturn((Iterator) null).when(list0).iterator();
+        doReturn(0).when(list0).size();
+        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+        doReturn("rGQA").when(iNotificationData0).getDistributionID();
+        doReturn(list0).when(iNotificationData0).getServiceArtifacts();
+        doReturn("rGQA").when(iNotificationData0).getServiceDescription();
+        doReturn("").when(iNotificationData0).getServiceInvariantUUID();
+        doReturn("").when(iNotificationData0).getServiceName();
+        doReturn("rGQA").when(iNotificationData0).getServiceUUID();
+        doReturn("").when(iNotificationData0).getServiceVersion();
+        // Undeclared exception!
+        try {
+            ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+            fail("Expecting exception: NullPointerException");
+
+        } catch(NullPointerException e) {
+            //
+            // no message in exception (getMessage() returned null)
+            //
+            verifyException("org.openecomp.mso.asdc.util.ASDCNotificationLogging", e);
+        }
+    }
 
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      linkedList0.add(iVfModuleMetadata0);
-      LinkedList<Object> linkedList1 = new LinkedList<Object>();
-      Object object0 = new Object();
-      linkedList1.push(object0);
-      linkedList0.spliterator();
-      linkedList0.removeAll(linkedList1);
-      linkedList0.clear();
-      LinkedList<String> linkedList2 = new LinkedList<String>();
-      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn((List<String>) null, (List<String>) null, linkedList2, (List<String>) null).when(iVfModuleMetadata1).getArtifacts();
-      doReturn("e.tf%6&", "e.tf%6&", "").when(iVfModuleMetadata1).getVfModuleModelDescription();
-      doReturn("", "", "").when(iVfModuleMetadata1).getVfModuleModelInvariantUUID();
-      doReturn("", "", "e.tf%6&").when(iVfModuleMetadata1).getVfModuleModelName();
-      doReturn("VfModuleMetaData:", "e.tf%6&", "BaseArtifactInfoImpl [artifactName=").when(iVfModuleMetadata1).getVfModuleModelUUID();
-      doReturn("e.tf%6&", "e.tf%6&", "e.tf%6&").when(iVfModuleMetadata1).getVfModuleModelVersion();
-      doReturn(false, false).when(iVfModuleMetadata1).isBase();
-      linkedList0.add(iVfModuleMetadata1);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      // Undeclared exception!
-      try { 
-        ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.util.ASDCNotificationLogging", e);
-      }
-  }
+    @Test(timeout = 4000)
+    public void test02()  throws Throwable  {
+        LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
+        LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
+        linkedList0.offerFirst((IResourceInstance) null);
+        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+        doReturn("").when(iNotificationData0).getDistributionID();
+        doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
+        doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
+        doReturn("").when(iNotificationData0).getServiceDescription();
+        doReturn("]U5JAkfdX0Cs").when(iNotificationData0).getServiceInvariantUUID();
+        doReturn("jV13a").when(iNotificationData0).getServiceName();
+        doReturn("").when(iNotificationData0).getServiceUUID();
+        doReturn("jV13a").when(iNotificationData0).getServiceVersion();
+        String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+        assertEquals("ASDC Notification:\nDistributionID:\nServiceName:jV13a\nServiceVersion:jV13a\nServiceUUID:\nServiceInvariantUUID:]U5JAkfdX0Cs\nServiceDescription:\nService Artifacts List:\nNULL\nResource Instances List:\n{\nNULL\n\n}\n\n", string0);
+    }
 
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-      ASDCNotificationLogging aSDCNotificationLogging1 = new ASDCNotificationLogging();
-      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn((List<String>) null, (List<String>) null).when(iVfModuleMetadata0).getArtifacts();
-      doReturn("TTq", (String) null).when(iVfModuleMetadata0).getVfModuleModelDescription();
-      doReturn("", (String) null).when(iVfModuleMetadata0).getVfModuleModelInvariantUUID();
-      doReturn("w1e~\"rjNBjuq*0HB!3&", (String) null).when(iVfModuleMetadata0).getVfModuleModelName();
-      doReturn("+l", (String) null).when(iVfModuleMetadata0).getVfModuleModelUUID();
-      doReturn("]", (String) null).when(iVfModuleMetadata0).getVfModuleModelVersion();
-      doReturn(true, false).when(iVfModuleMetadata0).isBase();
-      linkedList0.add(iVfModuleMetadata0);
-      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      linkedList0.removeFirstOccurrence(aSDCNotificationLogging1);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      assertEquals("{\nVfModuleMetaData:\nVfModuleModelName:NULL\nVfModuleModelVersion:NULL\nVfModuleModelUUID:NULL\nVfModuleModelInvariantUUID:NULL\nVfModuleModelDescription:NULL\nArtifacts UUID List:NULL\nisBase:false\n\n\n}\n", string0);
-  }
+    @Test(timeout = 4000)
+    public void test03()  throws Throwable  {
+        LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
+        LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
+        IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
+        doReturn((List) null).when(iResourceInstance0).getArtifacts();
+        doReturn((String) null).when(iResourceInstance0).getCategory();
+        doReturn((String) null).when(iResourceInstance0).getResourceCustomizationUUID();
+        doReturn((String) null).when(iResourceInstance0).getResourceInstanceName();
+        doReturn((String) null).when(iResourceInstance0).getResourceInvariantUUID();
+        doReturn((String) null).when(iResourceInstance0).getResourceName();
+        doReturn((String) null).when(iResourceInstance0).getResourceType();
+        doReturn((String) null).when(iResourceInstance0).getResourceUUID();
+        doReturn((String) null).when(iResourceInstance0).getResourceVersion();
+        doReturn((String) null).when(iResourceInstance0).getSubcategory();
+        linkedList0.add(iResourceInstance0);
+        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+        doReturn("").when(iNotificationData0).getDistributionID();
+        doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
+        doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
+        doReturn("").when(iNotificationData0).getServiceDescription();
+        doReturn("").when(iNotificationData0).getServiceInvariantUUID();
+        doReturn("36-s.n1@").when(iNotificationData0).getServiceName();
+        doReturn("36-s.n1@").when(iNotificationData0).getServiceUUID();
+        doReturn("").when(iNotificationData0).getServiceVersion();
+        String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+        assertEquals("ASDC Notification:\nDistributionID:\nServiceName:36-s.n1@\nServiceVersion:\nServiceUUID:36-s.n1@\nServiceInvariantUUID:\nServiceDescription:\nService Artifacts List:\nNULL\nResource Instances List:\n{\nResource Instance Info:\nResourceInstanceName:NULL\nResourceCustomizationUUID:NULL\nResourceInvariantUUID:NULL\nResourceName:NULL\nResourceType:NULL\nResourceUUID:NULL\nResourceVersion:NULL\nCategory:NULL\nSubCategory:NULL\nResource Artifacts List:\nNULL\n\n\n}\n\n", string0);
+    }
 
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      List<IResourceInstance> list0 = (List<IResourceInstance>) mock(List.class, new ViolatedAssumptionAnswer());
-      List<IArtifactInfo> list1 = (List<IArtifactInfo>) mock(List.class, new ViolatedAssumptionAnswer());
-      doReturn(false).when(list1).isEmpty();
-      doReturn((Iterator) null).when(list1).iterator();
-      doReturn(0).when(list1).size();
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData0).getDistributionID();
-      doReturn(list1).when(iNotificationData0).getServiceArtifacts();
-      doReturn("9").when(iNotificationData0).getServiceDescription();
-      doReturn("9").when(iNotificationData0).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceName();
-      doReturn("Type not recognized").when(iNotificationData0).getServiceUUID();
-      doReturn("").when(iNotificationData0).getServiceVersion();
-      // Undeclared exception!
-      try { 
-        ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.asdc.util.ASDCNotificationLogging", e);
-      }
-  }
+    @Test(timeout = 4000)
+    public void test04()  throws Throwable  {
+        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+        doReturn((String) null).when(iNotificationData0).getDistributionID();
+        doReturn((List) null).when(iNotificationData0).getResources();
+        doReturn((List) null).when(iNotificationData0).getServiceArtifacts();
+        doReturn((String) null).when(iNotificationData0).getServiceDescription();
+        doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
+        doReturn((String) null).when(iNotificationData0).getServiceName();
+        doReturn((String) null).when(iNotificationData0).getServiceUUID();
+        doReturn((String) null).when(iNotificationData0).getServiceVersion();
+        String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+        assertEquals("ASDC Notification:\nDistributionID:NULL\nServiceName:NULL\nServiceVersion:NULL\nServiceUUID:NULL\nServiceInvariantUUID:NULL\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n", string0);
+    }
 
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("(ICU8j3G)Z4Z[GAE").when(iNotificationData0).getDistributionID();
-      doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
-      doReturn((List<IArtifactInfo>) null).when(iNotificationData0).getServiceArtifacts();
-      doReturn(")&42fB6dZT&HRAb1a").when(iNotificationData0).getServiceDescription();
-      doReturn("(ICU8j3G)Z4Z[GAE").when(iNotificationData0).getServiceInvariantUUID();
-      doReturn(")&42fB6dZT&HRAb1a").when(iNotificationData0).getServiceName();
-      doReturn(")&42fB6dZT&HRAb1a").when(iNotificationData0).getServiceUUID();
-      doReturn("cHH N9Ha9YUPSpX00i").when(iNotificationData0).getServiceVersion();
-      String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      assertEquals("ASDC Notification:\nDistributionID:(ICU8j3G)Z4Z[GAE\nServiceName:)&42fB6dZT&HRAb1a\nServiceVersion:cHH N9Ha9YUPSpX00i\nServiceUUID:)&42fB6dZT&HRAb1a\nServiceInvariantUUID:(ICU8j3G)Z4Z[GAE\nServiceDescription:)&42fB6dZT&HRAb1a\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n", string0);
-  }
+    @Test(timeout = 4000)
+    public void test05()  throws Throwable  {
+        LinkedList<IVfModuleData> linkedList0 = new LinkedList<IVfModuleData>();
+        VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+        Map<String, String> map0 = vfModuleMetaData0.getProperties();
+        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
+        doReturn((List<String>) null, (List<String>) null).when(iVfModuleData0).getArtifacts();
+        doReturn(map0, map0, (Map<String, String>) null).when(iVfModuleData0).getProperties();
+        doReturn("vfModuleModelUUID", "isBase:").when(iVfModuleData0).getVfModuleModelDescription();
+        doReturn((String) null, "vfModuleModelName").when(iVfModuleData0).getVfModuleModelInvariantUUID();
+        doReturn("", "").when(iVfModuleData0).getVfModuleModelName();
+        doReturn("vfModuleModelUUID", "isBase:").when(iVfModuleData0).getVfModuleModelUUID();
+        doReturn("|:\\KD91", "vfModuleModelName").when(iVfModuleData0).getVfModuleModelVersion();
+        doReturn(false, false).when(iVfModuleData0).isBase();
+        linkedList0.add(iVfModuleData0);
+        String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+        assertEquals("VfModuleMetaData List:\n{\nVfModuleMetaData:\nVfModuleModelName:\nVfModuleModelVersion:|:\\KD91\nVfModuleModelUUID:vfModuleModelUUID\nVfModuleModelInvariantUUID:NULL\nVfModuleModelDescription:vfModuleModelUUID\nArtifacts UUID List:NULLProperties List:\n}\n\nisBase:false\n\n\n}\n", string0);
 
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
-      assertEquals(0, linkedList0.size());
-      
-      LinkedList<String> linkedList1 = new LinkedList<String>();
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn(linkedList1, linkedList1).when(iVfModuleMetadata0).getArtifacts();
-      doReturn(", artifactTimeout=").when(iVfModuleMetadata0).getVfModuleModelDescription();
-      doReturn(", artifactChecksum=").when(iVfModuleMetadata0).getVfModuleModelInvariantUUID();
-      doReturn(", artifactTimeout=").when(iVfModuleMetadata0).getVfModuleModelName();
-      doReturn(", artifactTimeout=").when(iVfModuleMetadata0).getVfModuleModelUUID();
-      doReturn(", artifactTimeout=").when(iVfModuleMetadata0).getVfModuleModelVersion();
-      doReturn(false).when(iVfModuleMetadata0).isBase();
-      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      linkedList0.add(iVfModuleMetadata1);
-      linkedList1.push("dzjz-zmMzFE");
-      linkedList0.listIterator();
-      linkedList0.toArray();
-      linkedList0.add(iVfModuleMetadata0);
-      linkedList0.pollFirst();
-      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      assertEquals("{\nVfModuleMetaData:\nVfModuleModelName:, artifactTimeout=\nVfModuleModelVersion:, artifactTimeout=\nVfModuleModelUUID:, artifactTimeout=\nVfModuleModelInvariantUUID:, artifactChecksum=\nVfModuleModelDescription:, artifactTimeout=\nArtifacts UUID List:{\ndzjz-zmMzFE\n\n}\n\nisBase:false\n\n\n}\n", string0);
-      
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-      LinkedList<IResourceInstance> linkedList2 = new LinkedList<IResourceInstance>();
-      LinkedList<IResourceInstance> linkedList3 = new LinkedList<IResourceInstance>((Collection<? extends IResourceInstance>) linkedList2);
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData0).getDistributionID();
-      doReturn((List) null).when(iNotificationData0).getResources();
-      doReturn((List) null).when(iNotificationData0).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData0).getServiceDescription();
-      doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceName();
-      doReturn((String) null).when(iNotificationData0).getServiceUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceVersion();
-      String string1 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      assertEquals("ASDC Notification:\nDistributionID:NULL\nServiceName:NULL\nServiceVersion:NULL\nServiceUUID:NULL\nServiceInvariantUUID:NULL\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n", string1);
-  }
+        String string1 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+        assertEquals("VfModuleMetaData List:\n{\nVfModuleMetaData:\nVfModuleModelName:\nVfModuleModelVersion:vfModuleModelName\nVfModuleModelUUID:isBase:\nVfModuleModelInvariantUUID:vfModuleModelName\nVfModuleModelDescription:isBase:\nArtifacts UUID List:NULLNULL\nisBase:false\n\n\n}\n", string1);
+    }
 
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData0).getDistributionID();
-      doReturn((List) null).when(iNotificationData0).getResources();
-      doReturn((List) null).when(iNotificationData0).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData0).getServiceDescription();
-      doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceName();
-      doReturn((String) null).when(iNotificationData0).getServiceUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
-      List<IVfModuleMetadata> list0 = linkedList0.subList(0, 0);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      linkedList0.removeAll(list0);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      Comparator<Object> comparator0 = (Comparator<Object>) mock(Comparator.class, new ViolatedAssumptionAnswer());
-      linkedList0.sort(comparator0);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      linkedList0.offerLast(iVfModuleMetadata0);
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData1).getDistributionID();
-      doReturn((List) null).when(iNotificationData1).getResources();
-      doReturn((List) null).when(iNotificationData1).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData1).getServiceDescription();
-      doReturn((String) null).when(iNotificationData1).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData1).getServiceName();
-      doReturn((String) null).when(iNotificationData1).getServiceUUID();
-      doReturn((String) null).when(iNotificationData1).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
-      // Undeclared exception!
-      try { 
-        ASDCNotificationLogging.dumpVfModuleMetaDataList(list0);
-        fail("Expecting exception: ConcurrentModificationException");
-      
-      } catch(ConcurrentModificationException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("java.util.SubList", e);
-      }
-  }
+    @Test(timeout = 4000)
+    public void test06()  throws Throwable  {
+        LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
+        LinkedList<IVfModuleData> linkedList1 = new LinkedList<IVfModuleData>();
+        IVfModuleData iVfModuleData0 = mock(IVfModuleData.class, new ViolatedAssumptionAnswer());
+        doReturn((List) null, (List) null).when(iVfModuleData0).getArtifacts();
+        doReturn((Map) null, (Map) null).when(iVfModuleData0).getProperties();
+        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelDescription();
+        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelInvariantUUID();
+        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelName();
+        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelUUID();
+        doReturn((String) null, (String) null).when(iVfModuleData0).getVfModuleModelVersion();
+        doReturn(false, false).when(iVfModuleData0).isBase();
+        linkedList1.add(iVfModuleData0);
+        String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList1);
+        String string1 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList1);
+        assertTrue(string1.equals((Object)string0));
+        assertEquals("VfModuleMetaData List:\n{\nVfModuleMetaData:\nVfModuleModelName:NULL\nVfModuleModelVersion:NULL\nVfModuleModelUUID:NULL\nVfModuleModelInvariantUUID:NULL\nVfModuleModelDescription:NULL\nArtifacts UUID List:NULLNULL\nisBase:false\n\n\n}\n", string1);
+    }
 
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-      ASDCNotificationLogging aSDCNotificationLogging1 = new ASDCNotificationLogging();
-      LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
-      LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("ResourceInstanceName:").when(iNotificationData0).getDistributionID();
-      doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
-      doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
-      doReturn("ResourceInstanceName:").when(iNotificationData0).getServiceDescription();
-      doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
-      doReturn("ResourceInstanceName:").when(iNotificationData0).getServiceName();
-      doReturn("pr26M0Ud8~n6#j/;g").when(iNotificationData0).getServiceUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      ASDCNotificationLogging aSDCNotificationLogging2 = new ASDCNotificationLogging();
-      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("ResourceInstanceName:").when(iNotificationData1).getDistributionID();
-      doReturn(linkedList0, linkedList0).when(iNotificationData1).getResources();
-      doReturn(linkedList1).when(iNotificationData1).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData1).getServiceDescription();
-      doReturn("").when(iNotificationData1).getServiceInvariantUUID();
-      doReturn("pr26M0Ud8~n6#j/;g").when(iNotificationData1).getServiceName();
-      doReturn("").when(iNotificationData1).getServiceUUID();
-      doReturn("Resource Artifacts List:").when(iNotificationData1).getServiceVersion();
-      String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
-      assertEquals("ASDC Notification:\nDistributionID:ResourceInstanceName:\nServiceName:pr26M0Ud8~n6#j/;g\nServiceVersion:Resource Artifacts List:\nServiceUUID:\nServiceInvariantUUID:\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n", string0);
-      
-      ASDCNotificationLogging aSDCNotificationLogging3 = new ASDCNotificationLogging();
-      LinkedList<IVfModuleMetadata> linkedList2 = new LinkedList<IVfModuleMetadata>();
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList2);
-      LinkedList<IResourceInstance> linkedList3 = new LinkedList<IResourceInstance>();
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactChecksum();
-      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactDescription();
-      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactName();
-      doReturn((Integer) null, (Integer) null, (Integer) null).when(iArtifactInfo0).getArtifactTimeout();
-      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactType();
-      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactURL();
-      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactUUID();
-      doReturn((String) null, (String) null, (String) null).when(iArtifactInfo0).getArtifactVersion();
-      doReturn((IArtifactInfo) null, (IArtifactInfo) null, (IArtifactInfo) null).when(iArtifactInfo0).getGeneratedArtifact();
-      doReturn((List) null, (List) null, (List) null).when(iArtifactInfo0).getRelatedArtifacts();
-      linkedList1.add(iArtifactInfo0);
-      INotificationData iNotificationData2 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("tlh7ku").when(iNotificationData2).getDistributionID();
-      doReturn(linkedList3, linkedList0).when(iNotificationData2).getResources();
-      doReturn(linkedList1).when(iNotificationData2).getServiceArtifacts();
-      doReturn("").when(iNotificationData2).getServiceDescription();
-      doReturn("").when(iNotificationData2).getServiceInvariantUUID();
-      doReturn("tlh7ku").when(iNotificationData2).getServiceName();
-      doReturn("_B4BTx//Er%IWM}et0").when(iNotificationData2).getServiceUUID();
-      doReturn("").when(iNotificationData2).getServiceVersion();
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      doReturn(linkedList1).when(iResourceInstance0).getArtifacts();
-      doReturn("").when(iResourceInstance0).getResourceInstanceName();
-      doReturn("Resource Artifacts List:").when(iResourceInstance0).getResourceInvariantUUID();
-      doReturn("Hq^8Xl<>T").when(iResourceInstance0).getResourceName();
-      doReturn((String) null).when(iResourceInstance0).getResourceType();
-      doReturn("ASDC Notification:\nDistributionID:ResourceInstanceName:\nServiceName:ResourceInstanceName:\nServiceVersion:NULL\nServiceUUID:pr26M0Ud8~n6#j/;g\nServiceInvariantUUID:NULL\nServiceDescription:ResourceInstanceName:\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n").when(iResourceInstance0).getResourceUUID();
-      doReturn("zIQ?4(U$K ").when(iResourceInstance0).getResourceVersion();
-      linkedList0.add(iResourceInstance0);
-      IResourceInstance iResourceInstance1 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      doReturn(linkedList1).when(iResourceInstance1).getArtifacts();
-      doReturn("ASDC Notification:\nDistributionID:ResourceInstanceName:\nServiceName:pr26M0Ud8~n6#j/;g\nServiceVersion:Resource Artifacts List:\nServiceUUID:\nServiceInvariantUUID:\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n").when(iResourceInstance1).getResourceInstanceName();
-      doReturn("5yNU;|<:T-ixwLB").when(iResourceInstance1).getResourceInvariantUUID();
-      doReturn("").when(iResourceInstance1).getResourceName();
-      doReturn("xguM[yK-\"").when(iResourceInstance1).getResourceType();
-      doReturn("").when(iResourceInstance1).getResourceUUID();
-      doReturn("ASDC Notification:\nDistributionID:ResourceInstanceName:\nServiceName:pr26M0Ud8~n6#j/;g\nServiceVersion:Resource Artifacts List:\nServiceUUID:\nServiceInvariantUUID:\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n").when(iResourceInstance1).getResourceVersion();
-      linkedList1.removeFirstOccurrence((Object) null);
-      linkedList0.add(iResourceInstance1);
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData2);
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      String string1 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList2);
-      assertEquals("\n}\n", string1);
-  }
+    @Test(timeout = 4000)
+    public void test07()  throws Throwable  {
+        LinkedList<IVfModuleData> linkedList0 = new LinkedList<IVfModuleData>();
+        VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+        linkedList0.add((IVfModuleData) vfModuleMetaData0);
+        UnaryOperator<IVfModuleData> unaryOperator0 = (UnaryOperator<IVfModuleData>) mock(UnaryOperator.class, new ViolatedAssumptionAnswer());
+        doReturn((Object) null).when(unaryOperator0).apply(any());
+        linkedList0.replaceAll(unaryOperator0);
+        String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+        assertEquals("VfModuleMetaData List:\n{\nNULL\n\n}\n", string0);
+    }
 
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData0).getDistributionID();
-      doReturn((List) null).when(iNotificationData0).getResources();
-      doReturn((List) null).when(iNotificationData0).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData0).getServiceDescription();
-      doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceName();
-      doReturn((String) null).when(iNotificationData0).getServiceUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData1).getDistributionID();
-      doReturn((List) null).when(iNotificationData1).getResources();
-      doReturn((List) null).when(iNotificationData1).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData1).getServiceDescription();
-      doReturn((String) null).when(iNotificationData1).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData1).getServiceName();
-      doReturn((String) null).when(iNotificationData1).getServiceUUID();
-      doReturn((String) null).when(iNotificationData1).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-      INotificationData iNotificationData2 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData2).getDistributionID();
-      doReturn((List) null).when(iNotificationData2).getResources();
-      doReturn((List) null).when(iNotificationData2).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData2).getServiceDescription();
-      doReturn((String) null).when(iNotificationData2).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData2).getServiceName();
-      doReturn((String) null).when(iNotificationData2).getServiceUUID();
-      doReturn((String) null).when(iNotificationData2).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData2);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      INotificationData iNotificationData3 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData3).getDistributionID();
-      doReturn((List) null).when(iNotificationData3).getResources();
-      doReturn((List) null).when(iNotificationData3).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData3).getServiceDescription();
-      doReturn((String) null).when(iNotificationData3).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData3).getServiceName();
-      doReturn((String) null).when(iNotificationData3).getServiceUUID();
-      doReturn((String) null).when(iNotificationData3).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData3);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      INotificationData iNotificationData4 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData4).getDistributionID();
-      doReturn((List) null).when(iNotificationData4).getResources();
-      doReturn((List) null).when(iNotificationData4).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData4).getServiceDescription();
-      doReturn((String) null).when(iNotificationData4).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData4).getServiceName();
-      doReturn((String) null).when(iNotificationData4).getServiceUUID();
-      doReturn((String) null).when(iNotificationData4).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData4);
-      INotificationData iNotificationData5 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData5).getDistributionID();
-      doReturn((List) null).when(iNotificationData5).getResources();
-      doReturn((List) null).when(iNotificationData5).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData5).getServiceDescription();
-      doReturn((String) null).when(iNotificationData5).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData5).getServiceName();
-      doReturn((String) null).when(iNotificationData5).getServiceUUID();
-      doReturn((String) null).when(iNotificationData5).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData5);
-      INotificationData iNotificationData6 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData6).getDistributionID();
-      doReturn((List) null).when(iNotificationData6).getResources();
-      doReturn((List) null).when(iNotificationData6).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData6).getServiceDescription();
-      doReturn((String) null).when(iNotificationData6).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData6).getServiceName();
-      doReturn((String) null).when(iNotificationData6).getServiceUUID();
-      doReturn((String) null).when(iNotificationData6).getServiceVersion();
-      String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData6);
-      assertEquals("ASDC Notification:\nDistributionID:NULL\nServiceName:NULL\nServiceVersion:NULL\nServiceUUID:NULL\nServiceInvariantUUID:NULL\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n", string0);
-      
-      ASDCNotificationLogging.dumpASDCNotification((INotificationData) null);
-      String string1 = ASDCNotificationLogging.dumpASDCNotification((INotificationData) null);
-      assertEquals("NULL", string1);
-  }
+    @Test(timeout = 4000)
+    public void test08()  throws Throwable  {
+        LinkedList<IVfModuleData> linkedList0 = new LinkedList<IVfModuleData>();
+        VfModuleMetaData vfModuleMetaData0 = new VfModuleMetaData();
+        linkedList0.add((IVfModuleData) vfModuleMetaData0);
+        // Undeclared exception!
+        try {
+            ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
+            fail("Expecting exception: NullPointerException");
 
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      LinkedList<IArtifactInfo> linkedList0 = new LinkedList<IArtifactInfo>();
-      IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iArtifactInfo0).getArtifactChecksum();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactDescription();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactName();
-      doReturn((Integer) null).when(iArtifactInfo0).getArtifactTimeout();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactType();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactURL();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
-      doReturn((String) null).when(iArtifactInfo0).getArtifactVersion();
-      doReturn((IArtifactInfo) null).when(iArtifactInfo0).getGeneratedArtifact();
-      doReturn((List) null).when(iArtifactInfo0).getRelatedArtifacts();
-      linkedList0.add(iArtifactInfo0);
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData0).getDistributionID();
-      doReturn((List<IResourceInstance>) null).when(iNotificationData0).getResources();
-      doReturn(linkedList0).when(iNotificationData0).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData0).getServiceDescription();
-      doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceName();
-      doReturn((String) null).when(iNotificationData0).getServiceUUID();
-      doReturn("(").when(iNotificationData0).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      assertNull(string0);
-  }
+        } catch(NullPointerException e) {
+            //
+            // no message in exception (getMessage() returned null)
+            //
+            verifyException("org.openecomp.mso.asdc.installer.VfModuleMetaData", e);
+        }
+    }
 
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
-      LinkedList<IVfModuleMetadata> linkedList1 = new LinkedList<IVfModuleMetadata>();
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      linkedList1.add(iVfModuleMetadata0);
-      LinkedList<String> linkedList2 = new LinkedList<String>();
-      LinkedList<String> linkedList3 = new LinkedList<String>();
-      linkedList1.removeFirst();
-      linkedList0.addAll((Collection<? extends IVfModuleMetadata>) linkedList1);
-      LinkedList<String> linkedList4 = new LinkedList<String>();
-      LinkedList<String> linkedList5 = new LinkedList<String>();
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      LinkedList<IResourceInstance> linkedList6 = new LinkedList<IResourceInstance>();
-      LinkedList<IArtifactInfo> linkedList7 = new LinkedList<IArtifactInfo>();
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("]=ztki(=]").when(iNotificationData0).getDistributionID();
-      doReturn(linkedList6, linkedList6).when(iNotificationData0).getResources();
-      doReturn(linkedList7).when(iNotificationData0).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData0).getServiceDescription();
-      doReturn("").when(iNotificationData0).getServiceInvariantUUID();
-      doReturn("").when(iNotificationData0).getServiceName();
-      doReturn("VG).").when(iNotificationData0).getServiceUUID();
-      doReturn("").when(iNotificationData0).getServiceVersion();
-      linkedList0.spliterator();
-      linkedList0.containsAll(linkedList1);
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      LinkedList<IResourceInstance> linkedList8 = new LinkedList<IResourceInstance>();
-      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("C'K").when(iNotificationData1).getDistributionID();
-      doReturn(linkedList6, linkedList8).when(iNotificationData1).getResources();
-      doReturn(linkedList7).when(iNotificationData1).getServiceArtifacts();
-      doReturn("NotificationDataImpl [distributionID=").when(iNotificationData1).getServiceDescription();
-      doReturn((String) null).when(iNotificationData1).getServiceInvariantUUID();
-      doReturn("B.").when(iNotificationData1).getServiceName();
-      doReturn("").when(iNotificationData1).getServiceUUID();
-      doReturn("").when(iNotificationData1).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-  }
+    @Test(timeout = 4000)
+    public void test09()  throws Throwable  {
+        String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleData>) null);
+        assertNull(string0);
+    }
 
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      linkedList0.add(iVfModuleMetadata0);
-      linkedList0.add((IVfModuleMetadata) null);
-      LinkedList<String> linkedList1 = new LinkedList<String>();
-      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn(linkedList1, linkedList1, linkedList1, linkedList1).when(iVfModuleMetadata1).getArtifacts();
-      doReturn("8u1XbrrMy{J2", "").when(iVfModuleMetadata1).getVfModuleModelDescription();
-      doReturn("YR/UZ7qrmvO", "8u1XbrrMy{J2").when(iVfModuleMetadata1).getVfModuleModelInvariantUUID();
-      doReturn("8u1XbrrMy{J2", ".l=(8f`8f}.9>yn").when(iVfModuleMetadata1).getVfModuleModelName();
-      doReturn("", "YR/UZ7qrmvO").when(iVfModuleMetadata1).getVfModuleModelUUID();
-      doReturn("[66/OPYLD.B%", ".l=(8f`8f}.9>yn").when(iVfModuleMetadata1).getVfModuleModelVersion();
-      doReturn(false, true).when(iVfModuleMetadata1).isBase();
-      LinkedList<IVfModuleMetadata> linkedList2 = new LinkedList<IVfModuleMetadata>();
-      linkedList2.add((IVfModuleMetadata) null);
-      linkedList2.offer((IVfModuleMetadata) null);
-      Predicate<IVfModuleMetadata> predicate0 = (Predicate<IVfModuleMetadata>) mock(Predicate.class, new ViolatedAssumptionAnswer());
-      doReturn(true, false).when(predicate0).test(any());
-      linkedList2.removeIf(predicate0);
-      linkedList0.retainAll(linkedList2);
-      LinkedList<String> linkedList3 = new LinkedList<String>();
-      IVfModuleMetadata iVfModuleMetadata2 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn(linkedList3, linkedList3, linkedList3, linkedList1).when(iVfModuleMetadata2).getArtifacts();
-      doReturn("YR/UZ7qrmvO", "8u1XbrrMy{J2").when(iVfModuleMetadata2).getVfModuleModelDescription();
-      doReturn("", "8u1XbrrMy{J2").when(iVfModuleMetadata2).getVfModuleModelInvariantUUID();
-      doReturn("[66/OPYLD.B%", "").when(iVfModuleMetadata2).getVfModuleModelName();
-      doReturn("", "[66/OPYLD.B%").when(iVfModuleMetadata2).getVfModuleModelUUID();
-      doReturn((String) null, "").when(iVfModuleMetadata2).getVfModuleModelVersion();
-      doReturn(true, false).when(iVfModuleMetadata2).isBase();
-      linkedList0.add(iVfModuleMetadata2);
-      linkedList0.push(iVfModuleMetadata1);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-      ASDCNotificationLogging aSDCNotificationLogging1 = new ASDCNotificationLogging();
-      ASDCNotificationLogging aSDCNotificationLogging2 = new ASDCNotificationLogging();
-      ASDCNotificationLogging aSDCNotificationLogging3 = new ASDCNotificationLogging();
-      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      assertEquals("{\nVfModuleMetaData:\nVfModuleModelName:.l=(8f`8f}.9>yn\nVfModuleModelVersion:.l=(8f`8f}.9>yn\nVfModuleModelUUID:YR/UZ7qrmvO\nVfModuleModelInvariantUUID:8u1XbrrMy{J2\nVfModuleModelDescription:\nArtifacts UUID List:\n}\n\nisBase:true\n\n,\nNULL\n,\nVfModuleMetaData:\nVfModuleModelName:\nVfModuleModelVersion:\nVfModuleModelUUID:[66/OPYLD.B%\nVfModuleModelInvariantUUID:8u1XbrrMy{J2\nVfModuleModelDescription:8u1XbrrMy{J2\nArtifacts UUID List:\n}\n\nisBase:false\n\n\n}\n", string0);
-      
-      LinkedList<IResourceInstance> linkedList4 = new LinkedList<IResourceInstance>();
-      LinkedList<IResourceInstance> linkedList5 = new LinkedList<IResourceInstance>((Collection<? extends IResourceInstance>) linkedList4);
-      LinkedList<IArtifactInfo> linkedList6 = new LinkedList<IArtifactInfo>();
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("95y$c-.BW5V()41WR").when(iNotificationData0).getDistributionID();
-      doReturn(linkedList5, linkedList4).when(iNotificationData0).getResources();
-      doReturn(linkedList6).when(iNotificationData0).getServiceArtifacts();
-      doReturn(", artifactTimeout=").when(iNotificationData0).getServiceDescription();
-      doReturn("[66/OPYLD.B%").when(iNotificationData0).getServiceInvariantUUID();
-      doReturn("[66/OPYLD.B%").when(iNotificationData0).getServiceName();
-      doReturn(", artifactChecksum=").when(iNotificationData0).getServiceUUID();
-      doReturn("W1vX^KnIx[x").when(iNotificationData0).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      ASDCNotificationLogging aSDCNotificationLogging4 = new ASDCNotificationLogging();
-      ASDCNotificationLogging aSDCNotificationLogging5 = new ASDCNotificationLogging();
-      LinkedList<IResourceInstance> linkedList7 = new LinkedList<IResourceInstance>();
-      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("").when(iNotificationData1).getDistributionID();
-      doReturn(linkedList4, linkedList7).when(iNotificationData1).getResources();
-      doReturn(linkedList6).when(iNotificationData1).getServiceArtifacts();
-      doReturn("3l\"ZrTP`IQ-4x]").when(iNotificationData1).getServiceDescription();
-      doReturn("").when(iNotificationData1).getServiceInvariantUUID();
-      doReturn("").when(iNotificationData1).getServiceName();
-      doReturn("").when(iNotificationData1).getServiceUUID();
-      doReturn("").when(iNotificationData1).getServiceVersion();
-      String string1 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
-      assertEquals("ASDC Notification:\nDistributionID:\nServiceName:\nServiceVersion:\nServiceUUID:\nServiceInvariantUUID:\nServiceDescription:3l\"ZrTP`IQ-4x]\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n", string1);
-  }
+    @Test(timeout = 4000)
+    public void test10()  throws Throwable  {
+        String string0 = ASDCNotificationLogging.dumpASDCNotification((INotificationData) null);
+        assertEquals("NULL", string0);
+    }
 
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData0).getDistributionID();
-      doReturn((List) null).when(iNotificationData0).getResources();
-      doReturn((List) null).when(iNotificationData0).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData0).getServiceDescription();
-      doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceName();
-      doReturn((String) null).when(iNotificationData0).getServiceUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData1).getDistributionID();
-      doReturn((List) null).when(iNotificationData1).getResources();
-      doReturn((List) null).when(iNotificationData1).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData1).getServiceDescription();
-      doReturn((String) null).when(iNotificationData1).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData1).getServiceName();
-      doReturn((String) null).when(iNotificationData1).getServiceUUID();
-      doReturn((String) null).when(iNotificationData1).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-      INotificationData iNotificationData2 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData2).getDistributionID();
-      doReturn((List) null).when(iNotificationData2).getResources();
-      doReturn((List) null).when(iNotificationData2).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData2).getServiceDescription();
-      doReturn((String) null).when(iNotificationData2).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData2).getServiceName();
-      doReturn((String) null).when(iNotificationData2).getServiceUUID();
-      doReturn((String) null).when(iNotificationData2).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData2);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      ASDCNotificationLogging aSDCNotificationLogging1 = new ASDCNotificationLogging();
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      INotificationData iNotificationData3 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData3).getDistributionID();
-      doReturn((List) null).when(iNotificationData3).getResources();
-      doReturn((List) null).when(iNotificationData3).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData3).getServiceDescription();
-      doReturn((String) null).when(iNotificationData3).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData3).getServiceName();
-      doReturn((String) null).when(iNotificationData3).getServiceUUID();
-      doReturn((String) null).when(iNotificationData3).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData3);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      ASDCNotificationLogging aSDCNotificationLogging2 = new ASDCNotificationLogging();
-      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null, (List) null, (List) null).when(iVfModuleMetadata0).getArtifacts();
-      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelDescription();
-      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelInvariantUUID();
-      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelName();
-      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelUUID();
-      doReturn((String) null, (String) null, (String) null).when(iVfModuleMetadata0).getVfModuleModelVersion();
-      doReturn(false, false, false).when(iVfModuleMetadata0).isBase();
-      linkedList0.add(iVfModuleMetadata0);
-      linkedList0.removeLastOccurrence("ASDC Notification:\nDistributionID:NULL\nServiceName:NULL\nServiceVersion:NULL\nServiceUUID:NULL\nServiceInvariantUUID:NULL\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\n\n}\n\n");
-      linkedList0.remove((Object) null);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      ASDCNotificationLogging aSDCNotificationLogging3 = new ASDCNotificationLogging();
-      String string0 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      String string1 = ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      assertEquals("{\nVfModuleMetaData:\nVfModuleModelName:NULL\nVfModuleModelVersion:NULL\nVfModuleModelUUID:NULL\nVfModuleModelInvariantUUID:NULL\nVfModuleModelDescription:NULL\nArtifacts UUID List:NULL\nisBase:false\n\n\n}\n", string1);
-      assertTrue(string1.equals((Object)string0));
-      
-      ASDCNotificationLogging aSDCNotificationLogging4 = new ASDCNotificationLogging();
-      ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleMetadata>) null);
-      INotificationData iNotificationData4 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn((String) null).when(iNotificationData4).getDistributionID();
-      doReturn((List) null).when(iNotificationData4).getResources();
-      doReturn((List) null).when(iNotificationData4).getServiceArtifacts();
-      doReturn((String) null).when(iNotificationData4).getServiceDescription();
-      doReturn((String) null).when(iNotificationData4).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData4).getServiceName();
-      doReturn((String) null).when(iNotificationData4).getServiceUUID();
-      doReturn((String) null).when(iNotificationData4).getServiceVersion();
-      String string2 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData4);
-      assertEquals("ASDC Notification:\nDistributionID:NULL\nServiceName:NULL\nServiceVersion:NULL\nServiceUUID:NULL\nServiceInvariantUUID:NULL\nServiceDescription:NULL\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n", string2);
-  }
+    @Test(timeout = 4000)
+    public void test11()  throws Throwable  {
+        LinkedList<IArtifactInfo> linkedList0 = new LinkedList<IArtifactInfo>();
+        INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+        doReturn("io7<{~.v|%").when(iNotificationData0).getDistributionID();
+        doReturn((List<IResourceInstance>) null).when(iNotificationData0).getResources();
+        doReturn(linkedList0).when(iNotificationData0).getServiceArtifacts();
+        doReturn("io7<{~.v|%").when(iNotificationData0).getServiceDescription();
+        doReturn("io7<{~.v|%").when(iNotificationData0).getServiceInvariantUUID();
+        doReturn("io7<{~.v|%").when(iNotificationData0).getServiceName();
+        doReturn((String) null).when(iNotificationData0).getServiceUUID();
+        doReturn("io7<{~.v|%").when(iNotificationData0).getServiceVersion();
+        String string0 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
+        assertEquals("ASDC Notification:\nDistributionID:io7<{~.v|%\nServiceName:io7<{~.v|%\nServiceVersion:io7<{~.v|%\nServiceUUID:NULL\nServiceInvariantUUID:io7<{~.v|%\nServiceDescription:io7<{~.v|%\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n", string0);
 
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
-      LinkedList<IResourceInstance> linkedList0 = new LinkedList<IResourceInstance>();
-      IResourceInstance iResourceInstance0 = mock(IResourceInstance.class, new ViolatedAssumptionAnswer());
-      doReturn((List) null).when(iResourceInstance0).getArtifacts();
-      doReturn((String) null).when(iResourceInstance0).getResourceInstanceName();
-      doReturn((String) null).when(iResourceInstance0).getResourceInvariantUUID();
-      doReturn((String) null).when(iResourceInstance0).getResourceName();
-      doReturn((String) null).when(iResourceInstance0).getResourceType();
-      doReturn((String) null).when(iResourceInstance0).getResourceUUID();
-      doReturn((String) null).when(iResourceInstance0).getResourceVersion();
-      linkedList0.add(iResourceInstance0);
-      LinkedList<IArtifactInfo> linkedList1 = new LinkedList<IArtifactInfo>();
-      INotificationData iNotificationData0 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
-      doReturn("(n,0").when(iNotificationData0).getDistributionID();
-      doReturn(linkedList0, linkedList0).when(iNotificationData0).getResources();
-      doReturn(linkedList1).when(iNotificationData0).getServiceArtifacts();
-      doReturn("(n,0").when(iNotificationData0).getServiceDescription();
-      doReturn((String) null).when(iNotificationData0).getServiceInvariantUUID();
-      doReturn((String) null).when(iNotificationData0).getServiceName();
-      doReturn("").when(iNotificationData0).getServiceUUID();
-      doReturn("t1N;ZSJsATt:&Ug").when(iNotificationData0).getServiceVersion();
-      ASDCNotificationLogging.dumpASDCNotification(iNotificationData0);
-      LinkedList<IVfModuleMetadata> linkedList2 = new LinkedList<IVfModuleMetadata>();
-      linkedList2.clear();
-      // Undeclared exception!
-      try { 
-        linkedList2.remove();
-        fail("Expecting exception: NoSuchElementException");
-      
-      } catch(NoSuchElementException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("java.util.LinkedList", e);
-      }
-  }
+        ASDCNotificationLogging.dumpVfModuleMetaDataList((List<IVfModuleData>) null);
+        IArtifactInfo iArtifactInfo0 = mock(IArtifactInfo.class, new ViolatedAssumptionAnswer());
+        doReturn((String) null).when(iArtifactInfo0).getArtifactChecksum();
+        doReturn((String) null).when(iArtifactInfo0).getArtifactDescription();
+        doReturn((String) null).when(iArtifactInfo0).getArtifactName();
+        doReturn((Integer) null).when(iArtifactInfo0).getArtifactTimeout();
+        doReturn((String) null).when(iArtifactInfo0).getArtifactType();
+        doReturn((String) null).when(iArtifactInfo0).getArtifactURL();
+        doReturn((String) null).when(iArtifactInfo0).getArtifactUUID();
+        doReturn((String) null).when(iArtifactInfo0).getArtifactVersion();
+        doReturn((IArtifactInfo) null).when(iArtifactInfo0).getGeneratedArtifact();
+        doReturn((List) null).when(iArtifactInfo0).getRelatedArtifacts();
+        linkedList0.push(iArtifactInfo0);
+        INotificationData iNotificationData1 = mock(INotificationData.class, new ViolatedAssumptionAnswer());
+        doReturn("t2J^4~*i|btm ib&").when(iNotificationData1).getDistributionID();
+        doReturn((List<IResourceInstance>) null).when(iNotificationData1).getResources();
+        doReturn(linkedList0).when(iNotificationData1).getServiceArtifacts();
+        doReturn("N~a W7").when(iNotificationData1).getServiceDescription();
+        doReturn("N~a W7").when(iNotificationData1).getServiceInvariantUUID();
+        doReturn("/&*/=").when(iNotificationData1).getServiceName();
+        doReturn((String) null).when(iNotificationData1).getServiceUUID();
+        doReturn("ASDC Notification:\nDistributionID:io7<{~.v|%\nServiceName:io7<{~.v|%\nServiceVersion:io7<{~.v|%\nServiceUUID:NULL\nServiceInvariantUUID:io7<{~.v|%\nServiceDescription:io7<{~.v|%\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n").when(iNotificationData1).getServiceVersion();
+        String string1 = ASDCNotificationLogging.dumpASDCNotification(iNotificationData1);
+        assertEquals("ASDC Notification:\nDistributionID:t2J^4~*i|btm ib&\nServiceName:/&*/=\nServiceVersion:ASDC Notification:\nDistributionID:io7<{~.v|%\nServiceName:io7<{~.v|%\nServiceVersion:io7<{~.v|%\nServiceUUID:NULL\nServiceInvariantUUID:io7<{~.v|%\nServiceDescription:io7<{~.v|%\nService Artifacts List:\nNULL\nResource Instances List:\nNULL\n\nServiceUUID:NULL\nServiceInvariantUUID:N~a W7\nServiceDescription:N~a W7\nService Artifacts List:\n{\nService Artifacts Info:\nArtifactName:NULL\nArtifactVersion:NULL\nArtifactType:NULL\nArtifactDescription:NULL\nArtifactTimeout:NULL\nArtifactURL:NULL\nArtifactUUID:NULL\nArtifactChecksum:NULL\nGeneratedArtifact:{NULL\n}\nRelatedArtifacts:NULL\n\n\n}\n\nResource Instances List:\nNULL\n", string1);
+    }
 
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      LinkedList<IVfModuleMetadata> linkedList0 = new LinkedList<IVfModuleMetadata>();
-      ASDCNotificationLogging.dumpVfModuleMetaDataList(linkedList0);
-      IVfModuleMetadata iVfModuleMetadata0 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      linkedList0.add(iVfModuleMetadata0);
-      linkedList0.remove((Object) "\n}\n");
-      IVfModuleMetadata iVfModuleMetadata1 = mock(IVfModuleMetadata.class, new ViolatedAssumptionAnswer());
-      linkedList0.offerLast(iVfModuleMetadata1);
-      // Undeclared exception!
-      try { 
-        linkedList0.subList((-1), (-1));
-        fail("Expecting exception: IndexOutOfBoundsException");
-      
-      } catch(IndexOutOfBoundsException e) {
-         //
-         // fromIndex = -1
-         //
-         verifyException("java.util.SubList", e);
-      }
-  }
+    @Test(timeout = 4000)
+    public void test12()  throws Throwable  {
+        ASDCNotificationLogging aSDCNotificationLogging0 = new ASDCNotificationLogging();
+        Object object0 = PrivateAccess.callMethod((Class<ASDCNotificationLogging>) ASDCNotificationLogging.class, aSDCNotificationLogging0, "dumpASDCResourcesList", (Object) null, (Class<?>) INotificationData.class);
+        assertNull(object0);
+    }
 }
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTestscaffolding.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTestscaffolding.java
index 1344bbe45d..62663e7397 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTestscaffolding.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/util/ASDCNotificationLoggingESTestscaffolding.java
@@ -1,7 +1,7 @@
 /**
- * Scaffolding file used to store all the setups needed to run 
+ * Scaffolding file used to store all the setups needed to run
  * tests automatically generated by EvoSuite
- * Fri Nov 25 13:31:27 GMT 2016
+ * Mon Mar 13 15:55:23 GMT 2017
  */
 
 package org.openecomp.mso.asdc.util;
@@ -12,69 +12,70 @@ import org.junit.Before;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.evosuite.runtime.sandbox.Sandbox;
+import org.evosuite.runtime.sandbox.Sandbox.SandboxMode;
 
 @EvoSuiteClassExclude
 public class ASDCNotificationLoggingESTestscaffolding {
 
-  @org.junit.Rule 
+  @org.junit.Rule
   public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
 
-  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
+  private static final java.util.Properties defaultProperties = (java.util.Properties) System.getProperties().clone();
 
   private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
 
-  @BeforeClass 
-  public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.util.ASDCNotificationLogging"; 
-    org.evosuite.runtime.GuiSupport.initialize(); 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
-    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
-    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
-    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
-    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.asdc.util.ASDCNotificationLogging";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = SandboxMode.RECOMMENDED;
+    Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
     initializeClasses();
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-  } 
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
 
-  @AfterClass 
-  public static void clearEvoSuiteFramework(){ 
-    Sandbox.resetDefaultSecurityManager(); 
-    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
-  } 
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
 
-  @Before 
-  public void initTestCase(){ 
+  @Before
+  public void initTestCase(){
     threadStopper.storeCurrentThreads();
     threadStopper.startRecordingTime();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
-    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
-    
-    org.evosuite.runtime.GuiSupport.setHeadless(); 
-    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
-  } 
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
 
-  @After 
-  public void doneWithTestCase(){ 
+  @After
+  public void doneWithTestCase(){
     threadStopper.killAndJoinClientThreads();
-    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
-    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
-    resetClasses(); 
-    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
-    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
-    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
-  } 
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
 
   private static void initializeClasses() {
     org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(ASDCNotificationLoggingESTestscaffolding.class.getClassLoader() ,
       "org.openecomp.sdc.api.notification.INotificationData",
+      "org.openecomp.mso.asdc.installer.VfModuleMetaData",
+      "org.openecomp.mso.asdc.installer.IVfModuleData",
       "org.openecomp.sdc.api.notification.IResourceInstance",
-      "org.openecomp.sdc.api.notification.IVfModuleMetadata",
-      "org.openecomp.mso.asdc.util.ASDCNotificationLogging",
-      "org.openecomp.sdc.api.notification.IArtifactInfo"
+      "org.openecomp.sdc.api.notification.IArtifactInfo",
+      "org.openecomp.mso.asdc.util.ASDCNotificationLogging"
     );
-  } 
+  }
 
   private static void resetClasses() {
   }