[*] factored out Finite State Machines into a separate DSL between Base and Room

Change-Id: I5183d3d56a45bdfb66d3da4c91dc9b72c05b965c

7 files changed, 97 insertions, 95 deletions

diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestCodeInheritance.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestCodeInheritance.java
index 6fa0d8345..ce21a066f 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestCodeInheritance.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestCodeInheritance.java
@@ -21,12 +21,12 @@ import java.util.HashMap;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
+import org.eclipse.etrice.core.fsm.fSM.State;
 import org.eclipse.etrice.core.genmodel.etricegen.ETriceGenPackage;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedRefinedState;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
-import org.eclipse.etrice.core.room.RoomPackage;
-import org.eclipse.etrice.core.room.State;
 import org.eclipse.etrice.core.room.util.RoomHelpers;
 import org.junit.Before;
 import org.junit.Test;
@@ -73,26 +73,26 @@ public class TestCodeInheritance extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testNumbers() {
-		assertEquals("number of states", 6, baseInstances.get(RoomPackage.eINSTANCE.getSimpleState()).size());
-		assertNull("number of choice points", baseInstances.get(RoomPackage.eINSTANCE.getChoicePoint()));
-		assertNull("number of transition points", baseInstances.get(RoomPackage.eINSTANCE.getTransitionPoint()));
-		assertNull("number of entry points", baseInstances.get(RoomPackage.eINSTANCE.getEntryPoint()));
-		assertNull("number of exit points", baseInstances.get(RoomPackage.eINSTANCE.getExitPoint()));
-		assertEquals("number of initial transitions", 3, baseInstances.get(RoomPackage.eINSTANCE.getInitialTransition()).size());
-		assertEquals("number of triggered transitions", 3, baseInstances.get(RoomPackage.eINSTANCE.getTriggeredTransition()).size());
-		assertNull("number of continuation transitions", baseInstances.get(RoomPackage.eINSTANCE.getContinuationTransition()));
-		assertNull("number of branch transitions", baseInstances.get(RoomPackage.eINSTANCE.getCPBranchTransition()));
+		assertEquals("number of states", 6, baseInstances.get(FSMPackage.eINSTANCE.getSimpleState()).size());
+		assertNull("number of choice points", baseInstances.get(FSMPackage.eINSTANCE.getChoicePoint()));
+		assertNull("number of transition points", baseInstances.get(FSMPackage.eINSTANCE.getTransitionPoint()));
+		assertNull("number of entry points", baseInstances.get(FSMPackage.eINSTANCE.getEntryPoint()));
+		assertNull("number of exit points", baseInstances.get(FSMPackage.eINSTANCE.getExitPoint()));
+		assertEquals("number of initial transitions", 3, baseInstances.get(FSMPackage.eINSTANCE.getInitialTransition()).size());
+		assertEquals("number of triggered transitions", 3, baseInstances.get(FSMPackage.eINSTANCE.getTriggeredTransition()).size());
+		assertNull("number of continuation transitions", baseInstances.get(FSMPackage.eINSTANCE.getContinuationTransition()));
+		assertNull("number of branch transitions", baseInstances.get(FSMPackage.eINSTANCE.getCPBranchTransition()));
 
-		assertEquals("number of states", 4, derivedInstances.get(RoomPackage.eINSTANCE.getSimpleState()).size());
+		assertEquals("number of states", 4, derivedInstances.get(FSMPackage.eINSTANCE.getSimpleState()).size());
 		assertEquals("number of states", 3, derivedInstances.get(ETriceGenPackage.eINSTANCE.getExpandedRefinedState()).size());
-		assertNull("number of choice points", derivedInstances.get(RoomPackage.eINSTANCE.getChoicePoint()));
-		assertNull("number of transition points", derivedInstances.get(RoomPackage.eINSTANCE.getTransitionPoint()));
-		assertNull("number of entry points", derivedInstances.get(RoomPackage.eINSTANCE.getEntryPoint()));
-		assertNull("number of exit points", derivedInstances.get(RoomPackage.eINSTANCE.getExitPoint()));
-		assertEquals("number of initial transitions", 4, derivedInstances.get(RoomPackage.eINSTANCE.getInitialTransition()).size());
-		assertEquals("number of triggered transitions", 3, derivedInstances.get(RoomPackage.eINSTANCE.getTriggeredTransition()).size());
-		assertNull("number of continuation transitions", derivedInstances.get(RoomPackage.eINSTANCE.getContinuationTransition()));
-		assertNull("number of branch transitions", derivedInstances.get(RoomPackage.eINSTANCE.getCPBranchTransition()));
+		assertNull("number of choice points", derivedInstances.get(FSMPackage.eINSTANCE.getChoicePoint()));
+		assertNull("number of transition points", derivedInstances.get(FSMPackage.eINSTANCE.getTransitionPoint()));
+		assertNull("number of entry points", derivedInstances.get(FSMPackage.eINSTANCE.getEntryPoint()));
+		assertNull("number of exit points", derivedInstances.get(FSMPackage.eINSTANCE.getExitPoint()));
+		assertEquals("number of initial transitions", 4, derivedInstances.get(FSMPackage.eINSTANCE.getInitialTransition()).size());
+		assertEquals("number of triggered transitions", 3, derivedInstances.get(FSMPackage.eINSTANCE.getTriggeredTransition()).size());
+		assertNull("number of continuation transitions", derivedInstances.get(FSMPackage.eINSTANCE.getContinuationTransition()));
+		assertNull("number of branch transitions", derivedInstances.get(FSMPackage.eINSTANCE.getCPBranchTransition()));
 	}
 	
 	@Test
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 4240717b1..479a2d157 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
@@ -36,7 +36,7 @@ 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.fsm.fSM.StateGraphItem;
 import org.eclipse.etrice.core.genmodel.base.ILogger;
 import org.eclipse.etrice.core.genmodel.builder.GeneratorModelBuilder;
 
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 403cdb277..cd33dcdf5 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
@@ -20,18 +20,18 @@ import java.util.ArrayList;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.fsm.fSM.CPBranchTransition;
+import org.eclipse.etrice.core.fsm.fSM.ChoicePoint;
+import org.eclipse.etrice.core.fsm.fSM.ContinuationTransition;
+import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
+import org.eclipse.etrice.core.fsm.fSM.State;
+import org.eclipse.etrice.core.fsm.fSM.Transition;
+import org.eclipse.etrice.core.fsm.fSM.TriggeredTransition;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
 import org.eclipse.etrice.core.genmodel.etricegen.TransitionChain;
 import org.eclipse.etrice.core.naming.RoomNameProvider;
-import org.eclipse.etrice.core.room.CPBranchTransition;
-import org.eclipse.etrice.core.room.ChoicePoint;
-import org.eclipse.etrice.core.room.ContinuationTransition;
 import org.eclipse.etrice.core.room.DataClass;
-import org.eclipse.etrice.core.room.RoomPackage;
-import org.eclipse.etrice.core.room.State;
-import org.eclipse.etrice.core.room.Transition;
-import org.eclipse.etrice.core.room.TriggeredTransition;
 import org.eclipse.etrice.core.room.VarDecl;
 import org.junit.Before;
 import org.junit.Test;
@@ -86,15 +86,15 @@ public class TestMultipleConnectedChoicepoint extends
 	
 	@Test
 	public void testNumbers() {
-		assertEquals("number of states", 6, instances.get(RoomPackage.eINSTANCE.getSimpleState()).size());
-		assertEquals("number of choice points", 1, instances.get(RoomPackage.eINSTANCE.getChoicePoint()).size());
-		assertNull("number of transition points", instances.get(RoomPackage.eINSTANCE.getTransitionPoint()));
-		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", 1, instances.get(RoomPackage.eINSTANCE.getInitialTransition()).size());
-		assertEquals("number of triggered transitions", 5, instances.get(RoomPackage.eINSTANCE.getTriggeredTransition()).size());
-		assertEquals("number of continuation transitions", 3, instances.get(RoomPackage.eINSTANCE.getContinuationTransition()).size());
-		assertEquals("number of branch transitions", 1, instances.get(RoomPackage.eINSTANCE.getCPBranchTransition()).size());
+		assertEquals("number of states", 6, instances.get(FSMPackage.eINSTANCE.getSimpleState()).size());
+		assertEquals("number of choice points", 1, instances.get(FSMPackage.eINSTANCE.getChoicePoint()).size());
+		assertNull("number of transition points", instances.get(FSMPackage.eINSTANCE.getTransitionPoint()));
+		assertEquals("number of entry points", 1, instances.get(FSMPackage.eINSTANCE.getEntryPoint()).size());
+		assertEquals("number of exit points", 1, instances.get(FSMPackage.eINSTANCE.getExitPoint()).size());
+		assertEquals("number of initial transitions", 1, instances.get(FSMPackage.eINSTANCE.getInitialTransition()).size());
+		assertEquals("number of triggered transitions", 5, instances.get(FSMPackage.eINSTANCE.getTriggeredTransition()).size());
+		assertEquals("number of continuation transitions", 3, instances.get(FSMPackage.eINSTANCE.getContinuationTransition()).size());
+		assertEquals("number of branch transitions", 1, instances.get(FSMPackage.eINSTANCE.getCPBranchTransition()).size());
 	}
 	
 	@Test
@@ -106,7 +106,7 @@ public class TestMultipleConnectedChoicepoint extends
 	
 	@Test
 	public void testGraph() {
-		ArrayList<EObject> cps = instances.get(RoomPackage.eINSTANCE.getChoicePoint());
+		ArrayList<EObject> cps = instances.get(FSMPackage.eINSTANCE.getChoicePoint());
 		ChoicePoint cp = (ChoicePoint) cps.get(0);
 		assertEquals("choicepoint name", "cp0", roomNameProvider.getFullPath(cp));
 		assertEquals("number of incoming transitions", 2, xpac.getIncomingTransitions(cp).size());
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 af9d06580..10df48c73 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
@@ -18,17 +18,17 @@ import java.util.ArrayList;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
 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;
-import org.eclipse.etrice.core.room.State;
-import org.eclipse.etrice.core.room.Transition;
+import org.eclipse.etrice.core.fsm.fSM.ChoicePoint;
+import org.eclipse.etrice.core.fsm.fSM.ContinuationTransition;
+import org.eclipse.etrice.core.fsm.fSM.State;
+import org.eclipse.etrice.core.fsm.fSM.Transition;
 
 public class TestStates extends TestInstanceModelBuilderBase {
 	
@@ -45,15 +45,15 @@ public class TestStates extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testNumbers() {
-		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());
+		checkSize(7, FSMPackage.eINSTANCE.getSimpleState());
+		checkSize(1, FSMPackage.eINSTANCE.getChoicePoint());
+		checkSize(2, FSMPackage.eINSTANCE.getTransitionPoint());
+		checkSize(1, FSMPackage.eINSTANCE.getEntryPoint());
+		checkSize(1, FSMPackage.eINSTANCE.getExitPoint());
+		checkSize(2, FSMPackage.eINSTANCE.getInitialTransition());
+		checkSize(9, FSMPackage.eINSTANCE.getTriggeredTransition());
+		checkSize(3, FSMPackage.eINSTANCE.getContinuationTransition());
+		checkSize(2, FSMPackage.eINSTANCE.getCPBranchTransition());
 	}
 	
 	@Test
@@ -67,7 +67,7 @@ public class TestStates extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testGraph() {
-		ArrayList<EObject> states = instances.get(RoomPackage.eINSTANCE.getSimpleState());
+		ArrayList<EObject> states = instances.get(FSMPackage.eINSTANCE.getSimpleState());
 //		for (EObject obj : states) {
 //			LogicalSystem.out.println("state "+RoomNameProvider.getFullPath((StateGraphItem) obj));
 //		}
@@ -88,7 +88,7 @@ public class TestStates extends TestInstanceModelBuilderBase {
 		
 		assertEquals("active triggers", 2, xpac.getActiveTriggers(s).size());
 
-		ArrayList<EObject> cps = instances.get(RoomPackage.eINSTANCE.getChoicePoint());
+		ArrayList<EObject> cps = instances.get(FSMPackage.eINSTANCE.getChoicePoint());
 		
 		ChoicePoint cp = (ChoicePoint) cps.get(0);
 		assertEquals("choicepoint name", "CP1", roomNameProvider.getFullPath(cp));
@@ -101,7 +101,7 @@ public class TestStates extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testChains() {
-		ArrayList<EObject> cts = instances.get(RoomPackage.eINSTANCE.getContinuationTransition());
+		ArrayList<EObject> cts = instances.get(FSMPackage.eINSTANCE.getContinuationTransition());
 //		for (EObject obj : cts) {
 //			LogicalSystem.out.println("ct "+RoomNameProvider.getFullPath((StateGraphItem) obj));
 //		}
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 ef0914522..9905b6f8d 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
@@ -11,25 +11,26 @@
  *******************************************************************************/
 package org.eclipse.etrice.core.genmodel;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.ArrayList;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.fsm.fSM.ChoicePoint;
+import org.eclipse.etrice.core.fsm.fSM.ContinuationTransition;
+import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
+import org.eclipse.etrice.core.fsm.fSM.State;
+import org.eclipse.etrice.core.fsm.fSM.Transition;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
 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;
-import org.eclipse.etrice.core.room.RoomPackage;
 import org.eclipse.etrice.core.room.SAP;
-import org.eclipse.etrice.core.room.State;
-import org.eclipse.etrice.core.room.Transition;
+import org.junit.Before;
+import org.junit.Test;
 
 public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 	
@@ -56,15 +57,15 @@ public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testNumbers() {
-		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());
+		checkSize(7, FSMPackage.eINSTANCE.getSimpleState());
+		checkSize(1, FSMPackage.eINSTANCE.getChoicePoint());
+		checkSize(4, FSMPackage.eINSTANCE.getTransitionPoint());
+		checkSize(1, FSMPackage.eINSTANCE.getEntryPoint());
+		checkSize(1, FSMPackage.eINSTANCE.getExitPoint());
+		checkSize(2, FSMPackage.eINSTANCE.getInitialTransition());
+		checkSize(11, FSMPackage.eINSTANCE.getTriggeredTransition());
+		checkSize(3, FSMPackage.eINSTANCE.getContinuationTransition());
+		checkSize(2, FSMPackage.eINSTANCE.getCPBranchTransition());
 	}
 	
 	@Test
@@ -76,7 +77,7 @@ public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testGraph() {
-		ArrayList<EObject> states = instances.get(RoomPackage.eINSTANCE.getSimpleState());
+		ArrayList<EObject> states = instances.get(FSMPackage.eINSTANCE.getSimpleState());
 //		for (EObject obj : states) {
 //			LogicalSystem.out.println("state "+RoomNameProvider.getFullPath((StateGraphItem) obj));
 //		}
@@ -95,7 +96,7 @@ public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 		
 		assertEquals("active triggers", 3, xpac.getActiveTriggers(s).size());
 
-		ArrayList<EObject> cps = instances.get(RoomPackage.eINSTANCE.getChoicePoint());
+		ArrayList<EObject> cps = instances.get(FSMPackage.eINSTANCE.getChoicePoint());
 		
 		ChoicePoint cp = (ChoicePoint) cps.get(0);
 		assertEquals("choicepoint name", "CP1", roomNameProvider.getFullPath(cp));
@@ -108,7 +109,7 @@ public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testChains() {
-		ArrayList<EObject> cts = instances.get(RoomPackage.eINSTANCE.getContinuationTransition());
+		ArrayList<EObject> cts = instances.get(FSMPackage.eINSTANCE.getContinuationTransition());
 //		for (EObject obj : cts) {
 //			LogicalSystem.out.println("ct "+RoomNameProvider.getFullPath((StateGraphItem) obj));
 //		}
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 d9fe5fca0..fbcf7247d 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
@@ -12,23 +12,24 @@
 
 package org.eclipse.etrice.core.genmodel;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.ArrayList;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.etrice.core.fsm.fSM.ChoicePoint;
+import org.eclipse.etrice.core.fsm.fSM.ContinuationTransition;
+import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
+import org.eclipse.etrice.core.fsm.fSM.State;
+import org.eclipse.etrice.core.fsm.fSM.Transition;
 import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
 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;
-import org.eclipse.etrice.core.room.State;
-import org.eclipse.etrice.core.room.Transition;
 
 public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 	
@@ -67,15 +68,15 @@ public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testNumbers() {
-		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());
+		checkSize(9, FSMPackage.eINSTANCE.getSimpleState());
+		checkSize(1, FSMPackage.eINSTANCE.getChoicePoint());
+		checkSize(5, FSMPackage.eINSTANCE.getTransitionPoint());
+		checkSize(2, FSMPackage.eINSTANCE.getEntryPoint());
+		checkSize(1, FSMPackage.eINSTANCE.getExitPoint());
+		checkSize(3, FSMPackage.eINSTANCE.getInitialTransition());
+		checkSize(17, FSMPackage.eINSTANCE.getTriggeredTransition());
+		checkSize(4, FSMPackage.eINSTANCE.getContinuationTransition());
+		checkSize(3, FSMPackage.eINSTANCE.getCPBranchTransition());
 	}
 	
 	@Test
@@ -87,7 +88,7 @@ public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testGraph() {
-		ArrayList<EObject> states = instances.get(RoomPackage.eINSTANCE.getSimpleState());
+		ArrayList<EObject> states = instances.get(FSMPackage.eINSTANCE.getSimpleState());
 //		for (EObject obj : states) {
 //			LogicalSystem.out.println("state "+RoomNameProvider.getFullPath((StateGraphItem) obj));
 //		}
@@ -106,7 +107,7 @@ public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 		
 		assertEquals("active triggers", 3, xpac.getActiveTriggers(s).size());
 
-		ArrayList<EObject> cps = instances.get(RoomPackage.eINSTANCE.getChoicePoint());
+		ArrayList<EObject> cps = instances.get(FSMPackage.eINSTANCE.getChoicePoint());
 		
 		ChoicePoint cp = (ChoicePoint) cps.get(0);
 		assertEquals("choicepoint name", "CP1", roomNameProvider.getFullPath(cp));
@@ -119,7 +120,7 @@ public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 	
 	@Test
 	public void testChains() {
-		ArrayList<EObject> cts = instances.get(RoomPackage.eINSTANCE.getContinuationTransition());
+		ArrayList<EObject> cts = instances.get(FSMPackage.eINSTANCE.getContinuationTransition());
 //		for (EObject obj : cts) {
 //			LogicalSystem.out.println("ct "+RoomNameProvider.getFullPath((StateGraphItem) obj));
 //		}
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 34cce3616..b8e2b87b5 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
@@ -101,7 +101,7 @@ public class TestStructureInheritance extends TestInstanceModelBuilderBase {
 		}
 		
 		if (ac.getBase()!=null)
-			return getPort(ac.getBase(), name);
+			return getPort(ac.getActorBase(), name);
 		
 		fail("port "+name+" not found");
 		return null;
@@ -114,7 +114,7 @@ public class TestStructureInheritance extends TestInstanceModelBuilderBase {
 		}
 		
 		if (ac.getBase()!=null)
-			return getSAP(ac.getBase(), name);
+			return getSAP(ac.getActorBase(), name);
 		
 		fail("sap "+name+" not found");
 		return null;