Replace dart_core.js with actual compiled SDK

test/codegen_test.dart

 // Copyright (c) 2015, 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.
 
 /// Tests code generation.
 /// Runs Dart Dev Compiler on all input in the `codegen` directory and checks
 /// that the output is what we expected.
 library dev_compiler.test.codegen_test;
 
 import 'dart:io';
 import 'package:cli_util/cli_util.dart' show getSdkDir;
 import 'package:analyzer/src/generated/engine.dart' show AnalysisEngine, Logger;
 import 'package:analyzer/src/generated/java_engine.dart' show CaughtException;
 import 'package:args/args.dart';
-import 'package:cli_util/cli_util.dart' show getSdkDir;
-import 'package:dev_compiler/devc.dart';
-import 'package:dev_compiler/src/options.dart';
 import 'package:logging/logging.dart' show Level;
 import 'package:path/path.dart' as path;
 import 'package:unittest/unittest.dart';
 
+import 'package:dev_compiler/devc.dart';
+import 'package:dev_compiler/src/options.dart';
+import 'package:dev_compiler/src/dependency_graph.dart'
+    show defaultRuntimeFiles;
+
 final ArgParser argParser = new ArgParser()
   ..addOption('dart-sdk', help: 'Dart SDK Path', defaultsTo: null)
   ..addFlag('dart-gen',
       abbr: 'd', help: 'Generate dart output', defaultsTo: false);
 
 main(arguments) {
   if (arguments == null) arguments = [];
   ArgResults args = argParser.parse(arguments);
   var script = Platform.script.path;
   var dartGen = args['dart-gen'];
@@ skipping 75 matching lines @@
           ? new File(path.join(actualDir, '$filename/$filename.dart'))
           : new File(path.join(actualDir, '$filename.js'));
       expect(outFile.existsSync(), success,
           reason: '${outFile.path} was created iff compilation succeeds');
 
       // TODO(jmesserly): ideally we'd diff the output here. For now it
       // happens in the containing shell script.
     });
   }
 
-  group('sdk', () {
-    // The analyzer does not bubble exception messages for certain internal
-    // dart:* library failures, such as failing to find
-    // "_internal/libraries.dart". Instead it produces an opaque "failed to
-    // instantiate dart:core" message. To remedy this we hook up an analysis
-    // logger that prints these messages.
-    var savedLogger;
-    setUp(() {
-      savedLogger = AnalysisEngine.instance.logger;
-      AnalysisEngine.instance.logger = new PrintLogger();
+  if (dartGen) {
+    group('sdk', () {
+      // The analyzer does not bubble exception messages for certain internal
+      // dart:* library failures, such as failing to find
+      // "_internal/libraries.dart". Instead it produces an opaque "failed to
+      // instantiate dart:core" message. To remedy this we hook up an analysis
+      // logger that prints these messages.
+      var savedLogger;
+      setUp(() {
+        savedLogger = AnalysisEngine.instance.logger;
+        AnalysisEngine.instance.logger = new PrintLogger();
+      });
+      tearDown(() {
+        AnalysisEngine.instance.logger = savedLogger;
+      });
+
+      test('devc dart:core', () {
+        // Get the test SDK. We use a checked in copy so test expectations can
+        // be generated against a specific SDK version.
+        var testSdk = path.join(testDir, '..', 'tool', 'input_sdk');
+        var result = compile('dart:core', testSdk, checkSdk: true);
+        var outputDir = new Directory(path.join(actualDir, 'core'));
+        var outFile = new File(path.join(actualDir, 'core/core'));
+        expect(outFile.existsSync(), true,
+            reason: '${outFile.path} was created for dart:core');
+      });
     });
-    tearDown(() {
-      AnalysisEngine.instance.logger = savedLogger;
-    });
+  }
 
-    test('devc dart:core', () {
-      // Get the test SDK. We use a checked in copy so test expectations can be
-      // generated against a specific SDK version.
-      // TODO(jmesserly): eventually we should track compiler messages.
-      // For now we're just trying to get decent code generation.
-      var testSdk = dartGen
-          ? path.join(testDir, '..', 'tool', 'input_sdk')
-          : path.join(testDir, 'generated_sdk');
-      var result = compile('dart:core', testSdk, checkSdk: true);
-      var outputDir = new Directory(path.join(actualDir, 'core'));
-      var outFile = dartGen
-          ? new File(path.join(actualDir, 'core/core'))
-          : new File(path.join(actualDir, 'dart/core.js'));
-      expect(outFile.existsSync(), true,
-          reason: '${outFile.path} was created for dart:core');
-    });
-  });
+  var expectedRuntime =
+      defaultRuntimeFiles.map((f) => 'dev_compiler/runtime/$f');
 
   if (!dartGen) {
     test('devc jscodegen sunflower.html', () {
       var filePath = path.join(inputDir, 'sunflower', 'sunflower.html');
       compilerMessages.writeln('// Messages from compiling sunflower.html');
 
       var result = compile(filePath, realSdk, subDir: 'sunflower');
       var success = !result.failure;
 
       // Write compiler messages to disk.
       new File(path.join(actualDir, 'sunflower', 'sunflower.txt'))
           .writeAsStringSync(compilerMessages.toString());
 
       var expectedFiles = [
         'sunflower.html',
         'sunflower.js',
         'sunflower.css',
         'math.png',
-        'dev_compiler/runtime/dart_core.js',
-        'dev_compiler/runtime/dart_runtime.js',
-        'dev_compiler/runtime/harmony_feature_check.js',
-      ];
+      ]..addAll(expectedRuntime);
+
       for (var filepath in expectedFiles) {
         var outFile = new File(path.join(actualDir, 'sunflower', filepath));
         expect(outFile.existsSync(), success,
             reason: '${outFile.path} was created iff compilation succeeds');
       }
     });
 
     test('devc jscodegen html_input.html', () {
       var filePath = path.join(inputDir, 'html_input.html');
       compilerMessages.writeln('// Messages from compiling html_input.html');
 
       var result = compile(filePath, realSdk);
       var success = !result.failure;
 
       // Write compiler messages to disk.
       new File(path.join(actualDir, 'html_input.txt'))
           .writeAsStringSync(compilerMessages.toString());
 
       var expectedFiles = [
         'html_input.html',
         'dir/html_input_a.js',
         'dir/html_input_b.js',
         'dir/html_input_c.js',
         'dir/html_input_d.js',
-        'dir/html_input_e.js',
-        'dev_compiler/runtime/dart_core.js',
-        'dev_compiler/runtime/dart_runtime.js',
-        'dev_compiler/runtime/harmony_feature_check.js',
-      ];
+        'dir/html_input_e.js'
+      ]..addAll(expectedRuntime);
+
       for (var filepath in expectedFiles) {
         var outFile = new File(path.join(actualDir, filepath));
         expect(outFile.existsSync(), success,
             reason: '${outFile.path} was created iff compilation succeeds');
       }
 
       var notExpectedFiles = [
         'dev_compiler/runtime/messages_widget.js',
         'dev_compiler/runtime/messages.css'
       ];
@@ skipping 16 matching lines @@
       new File(path.join(actualDir, 'server_mode', 'html_input.txt'))
           .writeAsStringSync(compilerMessages.toString());
 
       var expectedFiles = [
         'html_input.html',
         'dir/html_input_a.js',
         'dir/html_input_b.js',
         'dir/html_input_c.js',
         'dir/html_input_d.js',
         'dir/html_input_e.js',
-        'dev_compiler/runtime/dart_core.js',
-        'dev_compiler/runtime/dart_runtime.js',
-        'dev_compiler/runtime/harmony_feature_check.js',
         'dev_compiler/runtime/messages_widget.js',
         'dev_compiler/runtime/messages.css'
-      ];
+      ]..addAll(expectedRuntime);
+
       for (var filepath in expectedFiles) {
         var outFile = new File(path.join(actualDir, 'server_mode', filepath));
         expect(outFile.existsSync(), success,
             reason: '${outFile.path} was created iff compilation succeeds');
       }
     });
   }
 }
 
 /// An implementation of analysis engine's [Logger] that prints.
 class PrintLogger implements Logger {
   @override void logError(String message, [CaughtException exception]) {
     print('[AnalysisEngine] error $message $exception');
   }
 
   @override void logError2(String message, Object exception) {
     print('[AnalysisEngine] error $message $exception');
   }
 
   void logInformation(String message, [CaughtException exception]) {}
   void logInformation2(String message, Object exception) {}
 }