Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2015-05-19 13:41:25 +0000
committerJuergen Haug2015-05-19 14:29:56 +0000
commit6d7aee666bbaef2ad5c2a6adbb177008caf94b15 (patch)
tree8263edd566bd55d4a048fc382ba5037c2dd07999 /tests/org.eclipse.etrice.core.room.tests
parentf775d788cd68ae47f2d7ae3e11d3890dcc67e2ce (diff)
downloadorg.eclipse.etrice-6d7aee666bbaef2ad5c2a6adbb177008caf94b15.tar.gz
org.eclipse.etrice-6d7aee666bbaef2ad5c2a6adbb177008caf94b15.tar.xz
org.eclipse.etrice-6d7aee666bbaef2ad5c2a6adbb177008caf94b15.zip
[generator.test] fixed test due name validation
Diffstat (limited to 'tests/org.eclipse.etrice.core.room.tests')
-rw-r--r--tests/org.eclipse.etrice.core.room.tests/models/AnnotationExample.room7
-rw-r--r--tests/org.eclipse.etrice.core.room.tests/src/org/eclipse/etrice/core/TestAnnotations.java18
2 files changed, 0 insertions, 25 deletions
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 83bf7d7a3..d182a2734 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 @@ RoomModel AnnotationExample {
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 dbb0ce905..fa3d16e23 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.common.util.Diagnostic;
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 @@ public class TestAnnotations extends TestBase {
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"));
- }
}

Back to the top