[352696] [Tests] Cleanup RepositoryConfigs

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

4 files changed, 22 insertions, 19 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java
index 1183bd88d8..caa03db433 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.dawn.tests.common.DawnWrapperResourceTest;
 import org.eclipse.emf.cdo.dawn.tests.common.GMFTest;
 import org.eclipse.emf.cdo.dawn.tests.common.TestFrameworkTest;
 import org.eclipse.emf.cdo.tests.AllTests;
+import org.eclipse.emf.cdo.tests.config.IScenario;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
 
 import java.util.List;
@@ -35,17 +36,17 @@ public class AllTestsDawn extends AllTests
   }
 
   @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
+  protected void initConfigSuites(TestSuite parent)
   {
-    testClasses.add(TestFrameworkTest.class);
-    testClasses.add(GMFTest.class);
-    testClasses.add(DawnWrapperResourceTest.class);
-    testClasses.add(DawnCodeGenGMFFragmentTest.class);
+    addScenario(parent, COMBINED, MEM, JVM, NATIVE);
   }
 
   @Override
-  protected void initConfigSuites(TestSuite parent)
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
   {
-    addScenario(parent, COMBINED, MEM, JVM, NATIVE);
+    testClasses.add(TestFrameworkTest.class);
+    testClasses.add(GMFTest.class);
+    testClasses.add(DawnWrapperResourceTest.class);
+    testClasses.add(DawnCodeGenGMFFragmentTest.class);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java
index 5679aeeacc..ae8f88bf5b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.dawn.tests.ui.emf.DawnBasicEMFUITest;
 import org.eclipse.emf.cdo.dawn.tests.ui.gmf.DawnBasicGMFUITest;
 import org.eclipse.emf.cdo.dawn.tests.ui.gmf.DawnCreationWizardTest;
 import org.eclipse.emf.cdo.tests.AllTests;
+import org.eclipse.emf.cdo.tests.config.IScenario;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
 
 import java.util.List;
@@ -34,16 +35,16 @@ public class AllTestsDawnUI extends AllTests
   }
 
   @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
+  protected void initConfigSuites(TestSuite parent)
   {
-    testClasses.add(DawnCreationWizardTest.class);
-    testClasses.add(DawnBasicGMFUITest.class);
-    testClasses.add(DawnBasicEMFUITest.class);
+    addScenario(parent, COMBINED, MEM, TCP, NATIVE);
   }
 
   @Override
-  protected void initConfigSuites(TestSuite parent)
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
   {
-    addScenario(parent, COMBINED, MEM, TCP, NATIVE);
+    testClasses.add(DawnCreationWizardTest.class);
+    testClasses.add(DawnBasicGMFUITest.class);
+    testClasses.add(DawnBasicEMFUITest.class);
   }
 }
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 4ae0487056..9c53603072 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
@@ -23,6 +23,7 @@ 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.SimpleDiagramTest;
 import org.eclipse.emf.cdo.tests.AllTests;
+import org.eclipse.emf.cdo.tests.config.IScenario;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTestSuite;
 
@@ -51,9 +52,8 @@ public class AllTestsDawnUISWTBot extends ConfigTestSuite
   }
 
   @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
   {
-
     /******************** GMF **********************/
     testClasses.add(DawnPreferencesTest.class);
     testClasses.add(DawnCreationWizardSWTBotTest.class);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java
index e8d98217ed..9116bf5edd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.dawn.tests;
 
 import org.eclipse.emf.cdo.tests.AllConfigs;
 import org.eclipse.emf.cdo.tests.InitialTest;
+import org.eclipse.emf.cdo.tests.config.IScenario;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
 
 import java.util.List;
@@ -30,14 +31,14 @@ public class TCPConfigStarter extends AllConfigs
   }
 
   @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
+  protected void initConfigSuites(TestSuite parent)
   {
-    testClasses.add(InitialTest.class);
+    addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE);
   }
 
   @Override
-  protected void initConfigSuites(TestSuite parent)
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
   {
-    addScenario(parent, COMBINED, MEM_BRANCHES, TCP, NATIVE);
+    testClasses.add(InitialTest.class);
   }
 }