Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2011-02-01 02:56:09 -0500
committerHenrik Rentz-Reichert2011-02-01 02:56:09 -0500
commit8475938777b82ca39cd4673b27558ba2c2949e3e (patch)
tree55f6096eedcbf989173efa64a19e19df84e42b27 /tests
parent580590b65cd13e72d567feb8d107296e6181a923 (diff)
downloadorg.eclipse.etrice-8475938777b82ca39cd4673b27558ba2c2949e3e.tar.gz
org.eclipse.etrice-8475938777b82ca39cd4673b27558ba2c2949e3e.tar.xz
org.eclipse.etrice-8475938777b82ca39cd4673b27558ba2c2949e3e.zip
factored out DiagramAccessBase as common base class for structure and
behavior DiagramAccess
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/ActorClassWithBindings.java4
-rw-r--r--tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClass.java2
-rw-r--r--tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithInheritance.java4
-rw-r--r--tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithPorts.java2
-rw-r--r--tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithReferences.java2
6 files changed, 9 insertions, 8 deletions
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
index 71c8a75a5..af611e4da 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.etrice.core.room;bundle-version="0.1.0",
org.eclipse.etrice.ui.structure;bundle-version="0.1.0",
org.eclipse.xtext;bundle-version="1.0.1",
- org.eclipse.graphiti;bundle-version="0.7.0"
+ org.eclipse.graphiti;bundle-version="0.7.0",
+ org.eclipse.etrice.ui.common;bundle-version="0.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: eTrice (Incubation)
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/ActorClassWithBindings.java b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/ActorClassWithBindings.java
index 0dfc7c194..e10f864f9 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/ActorClassWithBindings.java
+++ b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/ActorClassWithBindings.java
@@ -67,7 +67,7 @@ public class ActorClassWithBindings extends TestBase {
@Test
public void checkReferences() {
- Diagram diagram = DiagramAccess.getDiagram(ac);
+ Diagram diagram = new DiagramAccess().getDiagram(ac);
ContainerShape shape = (ContainerShape) diagram.getChildren().get(0);
assertEquals("actor class child shapes", 5, shape.getChildren().size());
@@ -86,7 +86,7 @@ public class ActorClassWithBindings extends TestBase {
@Test
public void checkBindings() {
- Diagram diagram = DiagramAccess.getDiagram(ac);
+ Diagram diagram = new DiagramAccess().getDiagram(ac);
assertEquals("bindings", 2, diagram.getConnections().size());
for (Connection conn : diagram.getConnections()) {
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClass.java b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClass.java
index 0295c0ceb..83900f158 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClass.java
+++ b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClass.java
@@ -52,7 +52,7 @@ public class TestActorClass extends TestBase {
@Test
public void testActorClass() {
ActorClass ac = getModels().get(0).getActorClasses().get(0);
- Diagram diagram = DiagramAccess.getDiagram(ac);
+ Diagram diagram = new DiagramAccess().getDiagram(ac);
assertEquals("diagram children", 1, diagram.getChildren().size());
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithInheritance.java b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithInheritance.java
index bbef5bed4..14d1b0eff 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithInheritance.java
+++ b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithInheritance.java
@@ -85,7 +85,7 @@ public class TestActorClassWithInheritance extends TestBase {
@Test
public void checkReferences() {
- Diagram diagram = DiagramAccess.getDiagram(ac);
+ Diagram diagram = new DiagramAccess().getDiagram(ac);
ContainerShape shape = (ContainerShape) diagram.getChildren().get(0);
EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(shape);
assertTrue("bo is ActorClass", bo instanceof ActorClass);
@@ -137,7 +137,7 @@ public class TestActorClassWithInheritance extends TestBase {
@Test
public void checkBindings() {
- Diagram diagram = DiagramAccess.getDiagram(ac);
+ Diagram diagram = new DiagramAccess().getDiagram(ac);
ContainerShape shape = (ContainerShape) diagram.getChildren().get(0);
EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(shape);
assertTrue("bo is ActorClass", bo instanceof ActorClass);
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithPorts.java b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithPorts.java
index 9510faed9..7cceff6c5 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithPorts.java
+++ b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithPorts.java
@@ -30,7 +30,7 @@ public class TestActorClassWithPorts extends TestActorClass {
@Test
public void checkPorts() {
ActorClass ac = getModels().get(0).getActorClasses().get(0);
- Diagram diagram = DiagramAccess.getDiagram(ac);
+ Diagram diagram = new DiagramAccess().getDiagram(ac);
ContainerShape shape = (ContainerShape) diagram.getChildren().get(0);
assertEquals("actor class child shapes", 3, shape.getChildren().size());
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithReferences.java b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithReferences.java
index 92fa10b83..007e455b2 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithReferences.java
+++ b/tests/org.eclipse.etrice.ui.structure.tests/src/org/eclipse/etrice/ui/structure/commands/TestActorClassWithReferences.java
@@ -62,7 +62,7 @@ public class TestActorClassWithReferences extends TestBase {
@Test
public void checkReferences() {
- Diagram diagram = DiagramAccess.getDiagram(ac);
+ Diagram diagram = new DiagramAccess().getDiagram(ac);
ContainerShape shape = (ContainerShape) diagram.getChildren().get(0);
assertEquals("actor class child shapes", 5, shape.getChildren().size());

Back to the top