[320193] [Dawn] Provide a flexible testing environment for UI tests

https://bugs.eclipse.org/bugs/show_bug.cgi?id=320193

3 files changed, 1 insertions, 26 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnEMFTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnEMFTest.java
index e1ab97059a..26e3344987 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnEMFTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnEMFTest.java
@@ -12,21 +12,12 @@ package org.eclipse.emf.cdo.dawn.tests;
 
 import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnEMFEditorBot;
 
-import org.junit.Before;
-
 /**
  * @author Martin Fluegge
  */
 public abstract class AbstractDawnEMFTest extends AbstractDawnUITest<DawnEMFEditorBot>
 {
   @Override
-  @Before
-  public void setUp() throws Exception
-  {
-    super.setUp();
-  }
-
-  @Override
   protected void createBot()
   {
     setBot(new DawnEMFEditorBot());
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnGEFTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnGEFTest.java
index 725312746a..219776150b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnGEFTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnGEFTest.java
@@ -12,21 +12,12 @@ package org.eclipse.emf.cdo.dawn.tests;
 
 import org.eclipse.swtbot.eclipse.gef.finder.SWTGefBot;
 
-import org.junit.Before;
-
 /**
  * @author Martin Fluegge
  */
 public abstract class AbstractDawnGEFTest extends AbstractDawnUITest<SWTGefBot>
 {
   @Override
-  @Before
-  public void setUp() throws Exception
-  {
-    super.setUp();
-  }
-
-  @Override
   protected void createBot()
   {
     setBot(new SWTGefBot());
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 d79c976657..0e97ce089f 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
@@ -36,7 +36,7 @@ import org.junit.Before;
 /**
  * @author Martin Fluegge
  */
-public abstract class AbstractDawnUITest<T extends SWTWorkbenchBot> extends AbstractCDOUITest<SWTWorkbenchBot>
+public abstract class AbstractDawnUITest<T extends SWTWorkbenchBot> extends AbstractCDOUITest<T>
 {
   @Override
   @Before
@@ -49,13 +49,6 @@ public abstract class AbstractDawnUITest<T extends SWTWorkbenchBot> extends Abst
     getBot().viewByTitle("CDO Sessions").close();
   }
 
-  @SuppressWarnings("unchecked")
-  @Override
-  protected T getBot()
-  {
-    return (T)super.getBot();
-  }
-
   /**
    * This method opens a DawnDiagramEditor specified by the given URI. It automatically finds the right editor by
    * matching the "file extension".