Chromium Code Reviews| Index: pkg/analysis_server/test/src/utilities/change_builder_core_test.dart |
| diff --git a/pkg/analysis_server/test/src/utilities/change_builder_core_test.dart b/pkg/analysis_server/test/src/utilities/change_builder_core_test.dart |
| index 118bdb873da7242ceeecfd1462a60344b483e0e7..1f1099fccf8154003196f96ea8407f7a6cf86433 100644 |
| --- a/pkg/analysis_server/test/src/utilities/change_builder_core_test.dart |
| +++ b/pkg/analysis_server/test/src/utilities/change_builder_core_test.dart |
| @@ -2,8 +2,6 @@ |
| // for details. All rights reserved. Use of this source code is governed by a |
| // BSD-style license that can be found in the LICENSE file. |
| -library analysis_server.test.src.utilities.change_builder_core_test; |
| - |
| import 'package:analysis_server/plugin/protocol/protocol.dart'; |
| import 'package:analysis_server/src/provisional/edit/utilities/change_builder_core.dart'; |
| import 'package:analysis_server/src/utilities/change_builder_core.dart'; |
| @@ -23,12 +21,12 @@ main() { |
| @reflectiveTest |
| class ChangeBuilderImplTest { |
| - void test_createFileEditBuilder() { |
| + test_createFileEditBuilder() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| TestSource source = new TestSource('/test.dart'); |
|
scheglov
2017/02/08 21:09:10
It seems that using TestSource is not required any
Brian Wilkerson
2017/02/09 03:22:42
Done
|
| int timeStamp = 54; |
| FileEditBuilderImpl fileEditBuilder = |
| - builder.createFileEditBuilder(source, timeStamp); |
| + await builder.createFileEditBuilder(source.fullName, timeStamp); |
| expect(fileEditBuilder, new isInstanceOf<FileEditBuilder>()); |
| SourceFileEdit fileEdit = fileEditBuilder.fileEdit; |
| expect(fileEdit.file, source.fullName); |
| @@ -52,10 +50,10 @@ class ChangeBuilderImplTest { |
| expect(sourceChange.selection, isNull); |
| } |
| - void test_sourceChange_oneChange() { |
| + test_sourceChange_oneChange() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| TestSource source = new TestSource('/test.dart'); |
| - builder.addFileEdit(source, 0, (FileEditBuilder builder) {}); |
| + await builder.addFileEdit(source.fullName, 0, (FileEditBuilder builder) {}); |
| builder.getLinkedEditGroup('a'); |
| SourceChange sourceChange = builder.sourceChange; |
| expect(sourceChange, isNotNull); |
| @@ -70,11 +68,11 @@ class ChangeBuilderImplTest { |
| class EditBuilderImplTest { |
| TestSource source = new TestSource('/test.dart'); |
| - void test_addLinkedEdit() { |
| + test_addLinkedEdit() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| int offset = 10; |
| String text = 'content'; |
| - builder.addFileEdit(source, 0, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, 0, (FileEditBuilder builder) { |
| builder.addInsertion(10, (EditBuilder builder) { |
| builder.addLinkedEdit('a', (LinkedEditBuilder builder) { |
| builder.write(text); |
| @@ -95,9 +93,9 @@ class EditBuilderImplTest { |
| expect(positions[0].offset, offset); |
| } |
| - void test_createLinkedEditBuilder() { |
| + test_createLinkedEditBuilder() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| - builder.addFileEdit(source, 0, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, 0, (FileEditBuilder builder) { |
| builder.addInsertion(10, (EditBuilder builder) { |
| LinkedEditBuilderImpl linkBuilder = |
| (builder as EditBuilderImpl).createLinkedEditBuilder(); |
| @@ -106,12 +104,12 @@ class EditBuilderImplTest { |
| }); |
| } |
| - void test_write() { |
| + test_write() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| int timeStamp = 93; |
| int offset = 10; |
| String text = 'write'; |
| - builder.addFileEdit(source, timeStamp, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, timeStamp, (FileEditBuilder builder) { |
| builder.addInsertion(offset, (EditBuilder builder) { |
| builder.write(text); |
| }); |
| @@ -136,12 +134,12 @@ class EditBuilderImplTest { |
| expect(edit.replacement, text); |
| } |
| - void test_writeln_withoutText() { |
| + test_writeln_withoutText() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| int timeStamp = 39; |
| int offset = 52; |
| int length = 12; |
| - builder.addFileEdit(source, timeStamp, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, timeStamp, (FileEditBuilder builder) { |
| builder.addReplacement(offset, length, (EditBuilder builder) { |
| builder.writeln(); |
| }); |
| @@ -166,13 +164,13 @@ class EditBuilderImplTest { |
| expect(edit.replacement == '\n' || edit.replacement == '\r\n', isTrue); |
| } |
| - void test_writeln_withText() { |
| + test_writeln_withText() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| int timeStamp = 39; |
| int offset = 52; |
| int length = 12; |
| String text = 'writeln'; |
| - builder.addFileEdit(source, timeStamp, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, timeStamp, (FileEditBuilder builder) { |
| builder.addReplacement(offset, length, (EditBuilder builder) { |
| builder.writeln(text); |
| }); |
| @@ -203,23 +201,23 @@ class EditBuilderImplTest { |
| class FileEditBuilderImplTest { |
| TestSource source = new TestSource('/test.dart'); |
| - void test_addInsertion() { |
| + test_addInsertion() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| - builder.addFileEdit(source, 0, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, 0, (FileEditBuilder builder) { |
| builder.addInsertion(10, (EditBuilder builder) { |
| expect(builder, isNotNull); |
| }); |
| }); |
| } |
| - void test_addLinkedPosition() { |
| - ChangeBuilderImpl changeBuilder = new ChangeBuilderImpl(); |
| + test_addLinkedPosition() async { |
| + ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| String groupName = 'a'; |
| - changeBuilder.addFileEdit(source, 0, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, 0, (FileEditBuilder builder) { |
| builder.addLinkedPosition(3, 6, groupName); |
| }); |
| - LinkedEditGroup group = changeBuilder.getLinkedEditGroup(groupName); |
| + LinkedEditGroup group = builder.getLinkedEditGroup(groupName); |
| List<Position> positions = group.positions; |
| expect(positions, hasLength(1)); |
| Position position = positions[0]; |
| @@ -228,18 +226,18 @@ class FileEditBuilderImplTest { |
| expect(group.length, 6); |
| } |
| - void test_addReplacement() { |
| + test_addReplacement() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| - builder.addFileEdit(source, 0, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, 0, (FileEditBuilder builder) { |
| builder.addReplacement(4, 5, (EditBuilder builder) { |
| expect(builder, isNotNull); |
| }); |
| }); |
| } |
| - void test_createEditBuilder() { |
| + test_createEditBuilder() async { |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| - builder.addFileEdit(source, 0, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, 0, (FileEditBuilder builder) { |
| int offset = 4; |
| int length = 5; |
| EditBuilderImpl editBuilder = |
| @@ -257,10 +255,10 @@ class FileEditBuilderImplTest { |
| class LinkedEditBuilderImplTest { |
| TestSource source = new TestSource('/test.dart'); |
| - void test_addSuggestion() { |
| + test_addSuggestion() async { |
| String groupName = 'a'; |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| - builder.addFileEdit(source, 0, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, 0, (FileEditBuilder builder) { |
| builder.addInsertion(10, (EditBuilder builder) { |
| builder.addLinkedEdit(groupName, (LinkedEditBuilder builder) { |
| builder.addSuggestion(LinkedEditSuggestionKind.TYPE, 'A'); |
| @@ -272,10 +270,10 @@ class LinkedEditBuilderImplTest { |
| expect(group.suggestions, hasLength(1)); |
| } |
| - void test_addSuggestions() { |
| + test_addSuggestions() async { |
| String groupName = 'a'; |
| ChangeBuilderImpl builder = new ChangeBuilderImpl(); |
| - builder.addFileEdit(source, 0, (FileEditBuilder builder) { |
| + await builder.addFileEdit(source.fullName, 0, (FileEditBuilder builder) { |
| builder.addInsertion(10, (EditBuilder builder) { |
| builder.addLinkedEdit(groupName, (LinkedEditBuilder builder) { |
| builder.addSuggestions(LinkedEditSuggestionKind.TYPE, ['A', 'B']); |