| Index: dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameGlobalVariableProcessorTest.java
|
| diff --git a/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameGlobalVariableProcessorTest.java b/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameGlobalVariableProcessorTest.java
|
| index 5febe22be177041e48dfdbb79718be0e347c311e..4688b576dd6e5b2608d6ffeab01c46cad9269d17 100644
|
| --- a/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameGlobalVariableProcessorTest.java
|
| +++ b/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameGlobalVariableProcessorTest.java
|
| @@ -99,22 +99,22 @@ public final class RenameGlobalVariableProcessorTest extends RefactoringTest {
|
| }
|
|
|
| public void test_OK_multipleUnits_onReference() throws Exception {
|
| - setUnitContent("Test1.dart", new String[] {
|
| + setUnitContent(
|
| + "Test1.dart",
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "part of test;",
|
| "var test;",
|
| - ""});
|
| - setUnitContent("Test2.dart", new String[] {
|
| + "");
|
| + setUnitContent(
|
| + "Test2.dart",
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "part of test;",
|
| "f() {",
|
| " test = 1;",
|
| - "}"});
|
| + "}");
|
| setTestUnitContent(
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "library test;",
|
| - "part 'Test1.dart';",
|
| - "part 'Test2.dart';");
|
| + "#library('test');",
|
| + "#source('Test1.dart');",
|
| + "#source('Test2.dart');");
|
| // get units, because they have not library
|
| CompilationUnit unit1 = testProject.getUnit("Test1.dart");
|
| CompilationUnit unit2 = testProject.getUnit("Test2.dart");
|
| @@ -122,17 +122,17 @@ public final class RenameGlobalVariableProcessorTest extends RefactoringTest {
|
| DartVariableDeclaration variable = findElement(unit2, "test = 1;");
|
| // do rename
|
| renameVariable(variable, "newName");
|
| - assertUnitContent(unit1, new String[] {
|
| + assertUnitContent(
|
| + unit1,
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "part of test;",
|
| "var newName;",
|
| - ""});
|
| - assertUnitContent(unit2, new String[] {
|
| + "");
|
| + assertUnitContent(
|
| + unit2,
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "part of test;",
|
| "f() {",
|
| " newName = 1;",
|
| - "}"});
|
| + "}");
|
| }
|
|
|
| /**
|
| @@ -538,11 +538,8 @@ public final class RenameGlobalVariableProcessorTest extends RefactoringTest {
|
| assertThat(openInformationMessages).isEmpty();
|
| assertThat(showStatusMessages).hasSize(1);
|
| assertEquals(RefactoringStatus.ERROR, showStatusSeverities.get(0).intValue());
|
| - assertEquals("File 'Test/"
|
| - + unitName
|
| - + "' in library 'Test' already declares top-level "
|
| - + shadowName
|
| - + " 'newName'", showStatusMessages.get(0));
|
| + assertEquals("File 'Test/" + unitName + "' in library 'Test' already declares top-level "
|
| + + shadowName + " 'newName'", showStatusMessages.get(0));
|
| // no source changes
|
| assertEquals(source, testUnit.getSource());
|
| }
|
|
|