Update charted to 0.4.8 and roll

packages/string_scanner/test/string_scanner_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 string_scanner.string_scanner_test;
-
+import 'package:charcode/charcode.dart';
 import 'package:string_scanner/string_scanner.dart';
 import 'package:test/test.dart';
 
 void main() {
   group('with an empty string', () {
     var scanner;
     setUp(() {
       scanner = new StringScanner('');
     });
 
@@ skipping 19 matching lines @@
       expect(scanner.lastMatch, isNull);
       expect(scanner.position, equals(0));
     });
 
     test("peekChar returns null and doesn't change the state", () {
       expect(scanner.peekChar(), isNull);
       expect(scanner.lastMatch, isNull);
       expect(scanner.position, equals(0));
     });
 
+    test("scanChar returns false and doesn't change the state", () {
+      expect(scanner.scanChar($f), isFalse);
+      expect(scanner.lastMatch, isNull);
+      expect(scanner.position, equals(0));
+    });
+
+    test("expectChar fails and doesn't change the state", () {
+      expect(() => scanner.expectChar($f), throwsFormatException);
+      expect(scanner.lastMatch, isNull);
+      expect(scanner.position, equals(0));
+    });
+
     test("scan returns false and doesn't change the state", () {
       expect(scanner.scan(new RegExp('.')), isFalse);
       expect(scanner.lastMatch, isNull);
       expect(scanner.position, equals(0));
     });
 
     test("expect throws a FormatException and doesn't change the state", () {
       expect(() => scanner.expect(new RegExp('.')), throwsFormatException);
       expect(scanner.lastMatch, isNull);
       expect(scanner.position, equals(0));
@@ skipping 56 matching lines @@
       expect(scanner.lastMatch, isNull);
       expect(scanner.position, equals(0));
     });
 
     test('peekChar with an argument returns the nth character', () {
       expect(scanner.peekChar(4), equals(0x62));
       expect(scanner.lastMatch, isNull);
       expect(scanner.position, equals(0));
     });
 
+    test("a matching scanChar returns true moves forward", () {
+      expect(scanner.scanChar($f), isTrue);
+      expect(scanner.lastMatch, isNull);
+      expect(scanner.position, equals(1));
+    });
+
+    test("a non-matching scanChar returns false and does nothing", () {
+      expect(scanner.scanChar($x), isFalse);
+      expect(scanner.lastMatch, isNull);
+      expect(scanner.position, equals(0));
+    });
+
+    test("a matching expectChar moves forward", () {
+      scanner.expectChar($f);
+      expect(scanner.lastMatch, isNull);
+      expect(scanner.position, equals(1));
+    });
+
+    test("a non-matching expectChar fails", () {
+      expect(() => scanner.expectChar($x), throwsFormatException);
+      expect(scanner.lastMatch, isNull);
+      expect(scanner.position, equals(0));
+    });
+
     test("a matching scan returns true and changes the state", () {
       expect(scanner.scan(new RegExp('f(..)')), isTrue);
       expect(scanner.lastMatch[1], equals('oo'));
       expect(scanner.position, equals(3));
       expect(scanner.rest, equals(' bar'));
     });
 
     test("a non-matching scan returns false and sets lastMatch to null", () {
       expect(scanner.matches(new RegExp('f(..)')), isTrue);
       expect(scanner.lastMatch, isNotNull);
@@ skipping 87 matching lines @@
 
       expect(scanner.scan(new RegExp(' b(..)')), isTrue);
       expect(scanner.lastMatch[1], equals('ar'));
       expect(scanner.position, equals(7));
       expect(scanner.rest, equals(''));
       expect(scanner.isDone, isTrue);
       expect(scanner.expectDone, isNot(throwsFormatException));
     });
   });
 
+  group('after a scan', () {
+    var scanner;
+    setUp(() {
+      scanner = new StringScanner('foo bar');
+      expect(scanner.scan('foo'), isTrue);
+    });
+
+    test('readChar returns the first character and unsets the last match', () {
+      expect(scanner.readChar(), equals($space));
+      expect(scanner.lastMatch, isNull);
+      expect(scanner.position, equals(4));
+    });
+
+    test('a matching scanChar returns true and unsets the last match', () {
+      expect(scanner.scanChar($space), isTrue);
+      expect(scanner.lastMatch, isNull);
+      expect(scanner.position, equals(4));
+    });
+
+    test('a matching expectChar returns true and unsets the last match', () {
+      scanner.expectChar($space);
+      expect(scanner.lastMatch, isNull);
+      expect(scanner.position, equals(4));
+    });
+  });
+
   group('at the end of a string', () {
     var scanner;
     setUp(() {
       scanner = new StringScanner('foo bar');
       expect(scanner.scan('foo bar'), isTrue);
     });
 
     test('is done', () {
       expect(scanner.isDone, isTrue);
       expect(scanner.expectDone, isNot(throwsFormatException));
@@ skipping 12 matching lines @@
       expect(scanner.lastMatch, isNotNull);
       expect(scanner.position, equals(7));
     });
 
     test("peekChar returns null and doesn't change the state", () {
       expect(scanner.peekChar(), isNull);
       expect(scanner.lastMatch, isNotNull);
       expect(scanner.position, equals(7));
     });
 
+    test("scanChar returns false and doesn't change the state", () {
+      expect(scanner.scanChar($f), isFalse);
+      expect(scanner.lastMatch, isNotNull);
+      expect(scanner.position, equals(7));
+    });
+
+    test("expectChar fails and doesn't change the state", () {
+      expect(() => scanner.expectChar($f), throwsFormatException);
+      expect(scanner.lastMatch, isNotNull);
+      expect(scanner.position, equals(7));
+    });
+
     test("scan returns false and sets lastMatch to null", () {
       expect(scanner.scan(new RegExp('.')), isFalse);
       expect(scanner.lastMatch, isNull);
       expect(scanner.position, equals(7));
     });
 
     test("expect throws a FormatException and sets lastMatch to null", () {
       expect(() => scanner.expect(new RegExp('.')), throwsFormatException);
       expect(scanner.lastMatch, isNull);
       expect(scanner.position, equals(7));
@@ skipping 21 matching lines @@
       scanner.position = 1;
       expect(scanner.position, equals(1));
       expect(scanner.rest, equals('oo bar'));
 
       expect(scanner.scan(new RegExp('oo.')), isTrue);
       expect(scanner.lastMatch[0], equals('oo '));
       expect(scanner.position, equals(4));
       expect(scanner.rest, equals('bar'));
     });
 
+    test('setting and resetting position clears lastMatch', () {
+      var oldPosition = scanner.position;
+      scanner.position = 1;
+      scanner.position = oldPosition;
+      expect(scanner.lastMatch, isNull);
+    });
+
     test('setting position beyond the string throws an ArgumentError', () {
       expect(() {
         scanner.position = 8;
       }, throwsArgumentError);
     });
 
     test('setting position to -1 throws an ArgumentError', () {
       expect(() {
         scanner.position = -1;
       }, throwsArgumentError);
@@ skipping 16 matching lines @@
       expect(() => new StringScanner('foo bar', position: -1),
           throwsArgumentError);
     });
 
     test('throws an ArgumentError if the position is beyond the string', () {
       expect(
           () => new StringScanner('foo bar', position: 8), throwsArgumentError);
     });
   });
 }