diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTests.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTests.java index cc26089ef84..52a3c63acc1 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTests.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/AllTemplateEngineTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Symbian Software Limited and others. + * Copyright (c) 2007, 2017 Symbian Software Limited and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,11 +7,12 @@ * * Contributors: * Bala Torati (Symbian) - Initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.templateengine; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * This is a TestSuite, the TestCases created to test Template engine are @@ -20,33 +21,15 @@ import junit.framework.TestSuite; * * @since 4.0 */ -public class AllTemplateEngineTests extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ + TestTemplateEngine.class, + TestTemplateCore.class, + TestValueStore.class, + TestSharedDefaults.class, + TestProcesses.class, + TestTemplateEngineBugs.class, - public static void main(String[] args) { - junit.textui.TestRunner.run(AllTemplateEngineTests.suite()); - } - - /** - * Since the TemplateEngine consists of UI(Wizard). - * A TestWizard is created to which the dynamically generated - * UIPages are added. The Wizard is launched from here. - * The TestCases created to test the TemplateEngine is initialized here. - * @return - * - * @since 4.0 - */ - public static Test suite() { - TestSuite suite = new TestSuite("Template engine tests"); //$NON-NLS-1$ - //$JUnit-BEGIN$ - - suite.addTestSuite(TestTemplateEngine.class); - suite.addTestSuite(TestTemplateCore.class); - suite.addTestSuite(TestValueStore.class); - suite.addTestSuite(TestSharedDefaults.class); - suite.addTestSuite(TestProcesses.class); - suite.addTestSuite(TestTemplateEngineBugs.class); - - //$JUnit-END$ - return suite; - } +}) +public class AllTemplateEngineTests { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java index 7de74678f65..de7940509b0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -9,104 +9,38 @@ * IBM - Initial API and implementation * Anton Leherbauer (Wind River Systems) * Markus Schorn (Wind River Systems) - *******************************************************************************/ + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) + *******************************************************************************/ package org.eclipse.cdt.ui.tests; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.cdt.ui.tests.buildconsole.BuildConsoleTests; -import org.eclipse.cdt.ui.tests.callhierarchy.CallHierarchyTestSuite; -import org.eclipse.cdt.ui.tests.chelp.CHelpTest; -import org.eclipse.cdt.ui.tests.editor.EditorTestSuite; -import org.eclipse.cdt.ui.tests.includebrowser.IncludeBrowserTestSuite; -import org.eclipse.cdt.ui.tests.misc.MiscTestSuite; -import org.eclipse.cdt.ui.tests.outline.OutlineTestSuite; -import org.eclipse.cdt.ui.tests.quickfix.AssistQuickFixTest; -import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestSuite; -import org.eclipse.cdt.ui.tests.search.SearchTestSuite; -import org.eclipse.cdt.ui.tests.templateengine.AllTemplateEngineTests; -import org.eclipse.cdt.ui.tests.text.TextTestSuite; -import org.eclipse.cdt.ui.tests.text.contentassist.ContentAssistTestSuite; -import org.eclipse.cdt.ui.tests.text.contentassist2.ContentAssist2TestSuite; -import org.eclipse.cdt.ui.tests.text.selection.SelectionTestSuite; -import org.eclipse.cdt.ui.tests.typehierarchy.TypeHierarchyTestSuite; -import org.eclipse.cdt.ui.tests.viewsupport.ViewSupportTestSuite; -import org.eclipse.cdt.ui.tests.wizards.classwizard.ClassWizardTestSuite; -import org.eclipse.cdt.ui.tests.wizards.settingswizards.SettingsWizardTestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Test all areas of the UI. */ -public class AutomatedSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ + org.eclipse.cdt.ui.tests.text.TextTestSuite.class, + org.eclipse.cdt.ui.tests.outline.OutlineTestSuite.class, + org.eclipse.cdt.ui.tests.viewsupport.ViewSupportTestSuite.class, + org.eclipse.cdt.ui.tests.callhierarchy.CallHierarchyTestSuite.class, + org.eclipse.cdt.ui.tests.typehierarchy.TypeHierarchyTestSuite.class, + org.eclipse.cdt.ui.tests.includebrowser.IncludeBrowserTestSuite.class, + org.eclipse.cdt.ui.tests.text.contentassist.ContentAssistTestSuite.class, + org.eclipse.cdt.ui.tests.text.contentassist2.ContentAssist2TestSuite.class, + org.eclipse.cdt.ui.tests.text.selection.SelectionTestSuite.class, + org.eclipse.cdt.ui.tests.quickfix.AssistQuickFixTest.class, + org.eclipse.cdt.ui.tests.buildconsole.BuildConsoleTests.class, + org.eclipse.cdt.ui.tests.search.SearchTestSuite.class, + org.eclipse.cdt.ui.tests.refactoring.RefactoringTestSuite.class, + org.eclipse.cdt.ui.tests.chelp.CHelpTest.class, + org.eclipse.cdt.ui.tests.wizards.classwizard.ClassWizardTestSuite.class, + org.eclipse.cdt.ui.tests.wizards.settingswizards.SettingsWizardTestSuite.class, + org.eclipse.cdt.ui.tests.misc.MiscTestSuite.class, + org.eclipse.cdt.ui.tests.editor.EditorTestSuite.class, + org.eclipse.cdt.ui.tests.templateengine.AllTemplateEngineTests.class, - /** - * Returns the suite. This is required to - * use the JUnit Launcher. - */ - public static Test suite() throws Exception { - return new AutomatedSuite(); - } - - /** - * Construct the test suite. - */ - public AutomatedSuite() throws Exception { - - // tests from package org.eclipse.cdt.ui.tests.text - addTest(TextTestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.outline - addTest(OutlineTestSuite.suite()); - - // tests for package org.eclipse.cdt.ui.tests.viewsupport - addTest(ViewSupportTestSuite.suite()); - - // tests for package org.eclipse.cdt.ui.tests.callhierarchy - addTest(CallHierarchyTestSuite.suite()); - - // tests for package org.eclipse.cdt.ui.tests.typehierarchy - addTest(TypeHierarchyTestSuite.suite()); - - // tests for package org.eclipse.cdt.ui.tests.includebrowser - addTest(IncludeBrowserTestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.text.contentAssist - addTest(ContentAssistTestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.text.contentAssist2 - addTest(ContentAssist2TestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.text.selection - addTest(SelectionTestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.quickfix - addTest(AssistQuickFixTest.suite()); - - // tests from package org.eclipse.cdt.ui.tests.buildconsole - addTest(BuildConsoleTests.suite()); - - // tests from package org.eclipse.cdt.ui.tests.search - addTest(SearchTestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.refactoring - addTest(RefactoringTestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.chelp - addTest(CHelpTest.suite()); - - // tests from package org.eclipse.cdt.ui.tests.wizards.classwizard - addTest(ClassWizardTestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.wizards.settingswizards - addTest(SettingsWizardTestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.misc - addTest(MiscTestSuite.suite()); - - // tests from package org.eclipse.cdt.ui.tests.editor - addTest(EditorTestSuite.suite()); - - addTest(AllTemplateEngineTests.suite()); - } +}) +public class AutomatedSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java index 2e5dcfa0fe6..b51acec1abc 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,25 +7,23 @@ * * Contributors: * Markus Schorn - initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.callhierarchy; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class CallHierarchyTestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ + BasicCallHierarchyTest.class, + BasicCppCallHierarchyTest.class, + InitializersInCallHierarchyTest.class, + CppCallHierarchyTest.class, + CallHierarchyAcrossProjectsTest.class, + CallHierarchyBugs.class, +}) +public class CallHierarchyTestSuite { - public static TestSuite suite() { - return new CallHierarchyTestSuite(); - } - - public CallHierarchyTestSuite() { - super(CallHierarchyTestSuite.class.getName()); - addTest(BasicCallHierarchyTest.suite()); - addTest(BasicCppCallHierarchyTest.suite()); - addTest(InitializersInCallHierarchyTest.suite()); - addTest(CppCallHierarchyTest.suite()); - addTest(CallHierarchyAcrossProjectsTest.suite()); - addTest(CallHierarchyBugs.suite()); - } } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/EditorTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/EditorTestSuite.java index 02baeda6d17..cbcb12dc09a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/EditorTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/EditorTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015 Nathan Ridge. + * Copyright (c) 2015, 2017 Nathan Ridge and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,22 +7,20 @@ * * Contributors: * Nathan Ridge - initial implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.editor; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Tests for functionality in the package org.eclipse.cdt.internal.ui.editor. */ -public class EditorTestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ + SourceHeaderPartnerFinderTest.class, - public static TestSuite suite() { - return new EditorTestSuite(); - } - - public EditorTestSuite() { - super(EditorTestSuite.class.getName()); - addTest(SourceHeaderPartnerFinderTest.suite()); - } +}) +public class EditorTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/SourceHeaderPartnerFinderTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/SourceHeaderPartnerFinderTest.java index eff8d02179c..3e59a8c3938 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/SourceHeaderPartnerFinderTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/editor/SourceHeaderPartnerFinderTest.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.ui.tests.editor; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IProgressMonitor; @@ -30,10 +28,7 @@ import org.eclipse.cdt.internal.ui.editor.SourceHeaderPartnerFinder; * Tests for org.eclipse.cdt.internal.ui.editor.SourceHeaderPartnerFinder. */ public class SourceHeaderPartnerFinderTest extends BaseUITestCase { - - public static TestSuite suite() { - return suite(SourceHeaderPartnerFinderTest.class); - } + protected static IProgressMonitor NPM= new NullProgressMonitor(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserTestSuite.java index 83ff42f37c1..e2faf0bfb1c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,20 +7,18 @@ * * Contributors: * Markus Schorn - initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.includebrowser; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class IncludeBrowserTestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ + BasicIncludeBrowserTest.class, - public static TestSuite suite() { - return new IncludeBrowserTestSuite(); - } - - public IncludeBrowserTestSuite() { - super(IncludeBrowserTestSuite.class.getName()); - addTest(BasicIncludeBrowserTest.suite()); - } +}) +public class IncludeBrowserTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/MiscTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/MiscTestSuite.java index 3e4b4fc132b..9ef39f89816 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/MiscTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/misc/MiscTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2013 Andrew Gvozdev and others. + * Copyright (c) 2010, 2017 Andrew Gvozdev and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,24 +7,23 @@ * * Contributors: * Andrew Gvozdev (Quoin Inc.) - initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.misc; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * Test suite for miscellaneous tests which do not fit neatly to other * categories. */ -public class MiscTestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ + CDTSharedImagesTests.class, + LanguageVerifierTests.class, - public static TestSuite suite() { - return new MiscTestSuite(); - } - public MiscTestSuite() { - super(MiscTestSuite.class.getName()); - addTestSuite(CDTSharedImagesTests.class); - addTestSuite(LanguageVerifierTests.class); - } +}) +public class MiscTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/OutlineTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/OutlineTestSuite.java index 14c3df6ca31..0cd2aba7453 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/OutlineTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/outline/OutlineTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Wind River Systems, Inc. and others. + * Copyright (c) 2009, 2017 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,19 +7,15 @@ * * Contributors: * Anton Leherbauer (Wind River Systems) - initial implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.outline; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class OutlineTestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ BasicOutlineTest.class, }) +public class OutlineTestSuite { - public static TestSuite suite() { - return new OutlineTestSuite(); - } - - public OutlineTestSuite() { - super(OutlineTestSuite.class.getName()); - addTest(BasicOutlineTest.suite()); - } } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java index 2753ecb8524..2b4f97e3ead 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2013 Institute for Software, HSR Hochschule fuer Technik + * Copyright (c) 2008, 2017 Institute for Software, HSR Hochschule fuer Technik * Rapperswil, University of applied sciences and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -10,11 +10,12 @@ * Institute for Software - initial API and implementation * Tom Ball (Google) * Sergey Prigogin (Google) + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.refactoring; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.eclipse.cdt.ui.tests.refactoring.extractconstant.ExtractConstantRefactoringTest; import org.eclipse.cdt.ui.tests.refactoring.extractfunction.ExtractFunctionRefactoringTest; @@ -30,20 +31,19 @@ import org.eclipse.cdt.ui.tests.refactoring.utils.UtilTestSuite; /** * @author Emanuel Graf */ -public class RefactoringTestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ + UtilTestSuite.class, + RenameRegressionTests.class, + ExtractFunctionRefactoringTest.class, + ExtractConstantRefactoringTest.class, + HideMethodRefactoringTest.class, + GenerateGettersAndSettersTest.class, + ImplementMethodRefactoringTest.class, + ExtractLocalVariableRefactoringTest.class, + ToggleRefactoringTest.class, + IncludesTestSuite.class, - public static Test suite() throws Exception { - TestSuite suite = new RefactoringTestSuite(); - suite.addTest(UtilTestSuite.suite()); - suite.addTest(RenameRegressionTests.suite()); - suite.addTest(ExtractFunctionRefactoringTest.suite()); - suite.addTest(ExtractConstantRefactoringTest.suite()); - suite.addTest(HideMethodRefactoringTest.suite()); - suite.addTest(GenerateGettersAndSettersTest.suite()); - suite.addTest(ImplementMethodRefactoringTest.suite()); - suite.addTest(ExtractLocalVariableRefactoringTest.suite()); - suite.addTest(ToggleRefactoringTest.suite()); - suite.addTest(IncludesTestSuite.suite()); - return suite; - } +}) +public class RefactoringTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/FindReferencesTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/FindReferencesTest.java index 0dd3aa7cff9..15e9b86cd56 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/FindReferencesTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/FindReferencesTest.java @@ -1,9 +1,13 @@ /******************************************************************************* - * Copyright (c) 2016 Nathan Ridge. + * Copyright (c) 2016, 2017 Nathan Ridge and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Nathan Ridge - initial implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.search; @@ -44,9 +48,11 @@ public class FindReferencesTest extends SearchTestBase { public static TestSuite suite() { return suite(ReferencedProject.class); } } - public static void addTests(TestSuite suite) { - suite.addTest(SingleProject.suite()); - suite.addTest(ReferencedProject.suite()); + public static TestSuite suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(SingleProject.class); + suite.addTestSuite(ReferencedProject.class); + return suite; } public FindReferencesTest() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestSuite.java index 3ae856c7a5d..6fbb601ba3b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/SearchTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2015 Symbian Software Systems and others. + * Copyright (c) 2007, 2017 Symbian Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,21 +7,20 @@ * * Contributors: * Andrew Ferguson (Symbian) - Initial implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.search; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class SearchTestSuite extends TestSuite { - public static TestSuite suite() { - return new SearchTestSuite(); - } - - public SearchTestSuite() { - super(SearchTestSuite.class.getName()); - addTest(BasicSearchTest.suite()); - addTest(LinkedNamesFinderTest.suite()); - addTest(SearchReferencesAcrossLanguagesTest.suite()); - FindReferencesTest.addTests(this); - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ + BasicSearchTest.class, + LinkedNamesFinderTest.class, + SearchReferencesAcrossLanguagesTest.class, + FindReferencesTest.class, + +}) +public class SearchTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java index 006136c9845..257c53b38f0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/TextTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -9,75 +9,72 @@ * Markus Schorn - initial API and implementation * Andrew Ferguson (Symbian) * Sergey Prigogin (Google) + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.text; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.eclipse.cdt.ui.tests.text.doctools.DocCommentTestSuite; -public class TextTestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ - public static TestSuite suite() { - return new TextTestSuite(); - } + // documentation tool extension tests + DocCommentTestSuite.class, - public TextTestSuite() { - super(TextTestSuite.class.getName()); + // partitioning tests + PartitionTokenScannerTest.class, + CPartitionerTest.class, + AsmPartitionerTest.class, - // documentation tool extension tests - addTest(DocCommentTestSuite.suite()); - - // partitioning tests - addTest(PartitionTokenScannerTest.suite()); - addTest(CPartitionerTest.suite()); - addTest(AsmPartitionerTest.suite()); + // smart edit tests + CAutoIndentTest.class, + CHeuristicScannerTest.class, + BracketInserterTest.class, + IndentActionTest.class, + FormatActionTest.class, + ShiftActionTest.class, + CodeFormatterTest.class, + CIndenterTest.class, + TemplateFormatterTest.class, + + // Break iterator tests. + CBreakIteratorTest.class, + CWordIteratorTest.class, - // smart edit tests - addTest(CAutoIndentTest.suite()); - addTest(CHeuristicScannerTest.suite()); - addTest(BracketInserterTest.suite()); - addTest(IndentActionTest.suite()); - addTest(FormatActionTest.suite()); - addTest(ShiftActionTest.suite()); - addTest(CodeFormatterTest.suite()); - addTest(CIndenterTest.suite()); - addTest(TemplateFormatterTest.suite()); - - // Break iterator tests. - addTest(CBreakIteratorTest.suite()); - addTest(CWordIteratorTest.suite()); + // highlighting tests + SemanticHighlightingTest.class, + InactiveCodeHighlightingTest.class, + CHeaderRuleTest.class, + NumberRuleTest.class, + PairMatcherTest.class, + MarkOccurrenceTest.class, - // highlighting tests - addTest(SemanticHighlightingTest.suite()); - addTest(InactiveCodeHighlightingTest.suite()); - addTest(CHeaderRuleTest.suite()); - addTest(NumberRuleTest.suite()); - addTest(PairMatcherTest.suite()); - addTest(MarkOccurrenceTest.suite()); + // folding tests + FoldingTest.class, - // folding tests - addTest(FoldingTest.suite()); - - // basic editing tests - addTest(BasicCEditorTest.suite()); - - // editor hyperlink tests - addTest(HyperlinkTest.suite()); + // basic editing tests + BasicCEditorTest.class, + + // editor hyperlink tests + HyperlinkTest.class, - // word detection - addTest(CWordFinderTest.suite()); - - // compare tests - addTest(CStructureCreatorTest.suite()); - - // source manipulation tests - addTest(AddBlockCommentTest.suite()); - addTest(RemoveBlockCommentTest.suite()); - addTest(SortLinesTest.suite()); + // word detection + CWordFinderTest.class, + + // compare tests + CStructureCreatorTest.class, + + // source manipulation tests + AddBlockCommentTest.class, + RemoveBlockCommentTest.class, + SortLinesTest.class, - // add include - addTest(AddIncludeTest.suite()); - } + // add include + AddIncludeTest.class, +}) +public class TextTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTestSuite.java index 40e8002587d..56862245aa3 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2014 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,20 +7,18 @@ * * Contributors: * Markus Schorn - initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.contentassist; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class ContentAssistTestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ - public static TestSuite suite() { - return new ContentAssistTestSuite(); - } - - public ContentAssistTestSuite() { - super(ContentAssistTestSuite.class.getName()); - - addTest(ContentAssistTests.suite()); - } + ContentAssistTests.class, + +}) +public class ContentAssistTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java index 6953925722e..946527464d2 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2015 Siemens AG and others. + * Copyright (c) 2006, 2017 Siemens AG and others. * All rights reserved. This content and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,74 +10,71 @@ * Bryan Wilkinson (QNX) * Andrew Ferguson (Symbian) * Mohamed Azab (Mentor Graphics) - Bug 438549. Add mechanism for parameter guessing. + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.contentassist2; -import junit.framework.Test; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; /** * This suite bundles all tests for the CContentAssistProcessor */ -public class ContentAssist2TestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ - public static Test suite() { - return new ContentAssist2TestSuite(); - } - - public ContentAssist2TestSuite() { - super(ContentAssist2TestSuite.class.getName()); - - addTest(CompletionTest_AnonymousTypes.suite()); - addTest(CompletionTest_ArgumentType_Prefix.suite()); - addTest(CompletionTest_ArgumentType_Prefix2.suite()); - addTest(CompletionTest_ClassReference_NoPrefix.suite()); - addTest(CompletionTest_ClassReference_Prefix.suite()); - addTest(CompletionTest_ConstructorReference.suite()); - addTest(CompletionTest_ExceptionReference_NoPrefix.suite()); - addTest(CompletionTest_ExceptionReference_Prefix.suite()); - addTest(CompletionTest_FieldType_NoPrefix.suite()); - addTest(CompletionTest_FieldType_NoPrefix2.suite()); - addTest(CompletionTest_FieldType_Prefix.suite()); - addTest(CompletionTest_FunctionReference_Prefix.suite()); - addTest(CompletionTest_MacroRef_NoPrefix.suite()); - addTest(CompletionTest_MacroRef_Prefix.suite()); - addTest(CompletionTest_MemberReference_Arrow_NoPrefix.suite()); - addTest(CompletionTest_MemberReference_Arrow_NoPrefix2.suite()); - addTest(CompletionTest_MemberReference_Arrow_NoPrefix3.suite()); - addTest(CompletionTest_MemberReference_Arrow_Prefix.suite()); - addTest(CompletionTest_MemberReference_Arrow_Prefix2.suite()); - addTest(CompletionTest_MemberReference_Dot_NoPrefix.suite()); - addTest(CompletionTest_MemberReference_Dot_Prefix.suite()); - addTest(CompletionTest_NamespaceRef_NoPrefix.suite()); - addTest(CompletionTest_NamespaceRef_Prefix.suite()); - addTest(CompletionTest_NewTypeReference_NoPrefix.suite()); - addTest(CompletionTest_NewTypeReference_Prefix.suite()); - addTest(CompletionTest_ScopedReference_NonCodeScope.suite()); - addTest(CompletionTest_ScopedReference_NoPrefix.suite()); - addTest(CompletionTest_ScopedReference_Prefix.suite()); - addTest(CompletionTest_SingleName_Method_NoPrefix.suite()); - addTest(CompletionTest_SingleName_Method_Prefix.suite()); - addTest(CompletionTest_SingleName_NoPrefix.suite()); - addTest(CompletionTest_SingleName_Prefix.suite()); - addTest(CompletionTest_SingleName_Prefix2.suite()); - addTest(CompletionTest_TypeDef_NoPrefix.suite()); - addTest(CompletionTest_TypeDef_Prefix.suite()); - addTest(CompletionTest_TypeRef_NoPrefix.suite()); - addTest(CompletionTest_TypeRef_Prefix.suite()); - addTest(CompletionTest_VariableType_NestedPrefix.suite()); - addTest(CompletionTest_VariableType_NoPrefix.suite()); - addTest(CompletionTest_VariableType_Prefix.suite()); - - addTest(CompletionTests.suite()); - addTest(HelpProposalTests.suite()); - addTest(CompletionTests_PlainC.suite()); - addTest(ParameterHintTests.suite()); - addTest(CPPParameterGuessingTests.suite()); - addTest(CParameterGuessingTests.suite()); - - addTest(ShowCamelCasePreferenceTest.suite()); - - addTest(TemplateProposalTest.suite()); - } + CompletionTest_AnonymousTypes.class, + CompletionTest_ArgumentType_Prefix.class, + CompletionTest_ArgumentType_Prefix2.class, + CompletionTest_ClassReference_NoPrefix.class, + CompletionTest_ClassReference_Prefix.class, + CompletionTest_ConstructorReference.class, + CompletionTest_ExceptionReference_NoPrefix.class, + CompletionTest_ExceptionReference_Prefix.class, + CompletionTest_FieldType_NoPrefix.class, + CompletionTest_FieldType_NoPrefix2.class, + CompletionTest_FieldType_Prefix.class, + CompletionTest_FunctionReference_Prefix.class, + CompletionTest_MacroRef_NoPrefix.class, + CompletionTest_MacroRef_Prefix.class, + CompletionTest_MemberReference_Arrow_NoPrefix.class, + CompletionTest_MemberReference_Arrow_NoPrefix2.class, + CompletionTest_MemberReference_Arrow_NoPrefix3.class, + CompletionTest_MemberReference_Arrow_Prefix.class, + CompletionTest_MemberReference_Arrow_Prefix2.class, + CompletionTest_MemberReference_Dot_NoPrefix.class, + CompletionTest_MemberReference_Dot_Prefix.class, + CompletionTest_NamespaceRef_NoPrefix.class, + CompletionTest_NamespaceRef_Prefix.class, + CompletionTest_NewTypeReference_NoPrefix.class, + CompletionTest_NewTypeReference_Prefix.class, + CompletionTest_ScopedReference_NonCodeScope.class, + CompletionTest_ScopedReference_NoPrefix.class, + CompletionTest_ScopedReference_Prefix.class, + CompletionTest_SingleName_Method_NoPrefix.class, + CompletionTest_SingleName_Method_Prefix.class, + CompletionTest_SingleName_NoPrefix.class, + CompletionTest_SingleName_Prefix.class, + CompletionTest_SingleName_Prefix2.class, + CompletionTest_TypeDef_NoPrefix.class, + CompletionTest_TypeDef_Prefix.class, + CompletionTest_TypeRef_NoPrefix.class, + CompletionTest_TypeRef_Prefix.class, + CompletionTest_VariableType_NestedPrefix.class, + CompletionTest_VariableType_NoPrefix.class, + CompletionTest_VariableType_Prefix.class, + + CompletionTests.class, + HelpProposalTests.class, + CompletionTests_PlainC.class, + ParameterHintTests.class, + CPPParameterGuessingTests.class, + CParameterGuessingTests.class, + + ShowCamelCasePreferenceTest.class, + + TemplateProposalTest.class, + +}) +public class ContentAssist2TestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java index 28220630499..9f95ad1a398 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2015 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,26 +7,24 @@ * * Contributors: * Markus Schorn - initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.text.selection; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class SelectionTestSuite extends TestSuite { +@RunWith(Suite.class) +@Suite.SuiteClasses({ - public static TestSuite suite() { - return new SelectionTestSuite(); - } - - public SelectionTestSuite() { - super(SelectionTestSuite.class.getName()); - - // selection tests - addTest(ResolveBindingTests.suite()); - addTest(CPPSelectionTestsNoIndexer.suite()); - addTest(CSelectionTestsNoIndexer.suite()); - addTest(CPPSelectionTestsIndexer.suite()); - addTest(CSelectionTestsIndexer.suite()); - } + // selection tests + ResolveBindingTests.class, + CPPSelectionTestsNoIndexer.class, + CSelectionTestsNoIndexer.class, + CPPSelectionTestsIndexer.class, + CSelectionTestsIndexer.class, + +}) +public class SelectionTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyTestSuite.java index 83fb8e02afd..ffe8b1431bb 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2013 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2017 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,23 +7,20 @@ * * Contributors: * Markus Schorn - initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.typehierarchy; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class TypeHierarchyTestSuite extends TestSuite { - - public static TestSuite suite() { - return new TypeHierarchyTestSuite(); - } - - public TypeHierarchyTestSuite() { - super(TypeHierarchyTestSuite.class.getName()); - addTest(CTypeHierarchyTest.suite()); - addTest(CppTypeHierarchyTest.suite()); - addTest(QuickTypeHierarchyTest.suite()); - addTest(TypeHierarchyAcrossProjectsTest.suite()); - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ + CTypeHierarchyTest.class, + CppTypeHierarchyTest.class, + QuickTypeHierarchyTest.class, + TypeHierarchyAcrossProjectsTest.class, +}) +public class TypeHierarchyTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/ViewSupportTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/ViewSupportTestSuite.java index 50e01ccb3c9..0984ba9b246 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/ViewSupportTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/ViewSupportTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2017 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,20 +7,21 @@ * * Contributors: * Markus Schorn - initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.viewsupport; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + import junit.framework.TestSuite; +@RunWith(Suite.class) +@Suite.SuiteClasses({ + + AsyncViewerTest.class, +}) public class ViewSupportTestSuite extends TestSuite { - public static TestSuite suite() { - return new ViewSupportTestSuite(); - } - - public ViewSupportTestSuite() { - super(ViewSupportTestSuite.class.getName()); - addTestSuite(AsyncViewerTest.class); - } } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardTestSuite.java index cc4d87ae1d2..4cd40629fe7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/classwizard/ClassWizardTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Stefan Ghiaus. + * Copyright (c) 2011, 2017 Stefan Ghiaus and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,19 +7,17 @@ * * Contributors: * Stefan Ghiaus - initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.wizards.classwizard; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class ClassWizardTestSuite extends TestSuite { - - public static TestSuite suite() { - return new ClassWizardTestSuite(); - } - - public ClassWizardTestSuite() { - super(ClassWizardTestSuite.class.getName()); - addTestSuite(ClassWizardNameTest.class); - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ + ClassWizardNameTest.class, + +}) +public class ClassWizardTestSuite { } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsWizardTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsWizardTestSuite.java index 29d30a359df..386d8998ffb 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsWizardTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsWizardTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,19 +7,16 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Jonah Graham (Kichwa Coders) - converted to new style suite (Bug 515178) *******************************************************************************/ package org.eclipse.cdt.ui.tests.wizards.settingswizards; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class SettingsWizardTestSuite extends TestSuite { - - public static TestSuite suite() { - return new SettingsWizardTestSuite(); - } - - public SettingsWizardTestSuite() { - super(SettingsWizardTestSuite.class.getName()); - addTestSuite(SettingsImportExportTest.class); - } +@RunWith(Suite.class) +@Suite.SuiteClasses({ + SettingsImportExportTest.class +}) +public class SettingsWizardTestSuite { }