| Index: pkg/analysis_server/test/domain_execution_test.dart
|
| diff --git a/pkg/analysis_server/test/domain_execution_test.dart b/pkg/analysis_server/test/domain_execution_test.dart
|
| index 60c2454a61e832219388ff2ff86a5e641dfaeee5..78308b9e04cf4ef45b7b8b5f2c680fcf4f73e9a3 100644
|
| --- a/pkg/analysis_server/test/domain_execution_test.dart
|
| +++ b/pkg/analysis_server/test/domain_execution_test.dart
|
| @@ -38,14 +38,9 @@ main() {
|
| ExecutionDomainHandler handler;
|
|
|
| setUp(() {
|
| - server = new AnalysisServer(
|
| - new MockServerChannel(),
|
| - provider,
|
| - new MockPackageMapProvider(),
|
| - null,
|
| - new AnalysisServerOptions(),
|
| - new MockSdk(),
|
| - InstrumentationService.NULL_SERVICE);
|
| + server = new AnalysisServer(new MockServerChannel(), provider,
|
| + new MockPackageMapProvider(), null, new AnalysisServerOptions(),
|
| + new MockSdk(), InstrumentationService.NULL_SERVICE);
|
| handler = new ExecutionDomainHandler(server);
|
| });
|
|
|
| @@ -117,8 +112,8 @@ main() {
|
|
|
| group('file to URI', () {
|
| test('does not exist', () {
|
| - Request request =
|
| - new ExecutionMapUriParams(contextId, file: '/a/c.dart').toRequest('2');
|
| + Request request = new ExecutionMapUriParams(contextId,
|
| + file: '/a/c.dart').toRequest('2');
|
| Response response = handler.handleRequest(request);
|
| expect(response, isResponseFailure('2'));
|
| });
|
| @@ -132,8 +127,8 @@ main() {
|
| });
|
|
|
| test('valid', () {
|
| - Request request =
|
| - new ExecutionMapUriParams(contextId, file: '/a/b.dart').toRequest('2');
|
| + Request request = new ExecutionMapUriParams(contextId,
|
| + file: '/a/b.dart').toRequest('2');
|
| Response response = handler.handleRequest(request);
|
| expect(response, isResponseSuccess('2'));
|
| ExecutionMapUriResult result =
|
| @@ -145,15 +140,15 @@ main() {
|
|
|
| group('URI to file', () {
|
| test('invalid', () {
|
| - Request request =
|
| - new ExecutionMapUriParams(contextId, uri: 'foo:///a/b.dart').toRequest('2');
|
| + Request request = new ExecutionMapUriParams(contextId,
|
| + uri: 'foo:///a/b.dart').toRequest('2');
|
| Response response = handler.handleRequest(request);
|
| expect(response, isResponseFailure('2'));
|
| });
|
|
|
| test('valid', () {
|
| - Request request =
|
| - new ExecutionMapUriParams(contextId, uri: 'file:///a/b.dart').toRequest('2');
|
| + Request request = new ExecutionMapUriParams(contextId,
|
| + uri: 'file:///a/b.dart').toRequest('2');
|
| Response response = handler.handleRequest(request);
|
| expect(response, isResponseSuccess('2'));
|
| ExecutionMapUriResult result =
|
| @@ -199,8 +194,9 @@ main() {
|
| test('success - setting and clearing', () {
|
| expect(handler.onFileAnalyzed, isNull);
|
|
|
| - Request request = new ExecutionSetSubscriptionsParams(
|
| - [ExecutionService.LAUNCH_DATA]).toRequest('0');
|
| + Request request =
|
| + new ExecutionSetSubscriptionsParams([ExecutionService.LAUNCH_DATA])
|
| + .toRequest('0');
|
| Response response = handler.handleRequest(request);
|
| expect(response, isResponseSuccess('0'));
|
| expect(handler.onFileAnalyzed, isNotNull);
|
| @@ -222,15 +218,14 @@ main() {
|
| Source source7 = new TestSource('/g.html');
|
|
|
| AnalysisContext context = new AnalysisContextMock();
|
| - when(
|
| - context.launchableClientLibrarySources).thenReturn([source1, source2]);
|
| - when(
|
| - context.launchableServerLibrarySources).thenReturn([source2, source3]);
|
| + when(context.launchableClientLibrarySources)
|
| + .thenReturn([source1, source2]);
|
| + when(context.launchableServerLibrarySources)
|
| + .thenReturn([source2, source3]);
|
| when(context.librarySources).thenReturn([source4]);
|
| when(context.htmlSources).thenReturn([source5]);
|
| - when(
|
| - context.getLibrariesReferencedFromHtml(
|
| - anyObject)).thenReturn([source6, source7]);
|
| + when(context.getLibrariesReferencedFromHtml(anyObject))
|
| + .thenReturn([source6, source7]);
|
|
|
| ServerContextManager manager = new ServerContextManagerMock();
|
| when(manager.isInAnalysisRoot(anyString)).thenReturn(true);
|
| @@ -243,13 +238,14 @@ main() {
|
| when(server.onFileAnalyzed).thenReturn(controller.stream);
|
|
|
| List<String> unsentNotifications = <String>[
|
| - source1.fullName,
|
| - source2.fullName,
|
| - source3.fullName,
|
| - source4.fullName,
|
| - source5.fullName];
|
| - when(
|
| - server.sendNotification(anyObject)).thenInvoke((Notification notification) {
|
| + source1.fullName,
|
| + source2.fullName,
|
| + source3.fullName,
|
| + source4.fullName,
|
| + source5.fullName
|
| + ];
|
| + when(server.sendNotification(anyObject)).thenInvoke(
|
| + (Notification notification) {
|
| ExecutionLaunchDataParams params =
|
| new ExecutionLaunchDataParams.fromNotification(notification);
|
|
|
| @@ -274,8 +270,9 @@ main() {
|
| });
|
|
|
| ExecutionDomainHandler handler = new ExecutionDomainHandler(server);
|
| - Request request = new ExecutionSetSubscriptionsParams(
|
| - [ExecutionService.LAUNCH_DATA]).toRequest('0');
|
| + Request request =
|
| + new ExecutionSetSubscriptionsParams([ExecutionService.LAUNCH_DATA])
|
| + .toRequest('0');
|
| handler.handleRequest(request);
|
|
|
| // controller.add(null);
|
|
|