Fixes #374. Change pattern for error messages
diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.dart b/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.dart
index b76f269..f8b0367 100644
--- a/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.dart
+++ b/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.dart
@@ -696,7 +696,7 @@
// something went wrong with the link
var error = gl.getProgramInfoLog (program);
- testFailed("Error in program linking:" + error);
+ testFailed("Error in program linking: $error");
gl.deleteProgram(program);
}
diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test.dart b/LayoutTests/fast/canvas/webgl/resources/webgl-test.dart
index f500a4f..ac2c3e5 100644
--- a/LayoutTests/fast/canvas/webgl/resources/webgl-test.dart
+++ b/LayoutTests/fast/canvas/webgl/resources/webgl-test.dart
@@ -184,7 +184,7 @@
if (!linked) {
// something went wrong with the link
var error = gl.getProgramInfoLog(prog);
- webglTestLog("Error in program linking:" + error);
+ webglTestLog("Error in program linking: $error");
gl.deleteProgram(prog);
for (i = 0; i < shaders.length; ++i)
diff --git a/LibTest/core/RangeError/checkNotNegative_A01_t02.dart b/LibTest/core/RangeError/checkNotNegative_A01_t02.dart
index 94a6f45..633b495 100644
--- a/LibTest/core/RangeError/checkNotNegative_A01_t02.dart
+++ b/LibTest/core/RangeError/checkNotNegative_A01_t02.dart
@@ -24,7 +24,7 @@
Expect.equals(0, e.start);
Expect.equals(null, e.end);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type: $e");
}
@@ -38,7 +38,7 @@
Expect.equals(0, e.start);
Expect.equals(null, e.end);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
@@ -51,7 +51,7 @@
Expect.equals(0, e.start);
Expect.equals(null, e.end);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidIndex_A01_t01.dart b/LibTest/core/RangeError/checkValidIndex_A01_t01.dart
index f1e6e67..c82c5df 100644
--- a/LibTest/core/RangeError/checkValidIndex_A01_t01.dart
+++ b/LibTest/core/RangeError/checkValidIndex_A01_t01.dart
@@ -25,7 +25,7 @@
Expect.equals(0, e.start);
Expect.equals(indexable.length - 1, e.end);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidIndex_A01_t02.dart b/LibTest/core/RangeError/checkValidIndex_A01_t02.dart
index 45d176d..e9d08ac 100644
--- a/LibTest/core/RangeError/checkValidIndex_A01_t02.dart
+++ b/LibTest/core/RangeError/checkValidIndex_A01_t02.dart
@@ -29,7 +29,7 @@
Expect.equals(0, e.start);
Expect.equals(indexable.length - 1, e.end);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidIndex_A01_t03.dart b/LibTest/core/RangeError/checkValidIndex_A01_t03.dart
index ea8c023..32eb0e0 100644
--- a/LibTest/core/RangeError/checkValidIndex_A01_t03.dart
+++ b/LibTest/core/RangeError/checkValidIndex_A01_t03.dart
@@ -33,7 +33,7 @@
Expect.equals(length - 1, e.end);
}
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidIndex_A01_t04.dart b/LibTest/core/RangeError/checkValidIndex_A01_t04.dart
index e3bea03..82ff0e9 100644
--- a/LibTest/core/RangeError/checkValidIndex_A01_t04.dart
+++ b/LibTest/core/RangeError/checkValidIndex_A01_t04.dart
@@ -37,7 +37,7 @@
Expect.equals(length - 1, e.end);
}
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidIndex_A02_t02.dart b/LibTest/core/RangeError/checkValidIndex_A02_t02.dart
index 578bd6b..b7b193e 100644
--- a/LibTest/core/RangeError/checkValidIndex_A02_t02.dart
+++ b/LibTest/core/RangeError/checkValidIndex_A02_t02.dart
@@ -30,7 +30,7 @@
Expect.equals(0, e.start);
Expect.equals(indexable.length - 1, e.end);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidRange_A01_t01.dart b/LibTest/core/RangeError/checkValidRange_A01_t01.dart
index 1d16d8c..1dea4c4 100644
--- a/LibTest/core/RangeError/checkValidRange_A01_t01.dart
+++ b/LibTest/core/RangeError/checkValidRange_A01_t01.dart
@@ -34,7 +34,7 @@
Expect.equals(end, e.invalidValue);
}
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidRange_A02_t01.dart b/LibTest/core/RangeError/checkValidRange_A02_t01.dart
index 50db26c..d487f6b 100644
--- a/LibTest/core/RangeError/checkValidRange_A02_t01.dart
+++ b/LibTest/core/RangeError/checkValidRange_A02_t01.dart
@@ -26,7 +26,7 @@
Expect.equals("end", e.name);
}
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidRange_A03_t01.dart b/LibTest/core/RangeError/checkValidRange_A03_t01.dart
index 79678b9..90f2800 100644
--- a/LibTest/core/RangeError/checkValidRange_A03_t01.dart
+++ b/LibTest/core/RangeError/checkValidRange_A03_t01.dart
@@ -39,7 +39,7 @@
Expect.equals("Invalid value", e.message);
}
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidRange_A04_t01.dart b/LibTest/core/RangeError/checkValidRange_A04_t01.dart
index 35b8508..8731ca9 100644
--- a/LibTest/core/RangeError/checkValidRange_A04_t01.dart
+++ b/LibTest/core/RangeError/checkValidRange_A04_t01.dart
@@ -23,7 +23,7 @@
Expect.equals(length, e.end);
Expect.equals(start, e.invalidValue);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValidRange_A05_t01.dart b/LibTest/core/RangeError/checkValidRange_A05_t01.dart
index fbc3274..272ef20 100644
--- a/LibTest/core/RangeError/checkValidRange_A05_t01.dart
+++ b/LibTest/core/RangeError/checkValidRange_A05_t01.dart
@@ -25,7 +25,7 @@
Expect.equals(length, e.end);
Expect.equals(start, e.invalidValue);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValueInInterval_A01_t01.dart b/LibTest/core/RangeError/checkValueInInterval_A01_t01.dart
index 5f4da5a..1255ca6 100644
--- a/LibTest/core/RangeError/checkValueInInterval_A01_t01.dart
+++ b/LibTest/core/RangeError/checkValueInInterval_A01_t01.dart
@@ -26,7 +26,7 @@
Expect.equals(null, e.name);
Expect.equals("Invalid value", e.message);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/core/RangeError/checkValueInInterval_A02_t01.dart b/LibTest/core/RangeError/checkValueInInterval_A02_t01.dart
index 75a7742..2f58f0c 100644
--- a/LibTest/core/RangeError/checkValueInInterval_A02_t01.dart
+++ b/LibTest/core/RangeError/checkValueInInterval_A02_t01.dart
@@ -27,7 +27,7 @@
Expect.equals(name, e.name);
Expect.equals(message == null ? "Invalid value" : message, e.message);
} catch (e) {
- Expect.fail("Wrong exception type " + e);
+ Expect.fail("Wrong exception type $e");
}
}
diff --git a/LibTest/io/IOSink/done_A01_t01.dart b/LibTest/io/IOSink/done_A01_t01.dart
index e827d96..52869e1 100644
--- a/LibTest/io/IOSink/done_A01_t01.dart
+++ b/LibTest/io/IOSink/done_A01_t01.dart
@@ -22,7 +22,7 @@
sink.done.then((addresses) {
Expect.isTrue(controller.isClosed);
isDone++;
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
await controller.close();
Expect.equals(1, isDone);
diff --git a/LibTest/io/InternetAddress/host_A01_t01.dart b/LibTest/io/InternetAddress/host_A01_t01.dart
index 6c4c762..daf5664 100644
--- a/LibTest/io/InternetAddress/host_A01_t01.dart
+++ b/LibTest/io/InternetAddress/host_A01_t01.dart
@@ -21,5 +21,5 @@
addresses.forEach((InternetAddress addr) {
Expect.equals("localhost", addr.host);
});
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
diff --git a/LibTest/io/InternetAddress/isLoopBack_A01_t05.dart b/LibTest/io/InternetAddress/isLoopBack_A01_t05.dart
index 8685eb3..849cc0b 100644
--- a/LibTest/io/InternetAddress/isLoopBack_A01_t05.dart
+++ b/LibTest/io/InternetAddress/isLoopBack_A01_t05.dart
@@ -22,5 +22,5 @@
addresses.forEach((InternetAddress addr) {
Expect.isTrue(addr.isLoopback);
});
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
\ No newline at end of file
diff --git a/LibTest/io/InternetAddress/lookup_A01_t01.dart b/LibTest/io/InternetAddress/lookup_A01_t01.dart
index cd297a1..33f2065 100644
--- a/LibTest/io/InternetAddress/lookup_A01_t01.dart
+++ b/LibTest/io/InternetAddress/lookup_A01_t01.dart
@@ -22,7 +22,7 @@
addresses.forEach((InternetAddress addr) {
Expect.equals(name, addr.host);
});
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
main() {
diff --git a/LibTest/io/InternetAddress/lookup_A02_t01.dart b/LibTest/io/InternetAddress/lookup_A02_t01.dart
index 3dcb808..12f6a47 100644
--- a/LibTest/io/InternetAddress/lookup_A02_t01.dart
+++ b/LibTest/io/InternetAddress/lookup_A02_t01.dart
@@ -34,5 +34,5 @@
});
Expect.isTrue(contains6);
Expect.isTrue(contains4);
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
diff --git a/LibTest/io/InternetAddress/lookup_A02_t02.dart b/LibTest/io/InternetAddress/lookup_A02_t02.dart
index 3a6b0fd..4943ebc 100644
--- a/LibTest/io/InternetAddress/lookup_A02_t02.dart
+++ b/LibTest/io/InternetAddress/lookup_A02_t02.dart
@@ -35,7 +35,7 @@
"Address string does not correspond its type");
}
});
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
main() {
diff --git a/LibTest/io/InternetAddress/lookup_A03_t01.dart b/LibTest/io/InternetAddress/lookup_A03_t01.dart
index c8cd96e..836b3af 100644
--- a/LibTest/io/InternetAddress/lookup_A03_t01.dart
+++ b/LibTest/io/InternetAddress/lookup_A03_t01.dart
@@ -28,5 +28,5 @@
Expect.isTrue(ipv6.hasMatch(addr.address),
"Address string does not correspond its type");
});
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
diff --git a/LibTest/io/InternetAddress/lookup_A03_t02.dart b/LibTest/io/InternetAddress/lookup_A03_t02.dart
index e68b671..1f3d488 100644
--- a/LibTest/io/InternetAddress/lookup_A03_t02.dart
+++ b/LibTest/io/InternetAddress/lookup_A03_t02.dart
@@ -25,5 +25,5 @@
addresses.forEach((InternetAddress addr) {
Expect.equals(InternetAddressType.IPv6, addr.type);
});
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
diff --git a/LibTest/io/InternetAddress/lookup_A03_t03.dart b/LibTest/io/InternetAddress/lookup_A03_t03.dart
index 09130c9..2de9ca8 100644
--- a/LibTest/io/InternetAddress/lookup_A03_t03.dart
+++ b/LibTest/io/InternetAddress/lookup_A03_t03.dart
@@ -28,7 +28,7 @@
Expect.isTrue(ipv4.hasMatch(addr.address),
"Address string does not correspond its type");
});
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
main() {
diff --git a/LibTest/io/InternetAddress/lookup_A03_t04.dart b/LibTest/io/InternetAddress/lookup_A03_t04.dart
index 5727188..0ef2fbf 100644
--- a/LibTest/io/InternetAddress/lookup_A03_t04.dart
+++ b/LibTest/io/InternetAddress/lookup_A03_t04.dart
@@ -25,7 +25,7 @@
addresses.forEach((InternetAddress addr) {
Expect.equals(InternetAddressType.IPv4, addr.type);
});
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
main() {
diff --git a/LibTest/io/InternetAddress/reverse_A01_t01.dart b/LibTest/io/InternetAddress/reverse_A01_t01.dart
index 09898e7..c154a6a 100644
--- a/LibTest/io/InternetAddress/reverse_A01_t01.dart
+++ b/LibTest/io/InternetAddress/reverse_A01_t01.dart
@@ -22,7 +22,7 @@
Expect.equals(address.address, host.address);
Expect.equals(address.type, host.type);
Expect.equals(Platform.localHostname, host.host);
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
main() {
@@ -31,5 +31,5 @@
addresses.forEach((InternetAddress addr) {
check(addr);
});
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
}
diff --git a/LibTest/io/Stdout/done_A01_t01.dart b/LibTest/io/Stdout/done_A01_t01.dart
index a18393c..2022d09 100644
--- a/LibTest/io/Stdout/done_A01_t01.dart
+++ b/LibTest/io/Stdout/done_A01_t01.dart
@@ -18,7 +18,7 @@
sink.done.then((addresses) {
isDone++;
- }, onError: (e) { Expect.fail("Unexpected error appeared: " + e); });
+ }, onError: (e) { Expect.fail("Unexpected error appeared: $e"); });
Expect.equals(0, isDone);
await sink.close();
