Test fixes to catch up with Parser changes (dartbug.com/18315).

pkg/analyzer/test/services/formatter_test.dart

 // Copyright (c) 2013, 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 formatter_test;
 
 import 'dart:io';
 
 import 'package:path/path.dart';
 import 'package:unittest/unittest.dart';
@@ skipping 11 matching lines @@
   group('stmt_tests.data', () {
     // NOTE: statement tests are run with transforms enabled
     runTests('stmt_tests.data', (input, expectedOutput) {
       expect(formatStatement(input,
           options: new FormatterOptions(codeTransforms: true)) + '\n',
           equals(expectedOutput));
     });
   });
 
   /// Data-driven compilation unit tests
-  /// TODO(scheglov) https://code.google.com/p/dart/issues/detail?id=18315
-//  group('cu_tests.data', () {
-//    runTests('cu_tests.data', (input, expectedOutput) {
-//      expectCUFormatsTo(input, expectedOutput);
-//    });
-//  });
+  group('cu_tests.data', () {
+    runTests('cu_tests.data', (input, expectedOutput) {
+      expectCUFormatsTo(input, expectedOutput);
+    });
+  });
 
   /// Data-driven Style Guide acceptance tests
   group('style_guide_tests.data', () {
     runTests('style_guide_tests.data', (input, expectedOutput) {
       expectCUFormatsTo(input, expectedOutput);
     });
   });
 
   /// Formatter tests
   group('formatter', () {
@@ skipping 1424 matching lines @@
 expectStmtFormatsTo(src, expected, {transforms: true}) =>
     expect(formatStatement(src, options:
       new FormatterOptions(codeTransforms: transforms)), equals(expected));
 
 
 runTests(testFileName, expectClause(input, output)) {
 
   var testIndex = 1;
   var testFile = new File(join(TEST_DATA_DIR, testFileName));
   var lines = testFile.readAsLinesSync();
-
   for (var i = 1; i < lines.length; ++i) {
     var input = '', expectedOutput = '';
     while(!lines[i].startsWith('<<<')) {
       input += lines[i++] + '\n';
     }
     while(++i < lines.length && !lines[i].startsWith('>>>')) {
       expectedOutput += lines[i] + '\n';
     }
     test('test - (${testIndex++})', () {
       expectClause(input, expectedOutput);
     });
   }
 }