| Index: pkg/analysis_server/test/domain_analysis_test.dart
|
| diff --git a/pkg/analysis_server/test/domain_analysis_test.dart b/pkg/analysis_server/test/domain_analysis_test.dart
|
| index 530393fd6a05065f397aeeba28df8baff745dc6f..d13a5a02442997884a18621d9aacab87c1207d68 100644
|
| --- a/pkg/analysis_server/test/domain_analysis_test.dart
|
| +++ b/pkg/analysis_server/test/domain_analysis_test.dart
|
| @@ -20,7 +20,6 @@ import 'mock_sdk.dart';
|
| import 'mocks.dart';
|
| import 'reflective_tests.dart';
|
|
|
| -
|
| main() {
|
| groupSep = ' | ';
|
|
|
| @@ -34,14 +33,9 @@ main() {
|
| setUp(() {
|
| serverChannel = new MockServerChannel();
|
| resourceProvider = new MemoryResourceProvider();
|
| - server = new AnalysisServer(
|
| - serverChannel,
|
| - resourceProvider,
|
| - new MockPackageMapProvider(),
|
| - null,
|
| - new AnalysisServerOptions(),
|
| - new MockSdk(),
|
| - InstrumentationService.NULL_SERVICE);
|
| + server = new AnalysisServer(serverChannel, resourceProvider,
|
| + new MockPackageMapProvider(), null, new AnalysisServerOptions(),
|
| + new MockSdk(), InstrumentationService.NULL_SERVICE);
|
| handler = new AnalysisDomainHandler(server);
|
| });
|
|
|
| @@ -50,10 +44,10 @@ main() {
|
|
|
| group('AnalysisDomainHandler', () {
|
| group('setAnalysisRoots', () {
|
| - Response testSetAnalysisRoots(List<String> included,
|
| - List<String> excluded) {
|
| - Request request =
|
| - new AnalysisSetAnalysisRootsParams(included, excluded).toRequest('0');
|
| + Response testSetAnalysisRoots(
|
| + List<String> included, List<String> excluded) {
|
| + Request request = new AnalysisSetAnalysisRootsParams(included, excluded)
|
| + .toRequest('0');
|
| return handler.handleRequest(request);
|
| }
|
|
|
| @@ -96,8 +90,8 @@ main() {
|
| test('invalid', () {
|
| // TODO(paulberry): under the "eventual consistency" model this request
|
| // should not be invalid.
|
| - var request =
|
| - new AnalysisSetPriorityFilesParams(['/project/lib.dart']).toRequest('0');
|
| + var request = new AnalysisSetPriorityFilesParams(['/project/lib.dart'])
|
| + .toRequest('0');
|
| var response = handler.handleRequest(request);
|
| expect(response, isResponseFailure('0'));
|
| });
|
| @@ -109,8 +103,8 @@ main() {
|
| resourceProvider.newFile('/p2/b.dart', 'library b;');
|
| resourceProvider.newFile('/p2/c.dart', 'library c;');
|
|
|
| - var setRootsRequest =
|
| - new AnalysisSetAnalysisRootsParams(['/p1', '/p2'], []).toRequest('0');
|
| + var setRootsRequest = new AnalysisSetAnalysisRootsParams(
|
| + ['/p1', '/p2'], []).toRequest('0');
|
| var setRootsResponse = handler.handleRequest(setRootsRequest);
|
| expect(setRootsResponse, isResponseSuccess('0'));
|
|
|
| @@ -132,11 +126,8 @@ main() {
|
|
|
| group('updateOptions', () {
|
| test('invalid', () {
|
| - var request = new Request('0', ANALYSIS_UPDATE_OPTIONS, {
|
| - OPTIONS: {
|
| - 'not-an-option': true
|
| - }
|
| - });
|
| + var request = new Request(
|
| + '0', ANALYSIS_UPDATE_OPTIONS, {OPTIONS: {'not-an-option': true}});
|
| var response = handler.handleRequest(request);
|
| // Invalid options should be silently ignored.
|
| expect(response, isResponseSuccess('0'));
|
| @@ -144,9 +135,8 @@ main() {
|
|
|
| test('null', () {
|
| // null is allowed as a synonym for {}.
|
| - var request = new Request('0', ANALYSIS_UPDATE_OPTIONS, {
|
| - OPTIONS: null
|
| - });
|
| + var request =
|
| + new Request('0', ANALYSIS_UPDATE_OPTIONS, {OPTIONS: null});
|
| var response = handler.handleRequest(request);
|
| expect(response, isResponseSuccess('0'));
|
| });
|
| @@ -154,7 +144,6 @@ main() {
|
| });
|
| }
|
|
|
| -
|
| void test_setSubscriptions() {
|
| test('before analysis', () {
|
| AnalysisTestHelper helper = new AnalysisTestHelper();
|
| @@ -218,18 +207,13 @@ main() {
|
| });
|
| }
|
|
|
| -
|
| testUpdateContent() {
|
| test('bad type', () {
|
| AnalysisTestHelper helper = new AnalysisTestHelper();
|
| helper.createSingleFileProject('// empty');
|
| return helper.onAnalysisComplete.then((_) {
|
| Request request = new Request('0', ANALYSIS_UPDATE_CONTENT, {
|
| - 'files': {
|
| - helper.testFile: {
|
| - TYPE: 'foo',
|
| - }
|
| - }
|
| + 'files': {helper.testFile: {TYPE: 'foo',}}
|
| });
|
| Response response = helper.handler.handleRequest(request);
|
| expect(response, isResponseFailure('0'));
|
| @@ -264,9 +248,8 @@ testUpdateContent() {
|
| // Add the file to the cache
|
| helper.sendContentChange(new AddContentOverlay(initialContent));
|
| // update code
|
| - helper.sendContentChange(
|
| - new ChangeContentOverlay(
|
| - [new SourceEdit('library '.length, 'A;'.length, 'lib')]));
|
| + helper.sendContentChange(new ChangeContentOverlay(
|
| + [new SourceEdit('library '.length, 'A;'.length, 'lib')]));
|
| // wait, there is an error
|
| return helper.onAnalysisComplete.then((_) {
|
| List<AnalysisError> errors = helper.getTestErrors();
|
| @@ -326,12 +309,11 @@ testUpdateContent() {
|
| helper.sendContentChange(new AddContentOverlay('library B;'));
|
| return helper.onAnalysisComplete.then((_) {
|
| ChangeContentOverlay contentChange = new ChangeContentOverlay([edit]);
|
| - Request request = new AnalysisUpdateContentParams({
|
| - helper.testFile: contentChange
|
| - }).toRequest('0');
|
| + Request request =
|
| + new AnalysisUpdateContentParams({helper.testFile: contentChange})
|
| + .toRequest('0');
|
| Response response = helper.handler.handleRequest(request);
|
| - expect(
|
| - response,
|
| + expect(response,
|
| isResponseFailure('0', RequestErrorCode.INVALID_OVERLAY_CHANGE));
|
| });
|
| });
|
| @@ -351,7 +333,6 @@ testUpdateContent() {
|
| });
|
| }
|
|
|
| -
|
| @reflectiveTest
|
| class AnalysisDomainTest extends AbstractAnalysisTest {
|
| Map<String, List<AnalysisError>> filesErrors = {};
|
| @@ -403,8 +384,9 @@ f(A a) {
|
| library lib_a;
|
| class A {}
|
| ''');
|
| - packageMapProvider.packageMap['pkgA'] =
|
| - [resourceProvider.getResource('/packages/pkgA')];
|
| + packageMapProvider.packageMap['pkgA'] = [
|
| + resourceProvider.getResource('/packages/pkgA')
|
| + ];
|
| addTestFile('''
|
| import 'package:pkgA/libA.dart';
|
| main(A a) {
|
| @@ -421,7 +403,6 @@ main(A a) {
|
| }
|
| }
|
|
|
| -
|
| /**
|
| * A helper to test 'analysis.*' requests.
|
| */
|
| @@ -443,14 +424,9 @@ class AnalysisTestHelper {
|
| AnalysisTestHelper() {
|
| serverChannel = new MockServerChannel();
|
| resourceProvider = new MemoryResourceProvider();
|
| - server = new AnalysisServer(
|
| - serverChannel,
|
| - resourceProvider,
|
| - new MockPackageMapProvider(),
|
| - null,
|
| - new AnalysisServerOptions(),
|
| - new MockSdk(),
|
| - InstrumentationService.NULL_SERVICE);
|
| + server = new AnalysisServer(serverChannel, resourceProvider,
|
| + new MockPackageMapProvider(), null, new AnalysisServerOptions(),
|
| + new MockSdk(), InstrumentationService.NULL_SERVICE);
|
| handler = new AnalysisDomainHandler(server);
|
| // listen for notifications
|
| Stream<Notification> notificationStream =
|
| @@ -489,8 +465,8 @@ class AnalysisTestHelper {
|
| }
|
| files.add(file);
|
| // set subscriptions
|
| - Request request =
|
| - new AnalysisSetSubscriptionsParams(analysisSubscriptions).toRequest('0');
|
| + Request request = new AnalysisSetSubscriptionsParams(analysisSubscriptions)
|
| + .toRequest('0');
|
| handleSuccessfulRequest(request);
|
| }
|
|
|
| @@ -607,9 +583,8 @@ class AnalysisTestHelper {
|
| * Send an `updateContent` request for [testFile].
|
| */
|
| void sendContentChange(dynamic contentChange) {
|
| - Request request = new AnalysisUpdateContentParams({
|
| - testFile: contentChange
|
| - }).toRequest('0');
|
| + Request request = new AnalysisUpdateContentParams({testFile: contentChange})
|
| + .toRequest('0');
|
| handleSuccessfulRequest(request);
|
| }
|
|
|
|
|