diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java | 170 |
1 files changed, 85 insertions, 85 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java index 362781195f..b8fc8868d5 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java @@ -1,85 +1,85 @@ -/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.tests.ui.gmf;
-
-import org.eclipse.emf.cdo.dawn.editors.IDawnEditor;
-import org.eclipse.emf.cdo.dawn.tests.AbstractDawnGEFTest;
-import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnAcoreTestUtil;
-import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnSWTBotUtil;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
-import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor;
-import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-/**
- * @author Martin Fluegge
- */
-@CleanRepositoriesBefore
-@RunWith(SWTBotJunit4ClassRunner.class)
-public class RollbackTest extends AbstractDawnGEFTest
-{
- @Test
- public void testGMFAClassConflictMove() throws Exception
- {
- SWTBotGefEditor editor = DawnAcoreTestUtil.openNewAcoreGMFEditor("default.acore_diagram", getBot());
- assertNotNull(editor);
-
- createNodeWithLabel(DawnAcoreTestUtil.A_CLASS, 100, 100, "A", getBot(), editor);
- editor.save();
-
- editor.drag(100, 100, 200, 200);
-
- {
- CDOSession session = openSession();
- CDOTransaction transaction = session.openTransaction();
- CDOResource resource2 = transaction.getResource("/default.acore_diagram");
-
- Diagram diagram = (Diagram)resource2.getContents().get(0);
-
- assertEquals(1, diagram.getChildren().size());
-
- Node nodeA = (Node)diagram.getChildren().get(0);
-
- DawnSWTBotUtil.moveNodeRemotely(nodeA, 200, 300);
-
- transaction.commit();
- }
- sleep(500);
-
- List<SWTBotGefEditPart> aClassEditParts = DawnAcoreTestUtil.getAClassEditParts(editor);
- SWTBotGefEditPart classBEditpart = aClassEditParts.get(0);
-
- assertEquals(true, DawnAcoreTestUtil.showsConflict(classBEditpart.part()));
- editor.clickContextMenu("Solve Conflict");
-
- getBot().button("yes").click();
-
- assertEquals(false, ((IDawnEditor)editor.getReference().getEditor(false)).getView().hasConflict());
-
- EditPart part = DawnAcoreTestUtil.getAClassEditParts(editor).get(0).part();
-
- assertEquals(true, DawnSWTBotUtil.checkNodePosition((Node)part.getModel(), 200, 300));
-
- editor.save();
- }
-}
+/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Martin Fluegge - initial API and implementation + */ +package org.eclipse.emf.cdo.dawn.tests.ui.gmf; + +import org.eclipse.emf.cdo.dawn.editors.IDawnEditor; +import org.eclipse.emf.cdo.dawn.tests.AbstractDawnGEFTest; +import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnAcoreTestUtil; +import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnSWTBotUtil; +import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.cdo.session.CDOSession; +import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore; +import org.eclipse.emf.cdo.transaction.CDOTransaction; + +import org.eclipse.gef.EditPart; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.gmf.runtime.notation.Node; +import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart; +import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor; +import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.List; + +/** + * @author Martin Fluegge + */ +@CleanRepositoriesBefore +@RunWith(SWTBotJunit4ClassRunner.class) +public class RollbackTest extends AbstractDawnGEFTest +{ + @Test + public void testGMFAClassConflictMove() throws Exception + { + SWTBotGefEditor editor = DawnAcoreTestUtil.openNewAcoreGMFEditor("default.acore_diagram", getBot()); + assertNotNull(editor); + + createNodeWithLabel(DawnAcoreTestUtil.A_CLASS, 100, 100, "A", getBot(), editor); + editor.save(); + + editor.drag(100, 100, 200, 200); + + { + CDOSession session = openSession(); + CDOTransaction transaction = session.openTransaction(); + CDOResource resource2 = transaction.getResource("/default.acore_diagram"); + + Diagram diagram = (Diagram)resource2.getContents().get(0); + + assertEquals(1, diagram.getChildren().size()); + + Node nodeA = (Node)diagram.getChildren().get(0); + + DawnSWTBotUtil.moveNodeRemotely(nodeA, 200, 300); + + transaction.commit(); + } + sleep(500); + + List<SWTBotGefEditPart> aClassEditParts = DawnAcoreTestUtil.getAClassEditParts(editor); + SWTBotGefEditPart classBEditpart = aClassEditParts.get(0); + + assertEquals(true, DawnAcoreTestUtil.showsConflict(classBEditpart.part())); + editor.clickContextMenu("Solve Conflict"); + + getBot().button("yes").click(); + + assertEquals(false, ((IDawnEditor)editor.getReference().getEditor(false)).getView().hasConflict()); + + EditPart part = DawnAcoreTestUtil.getAClassEditParts(editor).get(0).part(); + + assertEquals(true, DawnSWTBotUtil.checkNodePosition((Node)part.getModel(), 200, 300)); + + editor.save(); + } +} |