| Index: pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_core_test.dart
|
| diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_core_test.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_core_test.dart
|
| index 46ee4d431caaaa8f3c0ded3341bb86688fbe432f..fe72dfa9d48ea9477966547078b59547d04f0394 100644
|
| --- a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_core_test.dart
|
| +++ b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_core_test.dart
|
| @@ -23,13 +23,11 @@ class ChangeBuilderImplTest {
|
| test_createFileEditBuilder() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| String path = '/test.dart';
|
| - int timeStamp = 54;
|
| FileEditBuilderImpl fileEditBuilder =
|
| - await builder.createFileEditBuilder(path, timeStamp);
|
| + await builder.createFileEditBuilder(path);
|
| expect(fileEditBuilder, new isInstanceOf<FileEditBuilder>());
|
| SourceFileEdit fileEdit = fileEditBuilder.fileEdit;
|
| expect(fileEdit.file, path);
|
| - expect(fileEdit.fileStamp, timeStamp);
|
| }
|
|
|
| void test_getLinkedEditGroup() {
|
| @@ -59,7 +57,7 @@ class ChangeBuilderImplTest {
|
| test_sourceChange_oneChange() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| String path = '/test.dart';
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {});
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {});
|
| builder.getLinkedEditGroup('a');
|
| SourceChange sourceChange = builder.sourceChange;
|
| expect(sourceChange, isNotNull);
|
| @@ -78,7 +76,7 @@ class EditBuilderImplTest {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| int offset = 10;
|
| String text = 'content';
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addInsertion(10, (EditBuilder builder) {
|
| builder.addLinkedEdit('a', (LinkedEditBuilder builder) {
|
| builder.write(text);
|
| @@ -103,7 +101,7 @@ class EditBuilderImplTest {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| int offset = 10;
|
| String text = 'content';
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addInsertion(10, (EditBuilder builder) {
|
| builder.addSimpleLinkedEdit('a', text);
|
| SourceEdit sourceEdit = (builder as EditBuilderImpl).sourceEdit;
|
| @@ -124,7 +122,7 @@ class EditBuilderImplTest {
|
|
|
| test_createLinkedEditBuilder() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addInsertion(10, (EditBuilder builder) {
|
| LinkedEditBuilderImpl linkBuilder =
|
| (builder as EditBuilderImpl).createLinkedEditBuilder();
|
| @@ -135,7 +133,7 @@ class EditBuilderImplTest {
|
|
|
| test_selectHere() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addInsertion(10, (EditBuilder builder) {
|
| builder.selectHere();
|
| });
|
| @@ -145,10 +143,9 @@ class EditBuilderImplTest {
|
|
|
| test_write() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - int timeStamp = 93;
|
| int offset = 10;
|
| String text = 'write';
|
| - await builder.addFileEdit(path, timeStamp, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addInsertion(offset, (EditBuilder builder) {
|
| builder.write(text);
|
| });
|
| @@ -162,7 +159,6 @@ class EditBuilderImplTest {
|
| SourceFileEdit fileEdit = fileEdits[0];
|
| expect(fileEdit, isNotNull);
|
| expect(fileEdit.file, path);
|
| - expect(fileEdit.fileStamp, timeStamp);
|
|
|
| List<SourceEdit> edits = fileEdit.edits;
|
| expect(edits, hasLength(1));
|
| @@ -175,10 +171,9 @@ class EditBuilderImplTest {
|
|
|
| test_writeln_withoutText() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - int timeStamp = 39;
|
| int offset = 52;
|
| int length = 12;
|
| - await builder.addFileEdit(path, timeStamp, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addReplacement(new SourceRange(offset, length),
|
| (EditBuilder builder) {
|
| builder.writeln();
|
| @@ -193,7 +188,6 @@ class EditBuilderImplTest {
|
| SourceFileEdit fileEdit = fileEdits[0];
|
| expect(fileEdit, isNotNull);
|
| expect(fileEdit.file, path);
|
| - expect(fileEdit.fileStamp, timeStamp);
|
|
|
| List<SourceEdit> edits = fileEdit.edits;
|
| expect(edits, hasLength(1));
|
| @@ -206,11 +200,10 @@ class EditBuilderImplTest {
|
|
|
| test_writeln_withText() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - int timeStamp = 39;
|
| int offset = 52;
|
| int length = 12;
|
| String text = 'writeln';
|
| - await builder.addFileEdit(path, timeStamp, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addReplacement(new SourceRange(offset, length),
|
| (EditBuilder builder) {
|
| builder.writeln(text);
|
| @@ -225,7 +218,6 @@ class EditBuilderImplTest {
|
| SourceFileEdit fileEdit = fileEdits[0];
|
| expect(fileEdit, isNotNull);
|
| expect(fileEdit.file, path);
|
| - expect(fileEdit.fileStamp, timeStamp);
|
|
|
| List<SourceEdit> edits = fileEdit.edits;
|
| expect(edits, hasLength(1));
|
| @@ -246,7 +238,7 @@ class FileEditBuilderImplTest {
|
| int offset = 23;
|
| int length = 7;
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addDeletion(new SourceRange(offset, length));
|
| });
|
| List<SourceEdit> edits = builder.sourceChange.edits[0].edits;
|
| @@ -258,7 +250,7 @@ class FileEditBuilderImplTest {
|
|
|
| test_addInsertion() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addInsertion(10, (EditBuilder builder) {
|
| expect(builder, isNotNull);
|
| });
|
| @@ -268,7 +260,7 @@ class FileEditBuilderImplTest {
|
| test_addLinkedPosition() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| String groupName = 'a';
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addLinkedPosition(new SourceRange(3, 6), groupName);
|
| });
|
|
|
| @@ -283,7 +275,7 @@ class FileEditBuilderImplTest {
|
|
|
| test_addReplacement() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addReplacement(new SourceRange(4, 5), (EditBuilder builder) {
|
| expect(builder, isNotNull);
|
| });
|
| @@ -294,7 +286,7 @@ class FileEditBuilderImplTest {
|
| int offset = 23;
|
| String text = 'xyz';
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addSimpleInsertion(offset, text);
|
| });
|
| List<SourceEdit> edits = builder.sourceChange.edits[0].edits;
|
| @@ -309,7 +301,7 @@ class FileEditBuilderImplTest {
|
| int length = 7;
|
| String text = 'xyz';
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addSimpleReplacement(new SourceRange(offset, length), text);
|
| });
|
| List<SourceEdit> edits = builder.sourceChange.edits[0].edits;
|
| @@ -321,7 +313,7 @@ class FileEditBuilderImplTest {
|
|
|
| test_createEditBuilder() async {
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| int offset = 4;
|
| int length = 5;
|
| EditBuilderImpl editBuilder =
|
| @@ -342,7 +334,7 @@ class LinkedEditBuilderImplTest {
|
| test_addSuggestion() async {
|
| String groupName = 'a';
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addInsertion(10, (EditBuilder builder) {
|
| builder.addLinkedEdit(groupName, (LinkedEditBuilder builder) {
|
| builder.addSuggestion(LinkedEditSuggestionKind.TYPE, 'A');
|
| @@ -357,7 +349,7 @@ class LinkedEditBuilderImplTest {
|
| test_addSuggestions() async {
|
| String groupName = 'a';
|
| ChangeBuilderImpl builder = new ChangeBuilderImpl();
|
| - await builder.addFileEdit(path, 0, (FileEditBuilder builder) {
|
| + await builder.addFileEdit(path, (FileEditBuilder builder) {
|
| builder.addInsertion(10, (EditBuilder builder) {
|
| builder.addLinkedEdit(groupName, (LinkedEditBuilder builder) {
|
| builder.addSuggestions(LinkedEditSuggestionKind.TYPE, ['A', 'B']);
|
|
|