[*] AbstractMessage even more abstract: EObject

Renamings of class fields.

Change-Id: I32a98482f8f4aaa7088bfff1287fdc842da490a7

1 files changed, 10 insertions, 11 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 f9213e6ee..d62d3eaa5 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
@@ -28,7 +28,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
 import org.eclipse.etrice.core.genmodel.etricegen.Root;
 import org.eclipse.etrice.core.genmodel.fsm.fsmgen.ExpandedRefinedState;
 import org.eclipse.etrice.core.genmodel.fsm.fsmgen.FsmGenPackage;
-import org.eclipse.etrice.core.room.util.RoomHelpers;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -43,7 +42,7 @@ public class TestCodeInheritance extends TestInstanceModelBuilderBase {
 	private HashMap<EClass, ArrayList<EObject>> derivedInstances;
 	private ExpandedActorClass base;
 	private ExpandedActorClass derived;
-	private FSMHelpers roomHelpers = new RoomHelpers();
+	private FSMHelpers fsmHelpers = new FSMHelpers();
 	
 	@Before
 	public void setUp() {
@@ -101,26 +100,26 @@ public class TestCodeInheritance extends TestInstanceModelBuilderBase {
 		State s = getState(derived, "BaseEntryExit");
 		assertTrue("is ExpandedRefinedState", s instanceof ExpandedRefinedState);
 		ExpandedRefinedState rs = (ExpandedRefinedState) s;
-		assertEquals("entry code", "// derived entry\n", roomHelpers.getDetailCode(rs.getEntryCode()));
+		assertEquals("entry code", "// derived entry\n", fsmHelpers.getDetailCode(rs.getEntryCode()));
 		assertNull("exit code", rs.getExitCode());
-		assertEquals("inherited entry", "// base entry\n", roomHelpers.getDetailCode(rs.getInheritedEntry()));
-		assertEquals("inherited exit", "// base exit\n", roomHelpers.getDetailCode(rs.getInheritedExit()));
+		assertEquals("inherited entry", "// base entry\n", fsmHelpers.getDetailCode(rs.getInheritedEntry()));
+		assertEquals("inherited exit", "// base exit\n", fsmHelpers.getDetailCode(rs.getInheritedExit()));
 		
 		s = getState(derived, "Base");
 		assertTrue("is ExpandedRefinedState", s instanceof ExpandedRefinedState);
 		rs = (ExpandedRefinedState) s;
 		assertNull("entry code", rs.getEntryCode());
-		assertEquals("exit code", "// derived exit\n", roomHelpers.getDetailCode(rs.getExitCode()));
-		assertEquals("inherited entry", "", roomHelpers.getDetailCode(rs.getInheritedEntry()));
-		assertEquals("inherited exit", "", roomHelpers.getDetailCode(rs.getInheritedExit()));
+		assertEquals("exit code", "// derived exit\n", fsmHelpers.getDetailCode(rs.getExitCode()));
+		assertEquals("inherited entry", "", fsmHelpers.getDetailCode(rs.getInheritedEntry()));
+		assertEquals("inherited exit", "", fsmHelpers.getDetailCode(rs.getInheritedExit()));
 		
 		s = getState(derived, "BaseSub");
 		assertTrue("is ExpandedRefinedState", s instanceof ExpandedRefinedState);
 		rs = (ExpandedRefinedState) s;
-		assertEquals("entry code", "// derived entry\n", roomHelpers.getDetailCode(rs.getEntryCode()));
+		assertEquals("entry code", "// derived entry\n", fsmHelpers.getDetailCode(rs.getEntryCode()));
 		assertNull("exit code", rs.getExitCode());
-		assertEquals("inherited entry", "", roomHelpers.getDetailCode(rs.getInheritedEntry()));
-		assertEquals("inherited exit", "", roomHelpers.getDetailCode(rs.getInheritedExit()));
+		assertEquals("inherited entry", "", fsmHelpers.getDetailCode(rs.getInheritedEntry()));
+		assertEquals("inherited exit", "", fsmHelpers.getDetailCode(rs.getInheritedExit()));
 	}
 
 }