| Index: dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameImportProcessorTest.java
|
| diff --git a/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameImportProcessorTest.java b/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameImportProcessorTest.java
|
| index cbb66c495f788f499a4bb146cd2238b504606c5f..82e1de60ce709195eb2ea14a3a9fb4b5a4fc5041 100644
|
| --- a/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameImportProcessorTest.java
|
| +++ b/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/refactoring/RenameImportProcessorTest.java
|
| @@ -103,25 +103,25 @@ public final class RenameImportProcessorTest extends RefactoringTest {
|
|
|
| public void test_OK_multipleUnits_onReference() throws Exception {
|
| prepareUniqueLibraries();
|
| - setUnitContent("Test1.dart", new String[] {
|
| + setUnitContent(
|
| + "Test1.dart",
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "part of Test;",
|
| "foo1() {",
|
| " test.A a;",
|
| " test.B b;",
|
| "}",
|
| - ""});
|
| - setUnitContent("Test2.dart", new String[] {
|
| + "");
|
| + setUnitContent(
|
| + "Test2.dart",
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "part of Test;",
|
| "foo2() {",
|
| " test.A a;",
|
| " test.B b;",
|
| "}",
|
| - ""});
|
| + "");
|
| setTestUnitContent(
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "library Test;",
|
| + "#library('Test');",
|
| "#import('LibA.dart', prefix: 'test');",
|
| "#import('LibB.dart', prefix: 'test');",
|
| "#source('Test1.dart');",
|
| @@ -135,28 +135,28 @@ public final class RenameImportProcessorTest extends RefactoringTest {
|
| renameImport(imprt, "newName");
|
| assertTestUnitContent(
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "library Test;",
|
| + "#library('Test');",
|
| "#import('LibA.dart', prefix: 'newName');",
|
| "#import('LibB.dart', prefix: 'test');",
|
| "#source('Test1.dart');",
|
| "#source('Test2.dart');",
|
| "");
|
| - assertUnitContent(unit1, new String[] {
|
| + assertUnitContent(
|
| + unit1,
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "part of Test;",
|
| "foo1() {",
|
| " newName.A a;",
|
| " test.B b;",
|
| "}",
|
| - ""});
|
| - assertUnitContent(unit2, new String[] {
|
| + "");
|
| + assertUnitContent(
|
| + unit2,
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "part of Test;",
|
| "foo2() {",
|
| " newName.A a;",
|
| " test.B b;",
|
| "}",
|
| - ""});
|
| + "");
|
| }
|
|
|
| public void test_OK_singleUnit_onDeclaration() throws Exception {
|
| @@ -693,11 +693,8 @@ public final class RenameImportProcessorTest 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());
|
| }
|
| @@ -710,14 +707,14 @@ public final class RenameImportProcessorTest extends RefactoringTest {
|
| "LibA.dart",
|
| makeSource(
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "library libA;",
|
| + "#library('A');",
|
| "class A {}",
|
| "")).getResource();
|
| testProject.setUnitContent(
|
| "LibB.dart",
|
| makeSource(
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| - "library libB;",
|
| + "#library('B');",
|
| "class B {}",
|
| "")).getResource();
|
| }
|
|
|