Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/test/org/eclipse/papyrus/integrationtests/editor/undoredo/UndoRedoAfterEditorCreationTest.java')
-rw-r--r--tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/test/org/eclipse/papyrus/integrationtests/editor/undoredo/UndoRedoAfterEditorCreationTest.java94
1 files changed, 48 insertions, 46 deletions
diff --git a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/test/org/eclipse/papyrus/integrationtests/editor/undoredo/UndoRedoAfterEditorCreationTest.java b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/test/org/eclipse/papyrus/integrationtests/editor/undoredo/UndoRedoAfterEditorCreationTest.java
index ab59265efa5..00da3a726d3 100644
--- a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/test/org/eclipse/papyrus/integrationtests/editor/undoredo/UndoRedoAfterEditorCreationTest.java
+++ b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/test/org/eclipse/papyrus/integrationtests/editor/undoredo/UndoRedoAfterEditorCreationTest.java
@@ -21,10 +21,10 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
* Integration tests.
* Check the undo/redo after nested editor creation.
- *
+ *
* @author cedric dumoulin
*
*/
@@ -34,15 +34,16 @@ public class UndoRedoAfterEditorCreationTest {
* Handler on a newly created editor
*/
protected ProgramaticPapyrusEditor editorHandler;
-
+
/**
* A diagram creator associated to the editor.
* Used to create diagrams.
*/
protected DiagramCreator diagramCreator;
-
+
/**
* Create a new editor
+ *
* @throws Exception
*/
@Before
@@ -53,6 +54,7 @@ public class UndoRedoAfterEditorCreationTest {
/**
* Dispose the editor.
+ *
* @throws Exception
*/
@After
@@ -61,92 +63,92 @@ public class UndoRedoAfterEditorCreationTest {
}
/**
- * @throws DiagramCreationException
- * @throws EditorCreationException
- * @throws ServiceException
- *
+ * @throws DiagramCreationException
+ * @throws EditorCreationException
+ * @throws ServiceException
+ *
*/
@Test
public void testUndoRedoUndo() throws DiagramCreationException, EditorCreationException, ServiceException {
-
+
TransactionalEditingDomain domain = editorHandler.getServiceRegistry().getService(TransactionalEditingDomain.class);
CommandStack cstack = domain.getCommandStack();
-
+
// Create one diagram
IPage createdPage = diagramCreator.createEmfTreeDiagram("newDiagram");
assertNotNull("diagram created", createdPage);
// Try to undo
editorHandler.undo();
assertNull("diagram removed", editorHandler.getEditor().getActiveEditor());
-
+
// Try to redo
editorHandler.redo();
assertNotNull("diagram exist", editorHandler.getEditor().getActiveEditor());
-
+
// Try to undo
editorHandler.undo();
assertNull("diagram removed", editorHandler.getEditor().getActiveEditor());
-
+
// Try to redo
editorHandler.redo();
assertNotNull("diagram exist", editorHandler.getEditor().getActiveEditor());
// Check di now
-
+
}
/**
- * @throws ServiceException
- * @throws ExecutionException
- *
+ * @throws ServiceException
+ * @throws ExecutionException
+ *
*/
@Test
public void testUndoRedoUndoIOperationHistory() throws ServiceException, ExecutionException {
-
+
// Create one diagram
IPage createdPage = diagramCreator.createEmfTreeDiagram("newDiagram");
assertNotNull("diagram created", createdPage);
IOperationHistoryHandler history = new OperationHistoryHandler(editorHandler);
-
+
// Try to undo
assertTrue("Can undo", history.canUndo());
history.undo();
assertNull("diagram removed", editorHandler.getEditor().getActiveEditor());
-
-
+
+
// Try to redo
assertTrue("Can redo", history.canRedo());
history.redo();
assertNotNull("diagram exist", editorHandler.getEditor().getActiveEditor());
-
+
// Try to undo
assertTrue("Can undo", history.canUndo());
history.undo();
assertNull("diagram removed", editorHandler.getEditor().getActiveEditor());
-
+
// Try to redo
assertTrue("Can redo", history.canRedo());
history.redo();
assertNotNull("diagram exist", editorHandler.getEditor().getActiveEditor());
// Check di now
-
+
}
/**
- * @throws ServiceException
- * @throws ExecutionException
- *
+ * @throws ServiceException
+ * @throws ExecutionException
+ *
*/
@Test
public void testDoubleCreateUndoUndoRedoRedoIOperationHistory() throws ServiceException, ExecutionException {
-
+
IOperationHistoryHandler history = new OperationHistoryHandler(editorHandler);
ISashWindowsContainer container = editorHandler.getServiceRegistry().getService(ISashWindowsContainer.class);
// Create one diagram
IPage createdPage = diagramCreator.createEmfTreeDiagram("newDiagram");
Object page1RawModel = createdPage.getRawModel();
-
+
assertNotNull("diagram created", createdPage);
assertNotNull("diagram created", page1RawModel);
@@ -154,46 +156,46 @@ public class UndoRedoAfterEditorCreationTest {
Object page2RawModel = createdPage2.getRawModel();
assertNotNull("diagram created", createdPage);
assertNotNull("diagram created", page2RawModel);
-
+
// Try to undo
assertTrue("Can undo", history.canUndo());
history.undo();
- assertNull( "diagram removed", container.lookupModelPage(page2RawModel ));
- assertNotNull( "diagram preserved", container.lookupModelPage(page1RawModel ));
-
-
+ assertNull("diagram removed", container.lookupModelPage(page2RawModel));
+ assertNotNull("diagram preserved", container.lookupModelPage(page1RawModel));
+
+
// Try to undo
assertTrue("Can undo", history.canUndo());
history.undo();
- assertNull( "diagram removed", container.lookupModelPage(page2RawModel ));
- assertNull( "diagram removed", container.lookupModelPage(page1RawModel ));
+ assertNull("diagram removed", container.lookupModelPage(page2RawModel));
+ assertNull("diagram removed", container.lookupModelPage(page1RawModel));
assertNull("no active editor", editorHandler.getEditor().getActiveEditor());
-
+
// Try to redo
assertTrue("Can redo", history.canRedo());
history.redo();
- assertNotNull( "diagram restored", container.lookupModelPage(page1RawModel ));
+ assertNotNull("diagram restored", container.lookupModelPage(page1RawModel));
assertNotNull("active editor set", editorHandler.getEditor().getActiveEditor());
-
+
// Try to redo
assertTrue("Can redo", history.canRedo());
history.redo();
- assertNotNull( "diagram restored", container.lookupModelPage(page2RawModel ));
+ assertNotNull("diagram restored", container.lookupModelPage(page2RawModel));
assertNotNull("active editor set", editorHandler.getEditor().getActiveEditor());
-
+
// Try to undo
assertTrue("Can undo", history.canUndo());
history.undo();
- assertNull( "diagram removed", container.lookupModelPage(page2RawModel ));
- assertNotNull( "diagram preserved", container.lookupModelPage(page1RawModel ));
-
+ assertNull("diagram removed", container.lookupModelPage(page2RawModel));
+ assertNotNull("diagram preserved", container.lookupModelPage(page1RawModel));
+
// Try to redo
assertTrue("Can redo", history.canRedo());
history.redo();
- assertNotNull( "diagram restored", container.lookupModelPage(page2RawModel ));
+ assertNotNull("diagram restored", container.lookupModelPage(page2RawModel));
assertNotNull("active editor set", editorHandler.getEditor().getActiveEditor());
// Check di now
-
+
}

Back to the top