Incremental compilation of libraries with multiple parts.

dart/tests/try/web/incremental_compilation_update_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 trydart.incremental_compilation_update_test;
 
 import 'dart:html' hide
     Element;
 
 import 'dart:async' show
@@ skipping 1641 matching lines @@
             const ProgramExpectation(
                 const <String>['A(v2)', 'B(v2)', 'B(A(v2))', 'A(B(v2))']),
         ]),
 
     const EncodedResult(
         r"""
 ==> main.dart <==
 library test.main;
 
 part 'part.dart';
 ==> part.dart.patch <==

[Johnni Winther, 2014/12/19 12:17:33]

Add blank lines around ==> ... <== lines.

[ahe, 2014/12/19 13:35:45]

Done.

 part of test.main;
 
 main() {
 <<<<<<<
   print('Hello, World!');
 =======
   print('Hello, Brave New World!');
 >>>>>>>
 }
 """,
         const [
             'Hello, World!',
-            const ProgramExpectation(
-                const <String>['Hello, Brave New World!'],
-                // TODO(ahe): Shouldn't throw.
-                compileUpdatesShouldThrow: true),
+            'Hello, Brave New World!',
         ]),
 ];
 
 void main() {
   listener.start();
 
   document.head.append(lineNumberStyle());
 
   summary = new SpanElement();
   document.body.append(new HeadingElement.h1()
@@ skipping 73 matching lines @@
               ? { 'main.dart': program.code }
               : program.code;
           Map<Uri, Uri> uriMap = <Uri, Uri>{};
           for (String name in code.keys) {
             Uri uri = base.resolve('$name?v${version++}');
             inputProvider.cachedSources[uri] = new Future.value(code[name]);
             uriMap[base.resolve(name)] = uri;
           }
           Future future = test.incrementalCompiler.compileUpdates(
               uriMap, logVerbose: logger, logTime: logger);
+          bool compileUpdatesThrew = false;
           future = future.catchError((error, trace) {
             String statusMessage;
             Future result;
+            compileUpdatesThrew = true;
             if (program.compileUpdatesShouldThrow &&
                 error is IncrementalCompilationFailed) {
               statusMessage = "Expected error in compileUpdates.";
               result = null;
             } else {
               statusMessage = "Unexpected error in compileUpdates.";
               result = new Future.error(error, trace);
             }
             status.append(new HeadingElement.h3()..appendText(statusMessage));
             return result;
           });
           return future.then((String update) {
             if (program.compileUpdatesShouldThrow) {
-              Expect.isNull(update);
+              Expect.isTrue(
+                  compileUpdatesThrew,
+                  "Expected an exception in compileUpdates");
+              Expect.isNull( update, "Expected update == null");
               return null;
             }
             print({'update': update});
             iframe.contentWindow.postMessage(['apply-update', update], '*');
 
             return listener.expect(
                 program.messagesWith('iframe-dart-updated-main-done'))
                 .then((_) {
+                  // TODO(ahe): Enable SerializeScopeTestCase for multiple
+                  // parts.
+                  if (program.code is! String) return null;
                   return new SerializeScopeTestCase(
                       program.code, test.incrementalCompiler.mainApp,
                       test.incrementalCompiler.compiler).run();
                 });
           });
         });
       });
     });
   }).then((_) {
     status.style.color = 'limegreen';
@@ skipping 101 matching lines @@
   position: absolute;
   left: 0px;
   width: 3em;
   text-align: right;
   background-color: lightgoldenrodyellow;
 }
 ''');
   style.type = 'text/css';
   return style;
 }