Add highlight regions for comments.

pkg/analysis_server/test/analysis_notification_highlights_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.analysis.notification.highlights;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/computer/computer_highlights.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:unittest/unittest.dart';
 
 import 'analysis_abstract.dart';
 import 'reflective_tests.dart';
 
 
 main() {
   group('notification.highlights', () {
-    runReflectiveTests(_AnalysisNotificationHighlightsTest);
+    runReflectiveTests(AnalysisNotificationHighlightsTest);
+  });
+  group('HighlightType', () {
+    runReflectiveTests(HighlightTypeTest);
   });
 }
 
 
 @ReflectiveTestCase()
-class _AnalysisNotificationHighlightsTest extends AbstractAnalysisTest {
-  List<_HighlightRegion> regions;
+class AnalysisNotificationHighlightsTest extends AbstractAnalysisTest {
+  List<HighlightRegion> regions;
 
   void assertHasRawRegion(HighlightType type, int offset, int length) {
-    for (_HighlightRegion region in regions) {
+    for (HighlightRegion region in regions) {
       if (region.offset == offset && region.length == length && region.type ==
-          type.name) {
+          type) {
         return;
       }
     }
-    StringBuffer buffer = new StringBuffer();
-    buffer.write('Expected to find (type=');
-    buffer.write(type.name);
-    buffer.write('; offset=');
-    buffer.write(offset);
-    buffer.write('; length=');
-    buffer.write(length);
-    buffer.write(') in\n');
-    for (_HighlightRegion region in regions) {
-      buffer.write('  (type=');
-      buffer.write(region.type);
-      buffer.write('; offset=');
-      buffer.write(region.offset);
-      buffer.write('; length=');
-      buffer.write(region.length);
-      buffer.write(') in\n');
-    }
-    fail(buffer.toString());
+    fail('Expected to find (offset=$offset; length=$length; type=$type) in\n'
+        '${regions.join('\n')}');
   }
 
   void assertHasRegion(HighlightType type, String search, [int length = -1]) {
     int offset = findOffset(search);
     length = findRegionLength(search, length);
     assertHasRawRegion(type, offset, length);
   }
 
   void assertNoRawRegion(HighlightType type, int offset, int length) {
-    for (_HighlightRegion region in regions) {
+    for (HighlightRegion region in regions) {
       if (region.offset == offset && region.length == length && region.type ==
-          type.name) {
+          type) {
         fail(
             'Not expected to find (offset=$offset; length=$length; type=$type) in\n'
             '${regions.join('\n')}');
       }
     }
   }
 
 
   void assertNoRegion(HighlightType type, String search, [int length = -1]) {
     int offset = findOffset(search);
@@ skipping 29 matching lines @@
   }
 
   void processNotification(Notification notification) {
     if (notification.event == ANALYSIS_HIGHLIGHTS) {
       String file = notification.getParameter(FILE);
       if (file == testFile) {
         regions = [];
         List<Map<String, Object>> regionsJson = notification.getParameter(
             REGIONS);
         for (Map<String, Object> regionJson in regionsJson) {
-          regions.add(new _HighlightRegion.fromJson(regionJson));
+          regions.add(new HighlightRegion.fromJson(regionJson));
         }
       }
     }
   }
 
   @override
   void setUp() {
     super.setUp();
     createProject();
   }
@@ skipping 335 matching lines @@
 void main() {
   // end-of-line comment
   my_function(1);
 }
 
 void my_function(String a) {
  /* block comment */
 }
 ''');
     return prepareHighlights(() {
-      // TODO(brianwilkerson) Make this test pass.
-//      assertHasRegion(HighlightType.COMMENT_END_OF_LINE, '//', 22);
-//      assertHasRegion(HighlightType.COMMENT_BLOCK, '/* b', 19);
-//      assertHasRegion(HighlightType.COMMENT_DOCUMENTATION, '/**', 32);
+      assertHasRegion(HighlightType.COMMENT_DOCUMENTATION, '/**', 32);
+      assertHasRegion(HighlightType.COMMENT_END_OF_LINE, '//', 22);
+      assertHasRegion(HighlightType.COMMENT_BLOCK, '/* b', 19);
     });
   }
 
   test_CONSTRUCTOR() {
     addTestFile('''
 class AAA {
   AAA() {}
   AAA.name(p) {}
 }
 main() {
@@ skipping 301 matching lines @@
     return prepareHighlights(() {
       assertHasRegion(HighlightType.TYPE_PARAMETER, 'T> {');
       assertHasRegion(HighlightType.TYPE_PARAMETER, 'T fff;');
       assertHasRegion(HighlightType.TYPE_PARAMETER, 'T mmm(');
       assertHasRegion(HighlightType.TYPE_PARAMETER, 'T p)');
     });
   }
 }
 
 
-class _HighlightRegion {
-  final int length;
-  final int offset;
-  final String type;
+@ReflectiveTestCase()
+class HighlightTypeTest {
+  void test_toString() {
+    expect(HighlightType.CLASS.toString(), HighlightType.CLASS.name);
+  }
 
-  _HighlightRegion(this.type, this.offset, this.length);
+  void test_valueOf() {
+    expect(HighlightType.CLASS, HighlightType.valueOf(
+        HighlightType.CLASS.name));
+  }
 
-  factory _HighlightRegion.fromJson(Map<String, Object> map) {
-    return new _HighlightRegion(map[TYPE], map[OFFSET], map[LENGTH]);
+  void test_valueOf_unknown() {
+    expect(() {
+      HighlightType.valueOf('no-such-type');
+    }, throws);
   }
 }