| Index: pkg/analysis_server/test/analysis_server_test.dart
|
| diff --git a/pkg/analysis_server/test/analysis_server_test.dart b/pkg/analysis_server/test/analysis_server_test.dart
|
| index 39ab01899a4295b007c4abd9eff3d23e9ec4c524..8bac1306e842b71cda798ed6e19272560ce160de 100644
|
| --- a/pkg/analysis_server/test/analysis_server_test.dart
|
| +++ b/pkg/analysis_server/test/analysis_server_test.dart
|
| @@ -41,49 +41,11 @@ class AnalysisServerTest {
|
| MemoryResourceProvider resourceProvider;
|
| MockPackageMapProvider packageMapProvider;
|
|
|
| - void processRequiredPlugins(ServerPlugin serverPlugin) {
|
| - List<Plugin> plugins = <Plugin>[];
|
| - plugins.addAll(AnalysisEngine.instance.requiredPlugins);
|
| - plugins.add(serverPlugin);
|
| -
|
| - ExtensionManager manager = new ExtensionManager();
|
| - manager.processPlugins(plugins);
|
| - }
|
| -
|
| - void setUp() {
|
| - ServerPlugin serverPlugin = new ServerPlugin();
|
| - processRequiredPlugins(serverPlugin);
|
| - channel = new MockServerChannel();
|
| - resourceProvider = new MemoryResourceProvider();
|
| - // Create an SDK in the mock file system.
|
| - new MockSdk(resourceProvider: resourceProvider);
|
| - packageMapProvider = new MockPackageMapProvider();
|
| - server = new AnalysisServer(
|
| - channel,
|
| - resourceProvider,
|
| - packageMapProvider,
|
| - null,
|
| - serverPlugin,
|
| - new AnalysisServerOptions(),
|
| - new DartSdkManager('/', false),
|
| - InstrumentationService.NULL_SERVICE,
|
| - rethrowExceptions: true);
|
| - }
|
| -
|
| - Future test_echo() {
|
| - server.handlers = [new EchoHandler()];
|
| - var request = new Request('my22', 'echo');
|
| - return channel.sendRequest(request).then((Response response) {
|
| - expect(response.id, equals('my22'));
|
| - expect(response.error, isNull);
|
| - });
|
| - }
|
| -
|
| /**
|
| * Test that having multiple analysis contexts analyze the same file doesn't
|
| * cause that file to receive duplicate notifications when it's modified.
|
| */
|
| - Future test_no_duplicate_notifications() async {
|
| + Future do_not_test_no_duplicate_notifications() async {
|
| // Subscribe to STATUS so we'll know when analysis is done.
|
| server.serverServices = [ServerService.STATUS].toSet();
|
| resourceProvider.newFolder('/foo');
|
| @@ -96,6 +58,8 @@ class AnalysisServerTest {
|
| for (AnalysisService service in AnalysisService.VALUES) {
|
| subscriptions[service] = <String>[bar.path].toSet();
|
| }
|
| + // The following line causes the isolate to continue running even though the
|
| + // test completes.
|
| server.setAnalysisSubscriptions(subscriptions);
|
| await server.onAnalysisComplete;
|
| expect(server.statusAnalyzing, isFalse);
|
| @@ -126,6 +90,44 @@ class AnalysisServerTest {
|
| }
|
| }
|
|
|
| + void processRequiredPlugins(ServerPlugin serverPlugin) {
|
| + List<Plugin> plugins = <Plugin>[];
|
| + plugins.addAll(AnalysisEngine.instance.requiredPlugins);
|
| + plugins.add(serverPlugin);
|
| +
|
| + ExtensionManager manager = new ExtensionManager();
|
| + manager.processPlugins(plugins);
|
| + }
|
| +
|
| + void setUp() {
|
| + ServerPlugin serverPlugin = new ServerPlugin();
|
| + processRequiredPlugins(serverPlugin);
|
| + channel = new MockServerChannel();
|
| + resourceProvider = new MemoryResourceProvider();
|
| + // Create an SDK in the mock file system.
|
| + new MockSdk(resourceProvider: resourceProvider);
|
| + packageMapProvider = new MockPackageMapProvider();
|
| + server = new AnalysisServer(
|
| + channel,
|
| + resourceProvider,
|
| + packageMapProvider,
|
| + null,
|
| + serverPlugin,
|
| + new AnalysisServerOptions(),
|
| + new DartSdkManager('/', false),
|
| + InstrumentationService.NULL_SERVICE,
|
| + rethrowExceptions: true);
|
| + }
|
| +
|
| + Future test_echo() {
|
| + server.handlers = [new EchoHandler()];
|
| + var request = new Request('my22', 'echo');
|
| + return channel.sendRequest(request).then((Response response) {
|
| + expect(response.id, equals('my22'));
|
| + expect(response.error, isNull);
|
| + });
|
| + }
|
| +
|
| void test_rethrowExceptions() {
|
| Exception exceptionToThrow = new Exception('test exception');
|
| MockServerOperation operation =
|
|
|