fix #470, string interpolation now respects Dart toString

test/codegen/expect/expect.js

 dart_library.library('expect', null, /* Imports */[
   'dart_sdk'
 ], function(exports, dart_sdk) {
   'use strict';
   const core = dart_sdk.core;
   const dart = dart_sdk.dart;
   const dartx = dart_sdk.dartx;
   const expect = Object.create(null);
   expect.Expect = class Expect extends core.Object {
     static _truncateString(string, start, end, length) {
@@ skipping 29 matching lines @@
         if (expected[dartx.codeUnitAt](i) != actual[dartx.codeUnitAt](i)) {
           let start = i;
           i++;
           while (i < dart.notNull(expected[dartx.length]) && i < dart.notNull(actual[dartx.length])) {
             if (expected[dartx.codeUnitAt](i) == actual[dartx.codeUnitAt](i)) break;
             i++;
           }
           let end = i;
           let truncExpected = expect.Expect._truncateString(expected, start, end, 20);
           let truncActual = expect.Expect._truncateString(actual, start, end, 20);
-          return `at index ${start}: Expected <${truncExpected}>, ` + `Found: <${truncActual}>`;
+          return dart.str`at index ${start}: Expected <${truncExpected}>, ` + dart.str`Found: <${truncActual}>`;
         }
       }
       return null;
     }
     static equals(expected, actual, reason) {
       if (reason === void 0) reason = null;
       if (dart.equals(expected, actual)) return;
       let msg = expect.Expect._getMessage(reason);
       if (typeof expected == 'string' && typeof actual == 'string') {
         let stringDifference = expect.Expect._stringDifference(expected, actual);
         if (stringDifference != null) {
-          expect.Expect._fail(`Expect.equals(${stringDifference}${msg}) fails.`);
+          expect.Expect._fail(dart.str`Expect.equals(${stringDifference}${msg}) fails.`);
         }
       }
-      expect.Expect._fail(`Expect.equals(expected: <${expected}>, actual: <${actual}>${msg}) fails.`);
+      expect.Expect._fail(dart.str`Expect.equals(expected: <${expected}>, actual: <${actual}>${msg}) fails.`);
     }
     static isTrue(actual, reason) {
       if (reason === void 0) reason = null;
       if (dart.notNull(expect._identical(actual, true))) return;
       let msg = expect.Expect._getMessage(reason);
-      expect.Expect._fail(`Expect.isTrue(${actual}${msg}) fails.`);
+      expect.Expect._fail(dart.str`Expect.isTrue(${actual}${msg}) fails.`);
     }
     static isFalse(actual, reason) {
       if (reason === void 0) reason = null;
       if (dart.notNull(expect._identical(actual, false))) return;
       let msg = expect.Expect._getMessage(reason);
-      expect.Expect._fail(`Expect.isFalse(${actual}${msg}) fails.`);
+      expect.Expect._fail(dart.str`Expect.isFalse(${actual}${msg}) fails.`);
     }
     static isNull(actual, reason) {
       if (reason === void 0) reason = null;
       if (null == actual) return;
       let msg = expect.Expect._getMessage(reason);
-      expect.Expect._fail(`Expect.isNull(actual: <${actual}>${msg}) fails.`);
+      expect.Expect._fail(dart.str`Expect.isNull(actual: <${actual}>${msg}) fails.`);
     }
     static isNotNull(actual, reason) {
       if (reason === void 0) reason = null;
       if (null != actual) return;
       let msg = expect.Expect._getMessage(reason);
-      expect.Expect._fail(`Expect.isNotNull(actual: <${actual}>${msg}) fails.`);
+      expect.Expect._fail(dart.str`Expect.isNotNull(actual: <${actual}>${msg}) fails.`);
     }
     static identical(expected, actual, reason) {
       if (reason === void 0) reason = null;
       if (dart.notNull(expect._identical(expected, actual))) return;
       let msg = expect.Expect._getMessage(reason);
-      expect.Expect._fail(`Expect.identical(expected: <${expected}>, actual: <${actual}>${msg}) ` + "fails.");
+      expect.Expect._fail(dart.str`Expect.identical(expected: <${expected}>, actual: <${actual}>${msg}) ` + "fails.");
     }
     static fail(msg) {
-      expect.Expect._fail(`Expect.fail('${msg}')`);
+      expect.Expect._fail(dart.str`Expect.fail('${msg}')`);
     }
     static approxEquals(expected, actual, tolerance, reason) {
       if (tolerance === void 0) tolerance = null;
       if (reason === void 0) reason = null;
       if (tolerance == null) {
         tolerance = (dart.notNull(expected) / 10000.0)[dartx.abs]();
       }
       if (dart.notNull((dart.notNull(expected) - dart.notNull(actual))[dartx.abs]()) <= dart.notNull(tolerance)) return;
       let msg = expect.Expect._getMessage(reason);
-      expect.Expect._fail(`Expect.approxEquals(expected:<${expected}>, actual:<${actual}>, ` + `tolerance:<${tolerance}>${msg}) fails`);
+      expect.Expect._fail(dart.str`Expect.approxEquals(expected:<${expected}>, actual:<${actual}>, ` + dart.str`tolerance:<${tolerance}>${msg}) fails`);
     }
     static notEquals(unexpected, actual, reason) {
       if (reason === void 0) reason = null;
       if (!dart.equals(unexpected, actual)) return;
       let msg = expect.Expect._getMessage(reason);
-      expect.Expect._fail(`Expect.notEquals(unexpected: <${unexpected}>, actual:<${actual}>${msg}) ` + "fails.");
+      expect.Expect._fail(dart.str`Expect.notEquals(unexpected: <${unexpected}>, actual:<${actual}>${msg}) ` + "fails.");
     }
     static listEquals(expected, actual, reason) {
       if (reason === void 0) reason = null;
       let msg = expect.Expect._getMessage(reason);
       let n = dart.notNull(expected[dartx.length]) < dart.notNull(actual[dartx.length]) ? expected[dartx.length] : actual[dartx.length];
       for (let i = 0; i < dart.notNull(n); i++) {
         if (!dart.equals(expected[dartx.get](i), actual[dartx.get](i))) {
-          expect.Expect._fail(`Expect.listEquals(at index ${i}, ` + `expected: <${expected[dartx.get](i)}>, actual: <${actual[dartx.get](i)}>${msg}) fails`);
+          expect.Expect._fail(dart.str`Expect.listEquals(at index ${i}, ` + dart.str`expected: <${expected[dartx.get](i)}>, actual: <${actual[dartx.get](i)}>${msg}) fails`);
         }
       }
       if (expected[dartx.length] != actual[dartx.length]) {
-        expect.Expect._fail('Expect.listEquals(list length, ' + `expected: <${expected[dartx.length]}>, actual: <${actual[dartx.length]}>${msg}) ` + 'fails: Next element <' + `${dart.notNull(expected[dartx.length]) > dart.notNull(n) ? expected[dartx.get](n) : actual[dartx.get](n)}>`);
+        expect.Expect._fail('Expect.listEquals(list length, ' + dart.str`expected: <${expected[dartx.length]}>, actual: <${actual[dartx.length]}>${msg}) ` + 'fails: Next element <' + dart.str`${dart.notNull(expected[dartx.length]) > dart.notNull(n) ? expected[dartx.get](n) : actual[dartx.get](n)}>`);
       }
     }
     static mapEquals(expected, actual, reason) {
       if (reason === void 0) reason = null;
       let msg = expect.Expect._getMessage(reason);
       for (let key of expected[dartx.keys]) {
         if (!dart.notNull(actual[dartx.containsKey](key))) {
-          expect.Expect._fail(`Expect.mapEquals(missing expected key: <${key}>${msg}) fails`);
+          expect.Expect._fail(dart.str`Expect.mapEquals(missing expected key: <${key}>${msg}) fails`);
         }
         expect.Expect.equals(expected[dartx.get](key), actual[dartx.get](key));
       }
       for (let key of actual[dartx.keys]) {
         if (!dart.notNull(expected[dartx.containsKey](key))) {
-          expect.Expect._fail(`Expect.mapEquals(unexpected key: <${key}>${msg}) fails`);
+          expect.Expect._fail(dart.str`Expect.mapEquals(unexpected key: <${key}>${msg}) fails`);
         }
       }
     }
     static stringEquals(expected, actual, reason) {
       if (reason === void 0) reason = null;
       if (expected == actual) return;
       let msg = expect.Expect._getMessage(reason);
-      let defaultMessage = `Expect.stringEquals(expected: <${expected}>", <${actual}>${msg}) fails`;
+      let defaultMessage = dart.str`Expect.stringEquals(expected: <${expected}>", <${actual}>${msg}) fails`;
       if (expected == null || actual == null) {
-        expect.Expect._fail(`${defaultMessage}`);
+        expect.Expect._fail(dart.str`${defaultMessage}`);
       }
       let left = 0;
       let right = 0;
       let eLen = expected[dartx.length];
       let aLen = actual[dartx.length];
       while (true) {
         if (left == eLen || left == aLen || expected[dartx.get](left) != actual[dartx.get](left)) {
           break;
         }
         left++;
@@ skipping 14 matching lines @@
       if (dart.notNull(eSnippet[dartx.length]) > 43) {
         eSnippet = dart.notNull(eSnippet[dartx.substring](0, 20)) + "..." + dart.notNull(eSnippet[dartx.substring](dart.notNull(eSnippet[dartx.length]) - 20));
       }
       if (dart.notNull(aSnippet[dartx.length]) > 43) {
         aSnippet = dart.notNull(aSnippet[dartx.substring](0, 20)) + "..." + dart.notNull(aSnippet[dartx.substring](dart.notNull(aSnippet[dartx.length]) - 20));
       }
       let leftLead = "...";
       let rightTail = "...";
       if (left <= 10) leftLead = "";
       if (right <= 10) rightTail = "";
-      let diff = `\nDiff (${left}..${dart.notNull(eLen) - right}/${dart.notNull(aLen) - right}):\n` + `${leftLead}${leftSnippet}[ ${eSnippet} ]${rightSnippet}${rightTail}\n` + `${leftLead}${leftSnippet}[ ${aSnippet} ]${rightSnippet}${rightTail}`;
-      expect.Expect._fail(`${defaultMessage}${diff}`);
+      let diff = dart.str`\nDiff (${left}..${dart.notNull(eLen) - right}/${dart.notNull(aLen) - right}):\n` + dart.str`${leftLead}${leftSnippet}[ ${eSnippet} ]${rightSnippet}${rightTail}\n` + dart.str`${leftLead}${leftSnippet}[ ${aSnippet} ]${rightSnippet}${rightTail}`;
+      expect.Expect._fail(dart.str`${defaultMessage}${diff}`);
     }
     static setEquals(expected, actual, reason) {
       if (reason === void 0) reason = null;
       let missingSet = core.Set.from(expected);
       missingSet.removeAll(actual);
       let extraSet = core.Set.from(actual);
       extraSet.removeAll(expected);
       if (dart.notNull(extraSet.isEmpty) && dart.notNull(missingSet.isEmpty)) return;
       let msg = expect.Expect._getMessage(reason);
-      let sb = new core.StringBuffer(`Expect.setEquals(${msg}) fails`);
+      let sb = new core.StringBuffer(dart.str`Expect.setEquals(${msg}) fails`);
       if (!dart.notNull(missingSet.isEmpty)) {
         sb.write('\nExpected collection does not contain: ');
       }
       for (let val of missingSet) {
-        sb.write(`${val} `);
+        sb.write(dart.str`${val} `);
       }
       if (!dart.notNull(extraSet.isEmpty)) {
         sb.write('\nExpected collection should not contain: ');
       }
       for (let val of extraSet) {
-        sb.write(`${val} `);
+        sb.write(dart.str`${val} `);
       }
       expect.Expect._fail(sb.toString());
     }
     static throws(f, check, reason) {
       if (check === void 0) check = null;
       if (reason === void 0) reason = null;
-      let msg = reason == null ? "" : `(${reason})`;
+      let msg = reason == null ? "" : dart.str`(${reason})`;
       if (!dart.is(f, expect._Nullary)) {
-        expect.Expect._fail(`Expect.throws${msg}: Function f not callable with zero arguments`);
+        expect.Expect._fail(dart.str`Expect.throws${msg}: Function f not callable with zero arguments`);
       }
       try {
         f();
       } catch (e) {
         let s = dart.stackTrace(e);
         if (check != null) {
           if (!dart.notNull(dart.dcall(check, e))) {
-            expect.Expect._fail(`Expect.throws${msg}: Unexpected '${e}'\n${s}`);
+            expect.Expect._fail(dart.str`Expect.throws${msg}: Unexpected '${e}'\n${s}`);
           }
         }
         return;
       }
 
-      expect.Expect._fail(`Expect.throws${msg} fails: Did not throw`);
+      expect.Expect._fail(dart.str`Expect.throws${msg} fails: Did not throw`);
     }
     static _getMessage(reason) {
-      return reason == null ? "" : `, '${reason}'`;
+      return reason == null ? "" : dart.str`, '${reason}'`;
     }
     static _fail(message) {
       dart.throw(new expect.ExpectException(message));
     }
   };
   dart.setSignature(expect.Expect, {
     statics: () => ({
       _truncateString: [core.String, [core.String, core.int, core.int, core.int]],
       _stringDifference: [core.String, [core.String, core.String]],
       equals: [dart.void, [dart.dynamic, dart.dynamic], [core.String]],
@@ skipping 50 matching lines @@
   expect.AssumeDynamic = class AssumeDynamic extends core.Object {
     new() {
     }
   };
   dart.setSignature(expect.AssumeDynamic, {
     constructors: () => ({new: [expect.AssumeDynamic, []]})
   });
   // Exports:
   exports.expect = expect;
 });