merge to trunk all changes from 36817 until 37378 under the packages: polymer,

pkg/polymer_expressions/test/parser_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 parser_test;
 
 import 'package:polymer_expressions/parser.dart';
 import 'package:polymer_expressions/expression.dart';
 import 'package:unittest/unittest.dart';
 
 expectParse(String s, Expression e) =>
     expect(new Parser(s).parse(), e, reason: s);
 
+final Matcher throwsParseException =
+    throwsA(new isInstanceOf<ParseException>('ParseException'));
+
 main() {
 
   group('parser', () {
 
     test('should parse an empty expression', () {
       expectParse('', empty());
     });
 
     test('should parse an identifier', () {
       expectParse('abc', ident('abc'));
@@ skipping 23 matching lines @@
     test('should parse a positive double literal', () {
       expectParse('+1.23', literal(1.23));
     });
 
     test('should parse a negative double literal', () {
       expectParse('-1.23', literal(-1.23));
     });
 
     test('should parse binary operators', () {
       var operators = ['+', '-', '*', '/', '%', '^', '==', '!=', '>', '<',
-          '>=', '<=', '||', '&&', '&'];
+          '>=', '<=', '||', '&&', '&', '===', '!==', '|'];
       for (var op in operators) {
         expectParse('a $op b', binary(ident('a'), op, ident('b')));
         expectParse('1 $op 2', binary(literal(1), op, literal(2)));
         expectParse('this $op null', binary(ident('this'), op, literal(null)));
       }
     });
 
+    test('should thrown on unknown operators', () {
+      expect(() => parse('a ?? b'), throwsParseException);
+      expect(() => parse('a &&& b'), throwsParseException);
+      expect(() => parse('a ==== b'), throwsParseException);
+    });
+
     test('should give multiply higher associativity than plus', () {
       expectParse('a + b * c',
           binary(ident('a'), '+', binary(ident('b'), '*', ident('c'))));
       expectParse('a * b + c',
           binary(binary(ident('a'), '*', ident('b')), '+', ident('c')));
     });
 
     test('should parse a dot operator', () {
       expectParse('a.b', getter(ident('a'), 'b'));
     });
@@ skipping 73 matching lines @@
       expectParse('a[b] + c[d]', binary(
           index(ident('a'), ident('b')),
           '+',
           index(ident('c'), ident('d'))));
     });
 
     test('should parse ternary operators', () {
       expectParse('a ? b : c', ternary(ident('a'), ident('b'), ident('c')));
       expectParse('a.a ? b.a : c.a', ternary(getter(ident('a'), 'a'),
           getter(ident('b'), 'a'), getter(ident('c'), 'a')));
-      expect(() => parse('a + 1 ? b + 1 :: c.d + 3'), throws);
+      expect(() => parse('a + 1 ? b + 1 :: c.d + 3'), throwsParseException);
     });
 
     test('ternary operators have lowest associativity', () {
       expectParse('a == b ? c + d : e - f', ternary(
             binary(ident('a'), '==', ident('b')),
             binary(ident('c'), '+', ident('d')),
             binary(ident('e'), '-', ident('f'))));
 
       expectParse('a.x == b.y ? c + d : e - f', ternary(
             binary(getter(ident('a'), 'x'), '==', getter(ident('b'), 'y')),
@@ skipping 13 matching lines @@
 
     test('should parse "in" expression', () {
       expectParse('a in b', inExpr(ident('a'), ident('b')));
       expectParse('a in b.c',
           inExpr(ident('a'), getter(ident('b'), 'c')));
       expectParse('a in b + c',
           inExpr(ident('a'), binary(ident('b'), '+', ident('c'))));
     });
 
     test('should reject comprehension with non-assignable left expression', () {
-      expect(() => parse('a + 1 in b'), throwsException);
+      expect(() => parse('a + 1 in b'), throwsParseException);
     });
 
     test('should parse "as" expressions', () {
       expectParse('a as b', asExpr(ident('a'), ident('b')));
     });
 
     skip_test('should reject keywords as identifiers', () {
-      expect(() => parse('a.in'), throws);
-      expect(() => parse('a.as'), throws);
-      // TODO: re-enable when 'this' is a keyword
-//      expect(() => parse('a.this'), throws);
+      expect(() => parse('a.in'), throwsParseException);
+      expect(() => parse('a.as'), throwsParseException);
+      expect(() => parse('a.this'), throwsParseException);
     });
 
     test('should parse map literals', () {
       expectParse("{'a': 1}",
           mapLiteral([mapLiteralEntry(literal('a'), literal(1))]));
       expectParse("{'a': 1, 'b': 2 + 3}",
           mapLiteral([
               mapLiteralEntry(literal('a'), literal(1)),
               mapLiteralEntry(literal('b'),
                   binary(literal(2), '+', literal(3)))]));
@@ skipping 13 matching lines @@
 
     test('should parse list literals', () {
       expectParse('[1, "a", b]',
           listLiteral([literal(1), literal('a'), ident('b')]));
       expectParse('[[1, 2], [3, 4]]',
           listLiteral([listLiteral([literal(1), literal(2)]),
                        listLiteral([literal(3), literal(4)])]));
     });
   });
 }