More clean-up in server

pkg/analyzer/test/src/context/builder_test.dart

 // Copyright (c) 2016, 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 analyzer.test.src.context.context_builder_test;
 
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/plugin/options.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
@@ skipping 86 matching lines @@
     contentCache = new ContentCache();
     builder = new ContextBuilder(resourceProvider, sdkManager, contentCache);
   }
 
   @failingTest
   void test_buildContext() {
     fail('Incomplete test');
   }
 
   void test_convertPackagesToMap_noPackages() {
-    expect(builder.convertPackagesToMap(Packages.noPackages), isNull);
+    expect(builder.convertPackagesToMap(Packages.noPackages), isNotNull);

[scheglov, 2016/09/20 15:29:14]

Should we check the returned map is empty here and below?

[Brian Wilkerson, 2016/09/20 15:39:16]

Done

   }
 
   void test_convertPackagesToMap_null() {
-    expect(builder.convertPackagesToMap(null), isNull);
+    expect(builder.convertPackagesToMap(null), isNotNull);
   }
 
   void test_convertPackagesToMap_packages() {
     String fooName = 'foo';
     String fooPath = '/pkg/foo';
     Uri fooUri = new Uri.directory(fooPath);
     String barName = 'bar';
     String barPath = '/pkg/bar';
     Uri barUri = new Uri.directory(barPath);
 
@@ skipping 587 matching lines @@
       fail('Unexpected invocation of optionsProcessed');
     }
     expect(options, hasLength(expectedOptions.length));
     for (String key in expectedOptions.keys) {
       expect(options.containsKey(key), isTrue, reason: 'missing key $key');
       expect(options[key], expectedOptions[key],
           reason: 'values for key $key do not match');
     }
   }
 }