new TokenType and Keyword API

pkg/analyzer/test/generated/parser_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 analyzer.test.generated.parser_test;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_ast_factory.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
@@ skipping 10861 matching lines @@
     expect(clause.superclass, new isInstanceOf<TypeName>());
   }
 
   void test_parseFinalConstVarOrType_const_functionType() {
     createParser('const int Function(int) f');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     Token keyword = result.keyword;
     expect(keyword, isNotNull);
-    expect(keyword.type, TokenType.KEYWORD);
+    expect(keyword.type.isKeyword, true);
     expect(keyword.keyword, Keyword.CONST);
     expect(result.type, isNotNull);
   }
 
   void test_parseFinalConstVarOrType_const_namedType() {
     createParser('const A a');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     Token keyword = result.keyword;
     expect(keyword, isNotNull);
-    expect(keyword.type, TokenType.KEYWORD);
+    expect(keyword.type.isKeyword, true);
     expect(keyword.keyword, Keyword.CONST);
     expect(result.type, isNotNull);
   }
 
   void test_parseFinalConstVarOrType_const_noType() {
     createParser('const');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     Token keyword = result.keyword;
     expect(keyword, isNotNull);
-    expect(keyword.type, TokenType.KEYWORD);
+    expect(keyword.type.isKeyword, true);
     expect(keyword.keyword, Keyword.CONST);
     expect(result.type, isNull);
   }
 
   void test_parseFinalConstVarOrType_final_functionType() {
     createParser('final int Function(int) f');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     Token keyword = result.keyword;
     expect(keyword, isNotNull);
-    expect(keyword.type, TokenType.KEYWORD);
+    expect(keyword.type.isKeyword, true);
     expect(keyword.keyword, Keyword.FINAL);
     expect(result.type, isNotNull);
   }
 
   void test_parseFinalConstVarOrType_final_namedType() {
     createParser('final A a');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     Token keyword = result.keyword;
     expect(keyword, isNotNull);
-    expect(keyword.type, TokenType.KEYWORD);
+    expect(keyword.type.isKeyword, true);
     expect(keyword.keyword, Keyword.FINAL);
     expect(result.type, isNotNull);
   }
 
   void test_parseFinalConstVarOrType_final_noType() {
     createParser('final');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     Token keyword = result.keyword;
     expect(keyword, isNotNull);
-    expect(keyword.type, TokenType.KEYWORD);
+    expect(keyword.type.isKeyword, true);
     expect(keyword.keyword, Keyword.FINAL);
     expect(result.type, isNull);
   }
 
   void test_parseFinalConstVarOrType_final_prefixedType() {
     createParser('final p.A a');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     Token keyword = result.keyword;
     expect(keyword, isNotNull);
-    expect(keyword.type, TokenType.KEYWORD);
+    expect(keyword.type.isKeyword, true);
     expect(keyword.keyword, Keyword.FINAL);
     expect(result.type, isNotNull);
   }
 
   void test_parseFinalConstVarOrType_type_function() {
     createParser('int Function(int) f');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     expect(result.keyword, isNull);
@@ skipping 55 matching lines @@
     expect(result.type, isNotNull);
   }
 
   void test_parseFinalConstVarOrType_var() {
     createParser('var');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     Token keyword = result.keyword;
     expect(keyword, isNotNull);
-    expect(keyword.type, TokenType.KEYWORD);
+    expect(keyword.type.isKeyword, true);
     expect(keyword.keyword, Keyword.VAR);
     expect(result.type, isNull);
   }
 
   void test_parseFinalConstVarOrType_void() {
     createParser('void f()');
     FinalConstVarOrType result = parser.parseFinalConstVarOrType(false);
     expectNotNullIfNoErrors(result);
     listener.assertNoErrors();
     expect(result.keyword, isNull);
@@ skipping 3935 matching lines @@
     expectCommentText(typeVariable.documentationComment, '/// Doc');
   }
 
   /**
    * Assert that the given [name] is in declaration context.
    */
   void _assertIsDeclarationName(SimpleIdentifier name) {
     expect(name.inDeclarationContext(), isTrue);
   }
 }