More clean-up in server

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

Index: pkg/analyzer/test/src/context/builder_test.dart
diff --git a/pkg/analyzer/test/src/context/builder_test.dart b/pkg/analyzer/test/src/context/builder_test.dart
index 5f04b4f97a51cf3d935aec637ac36b3acce654ac..01625d39e42cf42766bf2fdc4719ab8405ad8452 100644
--- a/pkg/analyzer/test/src/context/builder_test.dart
+++ b/pkg/analyzer/test/src/context/builder_test.dart
@@ -104,11 +104,11 @@ const Map<String, LibraryInfo> libraries = const {
   }
 
   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() {