| 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 import 'dart:async'; | 5 import 'dart:async'; |
| 6 | 6 |
| 7 import 'package:analysis_server/protocol/protocol_generated.dart' hide Element; | 7 import 'package:analysis_server/protocol/protocol_generated.dart' hide Element; |
| 8 import 'package:analysis_server/src/services/correction/status.dart'; | 8 import 'package:analysis_server/src/services/correction/status.dart'; |
| 9 import 'package:analysis_server/src/services/refactoring/inline_method.dart'; | 9 import 'package:analysis_server/src/services/refactoring/inline_method.dart'; |
| 10 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; | 10 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
| 11 import 'package:analyzer/src/generated/source.dart'; | 11 import 'package:analyzer/src/generated/source.dart'; |
| 12 import 'package:test/test.dart'; | 12 import 'package:test/test.dart'; |
| 13 import 'package:test_reflective_loader/test_reflective_loader.dart'; | 13 import 'package:test_reflective_loader/test_reflective_loader.dart'; |
| 14 | 14 |
| 15 import 'abstract_refactoring.dart'; | 15 import 'abstract_refactoring.dart'; |
| 16 | 16 |
| 17 main() { | 17 main() { |
| 18 defineReflectiveSuite(() { | 18 defineReflectiveSuite(() { |
| 19 defineReflectiveTests(InlineMethodTest); | 19 defineReflectiveTests(InlineMethodTest); |
| 20 defineReflectiveTests(InlineMethodTest_Driver); | |
| 21 }); | 20 }); |
| 22 } | 21 } |
| 23 | 22 |
| 24 @reflectiveTest | 23 @reflectiveTest |
| 25 class InlineMethodTest extends RefactoringTest { | 24 class InlineMethodTest extends RefactoringTest { |
| 26 InlineMethodRefactoringImpl refactoring; | 25 InlineMethodRefactoringImpl refactoring; |
| 27 bool deleteSource; | 26 bool deleteSource; |
| 28 bool inlineAll; | 27 bool inlineAll; |
| 29 | 28 |
| 29 @override |
| 30 bool get enableNewAnalysisDriver => true; |
| 31 |
| 30 test_access_FunctionElement() async { | 32 test_access_FunctionElement() async { |
| 31 await indexTestUnit(r''' | 33 await indexTestUnit(r''' |
| 32 test(a, b) { | 34 test(a, b) { |
| 33 return a + b; | 35 return a + b; |
| 34 } | 36 } |
| 35 main() { | 37 main() { |
| 36 var res = test(1, 2); | 38 var res = test(1, 2); |
| 37 } | 39 } |
| 38 '''); | 40 '''); |
| 39 _createRefactoring('test(1, 2)'); | 41 _createRefactoring('test(1, 2)'); |
| (...skipping 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1708 this.refactoringChange = change; | 1710 this.refactoringChange = change; |
| 1709 assertTestChangeResult(expectedCode); | 1711 assertTestChangeResult(expectedCode); |
| 1710 } | 1712 } |
| 1711 | 1713 |
| 1712 void _createRefactoring(String search) { | 1714 void _createRefactoring(String search) { |
| 1713 int offset = findOffset(search); | 1715 int offset = findOffset(search); |
| 1714 refactoring = new InlineMethodRefactoring( | 1716 refactoring = new InlineMethodRefactoring( |
| 1715 searchEngine, astProvider, testUnit, offset); | 1717 searchEngine, astProvider, testUnit, offset); |
| 1716 } | 1718 } |
| 1717 } | 1719 } |
| 1718 | |
| 1719 @reflectiveTest | |
| 1720 class InlineMethodTest_Driver extends InlineMethodTest { | |
| 1721 @override | |
| 1722 bool get enableNewAnalysisDriver => true; | |
| 1723 } | |
| OLD | NEW |