[generator] fix for enums from messages

Change-Id: I560a38ebc192139b371fc312d165d0da68d21027

3 files changed, 8 insertions, 6 deletions

diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/util/RoomCrossReferencer.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/util/RoomCrossReferencer.java
index ca49c767e..97d6ec238 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/util/RoomCrossReferencer.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/util/RoomCrossReferencer.java
@@ -163,6 +163,9 @@ public class RoomCrossReferencer {
 			do {
 				getAttributeDataClasses(dataClasses, enumClasses, cls.getAttributes());
 				getOperationDataClasses(dataClasses, enumClasses, cls.getOperations());
+				for(ProtocolClass protocol : getReferencedProtocolClasses(cls)) {
+					enumClasses.addAll(getReferencedEnumClasses(protocol));
+				}
 				cls = cls.getActorBase();
 			}
 			while (cls!=null);
diff --git a/tests/org.eclipse.etrice.generator.common.tests/build.gradle b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
index 2e4523e5b..7f797943e 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/build.gradle
+++ b/tests/org.eclipse.etrice.generator.common.tests/build.gradle
@@ -13,8 +13,7 @@ def tests = [
 	dataDrivenTest:				['models/DataDrivenTest.room', genericPhysical],
 	/* enumTest:				['models/EnumTest.room', genericPhysical],		not supported in c++	*/
 	
-	// to add 'models/DetailExpressionEnum.room', 'models/DetailExpressionTypes.room'
-	compileTests:				['models/CompileTests.room', genericPhysical, 'models/DetailExpressionTest.room', 'models/StatemachineInterfaceTest.room', 'models/StatemachineInterfaceInheritedTest.room', 'models/StatemachineInterfaceTest.room', 'models/ContinuationTransitionTest.room'],
+	compileTests:				['models/CompileTests.room', genericPhysical, 'models/DetailExpressionTest.room', 'models/DetailExpressionEnum.room', 'models/DetailExpressionTypes.room', 'models/StatemachineInterfaceTest.room', 'models/StatemachineInterfaceInheritedTest.room', 'models/StatemachineInterfaceTest.room', 'models/ContinuationTransitionTest.room'],
 	
 	handlerTest:				['models/HandlerTest.room', genericPhysical],
 	operationInheritanceTest:	['models/OperationInheritanceTest.room', genericPhysical],
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
index b29ed5fda..3fc01f00c 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/DetailExpressionTest.room
@@ -3,7 +3,7 @@ RoomModel DetailExpressionTestModel {
 	import room.basic.types.* from "../../../runtime/${etModellib}/model/Types.room"
 	import room.basic.test.* from "../../../runtime/${etModellib}/model/Tests.room"
 //	import room.basic.service.timing.* from "../../../runtime/${etModellib}/model/TimingService.room"
-//	import DetailExpressionEnum.* from "DetailExpressionEnum.room"
+	import DetailExpressionEnum.* from "DetailExpressionEnum.room"
 
 	Enumeration LocalEnum of int32 {
 		FIRST=1, SECOND=2, THIRD=3
@@ -29,7 +29,7 @@ RoomModel DetailExpressionTestModel {
 			conjugated Port cPortData: PDatadriven
 			conjugated Port cReplEvent [*]: PEventdriven
 			// no supported yet
-		//	conjugated Port enumEvent: PEnumProtocol
+			conjugated Port enumEvent: PEnumProtocol
 		}
 		Behavior {
 			ctor '''
@@ -83,8 +83,8 @@ RoomModel DetailExpressionTestModel {
 						// infoData.nested.dataOp("127.0.0.1", 8080);
 						
 						// enum
-						// enumEvent.enumMsg(ProtocolEnum.ACK);
-						// enumEvent.enumMsg2(ColorEnum.WHITE);
+						enumEvent.enumMsg(ProtocolEnum.ACK);
+						enumEvent.enumMsg2(ColorEnum.WHITE);
 						// numberArray[0] = LocalEnum.FIRST;
 					'''
 				}