diff options
Diffstat (limited to 'extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java')
-rw-r--r-- | extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java | 59 |
1 files changed, 28 insertions, 31 deletions
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java index f22d8d76947..1ac16aca7aa 100644 --- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java +++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2013 Cedric Dumoulin.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,11 +18,8 @@ import static org.junit.Assert.*; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.layers.stackmodel.util.NotationAndUmlModelsFactory;
import org.eclipse.papyrus.layers.stackmodel.util.TriggeredEventTraces;
-import org.eclipse.papyrus.layers.stackmodel.util.TriggeredEventTraces.TriggeredEvent;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Property;
import org.junit.After;
@@ -58,8 +55,8 @@ public class UmlNamedElementChangedEventNotifierTest { Diagram diagram1 = modelsFactory.newDiagram();
Class c1 = modelsFactory.newClass(diagram1, "C1");
- UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
- UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier)notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
+ UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
+ UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier) notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
// Assert
assertNotNull("notifier created", eventNotifier);
@@ -74,8 +71,8 @@ public class UmlNamedElementChangedEventNotifierTest { Diagram diagram1 = modelsFactory.newDiagram();
Class c1 = modelsFactory.newClass(diagram1, "C1");
- UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
- UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier)notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
+ UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
+ UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier) notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
TraceUmlNamedElementChangedEventListener listener = new TraceUmlNamedElementChangedEventListener();
eventNotifier.addEventListener(listener);
@@ -93,8 +90,8 @@ public class UmlNamedElementChangedEventNotifierTest { Diagram diagram1 = modelsFactory.newDiagram();
Class c1 = modelsFactory.newClass(diagram1, "C1");
- UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
- UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier)notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
+ UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
+ UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier) notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
TraceUmlNamedElementChangedEventListener listener = new TraceUmlNamedElementChangedEventListener();
eventNotifier.addEventListener(listener);
@@ -113,13 +110,13 @@ public class UmlNamedElementChangedEventNotifierTest { Diagram diagram1 = modelsFactory.newDiagram();
Class c1 = modelsFactory.newClass(diagram1, "C1");
- UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
- UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier)notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
+ UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
+ UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier) notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
TraceUmlNamedElementChangedEventListener listener = new TraceUmlNamedElementChangedEventListener();
eventNotifier.addEventListener(listener);
TriggeredEventTraces<Notification> traces = listener.traces;
-
+
// Action
traces.clear();
// Modify ele
@@ -128,11 +125,11 @@ public class UmlNamedElementChangedEventNotifierTest { // Assert
// Assert
assertTrue("event recorded", traces.contains("valueChanged"));
- assertEquals("one event recorded", 1, traces.traces.size() );
-
+ assertEquals("one event recorded", 1, traces.traces.size());
+
TriggeredEventTraces<Notification>.TriggeredEvent event = traces.traces.get(0);
-
- assertEquals("right element in event", c1, event.notifier.getNotifier() );
+
+ assertEquals("right element in event", c1, event.notifier.getNotifier());
}
/**
@@ -144,14 +141,14 @@ public class UmlNamedElementChangedEventNotifierTest { Diagram diagram1 = modelsFactory.newDiagram();
Class c1 = modelsFactory.newClass(diagram1, "C1");
- UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
- UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier)notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
+ UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
+ UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier) notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
TraceUmlNamedElementChangedEventListener listener = new TraceUmlNamedElementChangedEventListener();
eventNotifier.addEventListener(listener);
TriggeredEventTraces<Notification> traces = listener.traces;
int expectedEventCount = 2;
-
+
// Action
traces.clear();
// Modify ele
@@ -160,10 +157,10 @@ public class UmlNamedElementChangedEventNotifierTest { // Assert
// Assert
assertTrue("event recorded", traces.contains("valueChanged"));
- assertEquals("one event recorded", expectedEventCount, traces.traces.size() );
-
-// TriggeredEventTraces<Notification>.TriggeredEvent event = traces.traces.get(0);
-// assertEquals("right element in event", c1, event.notifier.getNotifier() );
+ assertEquals("one event recorded", expectedEventCount, traces.traces.size());
+
+ // TriggeredEventTraces<Notification>.TriggeredEvent event = traces.traces.get(0);
+ // assertEquals("right element in event", c1, event.notifier.getNotifier() );
}
/**
@@ -176,14 +173,14 @@ public class UmlNamedElementChangedEventNotifierTest { Class c1 = modelsFactory.newClass(diagram1, "C1");
Property p1 = modelsFactory.newProperty(c1, "p1");
- UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
- UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier)notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
+ UmlNamedElementChangedEventNotifierFactory notifierFactory = new UmlNamedElementChangedEventNotifierFactory();
+ UmlNamedElementChangedEventNotifier eventNotifier = (UmlNamedElementChangedEventNotifier) notifierFactory.adapt(c1, UmlNamedElementChangedEventNotifier.class);
TraceUmlNamedElementChangedEventListener listener = new TraceUmlNamedElementChangedEventListener();
eventNotifier.addEventListener(listener);
TriggeredEventTraces<Notification> traces = listener.traces;
int expectedEventCount = 1;
-
+
// Action
traces.clear();
// Modify ele
@@ -192,10 +189,10 @@ public class UmlNamedElementChangedEventNotifierTest { // Assert
// Assert
assertTrue("event recorded", traces.contains("valueChanged"));
- assertEquals("one event recorded", expectedEventCount, traces.traces.size() );
-
-// TriggeredEventTraces<Notification>.TriggeredEvent event = traces.traces.get(0);
-// assertEquals("right element in event", c1, event.notifier.getNotifier() );
+ assertEquals("one event recorded", expectedEventCount, traces.traces.size());
+
+ // TriggeredEventTraces<Notification>.TriggeredEvent event = traces.traces.get(0);
+ // assertEquals("right element in event", c1, event.notifier.getNotifier() );
}
}
|