Replace same() with equals() in TypeAssertions.

pkg/analyzer/test/utils.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 analyzer.test.utils;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
@@ skipping 203 matching lines @@
   Asserter<DartType> get isDynamic => isType(_typeProvider.dynamicType);
 
   /**
    * Primitive assertion for the int type
    */
   Asserter<DartType> get isInt => isType(_typeProvider.intType);
 
   /**
    * Primitive assertion for the list type
    */
-  Asserter<DartType> get isList => sameElement(_typeProvider.listType);
+  Asserter<DartType> get isList => hasElementOf(_typeProvider.listType);
 
   /**
    * Primitive assertion for the map type
    */
-  Asserter<DartType> get isMap => sameElement(_typeProvider.mapType);
+  Asserter<DartType> get isMap => hasElementOf(_typeProvider.mapType);
 
   /**
    * Primitive assertion for the num type
    */
   Asserter<DartType> get isNum => isType(_typeProvider.numType);
 
   /**
    * Primitive assertion for the string type
    */
   Asserter<DartType> get isString => isType(_typeProvider.stringType);
 
   /**
-   * Given a type, produce an assertion that a type has the same element.
+   * Assert that a type has the element that is equal to the [expected].
    */
-  Asserter<DartType> hasElement(Element element) =>
-      (DartType type) => expect(element, same(type.element));
+  Asserter<DartType> hasElement(Element expected) =>
+      (DartType type) => expect(expected, type.element);
+
+  /**
+   * Assert that a type has the element that is equal to the element of the
+   * given [type].
+   */
+  Asserter<DartType> hasElementOf(DartType type) => hasElement(type.element);
 
   /**
    * Given assertions for the argument and return types, produce an
    *  assertion over unary function types.
    */
   Asserter<DartType> isFunction2Of(
           Asserter<DartType> argType, Asserter<DartType> returnType) =>
       (DartType type) {
         FunctionType fType = (type as FunctionType);
         argType(fType.normalParameterTypes[0]);
         returnType(fType.returnType);
       };
 
   /**
    * Given an assertion for the base type and assertions over the type
-   * parameters, produce an assertion over instantations.
+   * parameters, produce an assertion over instantiations.
    */
   AsserterBuilder<List<Asserter<DartType>>, DartType> isInstantiationOf(
           Asserter<DartType> baseAssert) =>
       (List<Asserter<DartType>> argAsserts) => (DartType type) {
             InterfaceType t = (type as InterfaceType);
             baseAssert(t);
             List<DartType> typeArguments = t.typeArguments;
             expect(typeArguments, hasLength(argAsserts.length));
             for (int i = 0; i < typeArguments.length; i++) {
               argAsserts[i](typeArguments[i]);
             }
           };
 
   /**
    * Assert that a type is the List type, and that the given assertion holds
    * over the type parameter.
    */
   Asserter<InterfaceType> isListOf(Asserter<DartType> argAssert) =>
       isInstantiationOf(isList)([argAssert]);
 
   /**
    * Assert that a type is the Map type, and that the given assertions hold
    * over the type parameters.
    */
   Asserter<InterfaceType> isMapOf(
           Asserter<DartType> argAssert0, Asserter<DartType> argAssert1) =>
       isInstantiationOf(isMap)([argAssert0, argAssert1]);
 
   /**
-   * Assert that one type is the same as another
+   * Assert that a type is equal to the [expected].
    */
-  Asserter<DartType> isType(DartType argument) => (DartType t) {
-        expect(t, same(argument));
+  Asserter<DartType> isType(DartType expected) => (DartType t) {
+        expect(t, expected);
       };
-
-  /**
-   * Given a type, produce an assertion that a type has the same element.
-   */
-  Asserter<DartType> sameElement(DartType elementType) =>
-      hasElement(elementType.element);
 }