| Index: pkg/analysis_server/test/integration/integration_tests.dart
|
| diff --git a/pkg/analysis_server/test/integration/integration_tests.dart b/pkg/analysis_server/test/integration/integration_tests.dart
|
| index 305ea8a5671fb17be7638c4fbe67b72d457a289d..982c3c041cc311db43dba1a980d621e65eb8d56c 100644
|
| --- a/pkg/analysis_server/test/integration/integration_tests.dart
|
| +++ b/pkg/analysis_server/test/integration/integration_tests.dart
|
| @@ -96,9 +96,9 @@ abstract class AbstractAnalysisServerIntegrationTest extends
|
| Future standardAnalysisSetup({bool subscribeStatus: true}) {
|
| List<Future> futures = <Future>[];
|
| if (subscribeStatus) {
|
| - futures.add(sendServerSetSubscriptions(['STATUS']));
|
| + futures.add(sendServerSetSubscriptions(subscriptions: ['STATUS']));
|
| }
|
| - futures.add(sendAnalysisSetAnalysisRoots([sourceDirectory.path], []));
|
| + futures.add(sendAnalysisSetAnalysisRoots(included: [sourceDirectory.path]));
|
| return Future.wait(futures);
|
| }
|
|
|
| @@ -143,11 +143,12 @@ abstract class AbstractAnalysisServerIntegrationTest extends
|
| }
|
|
|
| @override
|
| - Future sendServerSetSubscriptions(List<String> subscriptions, {bool
|
| + Future sendServerSetSubscriptions({List<String> subscriptions, bool
|
| checkTypes: true}) {
|
| - _subscribedToServerStatus = subscriptions.contains('STATUS');
|
| - return super.sendServerSetSubscriptions(subscriptions, checkTypes:
|
| - checkTypes);
|
| + _subscribedToServerStatus = subscriptions != null &&
|
| + subscriptions.contains('STATUS');
|
| + return super.sendServerSetSubscriptions(subscriptions: subscriptions,
|
| + checkTypes: checkTypes);
|
| }
|
|
|
| /**
|
|
|