Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/corelib/math_parse_double_test.dart

Issue 10825339: Fix issue 4456 (BadNumberFormatException -> FormatException). (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/compiler/implementation/lib/math.dartp ('k') | tests/corelib/math_test.dart » ('j') | tests/corelib/math_test.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/corelib/math_parse_double_test.dart
diff --git a/tests/corelib/math_parse_double_test.dart b/tests/corelib/math_parse_double_test.dart
index 51ecbf734031bffdf0379091b99db945d48f13df..5267714ab3e28b08a1a788e011ed51380429b825 100644
--- a/tests/corelib/math_parse_double_test.dart
+++ b/tests/corelib/math_parse_double_test.dart
@@ -2,120 +2,127 @@
// 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.
+// We temporarily test both the new math library and the old Math
+// class. This can easily be simplified once we get rid of the Math
+// class entirely.
+#import('dart:math', prefix: 'math');
-bool parseDoubleThrowsFormatException(str) {
- try {
- Math.parseDouble(str);
- return false;
- } catch (FormatException e) {
- return true;
- }
+double parseDouble(String string) {
+ num x = Math.parseDouble(string);
+ num y = math.parseDouble(string);
+ Expect.equals(x, y);
+ return x;
+}
+
+void parseDoubleThrowsFormatException(str) {
+ Expect.throws(() => Math.parseDouble(str), (e) => e is FormatException);
+ Expect.throws(() => math.parseDouble(str), (e) => e is FormatException);
}
void main() {
- Expect.equals(499.0, Math.parseDouble("499"));
- Expect.equals(499.0, Math.parseDouble("499.0"));
- Expect.equals(499.0, Math.parseDouble("499.0"));
- Expect.equals(499.0, Math.parseDouble("+499"));
- Expect.equals(-499.0, Math.parseDouble("-499"));
- Expect.equals(499.0, Math.parseDouble(" 499 "));
- Expect.equals(499.0, Math.parseDouble(" +499 "));
- Expect.equals(-499.0, Math.parseDouble(" -499 "));
- Expect.equals(0.0, Math.parseDouble("0"));
- Expect.equals(0.0, Math.parseDouble("+0"));
- Expect.equals(-0.0, Math.parseDouble("-0"));
- Expect.equals(true, Math.parseDouble("-0").isNegative());
- Expect.equals(0.0, Math.parseDouble(" 0 "));
- Expect.equals(0.0, Math.parseDouble(" +0 "));
- Expect.equals(-0.0, Math.parseDouble(" -0 "));
- Expect.equals(true, Math.parseDouble(" -0 ").isNegative());
- Expect.equals(1.0 * 0x1234567890, Math.parseDouble("0x1234567890"));
- Expect.equals(1.0 * -0x1234567890, Math.parseDouble("-0x1234567890"));
- Expect.equals(1.0 * 0x1234567890, Math.parseDouble(" 0x1234567890 "));
- Expect.equals(1.0 * -0x1234567890, Math.parseDouble(" -0x1234567890 "));
- Expect.equals(256.0, Math.parseDouble("0x100"));
- Expect.equals(-256.0, Math.parseDouble("-0x100"));
- Expect.equals(256.0, Math.parseDouble(" 0x100 "));
- Expect.equals(-256.0, Math.parseDouble(" -0x100 "));
- Expect.equals(1.0 * 0xabcdef, Math.parseDouble("0xabcdef"));
- Expect.equals(1.0 * 0xABCDEF, Math.parseDouble("0xABCDEF"));
- Expect.equals(1.0 * 0xabcdef, Math.parseDouble("0xabCDEf"));
- Expect.equals(1.0 * -0xabcdef, Math.parseDouble("-0xabcdef"));
- Expect.equals(1.0 * -0xABCDEF, Math.parseDouble("-0xABCDEF"));
- Expect.equals(1.0 * 0xabcdef, Math.parseDouble(" 0xabcdef "));
- Expect.equals(1.0 * 0xABCDEF, Math.parseDouble(" 0xABCDEF "));
- Expect.equals(1.0 * -0xabcdef, Math.parseDouble(" -0xabcdef "));
- Expect.equals(1.0 * -0xABCDEF, Math.parseDouble(" -0xABCDEF "));
- Expect.equals(1.0 * 0xabcdef, Math.parseDouble("0x00000abcdef"));
- Expect.equals(1.0 * 0xABCDEF, Math.parseDouble("0x00000ABCDEF"));
- Expect.equals(1.0 * -0xabcdef, Math.parseDouble("-0x00000abcdef"));
- Expect.equals(1.0 * -0xABCDEF, Math.parseDouble("-0x00000ABCDEF"));
- Expect.equals(1.0 * 0xabcdef, Math.parseDouble(" 0x00000abcdef "));
- Expect.equals(1.0 * 0xABCDEF, Math.parseDouble(" 0x00000ABCDEF "));
- Expect.equals(1.0 * -0xabcdef, Math.parseDouble(" -0x00000abcdef "));
- Expect.equals(1.0 * -0xABCDEF, Math.parseDouble(" -0x00000ABCDEF "));
- Expect.equals(10.0, Math.parseDouble("010"));
- Expect.equals(-10.0, Math.parseDouble("-010"));
- Expect.equals(10.0, Math.parseDouble(" 010 "));
- Expect.equals(-10.0, Math.parseDouble(" -010 "));
- Expect.equals(0.1, Math.parseDouble("0.1"));
- Expect.equals(0.1, Math.parseDouble(" 0.1 "));
- Expect.equals(0.1, Math.parseDouble(" +0.1 "));
- Expect.equals(-0.1, Math.parseDouble(" -0.1 "));
- Expect.equals(0.1, Math.parseDouble(".1"));
- Expect.equals(0.1, Math.parseDouble(" .1 "));
- Expect.equals(0.1, Math.parseDouble(" +.1 "));
- Expect.equals(-0.1, Math.parseDouble(" -.1 "));
- Expect.equals(1234567.89, Math.parseDouble("1234567.89"));
- Expect.equals(1234567.89, Math.parseDouble(" 1234567.89 "));
- Expect.equals(1234567.89, Math.parseDouble(" +1234567.89 "));
- Expect.equals(-1234567.89, Math.parseDouble(" -1234567.89 "));
- Expect.equals(1234567e89, Math.parseDouble("1234567e89"));
- Expect.equals(1234567e89, Math.parseDouble(" 1234567e89 "));
- Expect.equals(1234567e89, Math.parseDouble(" +1234567e89 "));
- Expect.equals(-1234567e89, Math.parseDouble(" -1234567e89 "));
- Expect.equals(1234567.89e2, Math.parseDouble("1234567.89e2"));
- Expect.equals(1234567.89e2, Math.parseDouble(" 1234567.89e2 "));
- Expect.equals(1234567.89e2, Math.parseDouble(" +1234567.89e2 "));
- Expect.equals(-1234567.89e2, Math.parseDouble(" -1234567.89e2 "));
- Expect.equals(1234567.89e2, Math.parseDouble("1234567.89E2"));
- Expect.equals(1234567.89e2, Math.parseDouble(" 1234567.89E2 "));
- Expect.equals(1234567.89e2, Math.parseDouble(" +1234567.89E2 "));
- Expect.equals(-1234567.89e2, Math.parseDouble(" -1234567.89E2 "));
- Expect.equals(1234567.89e-2, Math.parseDouble("1234567.89e-2"));
- Expect.equals(1234567.89e-2, Math.parseDouble(" 1234567.89e-2 "));
- Expect.equals(1234567.89e-2, Math.parseDouble(" +1234567.89e-2 "));
- Expect.equals(-1234567.89e-2, Math.parseDouble(" -1234567.89e-2 "));
+ Expect.equals(499.0, parseDouble("499"));
+ Expect.equals(499.0, parseDouble("499.0"));
+ Expect.equals(499.0, parseDouble("499.0"));
+ Expect.equals(499.0, parseDouble("+499"));
+ Expect.equals(-499.0, parseDouble("-499"));
+ Expect.equals(499.0, parseDouble(" 499 "));
+ Expect.equals(499.0, parseDouble(" +499 "));
+ Expect.equals(-499.0, parseDouble(" -499 "));
+ Expect.equals(0.0, parseDouble("0"));
+ Expect.equals(0.0, parseDouble("+0"));
+ Expect.equals(-0.0, parseDouble("-0"));
+ Expect.equals(true, parseDouble("-0").isNegative());
+ Expect.equals(0.0, parseDouble(" 0 "));
+ Expect.equals(0.0, parseDouble(" +0 "));
+ Expect.equals(-0.0, parseDouble(" -0 "));
+ Expect.equals(true, parseDouble(" -0 ").isNegative());
+ Expect.equals(1.0 * 0x1234567890, parseDouble("0x1234567890"));
+ Expect.equals(1.0 * -0x1234567890, parseDouble("-0x1234567890"));
+ Expect.equals(1.0 * 0x1234567890, parseDouble(" 0x1234567890 "));
+ Expect.equals(1.0 * -0x1234567890, parseDouble(" -0x1234567890 "));
+ Expect.equals(256.0, parseDouble("0x100"));
+ Expect.equals(-256.0, parseDouble("-0x100"));
+ Expect.equals(256.0, parseDouble(" 0x100 "));
+ Expect.equals(-256.0, parseDouble(" -0x100 "));
+ Expect.equals(1.0 * 0xabcdef, parseDouble("0xabcdef"));
+ Expect.equals(1.0 * 0xABCDEF, parseDouble("0xABCDEF"));
+ Expect.equals(1.0 * 0xabcdef, parseDouble("0xabCDEf"));
+ Expect.equals(1.0 * -0xabcdef, parseDouble("-0xabcdef"));
+ Expect.equals(1.0 * -0xABCDEF, parseDouble("-0xABCDEF"));
+ Expect.equals(1.0 * 0xabcdef, parseDouble(" 0xabcdef "));
+ Expect.equals(1.0 * 0xABCDEF, parseDouble(" 0xABCDEF "));
+ Expect.equals(1.0 * -0xabcdef, parseDouble(" -0xabcdef "));
+ Expect.equals(1.0 * -0xABCDEF, parseDouble(" -0xABCDEF "));
+ Expect.equals(1.0 * 0xabcdef, parseDouble("0x00000abcdef"));
+ Expect.equals(1.0 * 0xABCDEF, parseDouble("0x00000ABCDEF"));
+ Expect.equals(1.0 * -0xabcdef, parseDouble("-0x00000abcdef"));
+ Expect.equals(1.0 * -0xABCDEF, parseDouble("-0x00000ABCDEF"));
+ Expect.equals(1.0 * 0xabcdef, parseDouble(" 0x00000abcdef "));
+ Expect.equals(1.0 * 0xABCDEF, parseDouble(" 0x00000ABCDEF "));
+ Expect.equals(1.0 * -0xabcdef, parseDouble(" -0x00000abcdef "));
+ Expect.equals(1.0 * -0xABCDEF, parseDouble(" -0x00000ABCDEF "));
+ Expect.equals(10.0, parseDouble("010"));
+ Expect.equals(-10.0, parseDouble("-010"));
+ Expect.equals(10.0, parseDouble(" 010 "));
+ Expect.equals(-10.0, parseDouble(" -010 "));
+ Expect.equals(0.1, parseDouble("0.1"));
+ Expect.equals(0.1, parseDouble(" 0.1 "));
+ Expect.equals(0.1, parseDouble(" +0.1 "));
+ Expect.equals(-0.1, parseDouble(" -0.1 "));
+ Expect.equals(0.1, parseDouble(".1"));
+ Expect.equals(0.1, parseDouble(" .1 "));
+ Expect.equals(0.1, parseDouble(" +.1 "));
+ Expect.equals(-0.1, parseDouble(" -.1 "));
+ Expect.equals(1.5, parseDouble("1.5"));
+ Expect.equals(1234567.89, parseDouble("1234567.89"));
+ Expect.equals(1234567.89, parseDouble(" 1234567.89 "));
+ Expect.equals(1234567.89, parseDouble(" +1234567.89 "));
+ Expect.equals(-1234567.89, parseDouble(" -1234567.89 "));
+ Expect.equals(1234567e89, parseDouble("1234567e89"));
+ Expect.equals(1234567e89, parseDouble(" 1234567e89 "));
+ Expect.equals(1234567e89, parseDouble(" +1234567e89 "));
+ Expect.equals(-1234567e89, parseDouble(" -1234567e89 "));
+ Expect.equals(1234567.89e2, parseDouble("1234567.89e2"));
+ Expect.equals(1234567.89e2, parseDouble(" 1234567.89e2 "));
+ Expect.equals(1234567.89e2, parseDouble(" +1234567.89e2 "));
+ Expect.equals(-1234567.89e2, parseDouble(" -1234567.89e2 "));
+ Expect.equals(1234567.89e2, parseDouble("1234567.89E2"));
+ Expect.equals(1234567.89e2, parseDouble(" 1234567.89E2 "));
+ Expect.equals(1234567.89e2, parseDouble(" +1234567.89E2 "));
+ Expect.equals(-1234567.89e2, parseDouble(" -1234567.89E2 "));
+ Expect.equals(1234567.89e-2, parseDouble("1234567.89e-2"));
+ Expect.equals(1234567.89e-2, parseDouble(" 1234567.89e-2 "));
+ Expect.equals(1234567.89e-2, parseDouble(" +1234567.89e-2 "));
+ Expect.equals(-1234567.89e-2, parseDouble(" -1234567.89e-2 "));
// TODO(floitsch): add tests for NaN and Infinity.
- Expect.equals(false, parseDoubleThrowsFormatException("1.5"));
- Expect.equals(true, parseDoubleThrowsFormatException("1b"));
- Expect.equals(true, parseDoubleThrowsFormatException(" 1b "));
- Expect.equals(true, parseDoubleThrowsFormatException(" 1 b "));
- Expect.equals(true, parseDoubleThrowsFormatException(" e3 "));
- Expect.equals(true, parseDoubleThrowsFormatException(" .e3 "));
- Expect.equals(true, parseDoubleThrowsFormatException("00x12"));
- Expect.equals(true, parseDoubleThrowsFormatException(" 00x12 "));
- Expect.equals(true, parseDoubleThrowsFormatException("-1b"));
- Expect.equals(true, parseDoubleThrowsFormatException(" -1b "));
- Expect.equals(true, parseDoubleThrowsFormatException(" -1 b "));
- Expect.equals(true, parseDoubleThrowsFormatException("-00x12"));
- Expect.equals(true, parseDoubleThrowsFormatException(" -00x12 "));
- Expect.equals(true, parseDoubleThrowsFormatException(" -00x12 "));
- Expect.equals(true, parseDoubleThrowsFormatException("0x0x12"));
- Expect.equals(true, parseDoubleThrowsFormatException("+ 1.5"));
- Expect.equals(true, parseDoubleThrowsFormatException("- 1.5"));
- Expect.equals(true, parseDoubleThrowsFormatException(""));
- Expect.equals(true, parseDoubleThrowsFormatException(" "));
- Expect.equals(true, parseDoubleThrowsFormatException("5."));
- Expect.equals(true, parseDoubleThrowsFormatException(" 5. "));
- Expect.equals(true, parseDoubleThrowsFormatException(" +5. "));
- Expect.equals(true, parseDoubleThrowsFormatException(" -5. "));
- Expect.equals(true, parseDoubleThrowsFormatException("1234567.e2"));
- Expect.equals(true, parseDoubleThrowsFormatException(" 1234567.e2 "));
- Expect.equals(true, parseDoubleThrowsFormatException(" +1234567.e2 "));
- Expect.equals(true, parseDoubleThrowsFormatException(" -1234567.e2 "));
- Expect.equals(true, parseDoubleThrowsFormatException("+0x1234567890"));
- Expect.equals(true, parseDoubleThrowsFormatException(" +0x1234567890 "));
- Expect.equals(true, parseDoubleThrowsFormatException(" +0x100 "));
- Expect.equals(true, parseDoubleThrowsFormatException("+0x100"));
+ parseDoubleThrowsFormatException("1b");
+ parseDoubleThrowsFormatException(" 1b ");
+ parseDoubleThrowsFormatException(" 1 b ");
+ parseDoubleThrowsFormatException(" e3 ");
+ parseDoubleThrowsFormatException(" .e3 ");
+ parseDoubleThrowsFormatException("00x12");
+ parseDoubleThrowsFormatException(" 00x12 ");
+ parseDoubleThrowsFormatException("-1b");
+ parseDoubleThrowsFormatException(" -1b ");
+ parseDoubleThrowsFormatException(" -1 b ");
+ parseDoubleThrowsFormatException("-00x12");
+ parseDoubleThrowsFormatException(" -00x12 ");
+ parseDoubleThrowsFormatException(" -00x12 ");
+ parseDoubleThrowsFormatException("0x0x12");
+ parseDoubleThrowsFormatException("+ 1.5");
+ parseDoubleThrowsFormatException("- 1.5");
+ parseDoubleThrowsFormatException("");
+ parseDoubleThrowsFormatException(" ");
+ parseDoubleThrowsFormatException("5.");
+ parseDoubleThrowsFormatException(" 5. ");
+ parseDoubleThrowsFormatException(" +5. ");
+ parseDoubleThrowsFormatException(" -5. ");
+ parseDoubleThrowsFormatException("1234567.e2");
+ parseDoubleThrowsFormatException(" 1234567.e2 ");
+ parseDoubleThrowsFormatException(" +1234567.e2 ");
+ parseDoubleThrowsFormatException(" -1234567.e2 ");
+ parseDoubleThrowsFormatException("+0x1234567890");
+ parseDoubleThrowsFormatException(" +0x1234567890 ");
+ parseDoubleThrowsFormatException(" +0x100 ");
+ parseDoubleThrowsFormatException("+0x100");
}
« no previous file with comments | « lib/compiler/implementation/lib/math.dartp ('k') | tests/corelib/math_test.dart » ('j') | tests/corelib/math_test.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698