From 01523b4da62fdf4e7fcc4966e9459e7592b70eed Mon Sep 17 00:00:00 2001 From: "Shane F. Carr" Date: Thu, 5 Mar 2020 22:16:02 -0800 Subject: [PATCH] ICU-20974 Fix exhaustive test failures --- icu4c/source/test/intltest/numbertest_decimalquantity.cpp | 8 ++++---- .../com/ibm/icu/dev/test/number/ExhaustiveNumberTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/icu4c/source/test/intltest/numbertest_decimalquantity.cpp b/icu4c/source/test/intltest/numbertest_decimalquantity.cpp index 0a4f5628fe8..8cb0ac0d086 100644 --- a/icu4c/source/test/intltest/numbertest_decimalquantity.cpp +++ b/icu4c/source/test/intltest/numbertest_decimalquantity.cpp @@ -235,8 +235,6 @@ void DecimalQuantityTest::testConvertToAccurateDouble() { // based on https://github.com/google/double-conversion/issues/28 static double hardDoubles[] = { 1651087494906221570.0, - -5074790912492772E-327, - 83602530019752571E-327, 2.207817077636718750000000000000, 1.818351745605468750000000000000, 3.941719055175781250000000000000, @@ -261,9 +259,11 @@ void DecimalQuantityTest::testConvertToAccurateDouble() { 1.305290222167968750000000000000, 3.834922790527343750000000000000,}; - static double integerDoubles[] = { + static double exactDoubles[] = { 51423, 51423e10, + -5074790912492772E-327, + 83602530019752571E-327, 4.503599627370496E15, 6.789512076111555E15, 9.007199254740991E15, @@ -273,7 +273,7 @@ void DecimalQuantityTest::testConvertToAccurateDouble() { checkDoubleBehavior(d, true); } - for (double d : integerDoubles) { + for (double d : exactDoubles) { checkDoubleBehavior(d, false); } diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/ExhaustiveNumberTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/ExhaustiveNumberTest.java index 69947cd82f7..20e55491c2b 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/ExhaustiveNumberTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/ExhaustiveNumberTest.java @@ -123,8 +123,6 @@ public class ExhaustiveNumberTest extends TestFmwk { // based on https://github.com/google/double-conversion/issues/28 double[] hardDoubles = { 1651087494906221570.0, - -5074790912492772E-327, - 83602530019752571E-327, 2.207817077636718750000000000000, 1.818351745605468750000000000000, 3.941719055175781250000000000000, @@ -149,9 +147,11 @@ public class ExhaustiveNumberTest extends TestFmwk { 1.305290222167968750000000000000, 3.834922790527343750000000000000, }; - double[] integerDoubles = { + double[] exactDoubles = { 51423, 51423e10, + -5074790912492772E-327, + 83602530019752571E-327, 4.503599627370496E15, 6.789512076111555E15, 9.007199254740991E15, @@ -161,7 +161,7 @@ public class ExhaustiveNumberTest extends TestFmwk { checkDoubleBehavior(d, true, ""); } - for (double d : integerDoubles) { + for (double d : exactDoubles) { checkDoubleBehavior(d, false, ""); }