Bug 515178: Convert ui AutomatedSuite to new style

This change enables future tests to use new style annotations,
for example using @RunWith(Parameterized.class)

Change-Id: I4998e8b50fc7574c057b4f4a556205ce5a2497d6

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 org.junit.runner.RunWith;
-import junit.framework.TestSuite;
+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());
+public class AllTemplateEngineTests {
-	}
-	
-	/**
-	 * 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;
-	}
 }

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 org.junit.runner.RunWith;
-import junit.framework.TestSuite;
+import org.junit.runners.Suite;
-
-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;
 
 /**
  * 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
+public class AutomatedSuite {
-	 * 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());
-	}
 }

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());
-    }
 }

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 class EditorTestSuite {
-    }
-    
-    public EditorTestSuite() {
-        super(EditorTestSuite.class.getName());
-		addTest(SourceHeaderPartnerFinderTest.suite());
-    }
 }

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();
 

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 class IncludeBrowserTestSuite {
-    }
-    
-    public IncludeBrowserTestSuite() {
-        super(IncludeBrowserTestSuite.class.getName());
-        addTest(BasicIncludeBrowserTest.suite());
-    }
 }

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());
+public class MiscTestSuite {
-		addTestSuite(CDTSharedImagesTests.class);
-		addTestSuite(LanguageVerifierTests.class);
-	}
 }

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());
-    }
 }

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 org.junit.runner.RunWith;
-import junit.framework.TestSuite;
+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();
+public class 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;
-	}
 }

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) {
+	public static TestSuite suite() {
-		suite.addTest(SingleProject.suite());
+		TestSuite suite = new TestSuite();
-		suite.addTest(ReferencedProject.suite());
+		suite.addTestSuite(SingleProject.class);
+		suite.addTestSuite(ReferencedProject.class);
+		return suite;
 	}
 	
 	public FindReferencesTest() {

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 {
+@RunWith(Suite.class)
-    public static TestSuite suite() {
+@Suite.SuiteClasses({
-        return new SearchTestSuite();
+    BasicSearchTest.class,
-    }
+    LinkedNamesFinderTest.class,
-    
+    SearchReferencesAcrossLanguagesTest.class,
-    public SearchTestSuite() {
+    FindReferencesTest.class,
-        super(SearchTestSuite.class.getName());
+
-        addTest(BasicSearchTest.suite());
+})
-        addTest(LinkedNamesFinderTest.suite());
+public class SearchTestSuite {
-        addTest(SearchReferencesAcrossLanguagesTest.suite());
-        FindReferencesTest.addTests(this);
-    }
 }

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() {
+    // documentation tool extension tests
-        return new TextTestSuite();
+    DocCommentTestSuite.class,
-    }
     
-    public TextTestSuite() {
+    // partitioning tests
-        super(TextTestSuite.class.getName());
+	PartitionTokenScannerTest.class,
+	CPartitionerTest.class,
+	AsmPartitionerTest.class,
 
-        // documentation tool extension tests
+    // smart edit tests
-        addTest(DocCommentTestSuite.suite());
+	CAutoIndentTest.class,
-        
+	CHeuristicScannerTest.class,
-        // partitioning tests
+	BracketInserterTest.class,
-		addTest(PartitionTokenScannerTest.suite());
+	IndentActionTest.class,
-		addTest(CPartitionerTest.suite());
+	FormatActionTest.class,
-		addTest(AsmPartitionerTest.suite());
+	ShiftActionTest.class,
+	CodeFormatterTest.class,
+	CIndenterTest.class,
+	TemplateFormatterTest.class,
+	
+	// Break iterator tests.
+	CBreakIteratorTest.class,
+	CWordIteratorTest.class,
 
-        // smart edit tests
+	// highlighting tests
-		addTest(CAutoIndentTest.suite());
+	SemanticHighlightingTest.class,
-		addTest(CHeuristicScannerTest.suite());
+	InactiveCodeHighlightingTest.class,
-		addTest(BracketInserterTest.suite());
+	CHeaderRuleTest.class,
-		addTest(IndentActionTest.suite());
+	NumberRuleTest.class,
-		addTest(FormatActionTest.suite());
+	PairMatcherTest.class,
-		addTest(ShiftActionTest.suite());
+	MarkOccurrenceTest.class,
-		addTest(CodeFormatterTest.suite());
-		addTest(CIndenterTest.suite());
-		addTest(TemplateFormatterTest.suite());
-		
-		// Break iterator tests.
-		addTest(CBreakIteratorTest.suite());
-		addTest(CWordIteratorTest.suite());
 
-		// highlighting tests
+	// folding tests
-		addTest(SemanticHighlightingTest.suite());
+	FoldingTest.class,
-		addTest(InactiveCodeHighlightingTest.suite());
-		addTest(CHeaderRuleTest.suite());
-		addTest(NumberRuleTest.suite());
-		addTest(PairMatcherTest.suite());
-		addTest(MarkOccurrenceTest.suite());
 
-		// folding tests
+	// basic editing tests
-		addTest(FoldingTest.suite());
+	BasicCEditorTest.class,
-		
+	
-		// basic editing tests
+	// editor hyperlink tests
-		addTest(BasicCEditorTest.suite());
+	HyperlinkTest.class,
-		
-		// editor hyperlink tests
-		addTest(HyperlinkTest.suite());
 
-		// word detection
+	// word detection
-		addTest(CWordFinderTest.suite());
+	CWordFinderTest.class,
-		
+	
-		// compare tests
+	// compare tests
-		addTest(CStructureCreatorTest.suite());
+	CStructureCreatorTest.class,
-		
+	
-		// source manipulation tests
+	// source manipulation tests
-		addTest(AddBlockCommentTest.suite());
+	AddBlockCommentTest.class,
-		addTest(RemoveBlockCommentTest.suite());
+	RemoveBlockCommentTest.class,
-		addTest(SortLinesTest.suite());
+	SortLinesTest.class,
 
-		// add include
+	// add include
-		addTest(AddIncludeTest.suite());
+	AddIncludeTest.class,
-    }
+})
+public class TextTestSuite {
 }

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() {
+	ContentAssistTests.class,
-        return new ContentAssistTestSuite();
+
-    }
+})
-    
+public class ContentAssistTestSuite {
-    public ContentAssistTestSuite() {
-        super(ContentAssistTestSuite.class.getName());
-        
-		addTest(ContentAssistTests.suite());
-    }
 }

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 org.junit.runner.RunWith;
-import junit.framework.TestSuite;
+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()  {
+	CompletionTest_AnonymousTypes.class,
-		return new ContentAssist2TestSuite();
+	CompletionTest_ArgumentType_Prefix.class,
-	}
+	CompletionTest_ArgumentType_Prefix2.class,
-	
+	CompletionTest_ClassReference_NoPrefix.class,
-	public ContentAssist2TestSuite()  {
+	CompletionTest_ClassReference_Prefix.class,
-		super(ContentAssist2TestSuite.class.getName());
+	CompletionTest_ConstructorReference.class,
-		
+	CompletionTest_ExceptionReference_NoPrefix.class,
-		addTest(CompletionTest_AnonymousTypes.suite());
+	CompletionTest_ExceptionReference_Prefix.class,
-		addTest(CompletionTest_ArgumentType_Prefix.suite());
+	CompletionTest_FieldType_NoPrefix.class,
-		addTest(CompletionTest_ArgumentType_Prefix2.suite());
+	CompletionTest_FieldType_NoPrefix2.class,
-		addTest(CompletionTest_ClassReference_NoPrefix.suite());
+	CompletionTest_FieldType_Prefix.class,
-		addTest(CompletionTest_ClassReference_Prefix.suite());
+	CompletionTest_FunctionReference_Prefix.class,
-		addTest(CompletionTest_ConstructorReference.suite());
+	CompletionTest_MacroRef_NoPrefix.class,
-		addTest(CompletionTest_ExceptionReference_NoPrefix.suite());
+	CompletionTest_MacroRef_Prefix.class,
-		addTest(CompletionTest_ExceptionReference_Prefix.suite());
+	CompletionTest_MemberReference_Arrow_NoPrefix.class,
-		addTest(CompletionTest_FieldType_NoPrefix.suite());
+	CompletionTest_MemberReference_Arrow_NoPrefix2.class,
-		addTest(CompletionTest_FieldType_NoPrefix2.suite());
+	CompletionTest_MemberReference_Arrow_NoPrefix3.class,
-		addTest(CompletionTest_FieldType_Prefix.suite());
+	CompletionTest_MemberReference_Arrow_Prefix.class,
-		addTest(CompletionTest_FunctionReference_Prefix.suite());
+	CompletionTest_MemberReference_Arrow_Prefix2.class,
-		addTest(CompletionTest_MacroRef_NoPrefix.suite());
+	CompletionTest_MemberReference_Dot_NoPrefix.class,
-		addTest(CompletionTest_MacroRef_Prefix.suite());
+	CompletionTest_MemberReference_Dot_Prefix.class,
-		addTest(CompletionTest_MemberReference_Arrow_NoPrefix.suite());
+	CompletionTest_NamespaceRef_NoPrefix.class,
-		addTest(CompletionTest_MemberReference_Arrow_NoPrefix2.suite());
+	CompletionTest_NamespaceRef_Prefix.class,
-		addTest(CompletionTest_MemberReference_Arrow_NoPrefix3.suite());
+	CompletionTest_NewTypeReference_NoPrefix.class,
-		addTest(CompletionTest_MemberReference_Arrow_Prefix.suite());
+	CompletionTest_NewTypeReference_Prefix.class,
-		addTest(CompletionTest_MemberReference_Arrow_Prefix2.suite());
+	CompletionTest_ScopedReference_NonCodeScope.class,
-		addTest(CompletionTest_MemberReference_Dot_NoPrefix.suite());
+	CompletionTest_ScopedReference_NoPrefix.class,
-		addTest(CompletionTest_MemberReference_Dot_Prefix.suite());
+	CompletionTest_ScopedReference_Prefix.class,
-		addTest(CompletionTest_NamespaceRef_NoPrefix.suite());
+	CompletionTest_SingleName_Method_NoPrefix.class,
-		addTest(CompletionTest_NamespaceRef_Prefix.suite());
+	CompletionTest_SingleName_Method_Prefix.class,
-		addTest(CompletionTest_NewTypeReference_NoPrefix.suite());
+	CompletionTest_SingleName_NoPrefix.class,
-		addTest(CompletionTest_NewTypeReference_Prefix.suite());
+	CompletionTest_SingleName_Prefix.class,
-		addTest(CompletionTest_ScopedReference_NonCodeScope.suite());
+	CompletionTest_SingleName_Prefix2.class,
-		addTest(CompletionTest_ScopedReference_NoPrefix.suite());
+	CompletionTest_TypeDef_NoPrefix.class,
-		addTest(CompletionTest_ScopedReference_Prefix.suite());
+	CompletionTest_TypeDef_Prefix.class,
-		addTest(CompletionTest_SingleName_Method_NoPrefix.suite());
+	CompletionTest_TypeRef_NoPrefix.class,
-		addTest(CompletionTest_SingleName_Method_Prefix.suite());
+	CompletionTest_TypeRef_Prefix.class,
-		addTest(CompletionTest_SingleName_NoPrefix.suite());
+	CompletionTest_VariableType_NestedPrefix.class,
-		addTest(CompletionTest_SingleName_Prefix.suite());
+	CompletionTest_VariableType_NoPrefix.class,
-		addTest(CompletionTest_SingleName_Prefix2.suite());
+	CompletionTest_VariableType_Prefix.class,
-		addTest(CompletionTest_TypeDef_NoPrefix.suite());
+
-		addTest(CompletionTest_TypeDef_Prefix.suite());
+	CompletionTests.class,
-		addTest(CompletionTest_TypeRef_NoPrefix.suite());
+	HelpProposalTests.class,
-		addTest(CompletionTest_TypeRef_Prefix.suite());
+	CompletionTests_PlainC.class,
-		addTest(CompletionTest_VariableType_NestedPrefix.suite());
+	ParameterHintTests.class,
-		addTest(CompletionTest_VariableType_NoPrefix.suite());
+	CPPParameterGuessingTests.class,
-		addTest(CompletionTest_VariableType_Prefix.suite());
+	CParameterGuessingTests.class,
-		
+
-		addTest(CompletionTests.suite());
+	ShowCamelCasePreferenceTest.class,
-		addTest(HelpProposalTests.suite());
+
-		addTest(CompletionTests_PlainC.suite());
+	TemplateProposalTest.class,
-		addTest(ParameterHintTests.suite());
+
-		addTest(CPPParameterGuessingTests.suite());
+})
-		addTest(CParameterGuessingTests.suite());
+public class ContentAssist2TestSuite {
-		
-		addTest(ShowCamelCasePreferenceTest.suite());
-		
-		addTest(TemplateProposalTest.suite());
-	}
 }

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() {
+	// selection tests
-        return new SelectionTestSuite();
+	ResolveBindingTests.class,
-    }
+	CPPSelectionTestsNoIndexer.class,
-    
+	CSelectionTestsNoIndexer.class,
-    public SelectionTestSuite() {
+	CPPSelectionTestsIndexer.class,
-        super(SelectionTestSuite.class.getName());
+	CSelectionTestsIndexer.class,
-        
+
-        // selection tests
+})
-        addTest(ResolveBindingTests.suite());
+public class SelectionTestSuite {
-        addTest(CPPSelectionTestsNoIndexer.suite());
-		addTest(CSelectionTestsNoIndexer.suite());
-		addTest(CPPSelectionTestsIndexer.suite());
-		addTest(CSelectionTestsIndexer.suite());
-    }
 }

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 {
+@RunWith(Suite.class)
-
+@Suite.SuiteClasses({
-    public static TestSuite suite() {
+    CTypeHierarchyTest.class,
-        return new TypeHierarchyTestSuite();
+    CppTypeHierarchyTest.class,
-    }
+    QuickTypeHierarchyTest.class,
-    
+    TypeHierarchyAcrossProjectsTest.class,
-    public TypeHierarchyTestSuite() {
+})
-        super(TypeHierarchyTestSuite.class.getName());
+public class TypeHierarchyTestSuite {
-        addTest(CTypeHierarchyTest.suite());
-        addTest(CppTypeHierarchyTest.suite());
-        addTest(QuickTypeHierarchyTest.suite());
-        addTest(TypeHierarchyAcrossProjectsTest.suite());
-    }
 }

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);
-    }
 }

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 {
+@RunWith(Suite.class)
-	
+@Suite.SuiteClasses({
-	public static TestSuite suite() {
+	ClassWizardNameTest.class,
-        return new ClassWizardTestSuite();
+
-    }
+})
-	
+public class ClassWizardTestSuite {
-	public ClassWizardTestSuite() {
-		super(ClassWizardTestSuite.class.getName());
-		addTestSuite(ClassWizardNameTest.class);
-	}
 }

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 {
+@RunWith(Suite.class)
-
+@Suite.SuiteClasses({
-    public static TestSuite suite() {
+	SettingsImportExportTest.class
-        return new SettingsWizardTestSuite();
+})
-    }
+public class SettingsWizardTestSuite {
-    
-    public SettingsWizardTestSuite() {
-        super(SettingsWizardTestSuite.class.getName());
-        addTestSuite(SettingsImportExportTest.class);
-    }
 }