org.onap migration

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

8 files changed, 0 insertions, 1263 deletions

diff --git a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/CapabilityTest.java b/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/CapabilityTest.java
deleted file mode 100644
index 4eed93b5..00000000
--- a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/CapabilityTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.openecomp.vid.asdc.beans.tosca;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.junit.Test;
-
-
-public class CapabilityTest {
-
-	private Capability createTestSubject() {
-		return new Capability();
-	}
-
-	
-	@Test
-	public void testGetType() throws Exception {
-		Capability testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getType();
-	}
-
-	
-	@Test
-	public void testGetDescription() throws Exception {
-		Capability testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDescription();
-	}
-
-	
-	@Test
-	public void testGetOccurrences() throws Exception {
-		Capability testSubject;
-		Collection<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getOccurrences();
-	}
-
-	
-	@Test
-	public void testGetProperties() throws Exception {
-		Capability testSubject;
-		Map<String, Property> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getProperties();
-	}
-
-	
-	@Test
-	public void testGetValid_source_types() throws Exception {
-		Capability testSubject;
-		Collection<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getValid_source_types();
-	}
-
-	
-	@Test
-	public void testSetType() throws Exception {
-		Capability testSubject;
-		String type = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setType(type);
-	}
-
-	
-	@Test
-	public void testSetDescription() throws Exception {
-		Capability testSubject;
-		String description = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDescription(description);
-	}
-
-	
-	@Test
-	public void testSetOccurrences() throws Exception {
-		Capability testSubject;
-		Collection<String> occurrences = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setOccurrences(occurrences);
-	}
-
-	
-	@Test
-	public void testSetProperties() throws Exception {
-		Capability testSubject;
-		Map<String, Property> properties = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setProperties(properties);
-	}
-
-	
-	@Test
-	public void testSetValid_source_types() throws Exception {
-		Capability testSubject;
-		Collection<String> valid_source_types = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setValid_source_types(valid_source_types);
-	}
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/ConstraintTest.java b/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/ConstraintTest.java
deleted file mode 100644
index fb416f7e..00000000
--- a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/ConstraintTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.openecomp.vid.asdc.beans.tosca;
-
-import java.util.List;
-
-import org.junit.Test;
-
-public class ConstraintTest {
-
-	private Constraint createTestSubject() {
-		return new Constraint();
-	}
-
-	
-	@Test
-	public void testGetvalid_values() throws Exception {
-		Constraint testSubject;
-		List<Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getvalid_values();
-	}
-
-	
-	@Test
-	public void testGetEqual() throws Exception {
-		Constraint testSubject;
-		Object result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEqual();
-	}
-
-	
-	@Test
-	public void testGetGreater_than() throws Exception {
-		Constraint testSubject;
-		Object result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getGreater_than();
-	}
-
-	
-	@Test
-	public void testGetGreater_or_equal() throws Exception {
-		Constraint testSubject;
-		Object result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getGreater_or_equal();
-	}
-
-	
-	@Test
-	public void testGetLess_than() throws Exception {
-		Constraint testSubject;
-		Object result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLess_than();
-	}
-
-	
-	@Test
-	public void testGetLess_or_equal() throws Exception {
-		Constraint testSubject;
-		Object result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLess_or_equal();
-	}
-
-	
-	@Test
-	public void testGetIn_range() throws Exception {
-		Constraint testSubject;
-		List<Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getIn_range();
-	}
-
-	
-	@Test
-	public void testGetLength() throws Exception {
-		Constraint testSubject;
-		Object result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLength();
-	}
-
-	
-	@Test
-	public void testGetMin_length() throws Exception {
-		Constraint testSubject;
-		Object result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMin_length();
-	}
-
-	
-	@Test
-	public void testGetMax_length() throws Exception {
-		Constraint testSubject;
-		Object result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMax_length();
-	}
-
-	
-	@Test
-	public void testSetvalid_values() throws Exception {
-		Constraint testSubject;
-		List<Object> vlist = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setvalid_values(vlist);
-	}
-
-	
-	@Test
-	public void testSetEqual() throws Exception {
-		Constraint testSubject;
-		Object e = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEqual(e);
-	}
-
-	
-	@Test
-	public void testSetGreater_than() throws Exception {
-		Constraint testSubject;
-		Object e = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setGreater_than(e);
-	}
-
-	
-	@Test
-	public void testSetLess_than() throws Exception {
-		Constraint testSubject;
-		Object e = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLess_than(e);
-	}
-
-	
-	@Test
-	public void testSetIn_range() throws Exception {
-		Constraint testSubject;
-		List<Object> e = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setIn_range(e);
-	}
-
-	
-	@Test
-	public void testSetLength() throws Exception {
-		Constraint testSubject;
-		Object e = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLength(e);
-	}
-
-	
-	@Test
-	public void testSetMin_length() throws Exception {
-		Constraint testSubject;
-		Object e = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMin_length(e);
-	}
-
-	
-	@Test
-	public void testSetMax_length() throws Exception {
-		Constraint testSubject;
-		Object e = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMax_length(e);
-	}
-
-	
-	@Test
-	public void testToString() throws Exception {
-		Constraint testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/GroupTest.java b/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/GroupTest.java
deleted file mode 100644
index d3a1e4bb..00000000
--- a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/GroupTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.openecomp.vid.asdc.beans.tosca;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.junit.Test;
-
-
-public class GroupTest {
-
-	private Group createTestSubject() {
-		return new Group();
-	}
-
-	
-	@Test
-	public void testGetMetadata() throws Exception {
-		Group testSubject;
-		ToscaMetadata result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMetadata();
-	}
-
-	
-	@Test
-	public void testSetMetadata() throws Exception {
-		Group testSubject;
-		ToscaMetadata metadata = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMetadata(metadata);
-	}
-
-	
-	@Test
-	public void testGetMembers() throws Exception {
-		Group testSubject;
-		Collection<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMembers();
-	}
-
-	
-	@Test
-	public void testSetMembers() throws Exception {
-		Group testSubject;
-		Collection<String> members = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMembers(members);
-	}
-
-	
-	@Test
-	public void testGetType() throws Exception {
-		Group testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getType();
-	}
-
-	
-	@Test
-	public void testSetType() throws Exception {
-		Group testSubject;
-		String type = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setType(type);
-	}
-
-	
-	@Test
-	public void testGetvf_module_type() throws Exception {
-		Group testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getvf_module_type();
-	}
-
-	
-	@Test
-	public void testSetvf_module_type() throws Exception {
-		Group testSubject;
-		String vf_module_type = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setvf_module_type(vf_module_type);
-	}
-
-	
-	@Test
-	public void testGetProperties() throws Exception {
-		Group testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getProperties();
-	}
-
-	
-	@Test
-	public void testSetProperties() throws Exception {
-		Group testSubject;
-		Map<String, Object> properties = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setProperties(properties);
-	}
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/NodeTemplateTest.java b/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/NodeTemplateTest.java
deleted file mode 100644
index 89177807..00000000
--- a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/NodeTemplateTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.openecomp.vid.asdc.beans.tosca;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-public class NodeTemplateTest {
-
-	private NodeTemplate createTestSubject() {
-		return new NodeTemplate();
-	}
-
-	@Test
-	public void testGetType() throws Exception {
-		NodeTemplate testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getType();
-	}
-
-	@Test
-	public void testSetType() throws Exception {
-		NodeTemplate testSubject;
-		String type = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setType(type);
-	}
-
-	@Test
-	public void testGetMetadata() throws Exception {
-		NodeTemplate testSubject;
-		ToscaMetadata result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMetadata();
-	}
-
-	@Test
-	public void testSetMetadata() throws Exception {
-		NodeTemplate testSubject;
-		ToscaMetadata metadata = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMetadata(metadata);
-	}
-
-	@Test
-	public void testGetProperties() throws Exception {
-		NodeTemplate testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getProperties();
-	}
-
-	@Test
-	public void testSetProperties() throws Exception {
-		NodeTemplate testSubject;
-		Map<String, Object> properties = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setProperties(properties);
-	}
-
-	@Test
-	public void testGetRequirements() throws Exception {
-		NodeTemplate testSubject;
-		Object result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getRequirements();
-	}
-
-	@Test
-	public void testSetRequirements() throws Exception {
-		NodeTemplate testSubject;
-		Object requirements = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setRequirements(requirements);
-	}
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/TestSuite.java b/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/TestSuite.java
deleted file mode 100644
index 40e08683..00000000
--- a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/TestSuite.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openecomp.vid.asdc.beans.tosca;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses(
-
-{ GroupTest.class, TopologyTemplateTest.class, ToscaModelTest.class, CapabilityTest.class, ToscaMetadataTest.class,
-		ConstraintTest.class, NodeTemplateTest.class })
-public class TestSuite { // nothing
-}
diff --git a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/TopologyTemplateTest.java b/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/TopologyTemplateTest.java
deleted file mode 100644
index a3b96c26..00000000
--- a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/TopologyTemplateTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.openecomp.vid.asdc.beans.tosca;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-
-public class TopologyTemplateTest {
-
-	private TopologyTemplate createTestSubject() {
-		return new TopologyTemplate();
-	}
-
-	
-	@Test
-	public void testGetsubstitution_mappings() throws Exception {
-		TopologyTemplate testSubject;
-		SubstitutionMappings result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getsubstitution_mappings();
-	}
-
-	
-	@Test
-	public void testSetsubstitution_mappings() throws Exception {
-		TopologyTemplate testSubject;
-		SubstitutionMappings substitution_mappings = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setsubstitution_mappings(substitution_mappings);
-	}
-
-	
-	@Test
-	public void testGetInputs() throws Exception {
-		TopologyTemplate testSubject;
-		Map<String, Input> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getInputs();
-	}
-
-	
-	@Test
-	public void testSetInputs() throws Exception {
-		TopologyTemplate testSubject;
-		Map<String, Input> inputs = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setInputs(inputs);
-	}
-
-	
-	@Test
-	public void testGetnode_templates() throws Exception {
-		TopologyTemplate testSubject;
-		Map<String, NodeTemplate> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getnode_templates();
-	}
-
-	
-	@Test
-	public void testSetnode_templates() throws Exception {
-		TopologyTemplate testSubject;
-		Map<String, NodeTemplate> node_templates = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setnode_templates(node_templates);
-	}
-
-	
-	@Test
-	public void testGetGroups() throws Exception {
-		TopologyTemplate testSubject;
-		Map<String, Group> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getGroups();
-	}
-
-	
-	@Test
-	public void testSetGroups() throws Exception {
-		TopologyTemplate testSubject;
-		Map<String, Group> groups = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setGroups(groups);
-	}
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadataTest.java b/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadataTest.java
deleted file mode 100644
index 4c6fed5c..00000000
--- a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadataTest.java
+++ /dev/null
@@ -1,443 +0,0 @@
-package org.openecomp.vid.asdc.beans.tosca;
-
-import org.junit.Test;
-
-public class ToscaMetadataTest {
-
-	private ToscaMetadata createTestSubject() {
-		return new ToscaMetadata();
-	}
-
-	@Test
-	public void testGetType() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getType();
-	}
-
-	@Test
-	public void testGetInvariantUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getInvariantUUID();
-	}
-
-	@Test
-	public void testGetCustomizationUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getCustomizationUUID();
-	}
-
-	@Test
-	public void testGetUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getUUID();
-	}
-
-	@Test
-	public void testGetVersion() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVersion();
-	}
-
-	@Test
-	public void testGetName() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getName();
-	}
-
-	@Test
-	public void testGetDescription() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDescription();
-	}
-
-	@Test
-	public void testGetCategory() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getCategory();
-	}
-
-	@Test
-	public void testGetSubcategory() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getSubcategory();
-	}
-
-	@Test
-	public void testGetResourceVendor() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getResourceVendor();
-	}
-
-	@Test
-	public void testGetResourceVendorRelease() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getResourceVendorRelease();
-	}
-
-	@Test
-	public void testGetServiceEcompNaming() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getServiceEcompNaming();
-	}
-
-	@Test
-	public void testGetNamingPolicy() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNamingPolicy();
-	}
-
-	@Test
-	public void testIsServiceHoming() throws Exception {
-		ToscaMetadata testSubject;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.isServiceHoming();
-	}
-
-	@Test
-	public void testIsEcompGeneratedNaming() throws Exception {
-		ToscaMetadata testSubject;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.isEcompGeneratedNaming();
-	}
-
-	@Test
-	public void testSetType() throws Exception {
-		ToscaMetadata testSubject;
-		String type = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setType(type);
-	}
-
-	@Test
-	public void testSetInvariantUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String invariantUUID = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setInvariantUUID(invariantUUID);
-	}
-
-	@Test
-	public void testSetNamingPolicy() throws Exception {
-		ToscaMetadata testSubject;
-		String namingPolicy = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNamingPolicy(namingPolicy);
-	}
-
-	@Test
-	public void testSetUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String uuid = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setUUID(uuid);
-	}
-
-	@Test
-	public void testSetCustomizationUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String u = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setCustomizationUUID(u);
-	}
-
-	@Test
-	public void testSetVersion() throws Exception {
-		ToscaMetadata testSubject;
-		String version = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVersion(version);
-	}
-
-	@Test
-	public void testSetName() throws Exception {
-		ToscaMetadata testSubject;
-		String name = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setName(name);
-	}
-
-	@Test
-	public void testSetDescription() throws Exception {
-		ToscaMetadata testSubject;
-		String description = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDescription(description);
-	}
-
-	@Test
-	public void testSetCategory() throws Exception {
-		ToscaMetadata testSubject;
-		String category = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setCategory(category);
-	}
-
-	@Test
-	public void testSetServiceEcompNaming() throws Exception {
-		ToscaMetadata testSubject;
-		String serviceEcompNaming = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setServiceEcompNaming(serviceEcompNaming);
-	}
-
-	@Test
-	public void testSetServiceHoming() throws Exception {
-		ToscaMetadata testSubject;
-		boolean serviceHoming = false;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setServiceHoming(serviceHoming);
-	}
-
-	@Test
-	public void testSetEcompGeneratedNaming() throws Exception {
-		ToscaMetadata testSubject;
-		boolean ecompGeneratedNaming = false;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEcompGeneratedNaming(ecompGeneratedNaming);
-	}
-
-	@Test
-	public void testGettemplate_name() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.gettemplate_name();
-	}
-
-	@Test
-	public void testSettemplate_name() throws Exception {
-		ToscaMetadata testSubject;
-		String template_name = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.settemplate_name(template_name);
-	}
-
-	
-	@Test
-	public void testSetSubcategory() throws Exception {
-		ToscaMetadata testSubject;
-		String subcategory = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setSubcategory(subcategory);
-	}
-
-	
-	@Test
-	public void testSetResourceVendor() throws Exception {
-		ToscaMetadata testSubject;
-		String resourceVendor = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setResourceVendor(resourceVendor);
-	}
-
-	
-	@Test
-	public void testSetResourceVendorRelease() throws Exception {
-		ToscaMetadata testSubject;
-		String resourceVendorRelease = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setResourceVendorRelease(resourceVendorRelease);
-	}
-
-	
-	@Test
-	public void testGetVfModuleModelName() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVfModuleModelName();
-	}
-
-	
-	@Test
-	public void testSetVfModuleModelName() throws Exception {
-		ToscaMetadata testSubject;
-		String vfModuleModelName = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVfModuleModelName(vfModuleModelName);
-	}
-
-	
-	@Test
-	public void testGetVfModuleModelInvariantUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVfModuleModelInvariantUUID();
-	}
-
-	
-	@Test
-	public void testSetVfModuleModelInvariantUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String vfModuleModelInvariantUUID = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVfModuleModelInvariantUUID(vfModuleModelInvariantUUID);
-	}
-
-	
-	@Test
-	public void testGetVfModuleModelUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVfModuleModelUUID();
-	}
-
-	
-	@Test
-	public void testSetVfModuleModelUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String vfModuleModelUUID = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVfModuleModelUUID(vfModuleModelUUID);
-	}
-
-	
-	@Test
-	public void testGetVfModuleModelVersion() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVfModuleModelVersion();
-	}
-
-	
-	@Test
-	public void testSetVfModuleModelVersion() throws Exception {
-		ToscaMetadata testSubject;
-		String vfModuleModelVersion = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVfModuleModelVersion(vfModuleModelVersion);
-	}
-
-	
-	@Test
-	public void testSetVfModuleModelCustomizationUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String u = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVfModuleModelCustomizationUUID(u);
-	}
-
-	
-	@Test
-	public void testGetVfModuleModelCustomizationUUID() throws Exception {
-		ToscaMetadata testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVfModuleModelCustomizationUUID();
-	}
-}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/ToscaModelTest.java b/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/ToscaModelTest.java
deleted file mode 100644
index 6fb6f893..00000000
--- a/vid-app-common/src/test/java/org/openecomp/vid/asdc/beans/tosca/ToscaModelTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.openecomp.vid.asdc.beans.tosca;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.junit.Test;
-
-
-public class ToscaModelTest {
-
-	private ToscaModel createTestSubject() {
-		return new ToscaModel();
-	}
-
-	
-	@Test
-	public void testGetMetadata() throws Exception {
-		ToscaModel testSubject;
-		ToscaMetadata result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMetadata();
-	}
-
-	
-	@Test
-	public void testSetMetadata() throws Exception {
-		ToscaModel testSubject;
-		ToscaMetadata metadata = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMetadata(metadata);
-	}
-
-	
-	@Test
-	public void testGettosca_definitions_version() throws Exception {
-		ToscaModel testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.gettosca_definitions_version();
-	}
-
-	
-	@Test
-	public void testSettosca_definitions_version() throws Exception {
-		ToscaModel testSubject;
-		String tosca_definitions_version = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.settosca_definitions_version(tosca_definitions_version);
-	}
-
-	
-	@Test
-	public void testGettopology_template() throws Exception {
-		ToscaModel testSubject;
-		TopologyTemplate result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.gettopology_template();
-	}
-
-	
-	@Test
-	public void testSettopology_template() throws Exception {
-		ToscaModel testSubject;
-		TopologyTemplate topology_template = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.settopology_template(topology_template);
-	}
-
-	
-	@Test
-	public void testGetDescription() throws Exception {
-		ToscaModel testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDescription();
-	}
-
-	
-	@Test
-	public void testSetDescription() throws Exception {
-		ToscaModel testSubject;
-		String description = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDescription(description);
-	}
-
-	
-	@Test
-	public void testGetImports() throws Exception {
-		ToscaModel testSubject;
-		Collection<Map<String, Map<String, String>>> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getImports();
-	}
-
-	
-	@Test
-	public void testSetImports() throws Exception {
-		ToscaModel testSubject;
-		Collection<Map<String, Map<String, String>>> imports = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setImports(imports);
-	}
-
-	
-	@Test
-	public void testGetnode_types() throws Exception {
-		ToscaModel testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getnode_types();
-	}
-
-	
-	@Test
-	public void testSetnode_types() throws Exception {
-		ToscaModel testSubject;
-		Map<String, Object> node_types = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setnode_types(node_types);
-	}
-}
\ No newline at end of file