diff options
| author | Camille Letavernier | 2015-10-28 12:16:21 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2015-10-28 12:16:21 +0000 |
| commit | ec2eecad9636863ec16aa7ae5bdd0217cb2c43b5 (patch) | |
| tree | d6bbc043cef2632e3c0fac7c8a7d1689b407ba50 /tests/junit | |
| parent | 1e629b83d6abc8ecb5881b0a1b23ca54ff7ecc5d (diff) | |
| download | org.eclipse.papyrus-ec2eecad9636863ec16aa7ae5bdd0217cb2c43b5.tar.gz org.eclipse.papyrus-ec2eecad9636863ec16aa7ae5bdd0217cb2c43b5.tar.xz org.eclipse.papyrus-ec2eecad9636863ec16aa7ae5bdd0217cb2c43b5.zip | |
480857: [Tests] Use ClassificationSuite instead of Suite to improve test
filtering & performances
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480857
Change-Id: I125b850e5c5d40773bbe79aa184fbaa398471cbe
Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>
Diffstat (limited to 'tests/junit')
113 files changed, 271 insertions, 266 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/AllTests.java index 761bd723d37..627ff0c83b0 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/AllTests.java @@ -22,7 +22,7 @@ import org.eclipse.papyrus.editor.integration.tests.tests.ModelSetTests; import org.eclipse.papyrus.editor.integration.tests.tests.PageManagerTests;
import org.eclipse.papyrus.editor.integration.tests.tests.RecoveryTest;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
@@ -32,7 +32,7 @@ import org.junit.runners.Suite.SuiteClasses; * the outline view's toolbar even after the editor was closed, and these persistent actions cause leaks of
* models opened later.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ EditorMemoryLeakTest.class, EditingScenariosMemoryLeakTest.class, //
PageManagerTests.class, RecoveryTest.class, ModelSetTests.class, //
EditorReloadTest.class })
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AllTests.java index 6f1f616fd35..b5fe031d9b6 100755 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/AllTests.java @@ -12,10 +12,10 @@ *****************************************************************************/ package org.eclipse.papyrus.infra.core.clipboard.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ClipboardTests.class }) public class AllTests { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java index 3eadad75992..69291cdda0e 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/tests/AllTests.java @@ -20,13 +20,13 @@ import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.Pag import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.TransactionalDiContentProvider2Test;
import org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query.SashModelQueryTest;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* Test suite for this fragment
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider
DiSashModelMngrTest.class,
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF index 020a7e7aadb..efbb9639760 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF @@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.ui.editors;bundle-version="3.8.0", org.eclipse.ui;bundle-version="3.106.0",
org.eclipse.ui.workbench.texteditor;bundle-version="3.9.0",
org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.emf.ecore;bundle-version="2.11.0"
+ org.eclipse.emf.ecore;bundle-version="2.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.infra.core.sasheditor.contentprovider,
org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple,
org.eclipse.papyrus.infra.core.sasheditor.editor,
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java index 21aedcb434b..33e6b522ff6 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AllTests.java @@ -12,14 +12,14 @@ package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests for package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ SimpleSashWindowsContentProviderTest.class })
public class AllTests {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java index f1eb15bd6d7..a0a4f43ac66 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/editor/AllTests.java @@ -12,14 +12,14 @@ package org.eclipse.papyrus.infra.core.sasheditor.editor;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests for package org.eclipse.papyrus.infra.core.sasheditor.editor
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ SashMultiPageEditorTest.class })
public class AllTests {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java index c231b9c33bd..3a9596c2010 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/internal/AllTests.java @@ -12,14 +12,14 @@ package org.eclipse.papyrus.infra.core.sasheditor.internal;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests for package org.eclipse.papyrus.infra.core.sasheditor.internal
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ SashContainerEventsProviderTest.class,
PageLifeCycleEventsThrownFromContainerTest.class,
SashWindowsContainerTest.class ,
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java index b8e961a87e7..462ff9469b8 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java @@ -12,14 +12,14 @@ package org.eclipse.papyrus.infra.core.sasheditor.tests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests for this plugin
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// testModel1
org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple.AllTests.class,
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/AllTests.java index fdaacf9cc97..91fbcd0d3c1 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/texteditor/AllTests.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
@@ -23,7 +23,7 @@ import org.junit.runners.Suite.SuiteClasses; * @author cedric dumoulin
*
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ FakeEditorInputTest.class,
FakeMultiSashPageEditorTest.class
})
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java index 6142a138c2d..9595ef227d1 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java @@ -31,12 +31,12 @@ import org.eclipse.papyrus.infra.core.utils.AdapterUtilsTest; import org.eclipse.papyrus.infra.core.utils.JobBasedFutureTest;
import org.eclipse.papyrus.infra.core.utils.JobExecutorServiceTest;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// {oep.resource}
ModelSetTest.class, AbstractModelWithSharedResourceTest.class, NestingTransactionalCommandStackTest.class, ResourceAdapterTest.class,
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java index 70684c8723e..08d72bea472 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java @@ -12,14 +12,14 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * All tests for this fragment */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ElementTypesRegistryTests.class, ElementEditHelperAdviceTests.class }) public class AllTests { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/AllTests.java index 53c01f8c4f9..33b23ac9882 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/AllTests.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/AllTests.java @@ -12,14 +12,14 @@ package org.eclipse.papyrus.infra.extendedtypes.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * All tests for this fragment */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ExtendedTypesRegistryTests.class, ExtendedEditHelperAdviceTests.class }) public class AllTests { diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch index f9db654ec4a..4be2d26a2b4 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch +++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch @@ -1,45 +1,45 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<booleanAttribute key="askclear" value="false"/> -<booleanAttribute key="automaticAdd" value="true"/> -<booleanAttribute key="automaticValidate" value="false"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests - Failures"/> -<booleanAttribute key="default" value="true"/> -<booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-failures-workspace"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<mapAttribute key="org.eclipse.debug.core.environmentVariables"> -<mapEntry key="skip.long.junit.tests" value="false"/> -</mapAttribute> -<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -testConfig=FAILING_TESTS_CONFIG"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx2048m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100"/> -<stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.platform.ide"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<booleanAttribute key="show_selected_only" value="false"/> -<booleanAttribute key="tracing" value="true"/> -<booleanAttribute key="useCustomFeatures" value="false"/> -<booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="useDefaultConfigArea" value="true"/> -<booleanAttribute key="useProduct" value="true"/> -<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/> -</launchConfiguration> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests - Failures"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-failures-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="skip.long.junit.tests" value="false"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -testConfig=FAILING_TESTS_CONFIG"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx2048m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="true"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/AllTests.java b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/AllTests.java index 9b226a01b9e..21e2d8177e4 100644 --- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/AllTests.java +++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/AllTests.java @@ -13,11 +13,11 @@ package org.eclipse.papyrus.customization.properties.tests; import org.eclipse.papyrus.customization.properties.tests.qvt.TransformationsTests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ TransformationsTests.class
})
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java index f74c0b1fe1c..7f07a42df79 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/AllTests.java @@ -14,10 +14,10 @@ package org.eclipse.papyrus.bundles.tests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ BundlesTests.class })
public class AllTests {
// JUnit 4 test suite
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/tests/AllTests.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/tests/AllTests.java index 12d2f83dd10..8f08d017b92 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/tests/AllTests.java +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/tests/AllTests.java @@ -17,14 +17,14 @@ import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManagerTest; import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyTesterTest; import org.eclipse.papyrus.infra.emf.readonly.ReferencedModelReadOnlyHandlerTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * Master test suite. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ PapyrusROTransactionalEditingDomainTest.class, ReferencedModelReadOnlyHandlerTest.class, ReadOnlyManagerTest.class, ReadOnlyTesterTest.class }) diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java index efc42046980..d61e3946228 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java @@ -19,14 +19,14 @@ import org.eclipse.papyrus.infra.emf.edit.domain.PapyrusTransactionalEditingDoma import org.eclipse.papyrus.infra.emf.resource.index.WorkspaceModelIndexTest; import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The test suite for the {@code org.eclipse.papyrus.infra.emf} plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ // oep.infra.emf.advice ReadOnlyObjectEditAdviceTest.class, diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF index d9ab678fc93..f1fcde4b69b 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF @@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.gef;bundle-version="3.10.0",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="1.2.0"
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AllTests.java b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AllTests.java index 89a1c405a28..b1384f6e1d6 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AllTests.java +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AllTests.java @@ -16,13 +16,13 @@ package org.eclipse.papyrus.infra.gmfdiag.assistant.tests; import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The master test suite for the plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ AssistantAllTests.class, // GenericModelingAssistantIntegrationTest.class, DiagramSpecificModelingAssistantIntegrationTest.class }) public class AllTests { diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AllTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AllTests.java index 9a3de9bdd58..2238ea1d322 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AllTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AllTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.infra.gmfdiag.canonical.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * Test suite for the {@code org.eclipse.papyrus.infra.gmfdiag.canonical} plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ BasicCanonicalClassDiagramTest.class, CanonicalStateInClassDiagramTest.class, diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/infra/gmfdiag/commands/tests/AllTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/infra/gmfdiag/commands/tests/AllTests.java index 8d4fcbd7195..1e4fd251ac7 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/infra/gmfdiag/commands/tests/AllTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/src/org/eclipse/papyrus/infra/gmfdiag/commands/tests/AllTests.java @@ -17,14 +17,14 @@ import org.eclipse.papyrus.commands.NestingNotifyingWorkspaceCommandStackTest; import org.eclipse.papyrus.commands.NotifyingWorkspaceCommandStackTest; import org.eclipse.papyrus.commands.util.CommandTreeIteratorTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * Master test suite for this test fragment. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ // {oep.commands} NotifyingWorkspaceCommandStackTest.class, NestingNotifyingWorkspaceCommandStackTest.class, diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/SyncTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/SyncTests.java index a4d626df09b..f673d2f9878 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/SyncTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/SyncTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.infra.gmfdiag.common.sync.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * Diagram-to-diagram synchronization framework test suite. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ MasterSlaveNotationSyncTest.class, NotationSyncOverrideTest.class, diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AllTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AllTests.java index 9cfcdab0cc4..5412b830459 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AllTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AllTests.java @@ -15,14 +15,14 @@ package org.eclipse.papyrus.infra.gmfdiag.common.tests; import org.eclipse.papyrus.infra.gmfdiag.common.sync.tests.SyncTests; import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafeTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * Master test suite for this test fragment. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ // {oep.commands} LoadExpansionModel.class, diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java index 477ace2a91a..05c7f2978bc 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java @@ -13,11 +13,11 @@ package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ CSSClassProviderTest.class, CSSStylesheetTest.class, diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/src/org/eclipse/papyrus/infra/gmfdiag/menu/tests/tests/AllTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/src/org/eclipse/papyrus/infra/gmfdiag/menu/tests/tests/AllTests.java index a3796ad39b7..026661d4148 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/src/org/eclipse/papyrus/infra/gmfdiag/menu/tests/tests/AllTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/src/org/eclipse/papyrus/infra/gmfdiag/menu/tests/tests/AllTests.java @@ -13,10 +13,10 @@ package org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests; import org.eclipse.papyrus.infra.gmfdiag.menu.utils.DeleteActionUtilTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ DeleteActionUtilTest.class }) public class AllTests { // JUnit 4 test suite diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/AllTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/AllTests.java index 631f892479d..6065c435f7f 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/AllTests.java +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/src/org/eclipse/papyrus/infra/nattable/model/editor/tests/tests/AllTests.java @@ -13,11 +13,11 @@ package org.eclipse.papyrus.infra.nattable.model.editor.tests.tests; import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ EditorsTests.class
})
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/AllTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/AllTests.java index a2070fba3ff..5b38745ee5f 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/AllTests.java +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/src/org/eclipse/papyrus/infra/nattable/model/tests/tests/AllTests.java @@ -13,11 +13,11 @@ package org.eclipse.papyrus.infra.nattable.model.tests.tests; import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ StyledElementTests.class
})
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/AllTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/AllTests.java index 479cae4753f..b5bb9741308 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/AllTests.java +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/AllTests.java @@ -15,10 +15,10 @@ package org.eclipse.papyrus.infra.nattable.tests.tests; import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ TableSelectionProviderTest.class , PasteTreeUtils_Tests.class})
public class AllTests {
// JUnit 4 test suite
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/AllTests.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/AllTests.java index 9217f0b21f2..2476b1be641 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/AllTests.java +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/AllTests.java @@ -15,10 +15,10 @@ package org.eclipse.papyrus.infra.nattable.views.tests.tests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ RevealViewsTableTest.class, TableCreationTest.class, OpenTableTest.class, TableVerifyContents.class, TableCreationTest2.class })
public class AllTests {
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF index 99468e2a846..21207bbc73c 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Require-Bundle: org.eclipse.core.runtime, org.junit;visibility:=reexport,
org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport,
org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport
+ org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/src/org/eclipse/papyrus/infra/filters/tests/AllTests.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/src/org/eclipse/papyrus/infra/filters/tests/AllTests.java index 8415b6e7745..26984323b6b 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/src/org/eclipse/papyrus/infra/filters/tests/AllTests.java +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/src/org/eclipse/papyrus/infra/filters/tests/AllTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.infra.filters.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The master test suite for the plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses(FiltersAllTests.class) public class AllTests { // Nothing required diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/AllDataBindingTests.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/AllDataBindingTests.java index 16e0612cc0e..bcb4fd3f0a5 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/AllDataBindingTests.java +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/AllDataBindingTests.java @@ -13,14 +13,14 @@ package org.eclipse.papyrus.infra.tools.databinding; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The test suite for data-bindings API. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ DelegatingObservableValueTest.class, DelegatingObservableSetTest.class, DelegatingObservableListTest.class }) public class AllDataBindingTests { diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/tests/AllTests.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/tests/AllTests.java index b2149ea162c..25ef0698a44 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/tests/AllTests.java +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/tests/AllTests.java @@ -15,14 +15,14 @@ package org.eclipse.papyrus.infra.tools.tests; import org.eclipse.papyrus.infra.tools.databinding.AllDataBindingTests; import org.eclipse.papyrus.infra.tools.util.UIUtilTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The master test suite for the plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ UIUtilTest.class, AllDataBindingTests.class }) public class AllTests { diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/AllTests.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/AllTests.java index ea125b3f640..8a65148f21a 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/AllTests.java +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/AllTests.java @@ -16,10 +16,10 @@ import org.eclipse.papyrus.infra.services.controlmode.tests.control.ControlModel import org.eclipse.papyrus.infra.services.controlmode.tests.uncontrol.UncontrolModelTest; import org.eclipse.papyrus.infra.services.controlmode.tests.uncontrol.UncontrolModelWithProfileTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ControlModelWithProfileTest.class, UncontrolModelTest.class, ControlModelTest.class, diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/suites/AllTests.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/suites/AllTests.java index 869711be480..0042d92520d 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/suites/AllTests.java +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/suites/AllTests.java @@ -25,13 +25,13 @@ import org.eclipse.papyrus.infra.services.edit.tests.service.TestElementEditServ import org.eclipse.papyrus.infra.services.edit.tests.utils.TestElementTypeValidator;
import org.eclipse.papyrus.infra.services.edit.tests.utils.TestGMFCommandUtils;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* Main Test suite.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
TestClientContext.class,
TestElementEditService.class,
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.java index a0fab645591..1cd41d17d70 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.java +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/src/org/eclipse/papyrus/infra/services/labelprovider/tests/AllTests.java @@ -12,10 +12,10 @@ package org.eclipse.papyrus.infra.services.labelprovider.tests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ LabelProviderServiceTest.class
})
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/AllTests.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/AllTests.java index f7cbe867416..d858b7d4178 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/AllTests.java +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/AllTests.java @@ -10,14 +10,14 @@ import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strat import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy2TestModel2WithModel1;
import org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2.Strategy2TestModel2WithPackage0;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests together.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// testModel1
Strategy1TestModel1.class,
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/META-INF/MANIFEST.MF index 18b16b7a32b..8a5801d286e 100644 --- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0", org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.2.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
org.junit;bundle-version="4.11.0";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0"
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AllTests.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AllTests.java index 4c732bc3db2..b29fd17a6a1 100644 --- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AllTests.java +++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AllTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.infra.viewpoints.configuration.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The master test suite for the plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses(ConfigurationAllTests.class) public class AllTests { // Nothing required diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationLinkTestsOnParametricOwnedByBlock.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationLinkTestsOnParametricOwnedByBlock.java index 49018f62915..0934ccdd831 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationLinkTestsOnParametricOwnedByBlock.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationLinkTestsOnParametricOwnedByBlock.java @@ -5,10 +5,10 @@ import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.link.connecto import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.link.connector.TestLinkCreationConnectorFromReference;
import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.link.connector.TestLinkCreationConnectorFromValue;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
TestLinkCreationConnectorFromPart.class,
TestLinkCreationConnectorFromReference.class,
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationLinkTestsOnParametricOwnedByConstraintBlock.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationLinkTestsOnParametricOwnedByConstraintBlock.java index c2dca2430f7..086b3f9e572 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationLinkTestsOnParametricOwnedByConstraintBlock.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationLinkTestsOnParametricOwnedByConstraintBlock.java @@ -4,10 +4,10 @@ import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.link.connecto import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.link.connector.TestLinkCreationConnectorFromReference4CB;
import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.link.connector.TestLinkCreationConnectorFromValue4CB;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
TestLinkCreationConnectorFromPart4CB.class,
TestLinkCreationConnectorFromReference4CB.class,
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationNodeTestsOnParametricOwnedByBlock.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationNodeTestsOnParametricOwnedByBlock.java index 8525ed1d311..c3400b34f0a 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationNodeTestsOnParametricOwnedByBlock.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationNodeTestsOnParametricOwnedByBlock.java @@ -29,11 +29,11 @@ import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.node.TestNode import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.node.TestNodeCreationOnValue;
import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.node.TestNodeCreationOnValueStructureCompartment;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
TestNodeCreationOnBlock.class,
TestNodeCreationOnBlockStructureCompartment.class,
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationNodeTestsOnParametricOwnedByConstraintBlock.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationNodeTestsOnParametricOwnedByConstraintBlock.java index d401852815f..0e204d9e4c9 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationNodeTestsOnParametricOwnedByConstraintBlock.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllCreationNodeTestsOnParametricOwnedByConstraintBlock.java @@ -23,11 +23,11 @@ import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.node.TestNode import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.node.TestNodeCreationOnConstraintProperty4CB;
import org.eclipse.papyrus.sysml.diagram.parametric.tests.creation.node.TestNodeCreationOnDiagram4CB;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
TestNodeCreationOnComment4CB.class,
TestNodeCreationOnConstraint4CB.class,
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllNodeDndTestsOnParametricOwnedByBlock.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllNodeDndTestsOnParametricOwnedByBlock.java index 6851fd175ee..ed63217b6f7 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllNodeDndTestsOnParametricOwnedByBlock.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllNodeDndTestsOnParametricOwnedByBlock.java @@ -2,10 +2,10 @@ package org.eclipse.papyrus.sysml.diagram.parametric.tests.suites; import org.eclipse.papyrus.sysml.diagram.parametric.tests.dnd.node.TestNodeDropOnBlockStructureCompartment;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
TestNodeDropOnBlockStructureCompartment.class,
})
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllNodeDndTestsOnParametricOwnedByConstraintBlock.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllNodeDndTestsOnParametricOwnedByConstraintBlock.java index b7f8c75cd9f..d6e9e80cb78 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllNodeDndTestsOnParametricOwnedByConstraintBlock.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllNodeDndTestsOnParametricOwnedByConstraintBlock.java @@ -2,10 +2,10 @@ package org.eclipse.papyrus.sysml.diagram.parametric.tests.suites; import org.eclipse.papyrus.sysml.diagram.parametric.tests.dnd.node.TestNodeDropOnBlockStructureCompartment4CB;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
TestNodeDropOnBlockStructureCompartment4CB.class,
})
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllTests.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllTests.java index 9a36f04ad1a..f5efdeff91c 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllTests.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/suites/AllTests.java @@ -14,10 +14,10 @@ package org.eclipse.papyrus.sysml.diagram.parametric.tests.suites;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
AllCreationNodeTestsOnParametricOwnedByBlock.class,
AllCreationNodeTestsOnParametricOwnedByConstraintBlock.class,
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/AllTests.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/AllTests.java index 079d46fd951..59f04efc8a2 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/AllTests.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/AllTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.sysml.diagram.requirement.test; import org.eclipse.papyrus.sysml.diagram.requirement.test.canonical.AllCanonicalTests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests together.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// canonical
AllCanonicalTests.class,
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/AllCanonicalTests.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/AllCanonicalTests.java index 10dd262d364..e05db3ff542 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/canonical/AllCanonicalTests.java @@ -13,13 +13,13 @@ package org.eclipse.papyrus.sysml.diagram.requirement.test.canonical;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All test in canonical package
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// Top Node
TestRequirementDiagramTopNode.class,
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/LoadTests.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/LoadTests.java index 9549a9b95a2..acd377eeecf 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/LoadTests.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/src/org/eclipse/papyrus/sysml/diagram/requirement/test/load/LoadTests.java @@ -13,13 +13,13 @@ package org.eclipse.papyrus.sysml.diagram.requirement.test.load;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests together.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// 10 classes
Load10RequirementTest.class,
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/src/org/eclipse/papyrus/sysml/nattable/allocation/tests/tests/AllTests.java b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/src/org/eclipse/papyrus/sysml/nattable/allocation/tests/tests/AllTests.java index 118070c800e..7baac013143 100755 --- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/src/org/eclipse/papyrus/sysml/nattable/allocation/tests/tests/AllTests.java +++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/src/org/eclipse/papyrus/sysml/nattable/allocation/tests/tests/AllTests.java @@ -15,10 +15,10 @@ package org.eclipse.papyrus.sysml.nattable.allocation.tests.tests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ RevealAllocationTableTest.class })
public class AllTests {
// JUnit 4 test suite
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/src/org/eclipse/papyrus/sysml/nattable/requirement/tests/tests/AllTests.java b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/src/org/eclipse/papyrus/sysml/nattable/requirement/tests/tests/AllTests.java index 5cad8741624..5ab17f28ae2 100755 --- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/src/org/eclipse/papyrus/sysml/nattable/requirement/tests/tests/AllTests.java +++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/src/org/eclipse/papyrus/sysml/nattable/requirement/tests/tests/AllTests.java @@ -18,11 +18,11 @@ import org.eclipse.papyrus.sysml.nattable.requirement.tests.bugs.InvertedAxisCha import org.eclipse.papyrus.sysml.nattable.requirement.tests.bugs.InvertedAxisChangeIndexWithoutConfigurationTest; import org.eclipse.papyrus.sysml.nattable.requirement.tests.paste.without.service.edit.Bug443814_Enumeration; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ SortAxisRequirementTableTest.class, InvertAxisRequirementTableTest.class, diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllCopyPasteTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllCopyPasteTests.java index f5cb23635e3..93b1f5d604d 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllCopyPasteTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllCopyPasteTests.java @@ -18,7 +18,7 @@ import org.eclipse.papyrus.sysml.modelexplorer.tests.copypaste.CopyPasteSimpleBl import org.eclipse.papyrus.sysml.modelexplorer.tests.copypaste.CopyPasteSimplePartTest; import org.eclipse.papyrus.sysml.modelexplorer.tests.copypaste.CopyPasteSimpleReferenceTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; @@ -26,7 +26,7 @@ import org.junit.runners.Suite.SuiteClasses; * Tests suite for Copy/Paste * */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ // Reference CopyPasteSimpleReferenceTest.class, diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllDragDropTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllDragDropTests.java index 7962b49c5db..435f68b4fe6 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllDragDropTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllDragDropTests.java @@ -15,14 +15,14 @@ package org.eclipse.papyrus.sysml.modelexplorer.tests.suites; import org.eclipse.papyrus.sysml.modelexplorer.tests.dragdrop.IBDDragDropTest;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* Tests suites for Drag And Drop inside the model explorer
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
IBDDragDropTest.class,
})
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllTests.java index 5a75dabf2fa..77a5a88d36a 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllTests.java @@ -13,14 +13,14 @@ package org.eclipse.papyrus.sysml.modelexplorer.tests.suites;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* Main test suite class
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ AllDragDropTests.class, AllCopyPasteTests.class, })
public class AllTests {
//Test suite
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/suites/AllTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/suites/AllTests.java index 2af5958ea54..3ebed2f962f 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/suites/AllTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/suites/AllTests.java @@ -2,13 +2,13 @@ package org.eclipse.papyrus.sysml.service.types.tests.suites; import org.eclipse.papyrus.sysml.service.types.tests.registry.TestElementTypeRegistryContent;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* Main Test suite.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ TestElementTypeRegistryContent.class })
public class AllTests {
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java index 81414aca619..6025b34e675 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java @@ -16,7 +16,7 @@ package org.eclipse.papyrus.sysml.allocations.tests; import junit.framework.TestSuite;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
@@ -25,7 +25,7 @@ import org.junit.runners.Suite.SuiteClasses; *
* @generated
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ AllocatedTest.class })
public class AllocationsTests extends TestSuite {
// AllocationsTests
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java index 3ba30c0e9be..7e5a38aa5bc 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.sysml.modelelements.tests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* A test suite for the '<em><b>modelelements</b></em>' package.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ ViewTest.class
// ProblemTest.class, RationaleTest.class, ViewPointTest.class
})
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java index 9e09473966d..ff0932e6500 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java @@ -16,7 +16,7 @@ package org.eclipse.papyrus.sysml.portandflows.tests; import junit.framework.TestSuite;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
@@ -25,7 +25,7 @@ import org.junit.runners.Suite.SuiteClasses; *
* @generated
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ FlowPortTest.class, FlowPropertyTest.class })
public class PortandflowsTests extends TestSuite {
// PortandflowsTests
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java index 480ee59acc1..0d56e3f6f21 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java @@ -16,7 +16,7 @@ package org.eclipse.papyrus.sysml.requirements.tests; import junit.framework.TestSuite;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
@@ -25,7 +25,7 @@ import org.junit.runners.Suite.SuiteClasses; *
* @generated
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ TestCaseTest.class, RequirementTest.class, RequirementRelatedTest.class })
public class RequirementsTests extends TestSuite {
// RequirementsTests
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java index 88af60064cf..689d8027d46 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java @@ -18,13 +18,13 @@ import org.eclipse.papyrus.sysml.modelelements.tests.ModelelementsTests; import org.eclipse.papyrus.sysml.portandflows.tests.PortandflowsTests;
import org.eclipse.papyrus.sysml.requirements.tests.RequirementsTests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* A test suite for the '<em><b>Sysml</b></em>' model.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ ModelelementsTests.class, PortandflowsTests.class, AllocationsTests.class, RequirementsTests.class
})
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF index fb0f2d1de4f..7a6cb71737d 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF @@ -17,8 +17,7 @@ Require-Bundle: org.eclipse.core.runtime, org.junit;visibility:=reexport,
org.eclipse.uml2;bundle-version="5.0.0",
org.eclipse.uml2.uml,
- org.objectweb.asm;bundle-version="[5.0.1,
- 6.0.0)";resolution:=optional,
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
org.eclipse.ocl.uml;bundle-version="5.0.0",
org.eclipse.uml2.uml.resources;bundle-version="5.0.0",
org.eclipse.papyrus.uml.alf;bundle-version="1.2.0",
@@ -27,7 +26,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
org.eclipse.xtext,
org.eclipse.ocl.pivot,
- org.eclipse.ocl
+ org.eclipse.ocl,
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.uml.alf,
org.eclipse.papyrus.uml.alf.tests
Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java index 0de2aa7e387..2af8a65e49c 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/src/org/eclipse/papyrus/uml/alf/tests/AllTests.java @@ -17,10 +17,10 @@ import org.eclipse.papyrus.uml.alf.tests.generator.GenerationTest; import org.eclipse.papyrus.uml.alf.tests.mapper.MappingTest;
import org.eclipse.papyrus.uml.alf.tests.mapper.MergeTest;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({MappingTest.class, MergeTest.class, SemanticTest.class,
SingleTest.class, SyntacticTest.class, GenerationTest.class})
public class AllTests {
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/AllTests.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/AllTests.java index 48889fbe649..e53baa80159 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/AllTests.java +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/AllTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.uml.profile.assistants.generator.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The master test suite for the plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ BasicAssistantsGenerationTest.class, DiagramSpecificAssistantsGenerationTest.class, ProfilesWithPackageNestingTest.class, ConnectionTypesTest.class }) diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/AllTests.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/AllTests.java index eb9a6394205..98ebd5980b1 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/AllTests.java +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/AllTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The master test suite for the plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ BasicElementTypesGenerationTest.class, DiagramSpecificElementTypesGenerationTest.class, ProfilesWithPackageNestingTest.class, diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/src/org/eclipse/papyrus/uml/decoratormodel/controlmode/tests/AllTests.java b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/src/org/eclipse/papyrus/uml/decoratormodel/controlmode/tests/AllTests.java index b3839b3b974..e840b71f168 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/src/org/eclipse/papyrus/uml/decoratormodel/controlmode/tests/AllTests.java +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/src/org/eclipse/papyrus/uml/decoratormodel/controlmode/tests/AllTests.java @@ -14,14 +14,14 @@ package org.eclipse.papyrus.uml.decoratormodel.controlmode.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * Main tests suite for this plugin */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ControlModeWithDecoratorModelsTest.class, AdditionalModelStructuresTest.class }) diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/tests/AllTests.java b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/tests/AllTests.java index 2ad71f08213..b45c7d3f852 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/tests/AllTests.java +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/tests/AllTests.java @@ -21,14 +21,14 @@ import org.eclipse.papyrus.uml.decoratormodel.internal.resource.index.tests.Prof import org.eclipse.papyrus.uml.decoratormodel.internal.resource.tests.DecoratorModelCopierTest; import org.eclipse.papyrus.uml.decoratormodel.internal.resource.tests.DecoratorModelIndexTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * Main tests suite for this plugin */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ExternalizeProfileApplicationTest.class, InternalizeProfileApplicationTest.class, // ProfileMigrationTest.class, StereotypeApplicationRepairTest.class, // diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java index af55db78d15..26c01c5c881 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java @@ -12,14 +12,14 @@ package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All test in canonical package
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// child nodes
TestActivityDiagramChildNode.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/AllCanonicalTests.java index 15d059bd8dd..1bfd09f57f6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/AllCanonicalTests.java @@ -12,13 +12,13 @@ package org.eclipse.papyrus.uml.diagram.clazz.test.canonical; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * All test in canonical package */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ // top nodes TestClassDiagramTopNode.class, diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/LoadTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/LoadTests.java index aadba8245f7..42b346b5189 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/LoadTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/LoadTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.uml.diagram.clazz.test.load;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests together.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// 10 classes
Load10ClassTest.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/AllTests.java index b1701c41211..9b6f06020ee 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/AllTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/AllTests.java @@ -23,10 +23,10 @@ import org.eclipse.papyrus.uml.diagram.common.tests.parser.MultiplicityStringFor import org.eclipse.papyrus.uml.diagram.common.tests.parser.ValueSpecificationUtilTestCase; import org.eclipse.papyrus.uml.diagram.common.tests.stereotype.display.AppliedStereotypeDisplayStructureTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ AppliedStereotypeDisplayStructureTest.class, CommonBendpointsTest.class, diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/AllCanonicalTests.java index b90d31cb1b4..582ae9a4b3b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/AllCanonicalTests.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.uml.diagram.communication.tests.canonical;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
@@ -20,7 +20,7 @@ import org.junit.runners.Suite.SuiteClasses; /**
* All test in canonical package
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// testTopNodes
TestCommunicationDiagramChildNode.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AllCanonicalTests.java index 400831d684e..f9538d23b51 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/AllCanonicalTests.java @@ -13,13 +13,13 @@ package org.eclipse.papyrus.uml.diagram.component.test.canonical;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All test in canonical package
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// Top Node
TestComponentDiagramTopNode.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/LoadTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/LoadTests.java index cd81eb6d642..792e94db892 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/LoadTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/LoadTests.java @@ -13,13 +13,13 @@ package org.eclipse.papyrus.uml.diagram.component.test.load;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests together.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// 10 Component
Load10ComponentTest.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/AllCanonicalTests.java index afde1cea340..75f3209b12d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/AllCanonicalTests.java @@ -13,13 +13,13 @@ package org.eclipse.papyrus.uml.diagram.composite.test.canonical; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * All test in canonical package */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ // test links TestCompositeDiagramLinkOwnedBySource.class, diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/AllModelTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/AllModelTests.java index ec4b4ec0310..16429aca71f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/AllModelTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/AllModelTests.java @@ -13,13 +13,13 @@ package org.eclipse.papyrus.uml.diagram.composite.test.model; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * All test in canonical package */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ CompositeDiagramElementTypeConfigurationTest.class, CompositeDiagramGmfGenTest.class, diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AllCanonicalTests.java index 1a20130a4e2..44b7f88cb3f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/AllCanonicalTests.java @@ -13,13 +13,13 @@ package org.eclipse.papyrus.uml.diagram.deployment.test.canonical;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All test in canonical package
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// Top Node
TestDeploymentDiagramTopNode.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/LoadTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/LoadTests.java index 87e0a83088e..179c36233ed 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/LoadTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/LoadTests.java @@ -13,13 +13,13 @@ package org.eclipse.papyrus.uml.diagram.deployment.test.load;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests together.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// 10 Node
Load10NodeTest.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/AllTests.java index fd0156c4a65..1687b51f265 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/AllTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/src/org/eclipse/papyrus/uml/diagram/dnd/tests/tests/AllTests.java @@ -12,11 +12,11 @@ package org.eclipse.papyrus.uml.diagram.dnd.tests.tests;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ InstanceSpecificationTest.class })
public class AllTests {
//Nothing
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/AllTests.java index fd833979ef3..3724f628587 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/AllTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/AllTests.java @@ -12,11 +12,11 @@ package org.eclipse.papyrus.uml.diagram.interactionoverview.tests; import org.eclipse.papyrus.uml.diagram.interactionoverview.tests.canonical.AllCanonicalTests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; //@formatter:off -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ // canonical AllCanonicalTests.class, diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AllCanonicalTests.java index 2da34b67490..a3c13d563ef 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AllCanonicalTests.java @@ -12,11 +12,11 @@ package org.eclipse.papyrus.uml.diagram.interactionoverview.tests.canonical; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; //@formatter:off -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ TestInteractionOverviewDiagramActivityTN.class, TestInteractionOverviewDiagramChildNode.class, TestControlNodesInStructuredCompartments.class, TestControlNodesInStructuredCompartments.class}) //@formatter:on diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/AllTests.java index ea70cbbfabe..eb52040c8d1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/AllTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/tests/AllTests.java @@ -13,14 +13,14 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests; import org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.regression.Bug457712PaletteConfigurationRequiredProfile; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * All tests for this fragment */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ Bug457712PaletteConfigurationRequiredProfile.class, }) public class AllTests { diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF index 63b9689f925..94b305cc8e3 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF @@ -12,8 +12,7 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0", org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
org.junit;bundle-version="4.10.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,
- 4.0.0)",
+ org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/AllCustomCommandTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/AllCustomCommandTests.java index 981418f5f9b..4b5e9cd33c5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/AllCustomCommandTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/AllCustomCommandTests.java @@ -14,14 +14,14 @@ package org.eclipse.papyrus.uml.diagram.profile.custom.commands.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * Test suite for the custom commands defined by the UML Profile Diagram plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ DefineProfileCommandTest.class }) public class AllCustomCommandTests { // Nothing required diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/AllCanonicalTests.java index 9904dcbcdb1..642658f2e35 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/AllCanonicalTests.java @@ -12,11 +12,12 @@ package org.eclipse.papyrus.uml.diagram.profile.tests.canonical;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
TestProfileDiagramTopNode.class,
TestProfileDiagramChildNode.class,
TestProfileDiagramLink.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests.java index 95868bda998..6c465102744 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests for bug.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ TestCombinedFragmentKind_364710.class, TestCombinedFragmentOperand_364701.class, TestLifelineAlignment_364688.class, TestMessageEndConstraint_364817.class, TestMessagesDeletion_364828.class, TestMovingCombinedFragment_364711.class, TestNestedCombinedFragment_364795.class, TestSynchronousMessageCreation_364827.class, /*
* TestCombinedFragmentGates_364816
* .
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests2.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests2.java index 4fa03ef4713..9ca6f53431d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests2.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests2.java @@ -1,10 +1,10 @@ package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
/* TestLifelineAutoResize_383723.class, TestLifelineLabelCustomize_383722.class */
@SuiteClasses({ TestCombinedFragmentName_382951.class, TestCreationUndo_384618.class, TestDestructionNode_384201.class, TestDurationConstraints_384596.class, TestExecutionSpecificationDimension_384572.class, TestInteractionConstraint_382966.class, TestMessageCreate_379661.class, TestMessageLostFound_384202.class, TestNestedExecution_384616.class, TestParentBarAutoresize_385603.class })
public class BugTests2 {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/BugTest_m7.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/BugTest_m7.java index cc44ea4286d..aaa331bad27 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/BugTest_m7.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/BugTest_m7.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.m7;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ TestDurationConstraint_402967.class, TestElementIcon_396799.class, TestExecutionSpecificationPosition_395462.class, TestGraphicalGate_389531.class, TestGuardVisibility_402966.class, TestInteractionUse.class, TestMessageCreateWithLifeline_403134.class, TestResizeStateInvariant_395774.class, TestTooltip_402964.class, TestMessageOccurrenceSpecification_402975.class, TestMakeSameHeightForLifelines_402978.class, TestMoveAnchorInsideCoRegion_402970.class, TestMoveMessageLostFound_403138.class, TestOrderingFragments_403233.class, TestShiftEnclosingMessageInOperand_402969.class, TestGateNameOnCombinedFragment.class, TestExecutionEndsWithMessageOccurrenceSpecification.class,
TestMessageOccurrenceSpecification_477463.class})
public class BugTest_m7 {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/AllTests_20130916.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/AllTests_20130916.java index de64c7d6067..872926815d4 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/AllTests_20130916.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/AllTests_20130916.java @@ -14,14 +14,14 @@ package org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* @author Jin Liu (jin.liu@soyatec.com)
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ CombinedFragmentStereotypesTest.class, ContinuationStereotypesTest.class, DurationConstraintStereotypesTest.class, DurationObservationStereotypesTest.class, ExecutionSpecificationStereotypesTest.class, Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373.class, Fixbug_OrderFragmentsAfterMessageReconnection_417375.class, Fixbug_OrderFragmentsAfterResizeExecutions_417374.class, GateStereotypesTest.class, GeneralOrderingStereotypesTest.class, InteractionOperandStereotypesTest.class, InteractionStereotypesTest.class, InteractionUseStereotypesTest.class, LifelineStereotypesTest.class, MessageStereotypesTest.class, New_DisplayBehaviorForBehaviorExecutionSpecification_417376.class, New_DisplayInvariantForStateInvariant_417377.class, StateInvariantStereotypesTest.class, TimeConstraintStereotypesTest.class, TimeObservationStereotypesTest.class, Fixbug_LifelineManagement_417365.class })
public class AllTests_20130916 {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/AllCanonicalTests.java index 6cdeb7eb8ff..e36b20c334c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/AllCanonicalTests.java @@ -14,14 +14,14 @@ package org.eclipse.papyrus.uml.diagram.sequence.tests.canonical;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All test in canonical package
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// top nodes
TestSequenceDiagramTopNode.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AllCanonicalTests.java index a422c63cd66..cc9f9e76c7b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/AllCanonicalTests.java @@ -12,14 +12,14 @@ package org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All test in canonical package
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// child nodes
TestStateMachineDiagramChildNode.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AllTests.java index ca22862561e..0181df6682b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AllTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AllTests.java @@ -15,13 +15,13 @@ package org.eclipse.papyrus.uml.diagram.stereotypeproperty; import org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests.creation.TestCreationReopen2Comment;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All tests together.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// canonical
TestProfileApplication.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AllCanonicalTests.java index 9363056e3f2..fcdce7dad49 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AllCanonicalTests.java @@ -9,11 +9,11 @@ package org.eclipse.papyrus.uml.diagram.timing.tests.canonical;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
//@formatter:off
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({ TestTimingDiagramInteraction.class, TestTimingDiagramFullLifeline.class, TestTimingDiagramCompactLifeline.class,
TestTimingDiagramFullStateInvariant.class, TestTimingDiagramCompactStateInvariant.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/AllCanonicalTests.java index 55426ee9ac8..815594fa80c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/AllCanonicalTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/AllCanonicalTests.java @@ -12,14 +12,14 @@ package org.eclipse.papyrus.uml.diagram.usecase.tests.canonical;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* All test in canonical package
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// top nodes
TestUseCaseTopNode.class,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java index 1f347a30052..3d98e58a66b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java @@ -12,12 +12,12 @@ package org.eclipse.papyrus.uml.diagram.wizards;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// {oep}.uml.diagram.wizards
TestCreateModelWizard.class, TestCreateSysMLModelWizard.class, TestInitModelWizard.class, TestNewProjectWizard.class, TestNewSysMLProjectWizard.class, TestCreateModelFromExistingModelWizard.class })
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AllTests.java b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AllTests.java index 9f0de804068..5ccea442a14 100644 --- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AllTests.java +++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AllTests.java @@ -25,10 +25,10 @@ import org.eclipse.papyrus.uml.modelexplorer.tests.paste.DiagramCopyPasteModelEx import org.eclipse.papyrus.uml.modelexplorer.tests.paste.StereotypeCopyPasteModelExplorerTest; import org.eclipse.papyrus.uml.modelexplorer.tests.paste.TableCopyPasteModelExplorerTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ // DeleteModelExplorerTest.class, RenameHandlerTest.class, ModelExplorerViewTests.class, CutPasteModelExplorerTest.class, CopyPasteModelExplorerTest.class, // DiagramCopyPasteModelExplorerTest.class, TableCopyPasteModelExplorerTest.class, StereotypeCopyPasteModelExplorerTest.class, // diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java index f4152819213..56b97410da1 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java @@ -78,10 +78,10 @@ import org.eclipse.papyrus.uml.nattable.clazz.config.tests.sort.Sort_V1_V3_V1; import org.eclipse.papyrus.uml.nattable.clazz.config.tests.unset.UnsetCellValueWithProfile_V1_V3_V1_Test; import org.eclipse.papyrus.uml.nattable.clazz.config.tests.unset.UnsetCellValue_H1_H3_H1_Test; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ EditInvalidPastedText_V1_V3_V1.class, OpenTableTest.class, diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java index ab19410c99b..a089ed6a8b2 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AllTests.java @@ -21,10 +21,10 @@ import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.InvertedAxisChangeInd import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.InvertedAxisChangeIndexWithoutConfigurationTest; import org.eclipse.papyrus.uml.nattable.generic.tests.bugs.OpenAndDeleteTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ SortAxisGenericTableTest.class, InvertAxisGenericTableTest.class, diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/src/org/eclipse/papyrus/uml/nattable/stereotype/display/tests/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/src/org/eclipse/papyrus/uml/nattable/stereotype/display/tests/tests/AllTests.java index be48e78c391..cfddc3dc52f 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/src/org/eclipse/papyrus/uml/nattable/stereotype/display/tests/tests/AllTests.java +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/src/org/eclipse/papyrus/uml/nattable/stereotype/display/tests/tests/AllTests.java @@ -14,10 +14,10 @@ package org.eclipse.papyrus.uml.nattable.stereotype.display.tests.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ StereotypeDisplayTableTest.class }) diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/AllTests.java index a40ab8e280e..bd734f00d5a 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/AllTests.java +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/src/org/eclipse/papyrus/uml/nattable/tests/tests/AllTests.java @@ -15,10 +15,10 @@ package org.eclipse.papyrus.uml.nattable.tests.tests; import org.eclipse.papyrus.uml.nattable.tests.tests.configs.GenericTreeTableConfigurationTest; import org.eclipse.papyrus.uml.nattable.tests.tests.configs.GenericTreeTableNattableConfigurationTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ UMLRestrictedContentProviderTest.class, UMLRestrictedContentProviderTestCustomProfile.class, GenericTreeTableConfigurationTest.class, GenericTreeTableNattableConfigurationTest.class diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF index 7b56d086c34..f227d5c6c25 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF @@ -1,6 +1,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui.ide;bundle-version="3.8.0",
- org.junit;bundle-version="4.10.0"
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.search.tests.suites
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/src/org/eclipse/papyrus/search/tests/suites/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/src/org/eclipse/papyrus/search/tests/suites/AllTests.java index fff44feecea..6dd9e7a1dbe 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/src/org/eclipse/papyrus/search/tests/suites/AllTests.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/src/org/eclipse/papyrus/search/tests/suites/AllTests.java @@ -1,13 +1,13 @@ package org.eclipse.papyrus.search.tests.suites;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* Main Test suite.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({})
public class AllTests {
//TODO: Model-Search tests
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/src/org/eclipse/papyrus/uml/filters/tests/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/src/org/eclipse/papyrus/uml/filters/tests/AllTests.java index 012f1173cf1..791dbdb2f45 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/src/org/eclipse/papyrus/uml/filters/tests/AllTests.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/src/org/eclipse/papyrus/uml/filters/tests/AllTests.java @@ -14,13 +14,13 @@ package org.eclipse.papyrus.uml.filters.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The master test suite for the plug-in. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ UMLFiltersAllTests.class, ProfileAppliedRegressionTest.class, diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/tests/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/tests/AllTests.java index fc69cd385ae..b3069bc4043 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/tests/AllTests.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/tests/AllTests.java @@ -15,14 +15,14 @@ package org.eclipse.papyrus.uml.modelrepair.tests; import org.eclipse.papyrus.uml.modelrepair.internal.stereotypes.StereotypeApplicationRepairSnippetTest; import org.eclipse.papyrus.uml.modelrepair.internal.stereotypes.StereotypeRepairRegressionTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * This is the AllTests type. Enjoy. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ StereotypeApplicationRepairSnippetTest.class, StereotypeRepairRegressionTest.class }) public class AllTests { //JUnit 4 Test Suite diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.profile.tests/src/org/eclipse/papyrus/uml/profile/tests/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.profile.tests/src/org/eclipse/papyrus/uml/profile/tests/AllTests.java index ca4fba8356c..16244d67db0 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.profile.tests/src/org/eclipse/papyrus/uml/profile/tests/AllTests.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.profile.tests/src/org/eclipse/papyrus/uml/profile/tests/AllTests.java @@ -14,14 +14,14 @@ package org.eclipse.papyrus.uml.profile.tests; import org.eclipse.papyrus.uml.profile.service.ReapplyProfilesServiceTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * The Papyrus UML Profile bundle's master test suite. */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ReapplyProfilesServiceTest.class }) public class AllTests { // JUnit 4 Test Suite diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java index 686c9533745..6a31970bf93 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java @@ -29,13 +29,13 @@ import org.eclipse.papyrus.uml.service.types.tests.deletion.DeleteContainmentSub import org.eclipse.papyrus.uml.service.types.tests.deletion.DeleteDependentWithStereotypeApplications458685;
import org.eclipse.papyrus.uml.service.types.tests.deletion.DeletePureUMLElementTest;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
/**
* Main Test suite.
*/
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
// TestElementTypeRegistryContent.class,
CreatePureUMLElementTest.class, // pure uml tests, only element edit service
diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/AllTests.java b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/AllTests.java index 3ab5f86a623..f1b165b420c 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/AllTests.java +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/AllTests.java @@ -22,13 +22,13 @@ import org.eclipse.papyrus.uml.profile.drafter.utils.UMLPrimitiveTypesModelTest; import org.eclipse.papyrus.uml.profile.drafter.ui.model.TypeProviderTest; import org.eclipse.papyrus.uml.profile.drafter.tests.utils.UMLModelCreatorTest; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; /** * Test suite for this fragment */ -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ProfileCatalogTest.class, EclipseProjectTest.class, diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/AllTests.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/AllTests.java index 62ad5a332ec..a4552c77878 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/AllTests.java +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/src/org/eclipse/papyrus/uml/textedit/parameter/tests/suites/AllTests.java @@ -12,10 +12,10 @@ package org.eclipse.papyrus.uml.textedit.parameter.tests.suites;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
ParameterGrammarTests.class
})
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java index ffad79b7219..35c40dc2a9d 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/src/org/eclipse/papyrus/uml/textedit/port/tests/suites/AllTests.java @@ -12,10 +12,10 @@ package org.eclipse.papyrus.uml.textedit.port.tests.suites;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
PortGrammarTests.class
})
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/suites/AllTests.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/suites/AllTests.java index ac5db740a54..bbcfa50c7c7 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/suites/AllTests.java +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/src/org/eclipse/papyrus/uml/textedit/property/tests/suites/AllTests.java @@ -12,10 +12,10 @@ package org.eclipse.papyrus.uml.textedit.property.tests.suites;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
import org.junit.runners.Suite.SuiteClasses;
-@RunWith(Suite.class)
+@RunWith(ClassificationSuite.class)
@SuiteClasses({
PropertyGrammarTests.class
})
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/src/org/eclipse/papyrus/uml/textedit/valuespecification/tests/suites/AllTests.java b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/src/org/eclipse/papyrus/uml/textedit/valuespecification/tests/suites/AllTests.java index 8745d107654..7c1bdee2b5a 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/src/org/eclipse/papyrus/uml/textedit/valuespecification/tests/suites/AllTests.java +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/src/org/eclipse/papyrus/uml/textedit/valuespecification/tests/suites/AllTests.java @@ -13,10 +13,10 @@ package org.eclipse.papyrus.uml.textedit.valuespecification.tests.suites; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ValueSpecificationGrammarTests.class, MultiplicityLowerValueSpecificationGrammarTests.class, diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/AllTests.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/AllTests.java index aa63864802d..cbb25787fc4 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/AllTests.java +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/AllTests.java @@ -17,10 +17,10 @@ package org.eclipse.papyrus.uml.tools.tests.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ContentProviderTest.class, UMLStereotypePropertyContentProviderTest.class, DependencyManagementTest.class, NamedElementValidatorTest.class, StereotypeElementListenerTest.class, ProfileApplicationListenerTest.class, UMLReferenceConverterTest.class, UMLReferenceConverterCompletionTest.class, UMLLanguageProvidersTest.class, diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java index 2d6b9f10444..d4a2091e817 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java @@ -16,10 +16,10 @@ package org.eclipse.papyrus.uml.tools.utils.tests.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ NameResolutionHelperTest.class, NamedElementUtilTest.class, UMLUtilTest.class }) diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java index b7b3ab2717d..8b133950e2a 100644 --- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java +++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/src/org/eclipse/papyrus/views/modelexplorer/tests/AllTests.java @@ -14,10 +14,10 @@ package org.eclipse.papyrus.views.modelexplorer.tests; import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) +@RunWith(ClassificationSuite.class) @SuiteClasses({ ModelExplorerViewTests.class, DeleteHandlerTest.class, |