diff options
| author | Martin Fluegge | 2011-04-16 15:24:04 +0000 |
|---|---|---|
| committer | Martin Fluegge | 2011-04-16 15:24:04 +0000 |
| commit | ad9ec36232679055608d260d63ecec99b54cc238 (patch) | |
| tree | 3db7d3002037721144cac32b5695b79c3d9a0f60 /plugins/org.eclipse.emf.cdo.dawn.tests | |
| parent | 802f79f3180df5b450294fb3b09b08b9a07c20c1 (diff) | |
| download | cdo-ad9ec36232679055608d260d63ecec99b54cc238.tar.gz cdo-ad9ec36232679055608d260d63ecec99b54cc238.tar.xz cdo-ad9ec36232679055608d260d63ecec99b54cc238.zip | |
[333187] [Dawn] Provide integration for Ecore Tools
https://bugs.eclipse.org/bugs/show_bug.cgi?id=333187
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.tests')
2 files changed, 7 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java index dee6c53678..721b1b48a6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnUITest.java @@ -46,7 +46,9 @@ public abstract class AbstractDawnUITest<T extends SWTWorkbenchBot> extends Abst SWTBotPreferences.SCREENSHOTS_DIR = DawnTestPlatform.instance.getTestFolder(); resetWorkbench(); DawnSWTBotUtil.initTest(getBot()); - // getBot().viewByTitle("CDO Sessions").close(); + + // TODO Remove this line if bug 323788 is solved. + getBot().viewByTitle("CDO Sessions").close(); } /** diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java index f4220407ac..b2e2ad151c 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java @@ -17,8 +17,10 @@ import org.eclipse.emf.cdo.dawn.tests.ui.DawnProjectExplorerTest; import org.eclipse.emf.cdo.dawn.tests.ui.emf.DawnEMFCreationWizardTest; import org.eclipse.emf.cdo.dawn.tests.ui.emf.DawnEMFHandleEditorTest; import org.eclipse.emf.cdo.dawn.tests.ui.emf.EMFEditorRollbackTest; +import org.eclipse.emf.cdo.dawn.tests.ui.gmf.ConflictTest; import org.eclipse.emf.cdo.dawn.tests.ui.gmf.DawnCreationWizardSWTBotTest; import org.eclipse.emf.cdo.dawn.tests.ui.gmf.MultipleResourcesTest; +import org.eclipse.emf.cdo.dawn.tests.ui.gmf.RollbackTest; import org.eclipse.emf.cdo.dawn.tests.ui.gmf.SimpleDiagramTest; import org.eclipse.emf.cdo.tests.AllTests; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; @@ -55,10 +57,9 @@ public class AllTestsDawnUISWTBot extends ConfigTestSuite testClasses.add(DawnCreationWizardSWTBotTest.class); testClasses.add(SimpleDiagramTest.class); testClasses.add(MultipleResourcesTest.class); - // MultipleResourcesDeletionTest.class, //excluded because of ui freeze testClasses.add(DawnProjectExplorerTest.class); - // testClasses.add(RollbackTest.class); - // testClasses.add(ConflictTest.class); + testClasses.add(RollbackTest.class); + testClasses.add(ConflictTest.class); /******************** EMF **********************/ testClasses.add(DawnEMFCreationWizardTest.class); |