[generator.test] fixed test due name validation
Change-Id: Ifcfc36cb7f4657e3ee371e2a456222bf49bf0597
diff --git a/tests/org.eclipse.etrice.core.room.tests/models/AnnotationExample.room b/tests/org.eclipse.etrice.core.room.tests/models/AnnotationExample.room
index 83bf7d7..d182a27 100644
--- a/tests/org.eclipse.etrice.core.room.tests/models/AnnotationExample.room
+++ b/tests/org.eclipse.etrice.core.room.tests/models/AnnotationExample.room
@@ -23,11 +23,4 @@
Message x()
}
}
-
- ActorClass SameNameAnnotationTypeRoomClass {
- }
-
- AnnotationType SameNameAnnotationTypeRoomClass {
- target = ActorClass
- }
}
diff --git a/tests/org.eclipse.etrice.core.room.tests/src/org/eclipse/etrice/core/TestAnnotations.java b/tests/org.eclipse.etrice.core.room.tests/src/org/eclipse/etrice/core/TestAnnotations.java
index dbb0ce9..fa3d16e 100644
--- a/tests/org.eclipse.etrice.core.room.tests/src/org/eclipse/etrice/core/TestAnnotations.java
+++ b/tests/org.eclipse.etrice.core.room.tests/src/org/eclipse/etrice/core/TestAnnotations.java
@@ -19,7 +19,6 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.etrice.core.common.base.AnnotationType;
-import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ProtocolClass;
import org.junit.Before;
import org.junit.Test;
@@ -50,21 +49,4 @@
assertTrue(diag.getChildren().size() == 1);
assertTrue(diag.getChildren().get(0).getMessage().contains("not allowed for target ProtocolClass"));
}
-
- @Test
- public void SameNameAnnotationTypeRoomClass() {
- // Test RoomClass validator check
- EObject obj = res.getEObject("ActorClass:SameNameAnnotationTypeRoomClass");
- ActorClass ac = (ActorClass)obj;
- Diagnostic diagActorClass = getDiag(ac);
- assertFalse(diagActorClass.getChildren().isEmpty());
- assertTrue(diagActorClass.getChildren().size() == 1);
- assertTrue(diagActorClass.getChildren().get(0).getMessage().contains("already exists as an AnnotationType name"));
- // Test AnnotationType validator check
- obj = res.getEObject("AnnotationType:SameNameAnnotationTypeRoomClass");
- AnnotationType at = (AnnotationType)obj;
- Diagnostic diagAnnotationType = getDiag(at);
- assertFalse(diagAnnotationType.getChildren().isEmpty());
- assertTrue(diagAnnotationType.getChildren().get(0).getMessage().contains("already exists as a RoomClass name"));
- }
}
diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DynamicActorTest3.room b/tests/org.eclipse.etrice.generator.common.tests/models/DynamicActorTest3.room
index 9177079..d53a019 100644
--- a/tests/org.eclipse.etrice.generator.common.tests/models/DynamicActorTest3.room
+++ b/tests/org.eclipse.etrice.generator.common.tests/models/DynamicActorTest3.room
@@ -88,8 +88,8 @@
}
Structure {
external Port fct
- optional ActorRef opt: Optional
- Binding opt and opt.p0
+ optional ActorRef optRef: Optional
+ Binding opt and optRef.p0
}
Behavior {
// this method prints the passed message and then dumps the object tree consisting of actors and ports
@@ -105,7 +105,7 @@
<create: fct>
}
action {
- "if (opt.createOptionalActor(ac, getThread()))"
+ "if (optRef.createOptionalActor(ac, getThread()))"
"\tfct.ok();"
"else"
"\tfct.error();"
