Improve test generation from processes (#480)

* wip

* wip

* wip

* wip

* start refactoring

* reworked test generation from process models.
Open: Create tests

* working on test for generation from process models

* add test

* adapt integration test for generating from processes

* remove warning

* address review comments

Author: junkerm

bundles/specmate-integration-test/src/com/specmate/test/integration/CrudTest.java

@@ -530,14 +530,13 @@ public void testGenerateTestsFromProcess() {
 		// Expect 2 tests should be generated
 		Assert.assertEquals(2, testCases.size());
 
-		// Expect 4 children: two test cases and two test parameters
-		Assert.assertEquals(4, retrievedTestChilds.length());
+		// Expect 3 children: two test cases and one test parameter
+		Assert.assertEquals(3, retrievedTestChilds.length());
 		getResult.getResponse().close();
 	}
 
-	
-	@Test 
-	public void testGenerateTestsWithMutExConstraint() { 
+	@Test
+	public void testGenerateTestsWithMutExConstraint() {
 
 		JSONObject requirement = postRequirementToRoot();
 		String requirementId = getId(requirement);
@@ -595,9 +594,8 @@ public void testGenerateTestsWithMutExConstraint() {
 				numberOfInconsistentTests++;
 			}
 		}
-		Assert.assertEquals(1, numberOfInconsistentTests); 
+		Assert.assertEquals(1, numberOfInconsistentTests);
 	}
-	 
 
 	/**
 	 * Generates a model with contradictory constraints and trys to generate test

bundles/specmate-integration-test/src/com/specmate/test/integration/ModelGenerationTestBase.java

@@ -10,7 +10,6 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Assert;
-import org.junit.Test;
 
 import com.specmate.model.base.BasePackage;
 import com.specmate.model.requirements.CEGConnection;

bundles/specmate-model-support/src/com/specmate/model/support/util/SpecmateEcoreUtil.java

@@ -3,8 +3,10 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.CDOState;
@@ -88,6 +90,12 @@ public static <T> List<T> getRootObjectsByType(Resource resource, Class<T> clazz
 		return pickInstancesOf(resource.getContents(), clazz);
 	}
 
+	public static <T> Set<T> uniqueInstancesOf(List<? extends EObject> contents, Class<T> clazz) {
+		Set<T> result = new HashSet<>();
+		result.addAll(pickInstancesOf(contents.iterator(), clazz));
+		return result;
+	}
+
 	public static <T> List<T> pickInstancesOf(List<? extends EObject> contents, Class<T> clazz) {
 		return pickInstancesOf(contents.iterator(), clazz);
 	}

bundles/specmate-persistency-cdo/src/com/specmate/persistency/validation/IDValidator.java

@@ -41,7 +41,8 @@ public void newObject(EObject object, String id, String className, Map<EStructur
 
 	private String validateID(EObject obj, Object objID) throws SpecmateValidationException {
 		if (objID == null) {
-			throw new SpecmateValidationException("Object does not have a valid Id.", getValidatorName(),
+			throw new SpecmateValidationException(
+					"Object of type " + obj.eClass().getName() + " does not have a valid Id.", getValidatorName(),
 					getObjectName(obj));
 		}