From 46a0d57740ea9fd2b5df475c5054df887362ca29 Mon Sep 17 00:00:00 2001 From: Mathieu Cartaud Date: Thu, 7 Sep 2017 16:09:04 +0200 Subject: [518760] Remove legacy JUnit3 artefacts Bug: 518760 Change-Id: I230f7b853a5f81fd3f9288c7061c51a165a7e0b6 --- .../diagram/ecoretools/tests/suite/AllTests.java | 23 ---------------------- .../ide/ecoretools/tests/suite/AllTests.java | 23 ---------------------- .../papyrus/tests/suite/PapyrusGitTests.java | 22 --------------------- .../diagram/papyrus/tests/suite/AllTests.java | 23 ---------------------- .../emf/compare/ide/tests/suite/AllTests.java | 22 --------------------- .../emf/compare/ide/ui/tests/suite/GitTests.java | 22 --------------------- .../emf/compare/ide/ui/tests/suite/AllTests.java | 22 --------------------- .../compare/ide/ui/tests/suite/BugsTestSuite.java | 22 --------------------- .../emf/compare/rcp/ui/tests/suite/AllTests.java | 22 --------------------- .../compare/rcp/ui/tests/suite/BugsTestSuite.java | 22 --------------------- .../eclipse/emf/compare/tests/suite/AllTests.java | 21 -------------------- .../emf/compare/uml2/ide/tests/suite/AllTests.java | 22 --------------------- .../compare/uml2/ide/ui/tests/suite/AllTests.java | 22 --------------------- .../uml2/papyrus/tests/suite/AllUITests.java | 18 ----------------- .../compare/uml2/rcp/ui/tests/suite/AllTests.java | 22 --------------------- 15 files changed, 328 deletions(-) diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.java index 97b8bf21f..c16e88a9a 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.java @@ -10,10 +10,6 @@ *******************************************************************************/ package org.eclipse.emf.compare.diagram.ecoretools.tests.suite; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - import org.eclipse.emf.compare.ComparePackage; import org.eclipse.emf.compare.diagram.ecoretools.tests.edgechanges.EdgechangesTest; import org.eclipse.emf.compare.diagram.ecoretools.tests.hide.HideTest; @@ -21,7 +17,6 @@ import org.eclipse.emf.compare.diagram.ecoretools.tests.merge.ExtensionMergeTest import org.eclipse.emf.compare.diagram.ecoretools.tests.nodechanges.NodechangesTest; import org.eclipse.emf.compare.diagram.ecoretools.tests.show.ShowTest; import org.eclipse.emf.compare.diagram.internal.extensions.ExtensionsPackage; -import org.eclipse.emf.compare.tests.suite.CompareTestSuite; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.resource.Resource; @@ -43,24 +38,6 @@ import org.junit.runners.Suite.SuiteClasses; ExtensionMergeTest.class }) public class AllTests { - /** - * Standalone launcher for all of compare's tests. - * - * @generated - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * This will return a suite populated with all tests available through this class. - * - * @generated - */ - public static Test suite() { - return new JUnit4TestAdapter(CompareTestSuite.class); - } - @BeforeClass public static void fillEMFRegistries() { EPackage.Registry.INSTANCE.put(ComparePackage.eNS_URI, ComparePackage.eINSTANCE); diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ide/ecoretools/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ide/ecoretools/tests/suite/AllTests.java index a8bb23b8c..2277d3d1c 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ide/ecoretools/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ide/ecoretools/tests/suite/AllTests.java @@ -10,14 +10,9 @@ *******************************************************************************/ package org.eclipse.emf.compare.diagram.ide.ecoretools.tests.suite; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - import org.eclipse.emf.compare.ComparePackage; import org.eclipse.emf.compare.diagram.ide.ecoretools.tests.nodechanges.NodechangesTest; import org.eclipse.emf.compare.diagram.internal.extensions.ExtensionsPackage; -import org.eclipse.emf.compare.tests.suite.CompareTestSuite; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.resource.Resource; @@ -38,24 +33,6 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses({NodechangesTest.class }) public class AllTests { - /** - * Standalone launcher for all of compare's tests. - * - * @generated - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * This will return a suite populated with all tests available through this class. - * - * @generated - */ - public static Test suite() { - return new JUnit4TestAdapter(CompareTestSuite.class); - } - @BeforeClass public static void fillEMFRegistries() { EPackage.Registry.INSTANCE.put(ComparePackage.eNS_URI, ComparePackage.eINSTANCE); diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java index c6c1630e1..9a6a7b379 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java @@ -40,10 +40,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - @SuppressWarnings("restriction") @RunWith(Suite.class) @SuiteClasses({AttachmentChangeImplicationTest.class, ResourceAttachmentChangeAdd1GitMergeTest.class, @@ -54,24 +50,6 @@ import junit.textui.TestRunner; MoveOfDiagramConflictDetectionTest.class, AdditiveMergeDiagramTests.class, MergeResolutionManagerTest.class, }) public class PapyrusGitTests { - /** - * Launches the test with the given arguments. - * - * @param args - * Arguments of the testCase. - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * Creates the {@link junit.framework.TestSuite TestSuite} for all the test. - * - * @return The test suite containing all the tests - */ - public static Test suite() { - return new JUnit4TestAdapter(PapyrusGitTests.class); - } @BeforeClass public static void fillEMFRegistries() { diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java index fc867dcb8..9c5cdf394 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java @@ -28,7 +28,6 @@ import org.eclipse.emf.compare.diagram.papyrus.tests.saveparameter.SaveParameter import org.eclipse.emf.compare.diagram.papyrus.tests.saveparameter.SaveParameterHookTest; import org.eclipse.emf.compare.diagram.papyrus.tests.structuremergeviewer.actions.MergeNonConflictingCascadingFilterTest; import org.eclipse.emf.compare.diagram.papyrus.tests.uriattachment.URIAttachmentTest; -import org.eclipse.emf.compare.tests.suite.CompareTestSuite; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory; @@ -42,10 +41,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - /** * This test suite allows us to launch all tests for EMF Compare at once. * @@ -60,24 +55,6 @@ import junit.textui.TestRunner; MergeNonConflictingCascadingFilterTest.class, MergeDiffInvolvingRefineDiffTest.class, }) public class AllTests { - /** - * Standalone launcher for all of compare's tests. - * - * @generated - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * This will return a suite populated with all tests available through this class. - * - * @generated - */ - public static Test suite() { - return new JUnit4TestAdapter(CompareTestSuite.class); - } - @BeforeClass public static void fillEMFRegistries() { EPackage.Registry.INSTANCE.put(ComparePackage.eNS_URI, ComparePackage.eINSTANCE); diff --git a/plugins/org.eclipse.emf.compare.ide.tests/src/org/eclipse/emf/compare/ide/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.ide.tests/src/org/eclipse/emf/compare/ide/tests/suite/AllTests.java index df49d2c35..f0ca873a1 100644 --- a/plugins/org.eclipse.emf.compare.ide.tests/src/org/eclipse/emf/compare/ide/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.ide.tests/src/org/eclipse/emf/compare/ide/tests/suite/AllTests.java @@ -21,31 +21,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - @RunWith(Suite.class) @SuiteClasses({ResourceUtil_BinaryIdentical2Test.class, ResourceUtil_BinaryIdentical2_ReadLimitTest.class, ResourceUtil_BinaryIdentical3Test.class, ResourceUtil_BinaryIdentical3_ReadLimitTest.class, Bug471045Test.class, Bug507157Test.class }) public class AllTests { - /** - * Launches the test with the given arguments. - * - * @param args - * Arguments of the testCase. - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * Creates the {@link junit.framework.TestSuite TestSuite} for all the test. - * - * @return The test suite containing all the tests - */ - public static Test suite() { - return new JUnit4TestAdapter(AllTests.class); - } } diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/suite/GitTests.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/suite/GitTests.java index f3bc3d64e..312b31393 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/suite/GitTests.java +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/suite/GitTests.java @@ -38,10 +38,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - @RunWith(Suite.class) @SuiteClasses({AdditiveMergeTests.class, DirCacheResourceVariantTreeProviderTest.class, // GitLogicalMergeTest.class, @@ -63,24 +59,6 @@ import junit.textui.TestRunner; ThreadedModelResolverResolutionTest.class, TreeWalkResourceVariantTreeProviderTest.class, EMFResourceMappingMergerPreMergeTest.class }) public class GitTests { - /** - * Launches the test with the given arguments. - * - * @param args - * Arguments of the testCase. - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * Creates the {@link junit.framework.TestSuite TestSuite} for all the test. - * - * @return The test suite containing all the tests - */ - public static Test suite() { - return new JUnit4TestAdapter(GitTests.class); - } @BeforeClass public static void fillEMFRegistries() { diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.java index 7895e92ff..0ea7d383f 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.java @@ -54,10 +54,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - @RunWith(Suite.class) @SuiteClasses({EMFCompareConfigurationTest.class, DependenciesTest.class, MergeActionTest.class, PseudoConflictsMergeActionTest.class, BugsTestSuite.class, NavigatableTest.class, @@ -72,24 +68,6 @@ import junit.textui.TestRunner; MergeNonConflictingRunnableRefinementTest.class, CachingImplicitDependenciesTest.class, MirroredMergeActionTest.class, EMFModelProviderRegistrationTest.class, }) public class AllTests { - /** - * Launches the test with the given arguments. - * - * @param args - * Arguments of the testCase. - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * Creates the {@link junit.framework.TestSuite TestSuite} for all the test. - * - * @return The test suite containing all the tests - */ - public static Test suite() { - return new JUnit4TestAdapter(AllTests.class); - } @BeforeClass public static void fillEMFRegistries() { diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/BugsTestSuite.java b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/BugsTestSuite.java index 71a062b1f..b758f335b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/BugsTestSuite.java +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/BugsTestSuite.java @@ -22,10 +22,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - /** * Aggregator of tests related to a bug described in bugzilla. * @@ -35,22 +31,4 @@ import junit.textui.TestRunner; @SuiteClasses({TestBug434827.class, TestBug434822.class, TestBug434828.class, TestBug434828_2.class, TestBug459131.class, TestBug470503.class, TestBug475586.class, TestBug497566.class }) public class BugsTestSuite { - /** - * Launches the test with the given arguments. - * - * @param args - * Arguments of the testCase. - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * Creates the {@link junit.framework.TestSuite TestSuite} for all the test. - * - * @return The test suite containing all the tests - */ - public static Test suite() { - return new JUnit4TestAdapter(AllTests.class); - } } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/AllTests.java index 2ec689b75..78c40436b 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/AllTests.java @@ -39,10 +39,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - @RunWith(Suite.class) @SuiteClasses({TestComparisonTreeNodeItemProviderSpec.class, TestMatchTreeNodeItemProviderSpec.class, TestReferenceChangeTreeNodeItemProviderSpec.class, MergeViewerItemTest.class, @@ -53,24 +49,6 @@ import junit.textui.TestRunner; MatchOfContainmentReferenceChangeAdapterTest.class, ResourceAttachmentChangeInGroupsTest.class, TableOrTreeMergeViewerElementComparerTest.class }) public class AllTests { - /** - * Launches the test with the given arguments. - * - * @param args - * Arguments of the testCase. - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * Creates the {@link junit.framework.TestSuite TestSuite} for all the test. - * - * @return The test suite containing all the tests - */ - public static Test suite() { - return new JUnit4TestAdapter(AllTests.class); - } @BeforeClass public static void fillEMFRegistries() { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/BugsTestSuite.java b/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/BugsTestSuite.java index 7728b46cb..8ae29cd0a 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/BugsTestSuite.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/BugsTestSuite.java @@ -10,10 +10,6 @@ *******************************************************************************/ package org.eclipse.emf.compare.rcp.ui.tests.suite; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - import org.eclipse.emf.compare.rcp.ui.tests.structuremergeviewer.filters.TestBug435365; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -27,22 +23,4 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses({TestBug435365.class }) public class BugsTestSuite { - /** - * Launches the test with the given arguments. - * - * @param args - * Arguments of the testCase. - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * Creates the {@link junit.framework.TestSuite TestSuite} for all the test. - * - * @return The test suite containing all the tests - */ - public static Test suite() { - return new JUnit4TestAdapter(AllTests.class); - } } diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java index 21a233f10..2ecd6fa88 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java @@ -81,10 +81,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - /** * This test suite allows us to launch all tests for EMF Compare at once. * @@ -112,23 +108,6 @@ import junit.textui.TestRunner; ConflictImplicationsTest_Bug484579.class, PseudoConflictDetectionTest.class, ComplexMergeTest.class, ConflictSearchTest.class, DiffRelationshipComputerTest.class }) public class AllTests { - /** - * Standalone launcher for all of compare's tests. - * - * @generated - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * This will return a suite populated with all tests available through this class. - * - * @generated - */ - public static Test suite() { - return new JUnit4TestAdapter(CompareTestSuite.class); - } @BeforeClass public static void fillEMFRegistries() { diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.tests/src/org/eclipse/emf/compare/uml2/ide/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.uml2.ide.tests/src/org/eclipse/emf/compare/uml2/ide/tests/suite/AllTests.java index 830a65d8d..0ecbed070 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.tests/src/org/eclipse/emf/compare/uml2/ide/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.uml2.ide.tests/src/org/eclipse/emf/compare/uml2/ide/tests/suite/AllTests.java @@ -10,10 +10,6 @@ *******************************************************************************/ package org.eclipse.emf.compare.uml2.ide.tests.suite; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - import org.eclipse.emf.compare.uml2.ide.tests.profile.ProfileLoadingTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -28,22 +24,4 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses({ProfileLoadingTest.class }) public class AllTests { - /** - * Standalone launcher for all of compare's tests. - * - * @generated - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * This will return a suite populated with all tests available through this class. - * - * @generated - */ - public static Test suite() { - return new JUnit4TestAdapter(AllTests.class); - } - } diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/src/org/eclipse/emf/compare/uml2/ide/ui/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/src/org/eclipse/emf/compare/uml2/ide/ui/tests/suite/AllTests.java index 0a6e902dd..9f4af6ddd 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/src/org/eclipse/emf/compare/uml2/ide/ui/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/src/org/eclipse/emf/compare/uml2/ide/ui/tests/suite/AllTests.java @@ -10,10 +10,6 @@ *******************************************************************************/ package org.eclipse.emf.compare.uml2.ide.ui.tests.suite; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - import org.eclipse.emf.compare.uml2.ide.ui.tests.comparison.tooltip.UMLTooltipProviderTest; import org.eclipse.emf.compare.uml2.ide.ui.tests.logical.ComparisonScopeBuilderTest; import org.junit.runner.RunWith; @@ -29,22 +25,4 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses({ComparisonScopeBuilderTest.class, UMLTooltipProviderTest.class }) public class AllTests { - /** - * Standalone launcher for all of compare's tests. - * - * @generated - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * This will return a suite populated with all tests available through this class. - * - * @generated - */ - public static Test suite() { - return new JUnit4TestAdapter(AllTests.class); - } - } diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/suite/AllUITests.java b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/suite/AllUITests.java index 97b5f008d..ffac14a70 100644 --- a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/suite/AllUITests.java +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/suite/AllUITests.java @@ -30,22 +30,4 @@ import junit.textui.TestRunner; @SuiteClasses({ProfileMigrationTest.class }) public class AllUITests { - /** - * Standalone launcher for all of compare's tests. - * - * @generated - */ - public static void main(final String[] args) { - TestRunner.run(suite()); - } - - /** - * This will return a suite populated with all tests available through this class. - * - * @generated - */ - public static Test suite() { - return new JUnit4TestAdapter(AllUITests.class); - } - } diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/suite/AllTests.java index e154b0a14..839716a73 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/suite/AllTests.java @@ -19,10 +19,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; -import junit.textui.TestRunner; - /** * This test suite allows us to launch all tests for EMF Compare at once. * @@ -33,22 +29,4 @@ import junit.textui.TestRunner; StaticProfileIntegrationDisplayTest.class, ConflictsGroupTest.class }) public class AllTests { - /** - * Standalone launcher for all of compare's tests. - * - * @generated - */ - public static void main(String[] args) { - TestRunner.run(suite()); - } - - /** - * This will return a suite populated with all tests available through this class. - * - * @generated - */ - public static Test suite() { - return new JUnit4TestAdapter(AllTests.class); - } - } -- cgit v1.2.3