diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodRefactoringTest.java index 678ac57cb30..4908b9d75aa 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodRefactoringTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodRefactoringTest.java @@ -38,28 +38,26 @@ public class HideMethodRefactoringTest extends RefactoringTest { @Override protected void runTest() throws Throwable { - IFile refFile = project.getFile(fileWithSelection); CRefactoring refactoring = new HideMethodRefactoring(refFile,selection, null, cproject); RefactoringStatus checkInitialConditions = refactoring.checkInitialConditions(NULL_PROGRESS_MONITOR); - if(errors > 0) { + if (errors > 0) { assertConditionsError(checkInitialConditions, errors); - }else if(fatalerrors > 0) { + } else if (fatalerrors > 0) { assertConditionsError(checkInitialConditions, errors); return; - }else { + } else { assertConditionsOk(checkInitialConditions); } Change createChange = refactoring.createChange(NULL_PROGRESS_MONITOR); RefactoringStatus finalConditions = refactoring.checkFinalConditions(NULL_PROGRESS_MONITOR); - if(warnings > 0){ + if (warnings > 0) { assertConditionsWarning(finalConditions, warnings); - }else{ + } else { assertConditionsOk(finalConditions); } createChange.perform(NULL_PROGRESS_MONITOR); - compareFiles(fileMap); } @@ -68,6 +66,5 @@ public class HideMethodRefactoringTest extends RefactoringTest { warnings = new Integer(refactoringProperties.getProperty("warnings", "0")).intValue(); //$NON-NLS-1$//$NON-NLS-2$ errors = new Integer(refactoringProperties.getProperty("errors", "0")).intValue(); //$NON-NLS-1$//$NON-NLS-2$ fatalerrors = new Integer(refactoringProperties.getProperty("fatalerrors", "0")).intValue(); //$NON-NLS-1$//$NON-NLS-2$ - } } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodTestSuite.java index 283f530108a..9f087c51285 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodTestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/hidemethod/HideMethodTestSuite.java @@ -28,7 +28,7 @@ public class HideMethodTestSuite extends TestSuite { suite.addTest(RefactoringTester.suite("HideMethodRefactoringTests", "resources/refactoring/HideMethod.rts")); suite.addTest(RefactoringTester.suite("HideMethodRefactoringHistoryTests", - "resources/refactoring/HideMethodHistory.rts")); + "resources/refactoring/HideMethodHistory.rts")); return suite; } }