Replace ${name} with $name where possible.

pkg/analyzer/test/generated/test_support.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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.test_support;
 
 import 'dart:collection';
@@ skipping 61 matching lines @@
    * @param getterName the name of the getter to be returned
    * @return the property accessor element representing the getter with the given name
    */
   PropertyAccessorElement getGetter(InterfaceType type, String getterName) {
     for (PropertyAccessorElement accessor in type.element.accessors) {
       if (accessor.isGetter && accessor.name == getterName) {
         return accessor;
       }
     }
     JUnitTestCase.fail(
-        "Could not find getter named ${getterName} in ${type.displayName}");
+        "Could not find getter named $getterName in ${type.displayName}");
     return null;
   }
 
   /**
    * Return the method in the given type with the given name. Inherited methods are ignored.
    *
    * @param type the type in which the method is declared
    * @param methodName the name of the method to be returned
    * @return the method element representing the method with the given name
    */
   MethodElement getMethod(InterfaceType type, String methodName) {
     for (MethodElement method in type.element.methods) {
       if (method.name == methodName) {
         return method;
       }
     }
     JUnitTestCase.fail(
-        "Could not find method named ${methodName} in ${type.displayName}");
+        "Could not find method named $methodName in ${type.displayName}");
     return null;
   }
 
   /**
    * Assert that the tokens in the actual stream of tokens have the same types and lexemes as the
    * tokens in the expected stream of tokens. Note that this does not assert anything about the
    * offsets of the tokens (although the lengths will be equal).
    *
    * @param expectedStream the head of the stream of tokens that were expected
    * @param actualStream the head of the stream of tokens that were actually found
@@ skipping 13 matching lines @@
    * Assert that the given collection is non-`null` and has the expected number of elements.
    *
    * @param expectedSize the expected number of elements
    * @param c the collection being tested
    * @throws AssertionFailedError if the list is `null` or does not have the expected number
    *           of elements
    */
   static void assertCollectionSize(int expectedSize, Iterable c) {
     if (c == null) {
       JUnitTestCase.fail(
-          "Expected collection of size ${expectedSize}; found null");
+          "Expected collection of size $expectedSize; found null");
     } else if (c.length != expectedSize) {
       JUnitTestCase.fail(
-          "Expected collection of size ${expectedSize}; contained ${c.length} elements");
+          "Expected collection of size $expectedSize; contained ${c.length} elements");
     }
   }
 
   /**
    * Assert that the given array is non-`null` and contains the expected elements. The
    * elements can appear in any order.
    *
    * @param array the array being tested
    * @param expectedElements the expected elements
    * @throws AssertionFailedError if the array is `null` or does not contain the expected
    *           elements
    */
   static void assertContains(List<Object> array,
       List<Object> expectedElements) {
     int expectedSize = expectedElements.length;
     if (array == null) {
       JUnitTestCase.fail(
-          "Expected array of length ${expectedSize}; found null");
+          "Expected array of length $expectedSize; found null");
     }
     if (array.length != expectedSize) {
       JUnitTestCase.fail(
-          "Expected array of length ${expectedSize}; contained ${array.length} elements");
+          "Expected array of length $expectedSize; contained ${array.length} elements");
     }
     List<bool> found = new List<bool>.filled(expectedSize, false);
     for (int i = 0; i < expectedSize; i++) {
       _privateAssertContains(array, found, expectedElements[i]);
     }
   }
 
   /**
    * Assert that a given String is equal to an expected value.
    *
    * @param expected the expected String value
    * @param actual the actual String value
    */
   static void assertEqualString(String expected, String actual) {
     if (actual == null || expected == null) {
       if (identical(actual, expected)) {
         return;
       }
       if (actual == null) {
         JUnitTestCase.assertTrueMsg(
-            "Content not as expected: is 'null' expected: ${expected}",
+            "Content not as expected: is 'null' expected: $expected",
             false);
       } else {
         JUnitTestCase.assertTrueMsg(
-            "Content not as expected: expected 'null' is: ${actual}",
+            "Content not as expected: expected 'null' is: $actual",
             false);
       }
     }
     int diffPos = _getDiffPos(expected, actual);
     if (diffPos != -1) {
       int diffAhead = math.max(0, diffPos - _PRINT_RANGE);
       int diffAfter = math.min(actual.length, diffPos + _PRINT_RANGE);
       String diffStr =
           "${actual.substring(diffAhead, diffPos)}^${actual.substring(diffPos, diffAfter)}";
       // use detailed message
       String message =
-          "Content not as expected: is\n${actual}\nDiffers at pos ${diffPos}: ${diffStr}\nexpected:\n${expected}";
+          "Content not as expected: is\n$actual\nDiffers at pos $diffPos: $diffStr\nexpected:\n$expected";
       JUnitTestCase.assertEqualsMsg(message, expected, actual);
     }
   }
 
   /**
    * Assert that the array of actual values contain exactly the same values as those in the array of
    * expected value, with the exception that the order of the elements is not required to be the
    * same.
    *
    * @param expectedValues the values that are expected to be found
@@ skipping 11 matching lines @@
     for (Object actualValue in actualValues) {
       bool wasExpected = false;
       for (int i = 0; i < expectedLength; i++) {
         if (!found[i] && expectedValues[i] == actualValue) {
           found[i] = true;
           wasExpected = true;
           break;
         }
       }
       if (!wasExpected) {
-        JUnitTestCase.fail("The actual value ${actualValue} was not expected");
+        JUnitTestCase.fail("The actual value $actualValue was not expected");
       }
     }
   }
 
   /**
    * Assert that the given array is non-`null` and has exactly expected elements.
    *
    * @param array the array being tested
    * @param expectedElements the expected elements
    * @throws AssertionFailedError if the array is `null` or does not have the expected
    *           elements
    */
   static void assertExactElementsInArray(List<Object> array,
       List<Object> expectedElements) {
     int expectedSize = expectedElements.length;
     if (array == null) {
-      JUnitTestCase.fail("Expected array of size ${expectedSize}; found null");
+      JUnitTestCase.fail("Expected array of size $expectedSize; found null");
     }
     if (array.length != expectedSize) {
       JUnitTestCase.fail(
-          "Expected array of size ${expectedSize}; contained ${array.length} elements");
+          "Expected array of size $expectedSize; contained ${array.length} elements");
     }
     for (int i = 0; i < expectedSize; i++) {
       Object element = array[i];
       Object expectedElement = expectedElements[i];
       if (element != expectedElement) {
         JUnitTestCase.fail(
-            "Expected ${expectedElement} at [${i}]; found ${element}");
+            "Expected $expectedElement at [$i]; found $element");
       }
     }
   }
 
   /**
    * Assert that the given list is non-`null` and has exactly expected elements.
    *
    * @param list the list being tested
    * @param expectedElements the expected elements
    * @throws AssertionFailedError if the list is `null` or does not have the expected elements
    */
   static void assertExactElementsInList(List list,
       List<Object> expectedElements) {
     int expectedSize = expectedElements.length;
     if (list == null) {
-      JUnitTestCase.fail("Expected list of size ${expectedSize}; found null");
+      JUnitTestCase.fail("Expected list of size $expectedSize; found null");
     }
     if (list.length != expectedSize) {
       JUnitTestCase.fail(
-          "Expected list of size ${expectedSize}; contained ${list.length} elements");
+          "Expected list of size $expectedSize; contained ${list.length} elements");
     }
     for (int i = 0; i < expectedSize; i++) {
       Object element = list[i];
       Object expectedElement = expectedElements[i];
       if (element != expectedElement) {
         JUnitTestCase.fail(
-            "Expected ${expectedElement} at [${i}]; found ${element}");
+            "Expected $expectedElement at [$i]; found $element");
       }
     }
   }
 
   /**
    * Assert that the given list is non-`null` and has exactly expected elements.
    *
    * @param set the list being tested
    * @param expectedElements the expected elements
    * @throws AssertionFailedError if the list is `null` or does not have the expected elements
    */
   static void assertExactElementsInSet(Set set, List<Object> expectedElements) {
     int expectedSize = expectedElements.length;
     if (set == null) {
-      JUnitTestCase.fail("Expected list of size ${expectedSize}; found null");
+      JUnitTestCase.fail("Expected list of size $expectedSize; found null");
     }
     if (set.length != expectedSize) {
       JUnitTestCase.fail(
-          "Expected list of size ${expectedSize}; contained ${set.length} elements");
+          "Expected list of size $expectedSize; contained ${set.length} elements");
     }
     for (int i = 0; i < expectedSize; i++) {
       Object expectedElement = expectedElements[i];
       if (!set.contains(expectedElement)) {
-        JUnitTestCase.fail("Expected ${expectedElement} in set${set}");
+        JUnitTestCase.fail("Expected $expectedElement in set$set");
       }
     }
   }
 
   /**
    * Assert that the given object is an instance of the expected class.
    *
    * @param expectedClass the class that the object is expected to be an instance of
    * @param object the object being tested
    * @return the object that was being tested
@@ skipping 12 matching lines @@
    * Assert that the given array is non-`null` and has the expected number of elements.
    *
    * @param expectedLength the expected number of elements
    * @param array the array being tested
    * @throws AssertionFailedError if the array is `null` or does not have the expected number
    *           of elements
    */
   static void assertLength(int expectedLength, List<Object> array) {
     if (array == null) {
       JUnitTestCase.fail(
-          "Expected array of length ${expectedLength}; found null");
+          "Expected array of length $expectedLength; found null");
     } else if (array.length != expectedLength) {
       JUnitTestCase.fail(
-          "Expected array of length ${expectedLength}; contained ${array.length} elements");
+          "Expected array of length $expectedLength; contained ${array.length} elements");
     }
   }
 
   /**
    * Assert that the actual token has the same type and lexeme as the expected token. Note that this
    * does not assert anything about the offsets of the tokens (although the lengths will be equal).
    *
    * @param expectedToken the token that was expected
    * @param actualToken the token that was found
    * @throws AssertionFailedError if the two tokens are not the same
@@ skipping 16 matching lines @@
   /**
    * Assert that the given list is non-`null` and has the expected number of elements.
    *
    * @param expectedSize the expected number of elements
    * @param list the list being tested
    * @throws AssertionFailedError if the list is `null` or does not have the expected number
    *           of elements
    */
   static void assertSizeOfList(int expectedSize, List list) {
     if (list == null) {
-      JUnitTestCase.fail("Expected list of size ${expectedSize}; found null");
+      JUnitTestCase.fail("Expected list of size $expectedSize; found null");
     } else if (list.length != expectedSize) {
       JUnitTestCase.fail(
-          "Expected list of size ${expectedSize}; contained ${list.length} elements");
+          "Expected list of size $expectedSize; contained ${list.length} elements");
     }
   }
 
   /**
    * Assert that the given map is non-`null` and has the expected number of elements.
    *
    * @param expectedSize the expected number of elements
    * @param map the map being tested
    * @throws AssertionFailedError if the map is `null` or does not have the expected number of
    *           elements
    */
   static void assertSizeOfMap(int expectedSize, Map map) {
     if (map == null) {
-      JUnitTestCase.fail("Expected map of size ${expectedSize}; found null");
+      JUnitTestCase.fail("Expected map of size $expectedSize; found null");
     } else if (map.length != expectedSize) {
       JUnitTestCase.fail(
-          "Expected map of size ${expectedSize}; contained ${map.length} elements");
+          "Expected map of size $expectedSize; contained ${map.length} elements");
     }
   }
 
   /**
    * Assert that the given set is non-`null` and has the expected number of elements.
    *
    * @param expectedSize the expected number of elements
    * @param set the set being tested
    * @throws AssertionFailedError if the set is `null` or does not have the expected number of
    *           elements
    */
   static void assertSizeOfSet(int expectedSize, Set set) {
     if (set == null) {
-      JUnitTestCase.fail("Expected set of size ${expectedSize}; found null");
+      JUnitTestCase.fail("Expected set of size $expectedSize; found null");
     } else if (set.length != expectedSize) {
       JUnitTestCase.fail(
-          "Expected set of size ${expectedSize}; contained ${set.length} elements");
+          "Expected set of size $expectedSize; contained ${set.length} elements");
     }
   }
 
   /**
    * @return the [AstNode] with requested type at offset of the "prefix".
    */
   static AstNode findNode(AstNode root, String code, String prefix,
       Predicate<AstNode> predicate) {
     int offset = code.indexOf(prefix);
     if (offset == -1) {
@@ skipping 39 matching lines @@
       JUnitTestCase.fail("Does not contain null");
     } else {
       for (int i = 0; i < array.length; i++) {
         if (!found[i]) {
           if (element == array[i]) {
             found[i] = true;
             return;
           }
         }
       }
-      JUnitTestCase.fail("Does not contain ${element}");
+      JUnitTestCase.fail("Does not contain $element");
     }
   }
 }
 
 /**
  * Instances of the class `GatheringErrorListener` implement an error listener that collects
  * all of the errors passed to it for later examination.
  */
 class GatheringErrorListener implements AnalysisErrorListener {
   /**
@@ skipping 216 matching lines @@
     for (AnalysisError error in _errors) {
       if (error.errorCode.errorSeverity == ErrorSeverity.ERROR) {
         actualErrorCount++;
       } else {
         actualWarningCount++;
       }
     }
     if (expectedErrorCount != actualErrorCount ||
         expectedWarningCount != actualWarningCount) {
       JUnitTestCase.fail(
-          "Expected ${expectedErrorCount} errors and ${expectedWarningCount} warnings, found ${actualErrorCount} errors and ${actualWarningCount} warnings");
+          "Expected $expectedErrorCount errors and $expectedWarningCount warnings, found $actualErrorCount errors and $actualWarningCount warnings");
     }
   }
 
   /**
    * Assert that no errors have been gathered.
    *
    * @throws AssertionFailedError if any errors have been gathered
    */
   void assertNoErrors() {
     assertErrors(_NO_ERRORS);
@@ skipping 266 matching lines @@
   void getContentsToReceiver(Source_ContentReceiver receiver) {
     throw new UnsupportedOperationException();
   }
   Source resolve(String uri) {
     throw new UnsupportedOperationException();
   }
   Uri resolveRelativeUri(Uri uri) {
     return new Uri(scheme: 'file', path: _name).resolveUri(uri);
   }
 }