Code streamlining.

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/Messages.java

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html  
- *  
- * Contributors: 
- * Institute for Software - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.ui.tests.refactoring;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.ui.tests.refactoring.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringBaseTest.java

@@ -13,9 +13,9 @@ package org.eclipse.cdt.ui.tests.refactoring;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.util.Collection;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.Vector;
 
 import org.eclipse.cdt.core.tests.BaseTestFramework;
 import org.eclipse.core.resources.IFile;
@@ -27,7 +27,6 @@ import org.eclipse.jface.text.TextSelection;
 
 /**
  * @author Guido Zgraggen IFS
- *
  */
 public abstract class RefactoringBaseTest extends BaseTestFramework implements ILogListener{
 	protected static final NullProgressMonitor NULL_PROGRESS_MONITOR = new NullProgressMonitor();
@@ -40,7 +39,7 @@ public abstract class RefactoringBaseTest extends BaseTestFramework implements I
 		super(name);
 	}
 	
-	public RefactoringBaseTest(String name, Vector<TestSourceFile> files) {
+	public RefactoringBaseTest(String name, Collection<TestSourceFile> files) {
 		super(name);
 		for (TestSourceFile file : files) {
 			fileMap.put(file.getName(), file);

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringHistoryTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Institute for Software, HSR Hochschule fuer Technik  
+ * Copyright (c) 2009, 2011 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 
@@ -13,8 +13,8 @@ package org.eclipse.cdt.ui.tests.refactoring;
 
 import java.io.ByteArrayInputStream;
 import java.net.URI;
+import java.util.Collection;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -29,15 +29,11 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoring;
 
 /**
  * @author Emanuel Graf IFS
- * 
  */
-public class RefactoringHistoryTest extends
+public class RefactoringHistoryTest extends	ExtractFunctionRefactoringTest {
-		ExtractFunctionRefactoringTest {
-
 	private TestSourceFile scriptFile;
 
-	public RefactoringHistoryTest(String name,
+	public RefactoringHistoryTest(String name, Collection<TestSourceFile> files) {
-			Vector<TestSourceFile> files) {
 		super(name, files);
 	}
 

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTest.java

@@ -14,8 +14,8 @@ package org.eclipse.cdt.ui.tests.refactoring;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry;
@@ -36,12 +36,9 @@ public abstract class RefactoringTest extends RefactoringBaseTest {
 	protected String fileName;
 	protected RefactoringASTCache astCache;
 
-	public RefactoringTest(String name, Vector<TestSourceFile> files) {
+	public RefactoringTest(String name, Collection<TestSourceFile> files) {
 		super(name, files);
 		initializeConfiguration(files);
-		for (TestSourceFile file : files) {
-			fileMap.put(file.getName(), file);
-		}
 	}
 
 	protected abstract void configureRefactoring(Properties refactoringProperties);
@@ -63,7 +60,7 @@ public abstract class RefactoringTest extends RefactoringBaseTest {
 		super.tearDown();
 	}
 
-	private void initializeConfiguration(Vector<TestSourceFile> files) {
+	private void initializeConfiguration(Collection<TestSourceFile> files) {
 		TestSourceFile configFile = null;
 
 		for (TestSourceFile currentFile : files) {

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTester.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Institute for Software, HSR Hochschule fuer Technik  
+ * Copyright (c) 2008, 2011 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 
@@ -15,10 +15,9 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
-import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -34,10 +33,8 @@ import org.eclipse.cdt.ui.testplugin.CTestPlugin;
 
 /**
  * @author Emanuel Graf
- *
  */
 public class RefactoringTester extends TestSuite{
-	
 	enum MatcherState{skip, inTest, inSource, inExpectedResult}
 	
 	private static final String classRegexp = "//#(.*)\\s*(\\w*)*$"; //$NON-NLS-1$
@@ -61,9 +58,8 @@ public class RefactoringTester extends TestSuite{
 	}
 	
 	private static ArrayList<RefactoringBaseTest> createTests(BufferedReader inputReader) throws Exception {
-		
 		String line;
-		Vector<TestSourceFile> files = new Vector<TestSourceFile>();
+		Collection<TestSourceFile> files = new ArrayList<TestSourceFile>();
 		TestSourceFile actFile = null;
 		MatcherState matcherState = MatcherState.skip;
 		ArrayList<RefactoringBaseTest> testCases = new ArrayList<RefactoringBaseTest>();
@@ -72,12 +68,11 @@ public class RefactoringTester extends TestSuite{
 		boolean bevorFirstTest = true;
 		
 		while ((line = inputReader.readLine()) != null) {
-			
 			if (lineMatchesBeginOfTest(line)) {
 				if (!bevorFirstTest) {
 					RefactoringBaseTest test = createTestClass(className, testName, files);
 					testCases.add(test);
-					files = new Vector<TestSourceFile>();
+					files = new ArrayList<TestSourceFile>();
 					className = null;
 					testName = null;
 				}
@@ -118,21 +113,22 @@ public class RefactoringTester extends TestSuite{
 		return testCases;
 	}
 	
-
+	private static RefactoringBaseTest createTestClass(String className, String testName, Collection<TestSourceFile> files) throws Exception {
-	
-	private static RefactoringBaseTest createTestClass(String className, String testName, Vector<TestSourceFile> files) throws Exception {
-		
-		
 		try {
 			Class<?> refClass = Class.forName(className);
-			Class<?> paratypes[] = new Class[2];
+			if (testName == null) {
-			paratypes[0] = testName.getClass();
+				testName = refClass.getSimpleName();
-			paratypes[1] = files.getClass();
+			}
-			Constructor<?> ct = refClass.getConstructor(paratypes);
+			Constructor<?>[] constructors = refClass.getConstructors();
-			Object arglist[] = new Object[2];
+			for (Constructor<?> ctor : constructors) {
-			arglist[0] = testName;
+				Object arglist[] = new Object[] { testName, files };
-			arglist[1] = files;
+				if (ctor.getParameterTypes().length == arglist.length) {
-			RefactoringBaseTest test = (RefactoringBaseTest) ct.newInstance(arglist);
+					RefactoringBaseTest test = null;
+					try {
+						test = (RefactoringBaseTest) ctor.newInstance(arglist);
+					} catch (IllegalArgumentException e) {
+						continue;
+					}
 					for (TestSourceFile file : files) {
 						TextSelection sel = file.getSelection();
 						if (sel != null) {
@@ -142,20 +138,13 @@ public class RefactoringTester extends TestSuite{
 						}
 					}
 					return test;
+				}
+			}
+			throw new Exception(className + " class does not provide required constructor"); //$NON-NLS-1$
 		} catch (ClassNotFoundException e) {
-			throw new Exception(Messages.getString("RefactoringTester.UnknownTestClass")); //$NON-NLS-1$
+			throw new Exception("Unknown test class " + className); //$NON-NLS-1$
-		} catch (SecurityException e) {
+		} catch (Exception e) {
-			throw new Exception(Messages.getString("RefactoringTester.SecurityException"), e); //$NON-NLS-1$
+			throw new Exception(e.getClass().getSimpleName() + " diring creation of test " + className, e); //$NON-NLS-1$
-		} catch (NoSuchMethodException e) {
-			throw new Exception(Messages.getString("RefactoringTester.ConstructorError")); //$NON-NLS-1$
-		} catch (IllegalArgumentException e) {
-			throw new Exception(Messages.getString("RefactoringTester.IllegalArgument"), e); //$NON-NLS-1$
-		} catch (InstantiationException e) {
-			throw new Exception(Messages.getString("RefactoringTester.InstantiationException"), e); //$NON-NLS-1$
-		} catch (IllegalAccessException e) {
-			throw new Exception(Messages.getString("RefactoringTester.IllegalAccessException"), e); //$NON-NLS-1$
-		} catch (InvocationTargetException e) {
-			throw new Exception(Messages.getString("RefactoringTester.InvocationTargetException"), e); //$NON-NLS-1$
 		}
 	}
 
@@ -195,8 +184,7 @@ public class RefactoringTester extends TestSuite{
 		Matcher matcherBeginOfTest = createMatcherFromString(testRegexp, line);
 		if (matcherBeginOfTest.find())
 			return matcherBeginOfTest.group(1);
-		else
+		return null;
-			return Messages.getString("RefactoringTester.NotNamed"); //$NON-NLS-1$
 	}
 	
 	private static boolean lineMatchesBeginOfResult(String line) {

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Institute for Software, HSR Hochschule fuer Technik  
+ * Copyright (c) 2008, 2011 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 
@@ -11,8 +11,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.ui.tests.refactoring.extractconstant;
 
+import java.util.Collection;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.ltk.core.refactoring.Change;
@@ -30,11 +30,9 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum;
  * @author Emanuel Graf
  */
 public class ExtractConstantRefactoringTest extends RefactoringTest {
-
-
 	protected VisibilityEnum visibility;
 
-	public ExtractConstantRefactoringTest(String name, Vector<TestSourceFile> files) {
+	public ExtractConstantRefactoringTest(String name, Collection<TestSourceFile> files) {
 		super(name, files);
 	}
 
@@ -57,7 +55,5 @@ public class ExtractConstantRefactoringTest extends RefactoringTest {
 	@Override
 	protected void configureRefactoring(Properties refactoringProperties) {
 		visibility = VisibilityEnum.getEnumForStringRepresentation(refactoringProperties.getProperty("visibility", VisibilityEnum.v_public.toString())); //$NON-NLS-1$
-	
 	}
-
 }

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Institute for Software, HSR Hochschule fuer Technik  
+ * Copyright (c) 2008, 2011 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 
@@ -11,8 +11,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.ui.tests.refactoring.extractfunction;
 
+import java.util.Collection;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
@@ -30,10 +30,8 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.VisibilityEnum;
 
 /**
  * @author Emanuel Graf
- *
  */
 public class ExtractFunctionRefactoringTest extends RefactoringTest {
-	
 	protected String methodName;
 	protected boolean replaceDuplicates;
 	protected boolean returnValue;
@@ -47,7 +45,7 @@ public class ExtractFunctionRefactoringTest extends RefactoringTest {
 	 * @param name
 	 * @param files
 	 */
-	public ExtractFunctionRefactoringTest(String name, Vector<TestSourceFile> files) {
+	public ExtractFunctionRefactoringTest(String name, Collection<TestSourceFile> files) {
 		super(name, files);
 	}
 

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractlocalvariable/ExtractLocalVariableRefactoringTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Institute for Software, HSR Hochschule fuer Technik  
+ * Copyright (c) 2008, 2011 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 
@@ -11,8 +11,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.ui.tests.refactoring.extractlocalvariable;
 
+import java.util.Collection;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.ltk.core.refactoring.Change;
@@ -34,7 +34,7 @@ public class ExtractLocalVariableRefactoringTest extends RefactoringTest {
 	protected String variableName;
 	protected boolean fatalError;
 
-	public ExtractLocalVariableRefactoringTest(String name, Vector<TestSourceFile> files) {
+	public ExtractLocalVariableRefactoringTest(String name, Collection<TestSourceFile> files) {
 		super(name, files);
 	}
 

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/gettersandsetters/GenerateGettersAndSettersTest.java

@@ -14,9 +14,9 @@
 package org.eclipse.cdt.ui.tests.refactoring.gettersandsetters;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
@@ -48,7 +48,7 @@ public class GenerateGettersAndSettersTest extends RefactoringTest {
 	 * @param name
 	 * @param files
 	 */
-	public GenerateGettersAndSettersTest(String name, Vector<TestSourceFile> files) {
+	public GenerateGettersAndSettersTest(String name, Collection<TestSourceFile> files) {
 		super(name, files);
 	}
 

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodRefactoringTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Institute for Software, HSR Hochschule fuer Technik  
+ * Copyright (c) 2008, 2011 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 
@@ -11,8 +11,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.ui.tests.refactoring.hidemethod;
 
+import java.util.Collection;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.ltk.core.refactoring.Change;
@@ -32,7 +32,7 @@ public class HideMethodRefactoringTest extends RefactoringTest {
 	private int errors;
 	private int fatalerrors;
 	
-	public HideMethodRefactoringTest(String name, Vector<TestSourceFile> files) {
+	public HideMethodRefactoringTest(String name, Collection<TestSourceFile> files) {
 		super(name, files);
 	}
 

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/implementmethod/ImplementMethodRefactoringTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Institute for Software, HSR Hochschule fuer Technik  
+ * Copyright (c) 2008, 2011 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 
@@ -11,8 +11,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.ui.tests.refactoring.implementmethod;
 
+import java.util.Collection;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.ltk.core.refactoring.Change;
@@ -26,22 +26,18 @@ import org.eclipse.cdt.internal.ui.refactoring.implementmethod.ImplementMethodRe
  
 /**
  * @author Mirko Stocker
- *
  */
 public class ImplementMethodRefactoringTest extends RefactoringTest {
-
 	protected int finalWarnings;
 	private int initialWarnings;
 
-	public ImplementMethodRefactoringTest(String name,Vector<TestSourceFile> files) {
+	public ImplementMethodRefactoringTest(String name, Collection<TestSourceFile> files) {
 		super(name, files);
 	}
 
 	@Override
 	protected void runTest() throws Throwable {
-		
 		IFile refFile = project.getFile(fileName);
-		
 		CRefactoring refactoring = new ImplementMethodRefactoring(refFile, selection, null, cproject);
 		
 		try {
@@ -65,8 +61,7 @@ public class ImplementMethodRefactoringTest extends RefactoringTest {
 				assertConditionsWarning(finalConditions, finalWarnings);
 			}
 			compareFiles(fileMap);
-		}
+		} finally {
-		finally {
 			refactoring.unlockIndex();
 		}
 	}

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/messages.properties

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Wind River 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Wind River Systems - initial API and implementation
-###############################################################################
-RefactoringTester.UnknownTestClass=Unknown TestClass. Make sure the test's sourcefile specifies a valid test class.
-RefactoringTester.SecurityException=Security Exception during Test creation
-RefactoringTester.ConstructorError=Test class does not provied required constructor.
-RefactoringTester.IllegalArgument=IllegalArgumentException during Test creation
-RefactoringTester.InstantiationException=InstantiationException during Test creation
-RefactoringTester.IllegalAccessException=IllegalAccessException during Test creation
-RefactoringTester.InvocationTargetException=InvocationTargetException during Test creation
-RefactoringTester.NotNamed=Not Named

core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/TranslationUnitHelperTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Institute for Software, HSR Hochschule fuer Technik  
+ * Copyright (c) 2008, 2011 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 
@@ -11,8 +11,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.ui.tests.refactoring.utils;
 
+import java.util.Collection;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 
@@ -25,13 +25,11 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.TranslationUnitHelper;
 
 /**
  * @author Mirko Stocker
- *
  */
 public class TranslationUnitHelperTest extends RefactoringTest {
-
 	private int offset;
 
-	public TranslationUnitHelperTest(String name,Vector<TestSourceFile> files) {
+	public TranslationUnitHelperTest(String name, Collection<TestSourceFile> files) {
 		super(name, files);
 	}