Clean-up and progress on analysis server

pkg/analysis_server/test/domain_context_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library test.domain.context;
 
 import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/domain_context.dart';
 import 'package:analysis_server/src/domain_server.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:unittest/matcher.dart';
 import 'package:unittest/unittest.dart';
 
 import 'mocks.dart';
 
 main() {
   group('ContextDomainHandlerTest', () {
     test('applyChanges', ContextDomainHandlerTest.applyChanges);
+    test('createChangeSet', ContextDomainHandlerTest.createChangeSet);
     test('setOptions', ContextDomainHandlerTest.setOptions);
     test('setPrioritySources_empty', ContextDomainHandlerTest.setPrioritySources_empty);
     test('setPrioritySources_nonEmpty', ContextDomainHandlerTest.setPrioritySources_nonEmpty);
   });
 }
 
 class ContextDomainHandlerTest {
   static void applyChanges() {
     AnalysisServer server = new AnalysisServer(new MockServerChannel());
     String contextId = _createContext(server);
     ChangeSet changeSet = new ChangeSet();
     ContextDomainHandler handler = new ContextDomainHandler(server);
 
     Request request = new Request('0', ContextDomainHandler.APPLY_CHANGES_NAME);
     request.setParameter(ContextDomainHandler.CONTEXT_ID_PARAM, contextId);
-    // TODO (danrubel) convert ChangeSet to Map
-//    request.setParameter(ContextDomainHandler.CHANGES_PARAM, changeSet);
-    request.setParameter(ContextDomainHandler.CHANGES_PARAM, new Map());
+    request.setParameter(ContextDomainHandler.CHANGES_PARAM, {
+      ContextDomainHandler.ADDED_PARAM : ['ffile:/one.dart'],
+      ContextDomainHandler.MODIFIED_PARAM : ['ffile:/two.dart'],
+      ContextDomainHandler.REMOVED_PARAM : ['ffile:/three.dart']
+    });
     Response response = handler.handleRequest(request);
     expect(response.toJson(), equals({
       Response.ID: '0',
       Response.ERROR: null
     }));
   }
 
+  static void createChangeSet() {
+    AnalysisServer server = new AnalysisServer(new MockServerChannel());
+    Request request = new Request('0', ContextDomainHandler.APPLY_CHANGES_NAME);
+    ContextDomainHandler handler = new ContextDomainHandler(server);
+    SourceFactory sourceFactory = new SourceFactory([new FileUriResolver()]);
+    ChangeSet changeSet = handler.createChangeSet(request, sourceFactory, {
+      ContextDomainHandler.ADDED_PARAM : ['ffile:/one.dart'],
+      ContextDomainHandler.MODIFIED_PARAM : [],
+      ContextDomainHandler.REMOVED_PARAM : ['ffile:/two.dart', 'ffile:/three.dart']
+    });
+    expect(changeSet.addedSources, hasLength(equals(1)));
+    expect(changeSet.changedSources, hasLength(equals(0)));
+    expect(changeSet.removedSources, hasLength(equals(2)));
+  }
+
   static void setOptions() {
     AnalysisServer server = new AnalysisServer(new MockServerChannel());
     String contextId = _createContext(server);
     Map<String, Object> options = new Map<String, Object>();
     ContextDomainHandler handler = new ContextDomainHandler(server);
 
     Request request = new Request('0', ContextDomainHandler.SET_OPTIONS_NAME);
     request.setParameter(ContextDomainHandler.CONTEXT_ID_PARAM, contextId);
     request.setParameter(ContextDomainHandler.OPTIONS_PARAM, options);
     Response response = handler.handleRequest(request);
@@ skipping 41 matching lines @@
     Request request = new Request('0', ServerDomainHandler.CREATE_CONTEXT_METHOD);
     request.setParameter(ServerDomainHandler.SDK_DIRECTORY_PARAM, sdkPath);
     Response response = handler.handleRequest(request);
     if (response.error != null) {
       fail('Unexpected error: ${response.error.toJson()}');
     }
     expect(response.error, isNull);
     return response.getResult(ServerDomainHandler.CONTEXT_ID_RESULT);
   }
 }