languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 03:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate test/services/refactoring/

Browse source 
R=brianwilkerson@google.com

Change-Id: Ica52e54ba277969ae8a3b63627902ba53045397f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195494
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2021-04-16 18:11:16 +00:00 committed by commit-bot@chromium.org
parent 30127ac12d
commit 7eda3cfe76
21 changed files with 72 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
View file

@ -769,9 +769,6 @@ class _VariablesVisitor extends GeneralizingAstVisitor<void> {
} else {
return;
}
// if (!(element is MethodElement || element is PropertyAccessorElement)) {
// return;
// }
if (element.enclosingElement is! ClassElement) {
return;
}

34
pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
@ -34,9 +32,9 @@ int findIdentifierLength(String search) {
/// The base class for all [Refactoring] tests.
abstract class RefactoringTest extends AbstractSingleUnitTest
with WithNonFunctionTypeAliasesMixin {
SearchEngine searchEngine;
late SearchEngine searchEngine;
SourceChange refactoringChange;
late SourceChange refactoringChange;
Refactoring get refactoring;
@ -48,7 +46,9 @@ abstract class RefactoringTest extends AbstractSingleUnitTest
}
// prepare FileEdit
var fileEdit = refactoringChange.getFileEdit(convertPath(path));
expect(fileEdit, isNotNull, reason: 'No file edit for $path');
if (fileEdit == null) {
fail('No file edit for $path');
}
// validate resulting code
var file = getFile(path);
var ini = file.readAsStringSync();
@ -79,26 +79,28 @@ abstract class RefactoringTest extends AbstractSingleUnitTest
/// Asserts that [status] has expected severity and message.
void assertRefactoringStatus(
RefactoringStatus status, RefactoringProblemSeverity expectedSeverity,
{String expectedMessage,
SourceRange expectedContextRange,
String expectedContextSearch}) {
RefactoringStatus status, RefactoringProblemSeverity? expectedSeverity,
{String? expectedMessage,
SourceRange? expectedContextRange,
String? expectedContextSearch}) {
expect(status.severity, expectedSeverity, reason: status.toString());
if (expectedSeverity != null) {
var problem = status.problem;
var problem = status.problem!;
expect(problem.severity, expectedSeverity);
if (expectedMessage != null) {
expect(problem.message, expectedMessage);
}
if (expectedContextRange != null) {
expect(problem.location.offset, expectedContextRange.offset);
expect(problem.location.length, expectedContextRange.length);
var location = problem.location!;
expect(location.offset, expectedContextRange.offset);
expect(location.length, expectedContextRange.length);
}
if (expectedContextSearch != null) {
var location = problem.location!;
var expectedOffset = findOffset(expectedContextSearch);
var expectedLength = findIdentifierLength(expectedContextSearch);
expect(problem.location.offset, expectedOffset);
expect(problem.location.length, expectedLength);
expect(location.offset, expectedOffset);
expect(location.length, expectedLength);
}
}
}
@ -125,7 +127,9 @@ abstract class RefactoringTest extends AbstractSingleUnitTest
}
// prepare FileEdit
var fileEdit = refactoringChange.getFileEdit(testFile);
expect(fileEdit, isNotNull);
if (fileEdit == null) {
fail('No file edit for $testFile');
}
// validate resulting code
var actualCode = SourceEdit.applySequence(testCode, fileEdit.edits);
expect(actualCode, expectedCode);

15
pkg/analysis_server/test/services/refactoring/abstract_rename.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/correction/namespace.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer/dart/ast/ast.dart';
@ -19,7 +17,7 @@ export 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
/// The base class for all [RenameRefactoring] tests.
class RenameRefactoringTest extends RefactoringTest {
@override
RenameRefactoring refactoring;
late RenameRefactoring refactoring;
/// Asserts that [refactoring] has potential edits in [testFile] at offset
/// of the given [searches].
@ -52,14 +50,17 @@ class RenameRefactoringTest extends RefactoringTest {
/// Creates a new [RenameRefactoring] in [refactoring] for [element].
/// Fails if no [RenameRefactoring] can be created.
void createRenameRefactoringForElement(Element element) {
void createRenameRefactoringForElement(Element? element) {
var workspace = RefactoringWorkspace(
[driverFor(testFile)],
searchEngine,
);
refactoring =
var refactoring =
RenameRefactoring.create(workspace, testAnalysisResult, element);
expect(refactoring, isNotNull, reason: "No refactoring for '$element'.");
if (refactoring == null) {
fail("No refactoring for '$element'.");
}
this.refactoring = refactoring;
}
/// Returns the [Edit] with the given [id], maybe `null`.
@ -71,6 +72,6 @@ class RenameRefactoringTest extends RefactoringTest {
}
}
}
return null;
fail('No edit with id: $id');
}
}

6
pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' hide ElementKind;
@ -20,7 +18,7 @@ void main() {
@reflectiveTest
class ConvertGetterToMethodTest extends RefactoringTest {
@override
ConvertGetterToMethodRefactoring refactoring;
late ConvertGetterToMethodRefactoring refactoring;
Future<void> test_change_function() async {
await indexTestUnit('''
@ -149,7 +147,7 @@ main() {
assertTestChangeResult(expectedCode);
}
void _createRefactoringForElement(ExecutableElement element) {
void _createRefactoringForElement(PropertyAccessorElement element) {
refactoring = ConvertGetterToMethodRefactoring(
searchEngine, testAnalysisResult.session, element);
}

4
pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart'
@ -21,7 +19,7 @@ void main() {
@reflectiveTest
class ConvertMethodToGetterTest extends RefactoringTest {
@override
ConvertMethodToGetterRefactoring refactoring;
late ConvertMethodToGetterRefactoring refactoring;
Future<void> test_change_function() async {
await indexTestUnit('''

20
pkg/analysis_server/test/services/refactoring/extract_local_test.dart
View file

@ -2,13 +2,10 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'dart:convert';
import 'package:analysis_server/src/services/linter/lint_names.dart';
import 'package:analysis_server/src/services/refactoring/extract_local.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -24,7 +21,7 @@ void main() {
@reflectiveTest
class ExtractLocalTest extends RefactoringTest {
@override
ExtractLocalRefactoringImpl refactoring;
late ExtractLocalRefactoringImpl refactoring;
Future<void> test_checkFinalConditions_sameVariable_after() async {
await indexTestUnit('''
@ -196,11 +193,6 @@ main() {
''');
_createRefactoringForString('1 + 2');
expect(refactoring.refactoringName, 'Extract Local Variable');
// null
refactoring.name = null;
assertRefactoringStatus(
refactoring.checkName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Variable name must not be null.');
// empty
refactoring.name = '';
assertRefactoringStatus(
@ -1365,8 +1357,11 @@ main() {
'Expression must be selected to activate this refactoring.');
}
void _assertSingleLinkedEditGroup(
{int length, List<int> offsets, List<String> names}) {
void _assertSingleLinkedEditGroup({
required int length,
required List<int> offsets,
required List<String> names,
}) {
var positions =
offsets.map((offset) => {'file': testFile, 'offset': offset});
var suggestions = names.map((name) => {'value': name, 'kind': 'VARIABLE'});
@ -1394,7 +1389,8 @@ main() {
}
void _createRefactoring(int offset, int length) {
refactoring = ExtractLocalRefactoring(testAnalysisResult, offset, length);
refactoring =
ExtractLocalRefactoringImpl(testAnalysisResult, offset, length);
refactoring.name = 'res';
}

12
pkg/analysis_server/test/services/refactoring/extract_method_test.dart
View file

@ -2,10 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/refactoring/extract_method.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -21,7 +18,7 @@ void main() {
@reflectiveTest
class ExtractMethodTest extends RefactoringTest {
@override
ExtractMethodRefactoringImpl refactoring;
late ExtractMethodRefactoringImpl refactoring;
Future<void> test_bad_assignmentLeftHandSide() async {
await indexTestUnit('''
@ -791,11 +788,6 @@ main() {
}
''');
_createRefactoringForString('1 + 2');
// null
refactoring.name = null;
assertRefactoringStatus(
refactoring.checkName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Method name must not be null.');
// empty
refactoring.name = '';
assertRefactoringStatus(
@ -2919,7 +2911,7 @@ Completer<int> newCompleter() => null;
}
void _createRefactoring(int offset, int length) {
refactoring = ExtractMethodRefactoring(
refactoring = ExtractMethodRefactoringImpl(
searchEngine, testAnalysisResult, offset, length);
refactoring.name = 'res';
}

13
pkg/analysis_server/test/services/refactoring/extract_widget_test.dart
View file

@ -2,10 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/refactoring/extract_widget.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -21,7 +18,7 @@ void main() {
@reflectiveTest
class ExtractWidgetTest extends RefactoringTest {
@override
ExtractWidgetRefactoringImpl refactoring;
late ExtractWidgetRefactoringImpl refactoring;
@override
void setUp() {
@ -55,12 +52,6 @@ class MyWidget extends StatelessWidget {
''');
_createRefactoringForStringOffset('new Text');
// null
refactoring.name = null;
assertRefactoringStatus(
refactoring.checkName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Class name must not be null.');
// empty
refactoring.name = '';
assertRefactoringStatus(
@ -1232,7 +1223,7 @@ void main() {
}
void _createRefactoring(int offset, int length) {
refactoring = ExtractWidgetRefactoring(
refactoring = ExtractWidgetRefactoringImpl(
searchEngine, testAnalysisResult, offset, length);
refactoring.name = 'Test';
}

7
pkg/analysis_server/test/services/refactoring/inline_local_test.dart
View file

@ -2,11 +2,8 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/inline_local.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -22,7 +19,7 @@ void main() {
@reflectiveTest
class InlineLocalTest extends RefactoringTest {
@override
InlineLocalRefactoringImpl refactoring;
late InlineLocalRefactoringImpl refactoring;
Future<void> test_access() async {
await indexTestUnit('''
@ -639,7 +636,7 @@ main() {
void _createRefactoring(String search) {
var offset = findOffset(search);
refactoring = InlineLocalRefactoring(
refactoring = InlineLocalRefactoringImpl(
searchEngine,
testAnalysisResult,
offset,

13
pkg/analysis_server/test/services/refactoring/inline_method_test.dart
View file

@ -2,10 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/refactoring/inline_method.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
import 'package:test/test.dart';
@ -22,9 +19,9 @@ void main() {
@reflectiveTest
class InlineMethodTest extends RefactoringTest {
@override
InlineMethodRefactoringImpl refactoring;
bool deleteSource;
bool inlineAll;
late InlineMethodRefactoringImpl refactoring;
bool? deleteSource;
bool? inlineAll;
Future<void> test_access_FunctionElement() async {
await indexTestUnit(r'''
@ -1763,9 +1760,11 @@ void f(bool p, bool p2, bool p3) {
var status = await refactoring.checkInitialConditions();
assertRefactoringStatusOK(status);
// configure
var deleteSource = this.deleteSource;
if (deleteSource != null) {
refactoring.deleteSource = deleteSource;
}
var inlineAll = this.inlineAll;
if (inlineAll != null) {
refactoring.inlineAll = inlineAll;
}
@ -1780,7 +1779,7 @@ void f(bool p, bool p2, bool p3) {
void _createRefactoring(String search) {
var offset = findOffset(search);
refactoring = InlineMethodRefactoring(
refactoring = InlineMethodRefactoringImpl(
searchEngine,
testAnalysisResult,
offset,

8
pkg/analysis_server/test/services/refactoring/move_file_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/protocol_server.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:test/test.dart';
@ -20,7 +18,7 @@ void main() {
@reflectiveTest
class MoveFileTest extends RefactoringTest {
@override
MoveFileRefactoring refactoring;
late MoveFileRefactoring refactoring;
Future<void> test_file_containing_imports_exports_parts() async {
var pathA = convertPath('/home/test/000/1111/a.dart');
@ -492,7 +490,7 @@ part 'test2.dart';
}
Future _assertFailedRefactoring(RefactoringProblemSeverity expectedSeverity,
{String expectedMessage}) async {
{String? expectedMessage}) async {
var status = await refactoring.checkAllConditions();
assertRefactoringStatus(status, expectedSeverity,
expectedMessage: expectedMessage);
@ -504,7 +502,7 @@ part 'test2.dart';
refactoringChange = await refactoring.createChange();
}
void _createRefactoring(String newFile, {String oldFile}) {
void _createRefactoring(String newFile, {String? oldFile}) {
var refactoringWorkspace =
RefactoringWorkspace([driverFor(testFile)], searchEngine);
// Allow passing an oldName for when we don't want to rename testSource,

52
pkg/analysis_server/test/services/refactoring/naming_conventions_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/naming_conventions.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
@ -22,7 +20,7 @@ void main() {
@reflectiveTest
class NamingConventionsTest extends RefactoringTest {
@override
Refactoring get refactoring => null;
Refactoring get refactoring => throw UnimplementedError();
void test_validateClassName_doesNotStartWithLowerCase() {
assertRefactoringStatus(
@ -60,12 +58,6 @@ class NamingConventionsTest extends RefactoringTest {
expectedMessage: 'Class name should start with an uppercase letter.');
}
void test_validateClassName_null() {
assertRefactoringStatus(
validateClassName(null), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Class name must not be null.');
}
void test_validateClassName_OK() {
assertRefactoringStatusOK(validateClassName('NewName'));
}
@ -177,12 +169,6 @@ class NamingConventionsTest extends RefactoringTest {
'Field name must begin with a lowercase letter or underscore.');
}
void test_validateFieldName_null() {
assertRefactoringStatus(
validateFieldName(null), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Field name must not be null.');
}
void test_validateFieldName_OK() {
assertRefactoringStatusOK(validateFieldName('newName'));
}
@ -242,12 +228,6 @@ class NamingConventionsTest extends RefactoringTest {
'Function name must begin with a lowercase letter or underscore.');
}
void test_validateFunctionName_null() {
assertRefactoringStatus(
validateFunctionName(null), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Function name must not be null.');
}
void test_validateFunctionName_OK() {
assertRefactoringStatusOK(validateFunctionName('newName'));
}
@ -375,12 +355,6 @@ class NamingConventionsTest extends RefactoringTest {
'Label name must begin with a lowercase letter or underscore.');
}
void test_validateLabelName_null() {
assertRefactoringStatus(
validateLabelName(null), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Label name must not be null.');
}
void test_validateLabelName_OK() {
assertRefactoringStatusOK(validateLabelName('newName'));
}
@ -517,12 +491,6 @@ class NamingConventionsTest extends RefactoringTest {
'Method name must begin with a lowercase letter or underscore.');
}
void test_validateMethodName_null() {
assertRefactoringStatus(
validateMethodName(null), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Method name must not be null.');
}
void test_validateMethodName_OK() {
assertRefactoringStatusOK(validateMethodName('newName'));
}
@ -587,12 +555,6 @@ class NamingConventionsTest extends RefactoringTest {
'Parameter name must begin with a lowercase letter or underscore.');
}
void test_validateParameterName_null() {
assertRefactoringStatus(
validateParameterName(null), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Parameter name must not be null.');
}
void test_validateParameterName_OK() {
assertRefactoringStatusOK(validateParameterName('newName'));
}
@ -653,12 +615,6 @@ class NamingConventionsTest extends RefactoringTest {
'Type alias name should start with an uppercase letter.');
}
void test_validateTypeAliasName_null() {
assertRefactoringStatus(
validateTypeAliasName(null), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Type alias name must not be null.');
}
void test_validateTypeAliasName_OK() {
assertRefactoringStatusOK(validateTypeAliasName('NewName'));
}
@ -722,12 +678,6 @@ class NamingConventionsTest extends RefactoringTest {
'Variable name must begin with a lowercase letter or underscore.');
}
void test_validateVariableName_null() {
assertRefactoringStatus(
validateVariableName(null), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Variable name must not be null.');
}
void test_validateVariableName_OK() {
assertRefactoringStatusOK(validateVariableName('newName'));
}

12
pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
@ -441,11 +439,6 @@ class A {
}
''');
createRenameRefactoringAtString('test = 0;');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Field name must not be null.');
// OK
refactoring.newName = 'newName';
assertRefactoringStatusOK(refactoring.checkNewName());
@ -458,11 +451,6 @@ class A {
}
''');
createRenameRefactoringAtString('test() {}');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Method name must not be null.');
// empty
refactoring.newName = '';
assertRefactoringStatus(

7
pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
@ -42,11 +40,6 @@ class A {
''');
createRenameRefactoringAtString('test() {}');
expect(refactoring.oldName, 'test');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Constructor name must not be null.');
// same
refactoring.newName = 'test';
assertRefactoringStatus(

16
pkg/analysis_server/test/services/refactoring/rename_extension_member_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -139,12 +137,12 @@ extension E on int {
}
''');
createRenameRefactoringAtString('test =>');
// null
refactoring.newName = null;
// empty
refactoring.newName = '';
assertRefactoringStatus(
refactoring.checkNewName(),
RefactoringProblemSeverity.FATAL,
expectedMessage: 'Field name must not be null.',
expectedMessage: 'Field name must not be empty.',
);
// OK
@ -160,14 +158,6 @@ extension E on int {
''');
createRenameRefactoringAtString('test() {}');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(),
RefactoringProblemSeverity.FATAL,
expectedMessage: 'Method name must not be null.',
);
// empty
refactoring.newName = '';
assertRefactoringStatus(

7
pkg/analysis_server/test/services/refactoring/rename_import_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -22,11 +20,6 @@ class RenameImportTest extends RenameRefactoringTest {
await indexTestUnit("import 'dart:async' as test;");
_createRefactoring("import 'dart:");
expect(refactoring.oldName, 'test');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Import prefix name must not be null.');
// same
refactoring.newName = 'test';
assertRefactoringStatus(

7
pkg/analysis_server/test/services/refactoring/rename_label_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -28,11 +26,6 @@ test:
}
''');
createRenameRefactoringAtString('test:');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Label name must not be null.');
// empty
refactoring.newName = '';
assertRefactoringStatus(

7
pkg/analysis_server/test/services/refactoring/rename_library_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -23,11 +21,6 @@ class RenameLibraryTest extends RenameRefactoringTest {
library my.app;
''');
_createRenameRefactoring();
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Library name must not be null.');
// empty
refactoring.newName = '';
assertRefactoringStatus(

19
pkg/analysis_server/test/services/refactoring/rename_local_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -242,11 +240,11 @@ main() {
}
''');
createRenameRefactoringAtString('test() => 0;');
// null
refactoring.newName = null;
// empty
refactoring.newName = '';
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Function name must not be null.');
expectedMessage: 'Function name must not be empty.');
// OK
refactoring.newName = 'newName';
assertRefactoringStatusOK(refactoring.checkNewName());
@ -259,11 +257,6 @@ main() {
}
''');
createRenameRefactoringAtString('test = 0;');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Variable name must not be null.');
// empty
refactoring.newName = '';
assertRefactoringStatus(
@ -280,11 +273,11 @@ main(test) {
}
''');
createRenameRefactoringAtString('test) {');
// null
refactoring.newName = null;
// empty
refactoring.newName = '';
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Parameter name must not be null.');
expectedMessage: 'Parameter name must not be empty.');
// OK
refactoring.newName = 'newName';
assertRefactoringStatusOK(refactoring.checkNewName());

35
pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@ -267,11 +265,6 @@ main() {
class Test {}
''');
createRenameRefactoringAtString('Test {}');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Class name must not be null.');
// empty
refactoring.newName = '';
assertRefactoringStatus(
@ -293,11 +286,6 @@ class Test {}
test() {}
''');
createRenameRefactoringAtString('test() {}');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Function name must not be null.');
// empty
refactoring.newName = '';
assertRefactoringStatus(
@ -313,11 +301,6 @@ test() {}
var test;
''');
createRenameRefactoringAtString('test;');
// null
refactoring.newName = null;
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Variable name must not be null.');
// empty
refactoring.newName = '';
assertRefactoringStatus(
@ -333,11 +316,11 @@ var test;
typedef Test = void Function();
''');
createRenameRefactoringAtString('Test =');
// null
refactoring.newName = null;
// empty
refactoring.newName = '';
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Type alias name must not be null.');
expectedMessage: 'Type alias name must not be empty.');
// OK
refactoring.newName = 'NewName';
assertRefactoringStatusOK(refactoring.checkNewName());
@ -348,11 +331,11 @@ typedef Test = void Function();
typedef Test = List<int>;
''');
createRenameRefactoringAtString('Test =');
// null
refactoring.newName = null;
// empty
refactoring.newName = '';
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Type alias name must not be null.');
expectedMessage: 'Type alias name must not be empty.');
// OK
refactoring.newName = 'NewName';
assertRefactoringStatusOK(refactoring.checkNewName());
@ -363,11 +346,11 @@ typedef Test = List<int>;
typedef Test();
''');
createRenameRefactoringAtString('Test();');
// null
refactoring.newName = null;
// empty
refactoring.newName = '';
assertRefactoringStatus(
refactoring.checkNewName(), RefactoringProblemSeverity.FATAL,
expectedMessage: 'Type alias name must not be null.');
expectedMessage: 'Type alias name must not be empty.');
// OK
refactoring.newName = 'NewName';
assertRefactoringStatusOK(refactoring.checkNewName());

2
pkg/analysis_server/test/services/refactoring/test_all.dart
View file

@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// @dart = 2.9
import 'package:test_reflective_loader/test_reflective_loader.dart';
import 'convert_getter_to_method_test.dart' as convert_getter_to_method_test;