| 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:unittest/unittest.dart' hide ERROR; | 13 import 'package:unittest/unittest.dart' hide ERROR; |
| 14 | 14 |
| 15 import '../analysis_abstract.dart'; | 15 import '../analysis_abstract.dart'; |
| 16 import '../reflective_tests.dart'; | 16 import '../reflective_tests.dart'; |
| 17 | 17 |
| 18 | 18 |
| 19 main() { | 19 main() { |
| 20 groupSep = ' | '; | 20 groupSep = ' | '; |
| 21 runReflectiveTests(ConvertGetterMethodToMethodTest); |
| 21 runReflectiveTests(ConvertMethodToGetterTest); | 22 runReflectiveTests(ConvertMethodToGetterTest); |
| 22 runReflectiveTests(ExtractLocalVariableTest); | 23 runReflectiveTests(ExtractLocalVariableTest); |
| 23 runReflectiveTests(ExtractMethodTest); | 24 runReflectiveTests(ExtractMethodTest); |
| 24 runReflectiveTests(GetAvailableRefactoringsTest); | 25 runReflectiveTests(GetAvailableRefactoringsTest); |
| 25 runReflectiveTests(InlineLocalTest); | 26 runReflectiveTests(InlineLocalTest); |
| 26 runReflectiveTests(InlineMethodTest); | 27 runReflectiveTests(InlineMethodTest); |
| 27 runReflectiveTests(MoveFileTest); | 28 runReflectiveTests(MoveFileTest); |
| 28 runReflectiveTests(RenameTest); | 29 runReflectiveTests(RenameTest); |
| 29 } | 30 } |
| 30 | 31 |
| 31 | 32 |
| 32 @ReflectiveTestCase() | 33 @ReflectiveTestCase() |
| 34 class ConvertGetterMethodToMethodTest extends _AbstractGetRefactoring_Test { |
| 35 test_function() { |
| 36 addTestFile(''' |
| 37 int get test => 42; |
| 38 main() { |
| 39 var a = 1 + test; |
| 40 var b = 2 + test; |
| 41 } |
| 42 '''); |
| 43 return assertSuccessfulRefactoring(() { |
| 44 return _sendConvertRequest('test =>'); |
| 45 }, ''' |
| 46 int test() => 42; |
| 47 main() { |
| 48 var a = 1 + test(); |
| 49 var b = 2 + test(); |
| 50 } |
| 51 '''); |
| 52 } |
| 53 |
| 54 test_init_fatalError_notExplicit() { |
| 55 addTestFile(''' |
| 56 int test = 42; |
| 57 main() { |
| 58 var v = test; |
| 59 } |
| 60 '''); |
| 61 return getRefactoringResult(() { |
| 62 return _sendConvertRequest('test;'); |
| 63 }).then((result) { |
| 64 assertResultProblemsFatal( |
| 65 result.initialProblems, |
| 66 'Only explicit getters can be converted to methods.'); |
| 67 // ...there is no any change |
| 68 expect(result.change, isNull); |
| 69 }); |
| 70 } |
| 71 |
| 72 test_method() { |
| 73 addTestFile(''' |
| 74 class A { |
| 75 int get test => 1; |
| 76 } |
| 77 class B extends A { |
| 78 int get test => 2; |
| 79 } |
| 80 class C extends B { |
| 81 int get test => 3; |
| 82 } |
| 83 class D extends A { |
| 84 int get test => 4; |
| 85 } |
| 86 main(A a, B b, C c, D d) { |
| 87 var va = a.test; |
| 88 var vb = b.test; |
| 89 var vc = c.test; |
| 90 var vd = d.test; |
| 91 } |
| 92 '''); |
| 93 return assertSuccessfulRefactoring(() { |
| 94 return _sendConvertRequest('test => 2'); |
| 95 }, ''' |
| 96 class A { |
| 97 int test() => 1; |
| 98 } |
| 99 class B extends A { |
| 100 int test() => 2; |
| 101 } |
| 102 class C extends B { |
| 103 int test() => 3; |
| 104 } |
| 105 class D extends A { |
| 106 int test() => 4; |
| 107 } |
| 108 main(A a, B b, C c, D d) { |
| 109 var va = a.test(); |
| 110 var vb = b.test(); |
| 111 var vc = c.test(); |
| 112 var vd = d.test(); |
| 113 } |
| 114 '''); |
| 115 } |
| 116 |
| 117 Future<Response> _sendConvertRequest(String search) { |
| 118 Request request = new EditGetRefactoringParams( |
| 119 RefactoringKind.CONVERT_GETTER_TO_METHOD, |
| 120 testFile, |
| 121 findOffset(search), |
| 122 0, |
| 123 false).toRequest('0'); |
| 124 return serverChannel.sendRequest(request); |
| 125 } |
| 126 } |
| 127 |
| 128 |
| 129 @ReflectiveTestCase() |
| 33 class ConvertMethodToGetterTest extends _AbstractGetRefactoring_Test { | 130 class ConvertMethodToGetterTest extends _AbstractGetRefactoring_Test { |
| 34 test_function() { | 131 test_function() { |
| 35 addTestFile(''' | 132 addTestFile(''' |
| 36 int test() => 42; | 133 int test() => 42; |
| 37 main() { | 134 main() { |
| 38 var a = 1 + test(); | 135 var a = 1 + test(); |
| 39 var b = 2 + test(); | 136 var b = 2 + test(); |
| 40 } | 137 } |
| 41 '''); | 138 '''); |
| 42 return assertSuccessfulRefactoring(() { | 139 return assertSuccessfulRefactoring(() { |
| (...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1306 } | 1403 } |
| 1307 | 1404 |
| 1308 @override | 1405 @override |
| 1309 void setUp() { | 1406 void setUp() { |
| 1310 super.setUp(); | 1407 super.setUp(); |
| 1311 server.handlers = [new EditDomainHandler(server),]; | 1408 server.handlers = [new EditDomainHandler(server),]; |
| 1312 createProject(); | 1409 createProject(); |
| 1313 handler = new EditDomainHandler(server); | 1410 handler = new EditDomainHandler(server); |
| 1314 } | 1411 } |
| 1315 } | 1412 } |
| OLD | NEW |