From e3f0abe16d96ff17bc537b9212827671bafe48b4 Mon Sep 17 00:00:00 2001
From: vlorenzo
Date: Thu, 6 Feb 2014 13:34:11 +0100
Subject: Fix some JUnits test on timeing diagram
---
.../build.properties | 4 +++-
.../org.eclipse.papyrus.uml.diagram.timing.tests.launch | 11 +++++------
.../timing/tests/canonical/AbstractTimingDiagramTestCase.java | 1 +
.../TestTimingDiagramFullOccurrenceSpecification.java | 5 ++++-
.../diagram/timing/tests/generic/AbstractPapyrusTestCase.java | 5 ++++-
5 files changed, 17 insertions(+), 9 deletions(-)
(limited to 'tests')
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/build.properties
index 33a364df284..a345b67f3d3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/build.properties
@@ -10,5 +10,7 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- about.html
+ about.html,\
+ org.eclipse.papyrus.uml.diagram.timing.tests.launch,\
+ build.properties
src.includes = about.html
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/org.eclipse.papyrus.uml.diagram.timing.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/org.eclipse.papyrus.uml.diagram.timing.tests.launch
index 4df50154270..5415d36826a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/org.eclipse.papyrus.uml.diagram.timing.tests.launch
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/org.eclipse.papyrus.uml.diagram.timing.tests.launch
@@ -10,8 +10,7 @@
-
-
+
@@ -29,12 +28,12 @@
-
+
-
-
-
+
+
+
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java
index 9d07531f411..78773eb7ef8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java
@@ -251,6 +251,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase {
final FullStateInvariantEditPartCN lastStateInvariant = getAndAssertLastFullStateInvariant(expectedNumberOfStateInvariants);
final Rectangle bounds = getAbsoluteBounds(lastStateInvariant);
assertTrue("position out of bounds", xPos < bounds.width);
+ flushEventLoop();
sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + xPos, bounds.y));
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java
index d2ac36557de..4864bd7fdcd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java
@@ -108,8 +108,9 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
// send the open request (corresponding to a double-click)
sendOpenSelectionRequest(stateInvariantEditPart, new Point(x, y));
-
+ flushEventLoop();
checkCreatedStateInvariants();
+ flushEventLoop();
checkCreatedOccurrenceSpecification();
// test undo
@@ -253,6 +254,7 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
protected void checkCreatedStateInvariants() {
// check the StateInvariants
+ flushEventLoop();
final List stateInvariantEditParts = findStateInvariantsInDefaultFullLifeline();
assertEquals("There must be two StateInvariants after creating an OccurrenceSpecification", 2, stateInvariantEditParts.size());
checkStateInvariant(stateInvariantEditParts.get(0));
@@ -260,6 +262,7 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
}
private void checkCreatedOccurrenceSpecification() {
+ flushEventLoop();
final List occurrenceSpecificationEditParts = findOccurrenceSpecificationsInDefaultFullLifeline();
assertEquals("There must be one OccurrenceSpecification", 1, occurrenceSpecificationEditParts.size());
final OccurrenceSpecificationEditPartCN occurrenceSpecificationEditPart = occurrenceSpecificationEditParts.get(0);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java
index e332f7c1279..6c47afe960e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java
@@ -264,6 +264,7 @@ public abstract class AbstractPapyrusTestCase {
}
}
});
+ flushEventLoop();
}
protected static void maximize() {
@@ -291,7 +292,7 @@ public abstract class AbstractPapyrusTestCase {
assertTrue("The editor must be a " + PapyrusMultiDiagramEditor.class.getSimpleName() + " (Actual type: " + editorPart.getClass().getSimpleName() + ")", editorPart instanceof PapyrusMultiDiagramEditor);
// maximize the editor
final IWorkbenchPartReference reference = this.page.getReference(editorPart);
- editorPart.getSite().getPage().toggleZoom(reference);
+// editorPart.getSite().getPage().toggleZoom(reference);
this.papyrusEditor = ((PapyrusMultiDiagramEditor)editorPart);
Assert.assertNotNull(papyrusEditor);
}
@@ -627,10 +628,12 @@ public abstract class AbstractPapyrusTestCase {
// set first name
final String name1 = "test name 1 " + System.currentTimeMillis();
setNameWithDirectEditRequest(editPart, name1);
+ flushEventLoop();
assertEquals("The element should have the first name", name1, nameProvider.getName(element));
// set second name
final String name2 = "test name 2 " + System.currentTimeMillis();
setNameWithDirectEditRequest(editPart, name2);
+ flushEventLoop();
assertEquals("The element should have the second name", name2, nameProvider.getName(element));
// test undo
undo();
--
cgit v1.2.1