Changes in polymer-expressions to prepare for codegen in polymer:

pkg/polymer_expressions/test/syntax_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.
 
 import 'dart:async';
 import 'dart:html';
 
-import 'package:logging/logging.dart';
 import 'package:observe/observe.dart';
 import 'package:observe/mirrors_used.dart'; // make test smaller.
 import 'package:polymer_expressions/polymer_expressions.dart';
 import 'package:template_binding/template_binding.dart';
 import 'package:unittest/html_config.dart';
 import 'package:unittest/unittest.dart';
 
 main() {
   useHtmlConfiguration();
 
@@ skipping 11 matching lines @@
 
     test('should make two-way bindings to inputs', () {
       testDiv.nodes.add(new Element.html('''
           <template id="test" bind>
             <input id="input" value="{{ firstName }}">
           </template>'''));
       var person = new Person('John', 'Messerly', ['A', 'B', 'C']);
       templateBind(query('#test'))
           ..bindingDelegate = new PolymerExpressions()
           ..model = person;
-      return new Future.delayed(new Duration()).then((_) {
+      return new Future(() {}).then((_) {
         InputElement input = query('#input');
         expect(input.value, 'John');
         input.focus();
         input.value = 'Justin';
         input.blur();
         var event = new Event('change');
         // TODO(justin): figure out how to trigger keyboard events to test
         // two-way bindings
       });
     });
 
     test('should handle null collections in "in" expressions', () {
       testDiv.nodes.add(new Element.html('''
           <template id="test" bind>
             <template repeat="{{ item in items }}">
               {{ item }}
             </template>
           </template>'''));
       templateBind(query('#test')).bindingDelegate =
           new PolymerExpressions(globals: {'items': null});
       // the template should be the only node
       expect(testDiv.nodes.length, 1);
       expect(testDiv.nodes[0].id, 'test');
     });
 
     test('should silently handle bad variable names', () {
-      var logger = new Logger('polymer_expressions');
-      var logFuture = logger.onRecord.toList();
-      testDiv.nodes.add(new Element.html('''
-          <template id="test" bind>{{ foo }}</template>'''));
-      templateBind(query('#test'))
-          ..bindingDelegate = new PolymerExpressions()
-          ..model = [];
-      return new Future(() {
-        logger.clearListeners();
-        return logFuture.then((records) {
-          expect(records.length, 1);
-          expect(records.first.message,
-              contains('Error evaluating expression'));
-          expect(records.first.message, contains('foo'));
-        });
+      var completer = new Completer();
+      runZoned(() {
+        testDiv.nodes.add(new Element.html('''
+            <template id="test" bind>{{ foo }}</template>'''));
+        templateBind(query('#test'))
+            ..bindingDelegate = new PolymerExpressions()
+            ..model = [];
+        return new Future(() {});
+      }, onError: (e, s) {
+        expect('$e', contains('foo'));
+        completer.complete(true);
       });
+      return completer.future;
     });
   });
 }
 
 @reflectable
 class Person extends ChangeNotifier {
   String _firstName;
   String _lastName;
   List<String> _items;
 
@@ skipping 14 matching lines @@
   String getFullName() => '$_firstName $_lastName';
 
   List<String> get items => _items;
 
   void set items(List<String> value) {
     _items = notifyPropertyChange(#items, _items, value);
   }
 
   String toString() => "Person(firstName: $_firstName, lastName: $_lastName)";
 }