[*] manually merged DynamicActors, new ui.structure and physical model aware Java generator

12 files changed, 328 insertions, 101 deletions

diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/models/dynamic_actors.room b/tests/org.eclipse.etrice.core.genmodel.tests/models/dynamic_actors.room
new file mode 100644
index 000000000..56405717d
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/models/dynamic_actors.room
@@ -0,0 +1,175 @@
+RoomModel DynamicActors {
+
+	LogicalSystem LS {
+		SubSystemRef main: Main
+	}
+
+	SubSystemClass Main {
+		ActorRef appl: Appl
+		LogicalThread defaultThread
+	}
+
+	ActorClass Appl {
+		Structure {
+			ActorRef cont1: Container1
+			ActorRef cont2: Container2
+			ActorRef cont3: Container3
+		}
+		Behavior { }
+	}
+
+	// example1: container with internal end port bound to optional actor
+	ActorClass Container1 {
+		Structure {
+			conjugated Port p0: PC
+			optional ActorRef ref0: Optional
+			Binding p0 and ref0.p0
+		}
+		Behavior { }
+	}
+
+	// example2: container with internal end port bound to array of optional actors
+	ActorClass Container2 {
+		Structure {
+			conjugated Port p0[*]: PC
+			optional ActorRef ref0[*]: Optional
+			Binding p0 and ref0.p0
+		}
+		Behavior { }
+	}
+
+	// example3: container with services
+	ActorClass Container3 {
+		Structure {
+			conjugated Port p0: PC
+			optional ActorRef ref0: OptionalForSvc
+			ActorRef svc2: Svc2
+			Binding p0 and ref0.p0
+			LayerConnection ref ref0 satisfied_by svc2.svc
+		}
+		Behavior { }
+	}
+
+	ActorClass Optional {
+		Interface {
+			Port p0: PC
+		}
+		Structure { }
+		Behavior { }
+	}
+
+	ActorClass Optional1 extends Optional {
+		Structure {
+			ActorRef ref0: AC1
+			Binding p0 and ref0.p0
+		}
+		Behavior { }
+	}
+
+	ActorClass Optional2 extends Optional {
+		Structure {
+			ActorRef ref0: AC2
+			Binding p0 and ref0.p0
+		}
+		Behavior { }
+	}
+
+	ActorClass AC1 {
+		Interface {
+			Port p0: PC
+		}
+		Structure {
+			external Port p0
+		}
+		Behavior { }
+	}
+
+	ActorClass AC2 {
+		Interface {
+			Port p0: PC
+		}
+		Structure {
+			ActorRef ref0: AC1
+			Binding p0 and ref0.p0
+		}
+		Behavior { }
+	}
+
+	ActorClass OptionalForSvc {
+		Interface {
+			Port p0: PC
+		}
+		Structure { }
+		Behavior { }
+	}
+	
+	ActorClass OptionalForSvcOK extends OptionalForSvc {
+		Structure {
+			ActorRef ref0: ACForSvc
+			ActorRef svc1: Svc1
+			Binding p0 and ref0.p0
+			LayerConnection ref ref0 satisfied_by svc1.svc
+		}
+		Behavior { }
+	}
+	
+	ActorClass OptionalForSvcNOK extends OptionalForSvc {
+		Structure {
+			ActorRef ref0: ACForSvc
+			ActorRef svc1: Svc1
+			Binding p0 and ref0.p0
+		}
+		Behavior { }
+	}
+	
+	ActorClass ACForSvc {
+		Interface {
+			Port p0: PC
+		}
+		Structure {
+			external Port p0
+			SAP sap1: PSvc1
+			SAP sap2: PSvc2
+		}
+		Behavior { }
+	}
+	
+	ActorClass Svc1 {
+		Interface {
+			SPP svc:PSvc1
+		}
+		Structure {
+			ServiceImplementation of svc
+		}
+		Behavior { }
+	}
+	
+	ActorClass Svc2 {
+		Interface {
+			SPP svc:PSvc2
+		}
+		Structure {
+			ServiceImplementation of svc
+		}
+		Behavior { }
+	}
+
+	ProtocolClass PC {
+		incoming {
+			Message m1()
+		}
+	}
+
+	ProtocolClass PSvc1 {
+		incoming {
+			Message m1()
+		}
+	}
+
+	ProtocolClass PSvc2 {
+		incoming {
+			Message m1()
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestConnectedPorts.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestConnectedPorts.java
index eea8ec529..716d3f75a 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestConnectedPorts.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestConnectedPorts.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
 import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
@@ -33,7 +31,6 @@ import org.junit.Test;
 public class TestConnectedPorts extends TestInstanceModelBuilderBase {
 	
 	private Root root;
-	private HashMap<EClass, ArrayList<EObject>> instances;
 	
 	@Before
 	public void setUp() {
@@ -45,8 +42,7 @@ public class TestConnectedPorts extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testPortNumbers() {
-		ArrayList<EObject> ports = instances.get(ETriceGenPackage.eINSTANCE.getPortInstance());
-		assertEquals("Number of PortInstances", 19, ports.size());
+		checkSize(19, ETriceGenPackage.eINSTANCE.getPortInstance());
 	}
 	
 	@Test
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestHierarchy.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestHierarchy.java
index 5de106aa7..ed9cff5cf 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestHierarchy.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestHierarchy.java
@@ -12,13 +12,8 @@
 
 package org.eclipse.etrice.core.genmodel;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
 import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
@@ -35,23 +30,21 @@ public class TestHierarchy extends TestInstanceModelBuilderBase {
 		prepare();
 		
 		root = buildInstanceModel("hierarchy.room");
+		instances = collectInstances(root);
 	}
 
 	@Test
 	public void testInstances() {
+		checkSize(1, ETriceGenPackage.eINSTANCE.getSubSystemInstance());
+		checkSize(18, ETriceGenPackage.eINSTANCE.getActorInstance());
 		
-		HashMap<EClass,ArrayList<EObject>> instances = collectInstances(root);
-		
-		assertEquals("Number of ComponentInstances", 1, instances.get(ETriceGenPackage.eINSTANCE.getSubSystemInstance()).size());
-		assertEquals("Number of ActorInstances", 18, instances.get(ETriceGenPackage.eINSTANCE.getActorInstance()).size());
-		
-		ActorInstance ai = root.getSubSystemInstances().get(0).getInstances().get(0);
+		ActorInstance ai = root.getSubSystemInstances().get(0).getActorInstances().get(0);
 		assertEquals("Instance Path", "/CMain/l1a", ai.getPath());
 		
-		ai = ai.getInstances().get(1);
+		ai = ai.getActorInstances().get(1);
 		assertEquals("Instance Path", "/CMain/l1a/l2b", ai.getPath());
 		
-		ai = ai.getInstances().get(2);
+		ai = ai.getActorInstances().get(2);
 		assertEquals("Instance Path", "/CMain/l1a/l2b/l3c", ai.getPath());
 	}
 }
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
index c9d05a25e..5bbbb0240 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
@@ -12,6 +12,7 @@
 
 package org.eclipse.etrice.core.genmodel;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
@@ -34,7 +35,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root;
 import org.eclipse.etrice.core.naming.RoomNameProvider;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
-
 import org.eclipse.etrice.core.room.RoomModel;
 import org.eclipse.etrice.core.room.StateGraphItem;
 import org.eclipse.etrice.core.genmodel.base.ILogger;
@@ -82,6 +82,7 @@ public class TestInstanceModelBuilderBase {
 	}
 
 	private String basePath;
+	protected HashMap<EClass, ArrayList<EObject>> instances;
 
 	protected void prepare() {
 		try {
@@ -156,4 +157,9 @@ public class TestInstanceModelBuilderBase {
 		return null;
 	}
 
+	protected void checkSize(int expected, EClass cls) {
+		ArrayList<EObject> objs = instances.get(cls);
+		assertEquals("Number of "+cls.getName(), expected, objs.size());
+	}
+
 }
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java
index 3cadf6ed6..70b4b9846 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestLayers.java
@@ -15,9 +15,7 @@ package org.eclipse.etrice.core.genmodel;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
 import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
@@ -31,7 +29,6 @@ import org.junit.Test;
 public class TestLayers extends TestInstanceModelBuilderBase {
 	
 	private Root root;
-	private HashMap<EClass, ArrayList<EObject>> instances;
 	
 	@Before
 	public void setUp() {
@@ -43,14 +40,9 @@ public class TestLayers extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testInstanceNumbers() {
-		ArrayList<EObject> saps = instances.get(ETriceGenPackage.eINSTANCE.getSAPInstance());
-		assertEquals("Number of SAPInstances", 6, saps.size());
-
-		ArrayList<EObject> spps = instances.get(ETriceGenPackage.eINSTANCE.getSPPInstance());
-		assertEquals("Number of SPPInstances", 7, spps.size());
-
-		ArrayList<EObject> svcs = instances.get(ETriceGenPackage.eINSTANCE.getServiceImplInstance());
-		assertEquals("Number of ServiceImplInstances", 3, svcs.size());
+		checkSize(6, ETriceGenPackage.eINSTANCE.getSAPInstance());
+		checkSize(7, ETriceGenPackage.eINSTANCE.getSPPInstance());
+		checkSize(3, ETriceGenPackage.eINSTANCE.getServiceImplInstance());
 	}
 	
 	@Test
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestMultipleConnectedChoicepoint.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestMultipleConnectedChoicepoint.java
index 0692da401..2695bfaf8 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestMultipleConnectedChoicepoint.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestMultipleConnectedChoicepoint.java
@@ -17,10 +17,8 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
@@ -46,7 +44,6 @@ public class TestMultipleConnectedChoicepoint extends
 		TestInstanceModelBuilderBase {
 	
 	private Root root;
-	private HashMap<EClass, ArrayList<EObject>> instances;
 	private ExpandedActorClass xpac;
 
 	@Before
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestOptionalActors.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestOptionalActors.java
new file mode 100644
index 000000000..97bc69089
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestOptionalActors.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2013 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * CONTRIBUTORS:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.genmodel;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.OptionalActorInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.etrice.core.genmodel.etricegen.SAPInstance;
+import org.eclipse.etrice.core.genmodel.etricegen.ServiceImplInstance;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author Henrik Rentz-Reichert
+ *
+ */
+public class TestOptionalActors extends TestInstanceModelBuilderBase {
+	
+	private Root root;
+	
+	@Before
+	public void setUp() {
+		prepare();
+		
+		root = buildInstanceModel("dynamic_actors.room");
+		instances = collectInstances(root);
+	}
+	
+	@Test
+	public void testInstanceNumbers() {
+		checkSize(4, ETriceGenPackage.eINSTANCE.getSAPInstance());
+		checkSize(3, ETriceGenPackage.eINSTANCE.getSPPInstance());
+		checkSize(3, ETriceGenPackage.eINSTANCE.getServiceImplInstance());
+		checkSize(12, ETriceGenPackage.eINSTANCE.getActorInstance());
+		checkSize(3, ETriceGenPackage.eINSTANCE.getActorInterfaceInstance());
+		checkSize(6, ETriceGenPackage.eINSTANCE.getOptionalActorInstance());
+	}
+	
+	@Test
+	public void testLayerConnections() {
+		ArrayList<EObject> saps = instances.get(ETriceGenPackage.eINSTANCE.getSAPInstance());
+		
+		SAPInstance sap = (SAPInstance) getInstance(saps, "/OptionalForSvcOK/ref0/sap1");
+		assertNotNull("sap expected", sap);
+		assertEquals("SAP has one peer", 1, sap.getPeers().size());
+		InterfaceItemInstance peer = ((SAPInstance)sap).getPeers().get(0);
+		assertTrue("peer is a service", (peer instanceof ServiceImplInstance));
+		ServiceImplInstance svc = (ServiceImplInstance) peer;
+		assertEquals("number of service peers", 1, svc.getPeers().size());
+		assertEquals("sap and service have same protocol", sap.getSap().getProtocol(), svc.getSvcImpl().getSpp().getProtocol());
+		
+		sap = (SAPInstance) getInstance(saps, "/OptionalForSvcOK/ref0/sap2");
+		assertNotNull("sap expected", sap);
+		assertEquals("SAP has no peer", 0, sap.getPeers().size());
+	}
+	
+	@Test
+	public void testRequiredProvided() {
+		ArrayList<EObject> aifs = instances.get(ETriceGenPackage.eINSTANCE.getActorInterfaceInstance());
+		ActorInterfaceInstance aif = (ActorInterfaceInstance) getInstance(aifs, "/LS/main/appl/cont3/ref0");
+		assertNotNull("actor interface expected", aif);
+		assertEquals("number of provided services", 1, aif.getProvidedServices().size());
+		
+		ArrayList<EObject> oais = instances.get(ETriceGenPackage.eINSTANCE.getOptionalActorInstance());
+		OptionalActorInstance oai = (OptionalActorInstance) getInstance(oais, "/OptionalForSvcOK");
+		assertNotNull("optional actor expected", oai);
+		assertEquals("number of required services", 1, oai.getRequiredServices().size());
+		
+		oai = (OptionalActorInstance) getInstance(oais, "/OptionalForSvcNOK");
+		assertNotNull("optional actor expected", oai);
+		assertEquals("number of required services", 2, oai.getRequiredServices().size());
+	}
+
+	// un-comment for debugging purposes
+//	private void assertEquals(String msg, int expect, int actual) {
+//		System.out.println(msg+" "+actual);
+//	}
+//	private void assertEquals(String msg, Object expect, Object actual) {
+//	}
+}
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestPorts.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestPorts.java
index 133b152ef..e1c02d2f6 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestPorts.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestPorts.java
@@ -14,11 +14,6 @@ package org.eclipse.etrice.core.genmodel;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
 import org.eclipse.etrice.core.genmodel.etricegen.PortInstance;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
@@ -35,12 +30,12 @@ public class TestPorts extends TestInstanceModelBuilderBase {
 		prepare();
 		
 		root = buildInstanceModel("ports.room");
+		instances = collectInstances(root);
 	}
 	
 	@Test
 	public void testPortNumbers() {
-		HashMap<EClass, ArrayList<EObject>> instances = collectInstances(root);
-		assertEquals("Number of PortInstances", 3, instances.get(ETriceGenPackage.eINSTANCE.getPortInstance()).size());
+		checkSize(3, ETriceGenPackage.eINSTANCE.getPortInstance());
 	}
 	
 	@Test
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java
index aa9fb4936..0930e86b6 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java
@@ -15,10 +15,8 @@ package org.eclipse.etrice.core.genmodel;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
@@ -26,7 +24,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
 import org.eclipse.etrice.core.naming.RoomNameProvider;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.eclipse.etrice.core.room.ChoicePoint;
 import org.eclipse.etrice.core.room.ContinuationTransition;
 import org.eclipse.etrice.core.room.RoomPackage;
@@ -36,8 +33,7 @@ import org.eclipse.etrice.core.room.Transition;
 public class TestStates extends TestInstanceModelBuilderBase {
 	
 	private Root root;
-	private HashMap<EClass, ArrayList<EObject>> instances;
-
+	
 	@Before
 	public void setUp() {
 		prepare();
@@ -48,15 +44,15 @@ public class TestStates extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testNumbers() {
-		assertEquals("number of states", 7, instances.get(RoomPackage.eINSTANCE.getSimpleState()).size());
-		assertEquals("number of choice points", 1, instances.get(RoomPackage.eINSTANCE.getChoicePoint()).size());
-		assertEquals("number of transition points", 2, instances.get(RoomPackage.eINSTANCE.getTransitionPoint()).size());
-		assertEquals("number of entry points", 1, instances.get(RoomPackage.eINSTANCE.getEntryPoint()).size());
-		assertEquals("number of exit points", 1, instances.get(RoomPackage.eINSTANCE.getExitPoint()).size());
-		assertEquals("number of initial transitions", 2, instances.get(RoomPackage.eINSTANCE.getInitialTransition()).size());
-		assertEquals("number of triggered transitions", 9, instances.get(RoomPackage.eINSTANCE.getTriggeredTransition()).size());
-		assertEquals("number of continuation transitions", 3, instances.get(RoomPackage.eINSTANCE.getContinuationTransition()).size());
-		assertEquals("number of branch transitions", 2, instances.get(RoomPackage.eINSTANCE.getCPBranchTransition()).size());
+		checkSize(7, RoomPackage.eINSTANCE.getSimpleState());
+		checkSize(1, RoomPackage.eINSTANCE.getChoicePoint());
+		checkSize(2, RoomPackage.eINSTANCE.getTransitionPoint());
+		checkSize(1, RoomPackage.eINSTANCE.getEntryPoint());
+		checkSize(1, RoomPackage.eINSTANCE.getExitPoint());
+		checkSize(2, RoomPackage.eINSTANCE.getInitialTransition());
+		checkSize(9, RoomPackage.eINSTANCE.getTriggeredTransition());
+		checkSize(3, RoomPackage.eINSTANCE.getContinuationTransition());
+		checkSize(2, RoomPackage.eINSTANCE.getCPBranchTransition());
 	}
 	
 	@Test
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java
index 0161fbe31..553ab01dc 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java
@@ -14,10 +14,8 @@ package org.eclipse.etrice.core.genmodel;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
@@ -25,7 +23,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
 import org.eclipse.etrice.core.naming.RoomNameProvider;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.eclipse.etrice.core.room.ChoicePoint;
 import org.eclipse.etrice.core.room.ContinuationTransition;
 import org.eclipse.etrice.core.room.Port;
@@ -38,8 +35,7 @@ public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 	
 	private Root root;
 	private ExpandedActorClass xpac;
-	private HashMap<EClass, ArrayList<EObject>> instances;
-
+	
 	@Before
 	public void setUp() {
 		prepare();
@@ -59,15 +55,15 @@ public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testNumbers() {
-		assertEquals("number of states", 7, instances.get(RoomPackage.eINSTANCE.getSimpleState()).size());
-		assertEquals("number of choice points", 1, instances.get(RoomPackage.eINSTANCE.getChoicePoint()).size());
-		assertEquals("number of transition points", 4, instances.get(RoomPackage.eINSTANCE.getTransitionPoint()).size());
-		assertEquals("number of entry points", 1, instances.get(RoomPackage.eINSTANCE.getEntryPoint()).size());
-		assertEquals("number of exit points", 1, instances.get(RoomPackage.eINSTANCE.getExitPoint()).size());
-		assertEquals("number of initial transitions", 2, instances.get(RoomPackage.eINSTANCE.getInitialTransition()).size());
-		assertEquals("number of triggered transitions", 11, instances.get(RoomPackage.eINSTANCE.getTriggeredTransition()).size());
-		assertEquals("number of continuation transitions", 3, instances.get(RoomPackage.eINSTANCE.getContinuationTransition()).size());
-		assertEquals("number of branch transitions", 2, instances.get(RoomPackage.eINSTANCE.getCPBranchTransition()).size());
+		checkSize(7, RoomPackage.eINSTANCE.getSimpleState());
+		checkSize(1, RoomPackage.eINSTANCE.getChoicePoint());
+		checkSize(4, RoomPackage.eINSTANCE.getTransitionPoint());
+		checkSize(1, RoomPackage.eINSTANCE.getEntryPoint());
+		checkSize(1, RoomPackage.eINSTANCE.getExitPoint());
+		checkSize(2, RoomPackage.eINSTANCE.getInitialTransition());
+		checkSize(11, RoomPackage.eINSTANCE.getTriggeredTransition());
+		checkSize(3, RoomPackage.eINSTANCE.getContinuationTransition());
+		checkSize(2, RoomPackage.eINSTANCE.getCPBranchTransition());
 	}
 	
 	@Test
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java
index fac0f12b4..e1d2a004c 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java
@@ -15,10 +15,8 @@ package org.eclipse.etrice.core.genmodel;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
@@ -26,7 +24,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
 import org.eclipse.etrice.core.naming.RoomNameProvider;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.eclipse.etrice.core.room.ChoicePoint;
 import org.eclipse.etrice.core.room.ContinuationTransition;
 import org.eclipse.etrice.core.room.RoomPackage;
@@ -36,7 +33,6 @@ import org.eclipse.etrice.core.room.Transition;
 public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 	
 	private Root root;
-	private HashMap<EClass, ArrayList<EObject>> instances;
 	private ExpandedActorClass xpac;
 
 	@Before
@@ -70,15 +66,15 @@ public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testNumbers() {
-		assertEquals("number of states", 9, instances.get(RoomPackage.eINSTANCE.getSimpleState()).size());
-		assertEquals("number of choice points", 1, instances.get(RoomPackage.eINSTANCE.getChoicePoint()).size());
-		assertEquals("number of transition points", 5, instances.get(RoomPackage.eINSTANCE.getTransitionPoint()).size());
-		assertEquals("number of entry points", 2, instances.get(RoomPackage.eINSTANCE.getEntryPoint()).size());
-		assertEquals("number of exit points", 1, instances.get(RoomPackage.eINSTANCE.getExitPoint()).size());
-		assertEquals("number of initial transitions", 3, instances.get(RoomPackage.eINSTANCE.getInitialTransition()).size());
-		assertEquals("number of triggered transitions", 17, instances.get(RoomPackage.eINSTANCE.getTriggeredTransition()).size());
-		assertEquals("number of continuation transitions", 4, instances.get(RoomPackage.eINSTANCE.getContinuationTransition()).size());
-		assertEquals("number of branch transitions", 3, instances.get(RoomPackage.eINSTANCE.getCPBranchTransition()).size());
+		checkSize(9, RoomPackage.eINSTANCE.getSimpleState());
+		checkSize(1, RoomPackage.eINSTANCE.getChoicePoint());
+		checkSize(5, RoomPackage.eINSTANCE.getTransitionPoint());
+		checkSize(2, RoomPackage.eINSTANCE.getEntryPoint());
+		checkSize(1, RoomPackage.eINSTANCE.getExitPoint());
+		checkSize(3, RoomPackage.eINSTANCE.getInitialTransition());
+		checkSize(17, RoomPackage.eINSTANCE.getTriggeredTransition());
+		checkSize(4, RoomPackage.eINSTANCE.getContinuationTransition());
+		checkSize(3, RoomPackage.eINSTANCE.getCPBranchTransition());
 	}
 	
 	@Test
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java
index 2c0b3b5bb..fc54a8523 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStructureInheritance.java
@@ -19,13 +19,10 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;
@@ -42,8 +39,6 @@ public class TestStructureInheritance extends TestInstanceModelBuilderBase {
 	
 	private Root root;
 	private ExpandedActorClass xpac;
-	private HashMap<EClass, ArrayList<EObject>> instances;
-	
 	@Before
 	public void setUp() {
 		prepare();
@@ -71,20 +66,11 @@ public class TestStructureInheritance extends TestInstanceModelBuilderBase {
 
 	@Test
 	public void testInstanceNumbers() {
-		ArrayList<EObject> actors = instances.get(ETriceGenPackage.eINSTANCE.getActorInstance());
-		assertEquals("Number of ActorInstances", 8, actors.size());
-
-		ArrayList<EObject> ports = instances.get(ETriceGenPackage.eINSTANCE.getPortInstance());
-		assertEquals("Number of PortInstances", 30, ports.size());
-
-		ArrayList<EObject> saps = instances.get(ETriceGenPackage.eINSTANCE.getSAPInstance());
-		assertEquals("Number of SAPInstances", 8, saps.size());
-
-		ArrayList<EObject> spps = instances.get(ETriceGenPackage.eINSTANCE.getSPPInstance());
-		assertEquals("Number of SPPInstances", 2, spps.size());
-
-		ArrayList<EObject> svcs = instances.get(ETriceGenPackage.eINSTANCE.getServiceImplInstance());
-		assertEquals("Number of ServiceImplInstances", 2, svcs.size());
+		checkSize(8, ETriceGenPackage.eINSTANCE.getActorInstance());
+		checkSize(30, ETriceGenPackage.eINSTANCE.getPortInstance());
+		checkSize(8, ETriceGenPackage.eINSTANCE.getSAPInstance());
+		checkSize(2, ETriceGenPackage.eINSTANCE.getSPPInstance());
+		checkSize(2, ETriceGenPackage.eINSTANCE.getServiceImplInstance());
 	}
 	
 	@Test