From 15c3810c5a7c83721190a64ba5c0a4cd04f371d5 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Wed, 21 May 2008 10:49:49 +0000 Subject: [PATCH] Rename local variables in macro-bodies, bug 232091. --- .../tests/refactoring/rename/RenameVariableTests.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameVariableTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameVariableTests.java index b4d643c21a8..94f51e9f296 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameVariableTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameVariableTests.java @@ -1969,11 +1969,12 @@ public class RenameVariableTests extends RenameTests { String contents = writer.toString(); IFile cpp= importFile("test.cpp", contents ); //$NON-NLS-1$ - int offset = contents.indexOf("v1") ; //$NON-NLS-1$ - offset= contents.indexOf("v1", offset+1) ; //$NON-NLS-1$ - Change changes = getRefactorChanges(cpp, offset, "z"); //$NON-NLS-1$ - assertTotalChanges( 1, changes ); - assertChange( changes, cpp, offset, 2, "z" ); //$NON-NLS-1$ + int offset1= contents.indexOf("v1") ; //$NON-NLS-1$ + int offset2= contents.indexOf("v1", offset1+1) ; //$NON-NLS-1$ + Change changes = getRefactorChanges(cpp, offset2, "z"); //$NON-NLS-1$ + assertTotalChanges( 2, changes ); + assertChange( changes, cpp, offset1, 2, "z" ); //$NON-NLS-1$ + assertChange( changes, cpp, offset2, 2, "z" ); //$NON-NLS-1$ } public void testBug72646() throws Exception {