| 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.services.refactoring.extract_local; | 5 library test.services.refactoring.extract_local; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/src/protocol.dart'; | 9 import 'package:analysis_server/src/protocol.dart'; |
| 10 import 'package:analysis_server/src/services/refactoring/extract_local.dart'; | 10 import 'package:analysis_server/src/services/refactoring/extract_local.dart'; |
| 11 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; | 11 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
| 12 import '../../reflective_tests.dart'; | |
| 13 import 'package:unittest/unittest.dart'; | 12 import 'package:unittest/unittest.dart'; |
| 14 | 13 |
| 14 import '../../reflective_tests.dart'; |
| 15 import 'abstract_refactoring.dart'; | 15 import 'abstract_refactoring.dart'; |
| 16 | 16 |
| 17 | 17 |
| 18 main() { | 18 main() { |
| 19 groupSep = ' | '; | 19 groupSep = ' | '; |
| 20 runReflectiveTests(ExtractLocalTest); | 20 runReflectiveTests(ExtractLocalTest); |
| 21 } | 21 } |
| 22 | 22 |
| 23 | 23 |
| 24 @ReflectiveTestCase() | 24 @ReflectiveTestCase() |
| (...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 711 int get foo => 42; | 711 int get foo => 42; |
| 712 } | 712 } |
| 713 main() { | 713 main() { |
| 714 A a = new A(); | 714 A a = new A(); |
| 715 var res = a.foo; | 715 var res = a.foo; |
| 716 int b = 1 + res; // marker | 716 int b = 1 + res; // marker |
| 717 } | 717 } |
| 718 '''); | 718 '''); |
| 719 } | 719 } |
| 720 | 720 |
| 721 test_singleExpression_inExpressionBody() { |
| 722 indexTestUnit(''' |
| 723 main() { |
| 724 print((x) => x.y * x.y + 1); |
| 725 } |
| 726 '''); |
| 727 _createRefactoringForString('x.y'); |
| 728 // apply refactoring |
| 729 return _assertSuccessfulRefactoring(''' |
| 730 main() { |
| 731 print((x) { |
| 732 var res = x.y; |
| 733 return res * res + 1; |
| 734 }); |
| 735 } |
| 736 '''); |
| 737 } |
| 738 |
| 721 test_singleExpression_inMethod() { | 739 test_singleExpression_inMethod() { |
| 722 indexTestUnit(''' | 740 indexTestUnit(''' |
| 723 class A { | 741 class A { |
| 724 main() { | 742 main() { |
| 725 print(1 + 2); | 743 print(1 + 2); |
| 726 } | 744 } |
| 727 } | 745 } |
| 728 '''); | 746 '''); |
| 729 _createRefactoringForString('1 + 2'); | 747 _createRefactoringForString('1 + 2'); |
| 730 // apply refactoring | 748 // apply refactoring |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 897 int length = search.length; | 915 int length = search.length; |
| 898 _createRefactoring(offset, length); | 916 _createRefactoring(offset, length); |
| 899 } | 917 } |
| 900 | 918 |
| 901 void _createRefactoringWithSuffix(String selectionSearch, String suffix) { | 919 void _createRefactoringWithSuffix(String selectionSearch, String suffix) { |
| 902 int offset = findOffset(selectionSearch + suffix); | 920 int offset = findOffset(selectionSearch + suffix); |
| 903 int length = selectionSearch.length; | 921 int length = selectionSearch.length; |
| 904 _createRefactoring(offset, length); | 922 _createRefactoring(offset, length); |
| 905 } | 923 } |
| 906 } | 924 } |
| OLD | NEW |