languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-05 18:22:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix available suggestions tests on Windows.

Browse source 
R=brianwilkerson@google.com

Change-Id: Ie96cfe6ee5ed2eaea596a8c2faaf842a0b67a570
Reviewed-on: https://dart-review.googlesource.com/c/92764
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2019-02-12 18:32:33 +00:00 committed by commit-bot@chromium.org
parent 78509055b6
commit c812d5a373
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkg/analysis_server/test/src/domains/completion/available_suggestion_sets_test.dart
View file

@ -17,7 +17,7 @@ main() {
@reflectiveTest
class AvailableSuggestionSetsTest extends AvailableSuggestionsBase {
test_notifications_whenFileChanges() async {
var path = '/home/test/lib/a.dart';
var path = convertPath('/home/test/lib/a.dart');
var uriStr = 'package:test/a.dart';
// No file initially, so no set.
@ -48,7 +48,7 @@ class B {}
}
test_suggestion_class() async {
var path = '/home/test/lib/a.dart';
var path = convertPath('/home/test/lib/a.dart');
var uriStr = 'package:test/a.dart';
newFile(path, content: r'''
@ -56,14 +56,14 @@ class A {}
''');
var set = await waitForSetWithUri(uriStr);
assertJsonText(_getSuggestion(set, 'A'), r'''
assertJsonText(_getSuggestion(set, 'A'), '''
{
"label": "A",
"element": {
"kind": "CLASS",
"name": "A",
"location": {
"file": "/home/test/lib/a.dart",
"file": ${jsonOfPath(path)},
"offset": 6,
"length": 0,
"startLine": 1,
@ -79,7 +79,7 @@ class A {}
}
test_suggestion_enum() async {
var path = '/home/test/lib/a.dart';
var path = convertPath('/home/test/lib/a.dart');
var uriStr = 'package:test/a.dart';
newFile(path, content: r'''
@ -90,14 +90,14 @@ enum MyEnum {
''');
var set = await waitForSetWithUri(uriStr);
assertJsonText(_getSuggestion(set, 'MyEnum'), r'''
assertJsonText(_getSuggestion(set, 'MyEnum'), '''
{
"label": "MyEnum",
"element": {
"kind": "ENUM",
"name": "MyEnum",
"location": {
"file": "/home/test/lib/a.dart",
"file": ${jsonOfPath(path)},
"offset": 5,
"length": 0,
"startLine": 1,
@ -113,7 +113,7 @@ enum MyEnum {
}
test_suggestion_topLevelVariable() async {
var path = '/home/test/lib/a.dart';
var path = convertPath('/home/test/lib/a.dart');
var uriStr = 'package:test/a.dart';
newFile(path, content: r'''
@ -124,14 +124,14 @@ var stringV = 'hi';
''');
var set = await waitForSetWithUri(uriStr);
assertJsonText(_getSuggestion(set, 'boolV'), r'''
assertJsonText(_getSuggestion(set, 'boolV'), '''
{
"label": "boolV",
"element": {
"kind": "TOP_LEVEL_VARIABLE",
"name": "boolV",
"location": {
"file": "/home/test/lib/a.dart",
"file": ${jsonOfPath(path)},
"offset": 4,
"length": 0,
"startLine": 1,
@ -145,14 +145,14 @@ var stringV = 'hi';
]
}
''');
assertJsonText(_getSuggestion(set, 'intV'), r'''
assertJsonText(_getSuggestion(set, 'intV'), '''
{
"label": "intV",
"element": {
"kind": "TOP_LEVEL_VARIABLE",
"name": "intV",
"location": {
"file": "/home/test/lib/a.dart",
"file": ${jsonOfPath(path)},
"offset": 23,
"length": 0,
"startLine": 2,
@ -166,14 +166,14 @@ var stringV = 'hi';
]
}
''');
assertJsonText(_getSuggestion(set, 'doubleV'), r'''
assertJsonText(_getSuggestion(set, 'doubleV'), '''
{
"label": "doubleV",
"element": {
"kind": "TOP_LEVEL_VARIABLE",
"name": "doubleV",
"location": {
"file": "/home/test/lib/a.dart",
"file": ${jsonOfPath(path)},
"offset": 37,
"length": 0,
"startLine": 3,
@ -187,14 +187,14 @@ var stringV = 'hi';
]
}
''');
assertJsonText(_getSuggestion(set, 'stringV'), r'''
assertJsonText(_getSuggestion(set, 'stringV'), '''
{
"label": "stringV",
"element": {
"kind": "TOP_LEVEL_VARIABLE",
"name": "stringV",
"location": {
"file": "/home/test/lib/a.dart",
"file": ${jsonOfPath(path)},
"offset": 56,
"length": 0,
"startLine": 4,

5
pkg/analysis_server/test/src/domains/completion/available_suggestions_base.dart
View file

@ -33,6 +33,11 @@ class AvailableSuggestionsBase extends AbstractAnalysisTest {
expect(actual, expected);
}
String jsonOfPath(String path) {
path = convertPath(path);
return json.encode(path);
}
@override
void processNotification(Notification notification) {
super.processNotification(notification);