Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2345] trunk/org.rubypeople.rdt.refactoring.tests/ src/org/rubypeople/rdt/refactoring/tests
|
From: <mir...@us...> - 2007-04-20 13:18:27
|
Revision: 2345
http://svn.sourceforge.net/rubyeclipse/?rev=2345&view=rev
Author: mirkostocker
Date: 2007-04-20 06:18:24 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
refactor the tests and remove some code..
Modified Paths:
--------------
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestData.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/RefactoringTestCase.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/TreeProviderTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/TwoLayerTreeEditProviderTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/convertlocaltofield/LocalToFieldTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/encapsulatefield/EncapsulateFieldTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateaccessors/GenerateAccessorTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateaccessors/TC_AccessorsGeneratorTreeTest.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateconstructor/ConstructorGeneratorTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/inlineclass/ClassInlinerTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/inlinelocal/LocalInlinerTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/mergeclasspartsinfile/ClassPartSelectorTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/mergewithexternalclassparts/MergeWithExternalClassPartsTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/movefield/MoveFieldTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/movemethod/MoveMethodTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/overridemethod/OverrideMethodTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/overridemethod/TC_OverridenMethodEditTest.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/pushdown/PushDownTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamefield/FieldRenamerTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamemethod/MethodRenamerTester.java
trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamemethod/selection/RenameMethodSelectionTester.java
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestData.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestData.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/FileTestData.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -58,7 +58,7 @@
return fileName;
}
- public FileTestData(String fileName, Class<?> resourceProvier) throws FileNotFoundException, IOException {
+ public FileTestData(String fileName) throws FileNotFoundException, IOException {
this(fileName, ".test_source", ".test_result");
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/RefactoringTestCase.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/RefactoringTestCase.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/RefactoringTestCase.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -45,10 +45,6 @@
public RefactoringTestCase(String name) {
super(name);
}
-
- public RefactoringTestCase() {
- super(RefactoringTestCase.class.getSimpleName());
- }
protected void createEditAndCompareResult(String document, String expectedDocument, IEditProvider editProvider) throws BadLocationException {
String result;
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/TreeProviderTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/TreeProviderTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/TreeProviderTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -33,8 +33,14 @@
import org.eclipse.jface.viewers.ITreeContentProvider;
-public abstract class TreeProviderTester extends RefactoringTestCase
-{
+public abstract class TreeProviderTester extends RefactoringTestCase {
+ public TreeProviderTester() {
+ this("Tree Provider Tester");
+ }
+
+ public TreeProviderTester(String fileName) {
+ super(fileName);
+ }
private Map<String, Entry> elements;
@@ -45,8 +51,7 @@
elements = new HashMap<String, Entry>();
}
- public void addContent(String[] content)
- {
+ public void addContent(String[] content) {
Map<String, Entry> aktMap = elements;
for (String str : content)
{
@@ -58,15 +63,12 @@
}
}
- public void validate(ITreeContentProvider provider)
- {
+ public void validate(ITreeContentProvider provider) {
this.provider = provider;
checkElements(elements, provider.getElements(null));
}
- private void checkElements(Map<String, Entry> expectedElements,
- Object[] elements)
- {
+ private void checkElements(Map<String, Entry> expectedElements, Object[] elements) {
assertNotNull(elements);
assertEquals(expectedElements.size(), elements.length);
@@ -85,30 +87,25 @@
}
}
- static class Entry
- {
+ static class Entry {
private String name;
private Map<String, Entry> childs;
- public Entry(String name)
- {
+ public Entry(String name) {
this.name = name;
childs = new HashMap<String, Entry>();
}
- public String getName()
- {
+ public String getName() {
return name;
}
- public void addChild(Entry child)
- {
+ public void addChild(Entry child) {
childs.put(child.getName(), child);
}
- public Map<String, Entry> getChilds()
- {
+ public Map<String, Entry> getChilds() {
return childs;
}
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/TwoLayerTreeEditProviderTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/TwoLayerTreeEditProviderTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/TwoLayerTreeEditProviderTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -48,7 +48,8 @@
private boolean autoCheckChildrenOnParentCheck;
- public TwoLayerTreeEditProviderTester(boolean autoCheckChildrenOnParentCheck) {
+ public TwoLayerTreeEditProviderTester(String fileName, boolean autoCheckChildrenOnParentCheck) {
+ super(fileName);
this.autoCheckChildrenOnParentCheck = autoCheckChildrenOnParentCheck;
selections = new ArrayList<ItemSelection>();
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/convertlocaltofield/LocalToFieldTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/convertlocaltofield/LocalToFieldTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/convertlocaltofield/LocalToFieldTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -37,16 +37,13 @@
import org.rubypeople.rdt.refactoring.core.convertlocaltofield.LocalToFieldConditionChecker;
import org.rubypeople.rdt.refactoring.core.convertlocaltofield.LocalToFieldConfig;
import org.rubypeople.rdt.refactoring.core.convertlocaltofield.LocalToFieldConverter;
-import org.rubypeople.rdt.refactoring.tests.FilePropertyData;
import org.rubypeople.rdt.refactoring.tests.FileTestData;
import org.rubypeople.rdt.refactoring.tests.RefactoringTestCase;
public class LocalToFieldTester extends RefactoringTestCase {
- private String fileName;
-
public LocalToFieldTester(String fileName) {
- this.fileName = fileName;
+ super(fileName);
}
protected int getInitPlace(String initPlace) {
@@ -55,40 +52,25 @@
} else if (initPlace.equalsIgnoreCase("TempToFieldConverter.INIT_IN_CONSTRUCTOR")) {
return LocalToFieldConverter.INIT_IN_CONSTRUCTOR;
} else {
- assertTrue(false);
+ fail();
return 0;
}
-
}
- protected void runTempToFieldTest(FilePropertyData data, String sourceDocument, String expectedDocument, String newName, boolean isClassField, int initPlace,
- int cursorPosition) throws BadLocationException {
- LocalToFieldConfig config = new LocalToFieldConfig(data, cursorPosition);
+ @Override
+ public void runTest() throws FileNotFoundException, IOException, BadLocationException {
+ FileTestData data = new FileTestData(getName());
+ LocalToFieldConfig config = new LocalToFieldConfig(data, data.getIntProperty("cursorPosition"));
LocalToFieldConditionChecker checker = new LocalToFieldConditionChecker(config);
+
if (!checker.shouldPerform()) {
fail();
}
+
LocalToFieldConverter converter = new LocalToFieldConverter(config);
- converter.setInitPlace(initPlace);
- converter.setIsClassField(isClassField);
- converter.setNewName(newName);
- createEditAndCompareResult(sourceDocument, expectedDocument, converter);
+ converter.setInitPlace(getInitPlace(data.getProperty("initPlace")));
+ converter.setIsClassField(data.getBoolProperty("isClassField"));
+ converter.setNewName(data.getProperty("newName"));
+ createEditAndCompareResult(data.getSource(), data.getExpectedResult(), converter);
}
-
- @Override
- public void runTest() throws FileNotFoundException, IOException, BadLocationException {
- FileTestData data = new FileTestData(fileName, getClass());
- String source = data.getSource();
- String expected = data.getExpectedResult();
- String newName = data.getProperty("newName");
- boolean isClassField = data.getBoolProperty("isClassField");
- int initPlace = getInitPlace(data.getProperty("initPlace"));
- int cursorPos = data.getIntProperty("cursorPosition");
- runTempToFieldTest(data, source, expected, newName, isClassField, initPlace, cursorPos);
- }
-
- @Override
- public String getName() {
- return fileName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/encapsulatefield/EncapsulateFieldTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/encapsulatefield/EncapsulateFieldTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/encapsulatefield/EncapsulateFieldTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -43,15 +43,13 @@
public class EncapsulateFieldTester extends RefactoringTestCase {
- private String testName;
-
public EncapsulateFieldTester(String fileName) {
- testName = fileName;
+ super(fileName);
}
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException {
- FileTestData testData = new FileTestData(testName, getClass());
+ FileTestData testData = new FileTestData(getName());
EncapsulateFieldConfig config = new EncapsulateFieldConfig(testData, testData.getIntProperty("cursorPosition"));
EncapsulateFieldConditionChecker checker = new EncapsulateFieldConditionChecker(config);
@@ -87,10 +85,4 @@
fail();
return METHOD_VISIBILITY.NONE;
}
-
- @Override
- public String getName() {
- return testName;
- }
-
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateaccessors/GenerateAccessorTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateaccessors/GenerateAccessorTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateaccessors/GenerateAccessorTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -47,21 +47,18 @@
public class GenerateAccessorTester extends RefactoringTestCase {
- private String testName;
-
private AccessorsGenerator accessorsGenerator;
- private Collection<AccessorSelection> selections;
+ private Collection<AccessorSelection> selections = new ArrayList<AccessorSelection>();
public GenerateAccessorTester(String fileName) {
- testName = fileName;
- selections = new ArrayList<AccessorSelection>();
+ super(fileName);
}
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException {
FileTestData testData;
- testData = new FileTestData(testName, getClass());
+ testData = new FileTestData(getName());
int type = getAccessorType(testData);
accessorsGenerator = new AccessorsGenerator(testData, type);
Collection<String> strSelections = testData.getNumberedProperty("selection");
@@ -84,11 +81,6 @@
return -1;
}
- @Override
- public String getName() {
- return testName;
- }
-
protected void addSelection(String name, String attributeName, boolean readerSelected, boolean writerSelected) {
selections.add(new AccessorSelection(name, attributeName, readerSelected, writerSelected));
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateaccessors/TC_AccessorsGeneratorTreeTest.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateaccessors/TC_AccessorsGeneratorTreeTest.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateaccessors/TC_AccessorsGeneratorTreeTest.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -38,7 +38,7 @@
import org.rubypeople.rdt.refactoring.documentprovider.StringDocumentProvider;
import org.rubypeople.rdt.refactoring.tests.TreeProviderTester;
-public class TC_AccessorsGeneratorTreeTest extends TreeProviderTester{
+public class TC_AccessorsGeneratorTreeTest extends TreeProviderTester {
private final static String TEST_DOCUMENT_SIMPLE = "#ClassComment\n" +
"class X\n" +
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateconstructor/ConstructorGeneratorTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateconstructor/ConstructorGeneratorTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/generateconstructor/ConstructorGeneratorTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -43,16 +43,13 @@
public class ConstructorGeneratorTester extends TwoLayerTreeEditProviderTester {
- private String testName;
-
public ConstructorGeneratorTester(String fileName) {
- super(true);
- testName = fileName;
+ super(fileName, true);
}
@Override
public void runTest() throws FileNotFoundException, IOException, MalformedTreeException, BadLocationException {
- FileTestData testData = new FileTestData(testName, getClass());
+ FileTestData testData = new FileTestData(getName());
ConstructorsGenerator generator = new ConstructorsGenerator(testData);
Collection<String> strSelections = testData.getNumberedProperty("selection");
for (String aktSelection : strSelections) {
@@ -67,9 +64,4 @@
}
createEditAndCompareResult(testData.getSource(), testData.getExpectedResult(), generator);
}
-
- @Override
- public String getName() {
- return testName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/inlineclass/ClassInlinerTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/inlineclass/ClassInlinerTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/inlineclass/ClassInlinerTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -46,12 +46,10 @@
public class ClassInlinerTester extends RefactoringTestCase {
- private String fileName;
-
private MultiFileTestData testData;
public ClassInlinerTester(String fileName) {
- this.fileName = fileName;
+ super(fileName);
}
private PartialClassNodeWrapper getTargetClassPart(String fileName, int classPos) {
@@ -67,7 +65,7 @@
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException {
- testData = new MultiFileTestData(fileName);
+ testData = new MultiFileTestData(getName());
int caretPosition = testData.getIntProperty("caretPosition");
InlineClassConfig config = new InlineClassConfig(testData, caretPosition);
@@ -82,9 +80,4 @@
checkMultiFileEdits(inliner, testData);
}
-
- @Override
- public String getName() {
- return fileName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/inlinelocal/LocalInlinerTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/inlinelocal/LocalInlinerTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/inlinelocal/LocalInlinerTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -42,16 +42,13 @@
public class LocalInlinerTester extends RefactoringTestCase {
- private String fileName;
-
- private FileTestData testData;
-
public LocalInlinerTester(String fileName) {
- this.fileName = fileName;
+ super(fileName);
}
- private void runInlineTempTest(FileTestData data) throws BadLocationException {
-
+ @Override
+ public void runTest() throws FileNotFoundException, IOException, BadLocationException {
+ FileTestData data = new FileTestData(getName());
InlineLocalConfig config = new InlineLocalConfig(data, data.getIntProperty("caretPosition"));
InlineLocalConditionChecker checker = new InlineLocalConditionChecker(config);
if (!checker.shouldPerform()) {
@@ -60,18 +57,7 @@
LocalVariableInliner inliner = new LocalVariableInliner(config);
config.setReplaceTempWithQuery(data.getBoolProperty("replaceWithQuery"));
config.setNewMethodName(data.getProperty("newMethodName"));
-
+
createEditAndCompareResult(data.getActiveFileContent(), data.getExpectedResult(), inliner);
}
-
- @Override
- public void runTest() throws FileNotFoundException, IOException, BadLocationException {
- testData = new FileTestData(fileName, getClass());
- runInlineTempTest(testData);
- }
-
- @Override
- public String getName() {
- return fileName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/mergeclasspartsinfile/ClassPartSelectorTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/mergeclasspartsinfile/ClassPartSelectorTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/mergeclasspartsinfile/ClassPartSelectorTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -48,14 +48,12 @@
public class ClassPartSelectorTester extends RefactoringTestCase {
- private String fileName;
-
private FileTestData testData;
private ClassNodeWrapper selectedClass;
public ClassPartSelectorTester(String fileName) {
- this.fileName = fileName;
+ super(fileName);
}
private Collection<Integer> getCheckedPartNumbers() {
@@ -114,12 +112,8 @@
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException {
- testData = new FileTestData(fileName, getClass());
+ testData = new FileTestData(getName());
runMergeClassPartsInFileTest(testData);
}
- @Override
- public String getName() {
- return fileName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/mergewithexternalclassparts/MergeWithExternalClassPartsTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/mergewithexternalclassparts/MergeWithExternalClassPartsTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/mergewithexternalclassparts/MergeWithExternalClassPartsTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -48,17 +48,14 @@
public class MergeWithExternalClassPartsTester extends RefactoringTestCase{
- private String testName;
-
- public MergeWithExternalClassPartsTester(String testName)
- {
- this.testName = testName;
+ public MergeWithExternalClassPartsTester(String testName) {
+ super(testName);
}
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException
{
- MultiFileTestData testData = new MultiFileTestData(testName);
+ MultiFileTestData testData = new MultiFileTestData(getName());
MergeWithExternalClassPartConfig config = new MergeWithExternalClassPartConfig(testData);
MergeWithExternalClassPartsConditionChecker checker = new MergeWithExternalClassPartsConditionChecker(config);
@@ -125,10 +122,4 @@
return partNumbers.get(0).intValue();
}
-
- @Override
- public String getName()
- {
- return testName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/movefield/MoveFieldTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/movefield/MoveFieldTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/movefield/MoveFieldTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -41,15 +41,13 @@
public class MoveFieldTester extends RefactoringTestCase {
- private String testName;
-
public MoveFieldTester(String testName) {
- this.testName = testName;
+ super(testName);
}
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException {
- MultiFileTestData testData = new MultiFileTestData(testName + ".", ".source.rb", ".result.rb", testName + ".test_properties");
+ MultiFileTestData testData = new MultiFileTestData(getName() + ".", ".source.rb", ".result.rb", getName() + ".test_properties");
MoveFieldConfig config = new MoveFieldConfig(new DocumentWithIncluding(testData), testData.getIntProperty("caretPosition"));
new MoveFieldConditionChecker(config);
@@ -60,10 +58,4 @@
MoveFieldEditProvider editProvider = new MoveFieldEditProvider(config);
checkMultiFileEdits(editProvider, testData);
}
-
-
- @Override
- public String getName() {
- return testName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/movemethod/MoveMethodTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/movemethod/MoveMethodTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/movemethod/MoveMethodTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -42,17 +42,14 @@
public class MoveMethodTester extends RefactoringTestCase {
- private String testName;
-
- public MoveMethodTester(String testName)
- {
- this.testName = testName;
+ public MoveMethodTester(String testName) {
+ super(testName);
}
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException
{
- MultiFileTestData testData = new MultiFileTestData(testName);
+ MultiFileTestData testData = new MultiFileTestData(getName());
MoveMethodConfig config = new MoveMethodConfig(testData, testData.getIntProperty("caretPosition"));
MoveMethodConditionChecker checker = new MoveMethodConditionChecker(config);
@@ -80,11 +77,4 @@
checkMultiFileEdits(mover, testData);
}
-
-
- @Override
- public String getName()
- {
- return testName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/overridemethod/OverrideMethodTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/overridemethod/OverrideMethodTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/overridemethod/OverrideMethodTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -44,22 +44,20 @@
public class OverrideMethodTester extends TwoLayerTreeEditProviderTester {
- private String testName;
-
public OverrideMethodTester(String fileName) {
- super(true);
- testName = fileName;
+ super(fileName, true);
}
@Override
public void runTest() throws FileNotFoundException, IOException, MalformedTreeException, BadLocationException {
FileTestData testData;
- testData = new FileTestData(testName, getClass());
+ testData = new FileTestData(getName());
StringDocumentProvider docProvider = new StringDocumentProvider(testData.getFileName(), testData.getActiveFileContent());
String superClassFileName = testData.getProperty("superclassfilename");
docProvider.addFile(superClassFileName, testData.getFileContent(superClassFileName));
MethodsOverrider overrider = new MethodsOverrider(docProvider);
Collection<String> strSelections = testData.getNumberedProperty("selection");
+
for (String aktSelection : strSelections) {
String[] selection = FilePropertyData.seperateString(aktSelection);
if (selection.length == 2) {
@@ -72,9 +70,4 @@
}
createEditAndCompareResult(testData.getSource(), testData.getExpectedResult(), overrider);
}
-
- @Override
- public String getName() {
- return testName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/overridemethod/TC_OverridenMethodEditTest.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/overridemethod/TC_OverridenMethodEditTest.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/overridemethod/TC_OverridenMethodEditTest.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -32,16 +32,12 @@
import org.rubypeople.rdt.refactoring.documentprovider.StringDocumentProvider;
import org.rubypeople.rdt.refactoring.tests.TwoLayerTreeEditProviderTester;
-public class TC_OverridenMethodEditTest extends TwoLayerTreeEditProviderTester
-{
+public class TC_OverridenMethodEditTest extends TwoLayerTreeEditProviderTester {
private static int test_count = 0;
-
-
- public TC_OverridenMethodEditTest()
- {
- super(true);
+ public TC_OverridenMethodEditTest() {
+ super("Overriden Method Edit Test", true);
}
private final static String BASE_DOCUMENT_SIMPLE = "class A < X\n" +
@@ -57,12 +53,6 @@
" attr_accessor :b\n" +
"end";
-// Support for JRubyBuilt in Classes disabled (uncommented Code) because the Arity of the methods
-// cannot propperly be evaluated.
-
-// private final static String BASE_DOCUMENT_EXTENDS_DIR = "class A < Dir\n" +
-// "end";
-
private final static String SUPER_CLASS_EMPTY = "class X\n" +
"end";
@@ -183,15 +173,6 @@
"end");
}
-// Support for JRubyBuilt in Classes disabled (uncommented Code) because the Arity of the methods
-// cannot propperly be evaluated.
-
-// public void testDirSuperClass()
-// {
-// addSelection("A", "initialize");
-// check(BASE_DOCUMENT_EXTENDS_DIR, null, "class A < Dir\n\ndef initialize arg0\nsuper arg0\nend\n\nend");
-// }
-
private void check(String classDocument, String superClassDocument, String expectedDocument) {
StringDocumentProvider docProvider = new StringDocumentProvider("override_method_edit_test_nr_" + ++test_count, classDocument);
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/pushdown/PushDownTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/pushdown/PushDownTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/pushdown/PushDownTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -44,17 +44,14 @@
public class PushDownTester extends TwoLayerTreeEditProviderTester {
- private String testName;
-
public PushDownTester(String fileName) {
- super(true);
- testName = fileName;
+ super(fileName, true);
}
@Override
public void runTest() throws FileNotFoundException, IOException, MalformedTreeException, BadLocationException {
FileTestData testData;
- testData = new FileTestData(testName, getClass());
+ testData = new FileTestData(getName());
StringDocumentProvider docProvider = new StringDocumentProvider(testData.getFileName(), testData.getActiveFileContent());
Collection<String> projectFileNames = testData.getNumberedProperty("projectfilename");
for (String projectFileName : projectFileNames) {
@@ -74,9 +71,4 @@
}
createEditAndCompareResult(testData.getSource(), testData.getExpectedResult(), downPusher);
}
-
- @Override
- public String getName() {
- return testName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamefield/FieldRenamerTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamefield/FieldRenamerTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamefield/FieldRenamerTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -42,18 +42,13 @@
import org.rubypeople.rdt.refactoring.tests.RefactoringTestCase;
public class FieldRenamerTester extends RefactoringTestCase {
-
- private String fileName;
-
- private MultiFileTestData testData;
-
public FieldRenamerTester(String fileName) {
- this.fileName = fileName;
+ super(fileName);
}
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException {
- testData = new MultiFileTestData(fileName);
+ MultiFileTestData testData = new MultiFileTestData(getName());
int caretPosition = testData.getIntProperty("caretPosition");
RenameFieldConfig config = new RenameFieldConfig(testData, caretPosition);
@@ -66,9 +61,4 @@
config.setDoRenameAccessorMethods(testData.getBoolProperty("replaceMethodAccessors"));
checkMultiFileEdits(renamer, testData);
}
-
- @Override
- public String getName() {
- return fileName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamemethod/MethodRenamerTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamemethod/MethodRenamerTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamemethod/MethodRenamerTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -46,16 +46,13 @@
public class MethodRenamerTester extends RefactoringTestCase {
- private String fileName;
-
-
public MethodRenamerTester(String fileName) {
- this.fileName = fileName;
+ super(fileName);
}
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException {
- MultiFileTestData testData = new MultiFileTestData(fileName);
+ MultiFileTestData testData = new MultiFileTestData(getName());
int caretPosition = testData.getIntProperty("caretPosition");
RenameMethodConfig config = new RenameMethodConfig(testData, caretPosition);
@@ -80,9 +77,4 @@
checkMultiFileEdits(renamer, testData);
}
-
- @Override
- public String getName() {
- return fileName;
- }
}
Modified: trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamemethod/selection/RenameMethodSelectionTester.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamemethod/selection/RenameMethodSelectionTester.java 2007-04-20 08:37:24 UTC (rev 2344)
+++ trunk/org.rubypeople.rdt.refactoring.tests/src/org/rubypeople/rdt/refactoring/tests/core/renamemethod/selection/RenameMethodSelectionTester.java 2007-04-20 13:18:24 UTC (rev 2345)
@@ -45,17 +45,13 @@
public class RenameMethodSelectionTester extends RefactoringTestCase {
- private String fileName;
-
- private MultiFileTestData testData;
-
public RenameMethodSelectionTester(String fileName) {
- this.fileName = fileName;
+ super(fileName);
}
@Override
public void runTest() throws FileNotFoundException, IOException, BadLocationException {
- testData = new MultiFileTestData(fileName);
+ MultiFileTestData testData = new MultiFileTestData(getName());
int caretPosition = testData.getIntProperty("caretPosition");
RenameMethodConfig config = new RenameMethodConfig(testData, caretPosition);
@@ -73,9 +69,4 @@
checkMultiFileEdits(renamer, testData);
}
-
- @Override
- public String getName() {
- return fileName;
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
