| Index: pkg/analysis_server/test/domain_server_test.dart
|
| diff --git a/pkg/analysis_server/test/domain_server_test.dart b/pkg/analysis_server/test/domain_server_test.dart
|
| index 031c95c3c89b587051ef6634f9d604ab136211ad..1356816d3b9b9e03c234a3dad3017c52a291d105 100644
|
| --- a/pkg/analysis_server/test/domain_server_test.dart
|
| +++ b/pkg/analysis_server/test/domain_server_test.dart
|
| @@ -12,114 +12,69 @@ import 'package:unittest/unittest.dart';
|
| import 'mocks.dart';
|
|
|
| main() {
|
| - group('ServerDomainHandler', () {
|
| - test('createContext', ServerDomainHandlerTest.createContext);
|
| - test('deleteContext_alreadyDeleted', ServerDomainHandlerTest.deleteContext_alreadyDeleted);
|
| - test('deleteContext_doesNotExist', ServerDomainHandlerTest.deleteContext_doesNotExist);
|
| - test('deleteContext_existing', ServerDomainHandlerTest.deleteContext_existing);
|
| - test('shutdown', ServerDomainHandlerTest.shutdown);
|
| - test('version', ServerDomainHandlerTest.version);
|
| - });
|
| -}
|
| -
|
| -class ServerDomainHandlerTest {
|
| - static void createContext() {
|
| - AnalysisServer server = new AnalysisServer(new MockServerChannel());
|
| - ServerDomainHandler handler = new ServerDomainHandler(server);
|
| -
|
| - Request createRequest = new Request('0', ServerDomainHandler.CREATE_CONTEXT_METHOD);
|
| - createRequest.setParameter(ServerDomainHandler.SDK_DIRECTORY_PARAM, sdkPath);
|
| - createRequest.setParameter(AnalysisServer.CONTEXT_ID_PARAM, 'ctx');
|
| - Response response = handler.handleRequest(createRequest);
|
| - expect(response.id, equals('0'));
|
| - expect(response.error, isNull);
|
| - expect(response.result, isEmpty);
|
| - }
|
| -
|
| - static void createContext_alreadyExists() {
|
| - AnalysisServer server = new AnalysisServer(new MockServerChannel());
|
| - ServerDomainHandler handler = new ServerDomainHandler(server);
|
| -
|
| - Request createRequest = new Request('0', ServerDomainHandler.CREATE_CONTEXT_METHOD);
|
| - createRequest.setParameter(ServerDomainHandler.SDK_DIRECTORY_PARAM, sdkPath);
|
| - createRequest.setParameter(AnalysisServer.CONTEXT_ID_PARAM, 'ctx');
|
| - Response response = handler.handleRequest(createRequest);
|
| - expect(response.error, isNull);
|
| - response = handler.handleRequest(createRequest);
|
| - expect(response.error, isNotNull);
|
| - }
|
| -
|
| - static void deleteContext_alreadyDeleted() {
|
| - AnalysisServer server = new AnalysisServer(new MockServerChannel());
|
| - ServerDomainHandler handler = new ServerDomainHandler(server);
|
| -
|
| - String contextId = 'ctx';
|
| - Request createRequest = new Request('0', ServerDomainHandler.CREATE_CONTEXT_METHOD);
|
| - createRequest.setParameter(ServerDomainHandler.SDK_DIRECTORY_PARAM, sdkPath);
|
| - createRequest.setParameter(AnalysisServer.CONTEXT_ID_PARAM, contextId);
|
| - handler.handleRequest(createRequest);
|
| -
|
| - Request deleteRequest = new Request('0', ServerDomainHandler.DELETE_CONTEXT_METHOD);
|
| - deleteRequest.setParameter(AnalysisServer.CONTEXT_ID_PARAM, contextId);
|
| - handler.handleRequest(deleteRequest);
|
| - Response response = handler.handleRequest(deleteRequest);
|
| - expect(response.id, equals('0'));
|
| - expect(response.error, isNotNull);
|
| - }
|
| + AnalysisServer server;
|
| + ServerDomainHandler handler;
|
|
|
| - static void deleteContext_doesNotExist() {
|
| - AnalysisServer server = new AnalysisServer(new MockServerChannel());
|
| - ServerDomainHandler handler = new ServerDomainHandler(server);
|
| -
|
| - Request deleteRequest = new Request('0', ServerDomainHandler.DELETE_CONTEXT_METHOD);
|
| - deleteRequest.setParameter(AnalysisServer.CONTEXT_ID_PARAM, 'xyzzy');
|
| - Response response = handler.handleRequest(deleteRequest);
|
| - expect(response.id, equals('0'));
|
| - expect(response.error, isNotNull);
|
| - }
|
| -
|
| - static void deleteContext_existing() {
|
| - AnalysisServer server = new AnalysisServer(new MockServerChannel());
|
| - ServerDomainHandler handler = new ServerDomainHandler(server);
|
| -
|
| - String contextId = 'ctx';
|
| - Request createRequest = new Request('0', ServerDomainHandler.CREATE_CONTEXT_METHOD);
|
| - createRequest.setParameter(ServerDomainHandler.SDK_DIRECTORY_PARAM, sdkPath);
|
| - createRequest.setParameter(AnalysisServer.CONTEXT_ID_PARAM, contextId);
|
| - handler.createContext(createRequest);
|
| -
|
| - Request deleteRequest = new Request('0', ServerDomainHandler.DELETE_CONTEXT_METHOD);
|
| - deleteRequest.setParameter(AnalysisServer.CONTEXT_ID_PARAM, contextId);
|
| - Response response = handler.handleRequest(deleteRequest);
|
| - expect(response.toJson(), equals({
|
| - Response.ID: '0'
|
| - }));
|
| - }
|
| -
|
| - static void shutdown() {
|
| - AnalysisServer server = new AnalysisServer(new MockServerChannel());
|
| - ServerDomainHandler handler = new ServerDomainHandler(server);
|
| -
|
| - expect(server.running, isTrue);
|
| - Request shutdownRequest = new Request('0', ServerDomainHandler.SHUTDOWN_METHOD);
|
| - Response response = handler.handleRequest(shutdownRequest);
|
| - expect(response.toJson(), equals({
|
| - Response.ID: '0'
|
| - }));
|
| - expect(server.running, isFalse);
|
| - }
|
| -
|
| - static void version() {
|
| - AnalysisServer server = new AnalysisServer(new MockServerChannel());
|
| - ServerDomainHandler handler = new ServerDomainHandler(server);
|
| + setUp(() {
|
| + var serverChannel = new MockServerChannel();
|
| + server = new AnalysisServer(serverChannel);
|
| + handler = new ServerDomainHandler(server);
|
| + });
|
|
|
| - Request versionRequest = new Request('0', ServerDomainHandler.VERSION_METHOD);
|
| - Response response = handler.handleRequest(versionRequest);
|
| - expect(response.toJson(), equals({
|
| - Response.ID: '0',
|
| - Response.RESULT: {
|
| - ServerDomainHandler.VERSION_RESULT: '0.0.1'
|
| - }
|
| - }));
|
| - }
|
| + group('ServerDomainHandler', () {
|
| + test('getVersion', () {
|
| + var request = new Request('0', ServerDomainHandler.GET_VERSION_METHOD);
|
| + var response = handler.handleRequest(request);
|
| + expect(response.toJson(), equals({
|
| + Response.ID: '0',
|
| + Response.RESULT: {
|
| + ServerDomainHandler.VERSION_RESULT: '0.0.1'
|
| + }
|
| + }));
|
| + });
|
| +
|
| + group('setSubscriptions', () {
|
| + Request request;
|
| + setUp(() {
|
| + request = new Request('0', ServerDomainHandler.SET_SUBSCRIPTIONS_METHOD);
|
| + });
|
| +
|
| + test('invalid service name', () {
|
| + request.setParameter(
|
| + ServerDomainHandler.SUBSCRIPTIONS_PARAMETER,
|
| + ['noSuchService']);
|
| + var response = handler.handleRequest(request);
|
| + // TODO(scheglov) extract isResponseError(id) matcher
|
| + expect(response.id, equals('0'));
|
| + expect(response.error, isNotNull);
|
| + });
|
| +
|
| + test('success', () {
|
| + expect(server.serverServices, isEmpty);
|
| + // send request
|
| + request.setParameter(
|
| + ServerDomainHandler.SUBSCRIPTIONS_PARAMETER,
|
| + [ServerService.STATUS.name]);
|
| + var response = handler.handleRequest(request);
|
| + // TODO(scheglov) extract isResponseSuccess(id) matcher
|
| + expect(response.id, equals('0'));
|
| + expect(response.error, isNull);
|
| + // set of services has been changed
|
| + expect(server.serverServices, contains(ServerService.STATUS));
|
| + });
|
| + });
|
| +
|
| + test('shutdown', () {
|
| + expect(server.running, isTrue);
|
| + // send request
|
| + var request = new Request('0', ServerDomainHandler.SHUTDOWN_METHOD);
|
| + var response = handler.handleRequest(request);
|
| + // TODO(scheglov) extract isResponseSuccess(id) matcher
|
| + expect(response.toJson(), equals({
|
| + Response.ID: '0'
|
| + }));
|
| + // server is down
|
| + expect(server.running, isFalse);
|
| + });
|
| + });
|
| }
|
|
|