| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library test.edit.refactoring; | 5 library test.edit.refactoring; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/src/edit/edit_domain.dart'; | 9 import 'package:analysis_server/src/edit/edit_domain.dart'; |
| 10 import 'package:analysis_server/src/protocol.dart'; | 10 import 'package:analysis_server/src/protocol.dart'; |
| 11 import 'package:analysis_server/src/services/index/index.dart'; | 11 import 'package:analysis_server/src/services/index/index.dart'; |
| 12 import 'package:analysis_server/src/services/index/local_memory_index.dart'; | 12 import 'package:analysis_server/src/services/index/local_memory_index.dart'; |
| 13 import 'package:analysis_server/src/services/json.dart'; | |
| 14 import 'package:unittest/unittest.dart' hide ERROR; | 13 import 'package:unittest/unittest.dart' hide ERROR; |
| 15 | 14 |
| 16 import '../analysis_abstract.dart'; | 15 import '../analysis_abstract.dart'; |
| 17 import '../reflective_tests.dart'; | 16 import '../reflective_tests.dart'; |
| 18 | 17 |
| 19 | 18 |
| 20 main() { | 19 main() { |
| 21 groupSep = ' | '; | 20 groupSep = ' | '; |
| 22 runReflectiveTests(ExtractLocalVariableTest); | 21 runReflectiveTests(ExtractLocalVariableTest); |
| 23 runReflectiveTests(ExtractMethodTest); | 22 runReflectiveTests(ExtractMethodTest); |
| (...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 659 '''); | 658 '''); |
| 660 } | 659 } |
| 661 | 660 |
| 662 Future<Response> _sendInlineRequest(String search) { | 661 Future<Response> _sendInlineRequest(String search) { |
| 663 Request request = new EditGetRefactoringParams( | 662 Request request = new EditGetRefactoringParams( |
| 664 RefactoringKind.INLINE_METHOD, | 663 RefactoringKind.INLINE_METHOD, |
| 665 testFile, | 664 testFile, |
| 666 findOffset(search), | 665 findOffset(search), |
| 667 0, | 666 0, |
| 668 false, | 667 false, |
| 669 options: options.toJson()).toRequest('0'); | 668 options: options).toRequest('0'); |
| 670 return serverChannel.sendRequest(request); | 669 return serverChannel.sendRequest(request); |
| 671 } | 670 } |
| 672 } | 671 } |
| 673 | 672 |
| 674 | 673 |
| 675 @ReflectiveTestCase() | 674 @ReflectiveTestCase() |
| 676 class RenameTest extends _AbstractGetRefactoring_Test { | 675 class RenameTest extends _AbstractGetRefactoring_Test { |
| 677 Future<Response> sendRenameRequest(String search, String newName, | 676 Future<Response> sendRenameRequest(String search, String newName, |
| 678 [bool validateOnly = false]) { | 677 [bool validateOnly = false]) { |
| 678 RenameOptions options = newName != null ? new RenameOptions(newName) : null; |
| 679 Request request = new EditGetRefactoringParams( | 679 Request request = new EditGetRefactoringParams( |
| 680 RefactoringKind.RENAME, | 680 RefactoringKind.RENAME, |
| 681 testFile, | 681 testFile, |
| 682 findOffset(search), | 682 findOffset(search), |
| 683 0, | 683 0, |
| 684 validateOnly, | 684 validateOnly, |
| 685 options: new RenameOptions(newName).toJson()).toRequest('0'); | 685 options: options).toRequest('0'); |
| 686 return serverChannel.sendRequest(request); | 686 return serverChannel.sendRequest(request); |
| 687 } | 687 } |
| 688 | 688 |
| 689 test_class() { | 689 test_class() { |
| 690 addTestFile(''' | 690 addTestFile(''' |
| 691 class Test {} | 691 class Test {} |
| 692 main() { | 692 main() { |
| 693 Test v; | 693 Test v; |
| 694 } | 694 } |
| 695 '''); | 695 '''); |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1037 Future<EditGetRefactoringResult> getRefactoringResult(Future<Response> | 1037 Future<EditGetRefactoringResult> getRefactoringResult(Future<Response> |
| 1038 requestSender()) { | 1038 requestSender()) { |
| 1039 return waitForTasksFinished().then((_) { | 1039 return waitForTasksFinished().then((_) { |
| 1040 return requestSender().then((Response response) { | 1040 return requestSender().then((Response response) { |
| 1041 return new EditGetRefactoringResult.fromResponse(response); | 1041 return new EditGetRefactoringResult.fromResponse(response); |
| 1042 }); | 1042 }); |
| 1043 }); | 1043 }); |
| 1044 } | 1044 } |
| 1045 | 1045 |
| 1046 Future<Response> sendRequest(RefactoringKind kind, int offset, int length, | 1046 Future<Response> sendRequest(RefactoringKind kind, int offset, int length, |
| 1047 HasToJson options, [bool validateOnly = false]) { | 1047 RefactoringOptions options, [bool validateOnly = false]) { |
| 1048 Map optionsJson = options != null ? options.toJson() : null; | |
| 1049 Request request = new EditGetRefactoringParams( | 1048 Request request = new EditGetRefactoringParams( |
| 1050 kind, | 1049 kind, |
| 1051 testFile, | 1050 testFile, |
| 1052 offset, | 1051 offset, |
| 1053 length, | 1052 length, |
| 1054 validateOnly, | 1053 validateOnly, |
| 1055 options: optionsJson).toRequest('0'); | 1054 options: options).toRequest('0'); |
| 1056 return serverChannel.sendRequest(request); | 1055 return serverChannel.sendRequest(request); |
| 1057 } | 1056 } |
| 1058 | 1057 |
| 1059 @override | 1058 @override |
| 1060 void setUp() { | 1059 void setUp() { |
| 1061 super.setUp(); | 1060 super.setUp(); |
| 1062 server.handlers = [new EditDomainHandler(server),]; | 1061 server.handlers = [new EditDomainHandler(server),]; |
| 1063 createProject(); | 1062 createProject(); |
| 1064 handler = new EditDomainHandler(server); | 1063 handler = new EditDomainHandler(server); |
| 1065 } | 1064 } |
| 1066 } | 1065 } |
| OLD | NEW |