[webkit-changes] [122916] trunk/Source/WebKit/chromium

Tue, 17 Jul 2012 21:09:10 -0700

Title: [122916] trunk/Source/WebKit/chromium
Revision
122916
Author
[email protected]
Date
2012-07-17 21:09:04 -0700 (Tue, 17 Jul 2012)

Log Message

Test cases in DecimalTest should use EXPECT_STREQ for ease of debugging test case
https://bugs.webkit.org/show_bug.cgi?id=91572

Reviewed by Kent Tamura.

This patch introduces EXPECT_DECIMAL_STREQ macro to replace EXPECT_EQ
with String class for displaying text string rather than object dump
for ease of debugging test cases.

* tests/DecimalTest.cpp:
(DecimalTest::stepDown): Changed to return Decimal instead of String
to use EXPECT_DECIMAL_STREQ.
(DecimalTest::stepUp): ditto.
(TEST_F): Replaced EXPECT_EQ + String class to EXPECT_DECIMAL_STREQ.

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (122915 => 122916)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-07-18 04:05:24 UTC (rev 122915)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-07-18 04:09:04 UTC (rev 122916)
@@ -1,3 +1,20 @@
+2012-07-17  Yoshifumi Inoue  <[email protected]>
+
+        Test cases in DecimalTest should use EXPECT_STREQ for ease of debugging test case
+        https://bugs.webkit.org/show_bug.cgi?id=91572
+
+        Reviewed by Kent Tamura.
+
+        This patch introduces EXPECT_DECIMAL_STREQ macro to replace EXPECT_EQ
+        with String class for displaying text string rather than object dump
+        for ease of debugging test cases.
+
+        * tests/DecimalTest.cpp:
+        (DecimalTest::stepDown): Changed to return Decimal instead of String
+        to use EXPECT_DECIMAL_STREQ.
+        (DecimalTest::stepUp): ditto.
+        (TEST_F): Replaced EXPECT_EQ + String class to EXPECT_DECIMAL_STREQ.
+
 2012-07-17  Joshua Bell  <[email protected]>
 
         IndexedDB: Key generator state not maintained across connections

Modified: trunk/Source/WebKit/chromium/tests/DecimalTest.cpp (122915 => 122916)


--- trunk/Source/WebKit/chromium/tests/DecimalTest.cpp	2012-07-18 04:05:24 UTC (rev 122915)
+++ trunk/Source/WebKit/chromium/tests/DecimalTest.cpp	2012-07-18 04:09:04 UTC (rev 122916)
@@ -89,7 +89,7 @@
         return Decimal::fromString(string);
     }
 
-    protected: String stepDown(const String& minimum, const String& maximum, const String& step, const String& valueString, int numberOfStepTimes)
+    protected: Decimal stepDown(const String& minimum, const String& maximum, const String& step, const String& valueString, int numberOfStepTimes)
     {
         DecimalStepRange stepRange(fromString(minimum), fromString(maximum), fromString(step));
         Decimal value = fromString(valueString);
@@ -97,10 +97,10 @@
             value -= stepRange.step;
             value = stepRange.clampValue(value);
         }
-        return value.toString();
+        return value;
     }
 
-    protected: String stepUp(const String& minimum, const String& maximum, const String& step, const String& valueString, int numberOfStepTimes)
+    protected: Decimal stepUp(const String& minimum, const String& maximum, const String& step, const String& valueString, int numberOfStepTimes)
     {
         DecimalStepRange stepRange(fromString(minimum), fromString(maximum), fromString(step));
         Decimal value = fromString(valueString);
@@ -108,10 +108,12 @@
             value += stepRange.step;
             value = stepRange.clampValue(value);
         }
-        return value.toString();
+        return value;
     }
 };
 
+#define EXPECT_DECIMAL_STREQ(expected, decimal) EXPECT_STREQ((expected), (decimal).toString().ascii().data())
+
 TEST_F(DecimalTest, Abs)
 {
     EXPECT_EQ(encode(0, 0, Positive), encode(0, 0, Positive).abs());
@@ -840,29 +842,29 @@
 // LayoutTests/fast/forms/number/number-stepup-stepdown-from-renderer
 TEST_F(DecimalTest, RealWorldExampleNumberStepUpStepDownFromRenderer)
 {
-    EXPECT_EQ(String("10"), stepDown("0", "100", "10", "19", 1));
-    EXPECT_EQ(String("90"), stepUp("0", "99", "10", "89", 1));
-    EXPECT_EQ(String("1"), stepUp("0", "1", "0.33333333333333333", "0", 3)); // step=1/3
-    EXPECT_EQ(String("0.01"), stepUp("0", "0.01", "0.0033333333333333333", "0", 3)); // step=1/300
-    EXPECT_EQ(String("1"), stepUp("0", "1", "0.003921568627450980", "0", 255)); // step=1/255
-    EXPECT_EQ(String("1"), stepUp("0", "1", "0.1", "0", 10));
+    EXPECT_DECIMAL_STREQ("10", stepDown("0", "100", "10", "19", 1));
+    EXPECT_DECIMAL_STREQ("90", stepUp("0", "99", "10", "89", 1));
+    EXPECT_DECIMAL_STREQ("1", stepUp("0", "1", "0.33333333333333333", "0", 3)); // step=1/3
+    EXPECT_DECIMAL_STREQ("0.01", stepUp("0", "0.01", "0.0033333333333333333", "0", 3)); // step=1/300
+    EXPECT_DECIMAL_STREQ("1", stepUp("0", "1", "0.003921568627450980", "0", 255)); // step=1/255
+    EXPECT_DECIMAL_STREQ("1", stepUp("0", "1", "0.1", "0", 10));
 }
 
 TEST_F(DecimalTest, RealWorldExampleNumberStepUpStepDownFromRendererRounding)
 {
-    EXPECT_EQ(String("5.015"), stepUp("0", "100", "0.005", "5.005", 2));
-    EXPECT_EQ(String("5.06"), stepUp("0", "100", "0.005", "5.005", 11));
-    EXPECT_EQ(String("5.065"), stepUp("0", "100", "0.005", "5.005", 12));
+    EXPECT_DECIMAL_STREQ("5.015", stepUp("0", "100", "0.005", "5.005", 2));
+    EXPECT_DECIMAL_STREQ("5.06", stepUp("0", "100", "0.005", "5.005", 11));
+    EXPECT_DECIMAL_STREQ("5.065", stepUp("0", "100", "0.005", "5.005", 12));
 
-    EXPECT_EQ(String("5.015"), stepUp("4", "9", "0.005", "5.005", 2));
-    EXPECT_EQ(String("5.06"), stepUp("4", "9", "0.005", "5.005", 11));
-    EXPECT_EQ(String("5.065"), stepUp("4", "9", "0.005", "5.005", 12));
+    EXPECT_DECIMAL_STREQ("5.015", stepUp("4", "9", "0.005", "5.005", 2));
+    EXPECT_DECIMAL_STREQ("5.06", stepUp("4", "9", "0.005", "5.005", 11));
+    EXPECT_DECIMAL_STREQ("5.065", stepUp("4", "9", "0.005", "5.005", 12));
 }
 
 TEST_F(DecimalTest, RealWorldExampleRangeStepUpStepDown)
 {
-    EXPECT_EQ(String("1e+38"), stepUp("0", "1E38", "1", "1E38", 9));
-    EXPECT_EQ(String("1e+38"), stepDown("0", "1E38", "1", "1E38", 9));
+    EXPECT_DECIMAL_STREQ("1e+38", stepUp("0", "1E38", "1", "1E38", 9));
+    EXPECT_DECIMAL_STREQ("1e+38", stepDown("0", "1E38", "1", "1E38", 9));
 }
 
 TEST_F(DecimalTest, Remainder)
@@ -1022,31 +1024,31 @@
 
 TEST_F(DecimalTest, ToString)
 {
-    EXPECT_EQ(String("0"), Decimal::zero(Positive).toString());
-    EXPECT_EQ(String("-0"), Decimal::zero(Negative).toString());
-    EXPECT_EQ(String("1"), Decimal(1).toString());
-    EXPECT_EQ(String("-1"), Decimal(-1).toString());
-    EXPECT_EQ(String("1234567"), Decimal(1234567).toString());
-    EXPECT_EQ(String("-1234567"), Decimal(-1234567).toString());
-    EXPECT_EQ(String("0.5"), encode(5, -1, Positive).toString());
-    EXPECT_EQ(String("-0.5"), encode(5, -1, Negative).toString());
-    EXPECT_EQ(String("12.345"), encode(12345, -3, Positive).toString());
-    EXPECT_EQ(String("-12.345"), encode(12345, -3, Negative).toString());
-    EXPECT_EQ(String("0.12345"), encode(12345, -5, Positive).toString());
-    EXPECT_EQ(String("-0.12345"), encode(12345, -5, Negative).toString());
-    EXPECT_EQ(String("50"), encode(50, 0, Positive).toString());
-    EXPECT_EQ(String("-50"), encode(50, 0, Negative).toString());
-    EXPECT_EQ(String("5e+1"), encode(5, 1, Positive).toString());
-    EXPECT_EQ(String("-5e+1"), encode(5, 1, Negative).toString());
-    EXPECT_EQ(String("5.678e+103"), encode(5678, 100, Positive).toString());
-    EXPECT_EQ(String("-5.678e+103"), encode(5678, 100, Negative).toString());
-    EXPECT_EQ(String("5.678e-97"), encode(5678, -100, Positive).toString());
-    EXPECT_EQ(String("-5.678e-97"), encode(5678, -100, Negative).toString());
+    EXPECT_DECIMAL_STREQ("0", Decimal::zero(Positive));
+    EXPECT_DECIMAL_STREQ("-0", Decimal::zero(Negative));
+    EXPECT_DECIMAL_STREQ("1", Decimal(1));
+    EXPECT_DECIMAL_STREQ("-1", Decimal(-1));
+    EXPECT_DECIMAL_STREQ("1234567", Decimal(1234567));
+    EXPECT_DECIMAL_STREQ("-1234567", Decimal(-1234567));
+    EXPECT_DECIMAL_STREQ("0.5", encode(5, -1, Positive));
+    EXPECT_DECIMAL_STREQ("-0.5", encode(5, -1, Negative));
+    EXPECT_DECIMAL_STREQ("12.345", encode(12345, -3, Positive));
+    EXPECT_DECIMAL_STREQ("-12.345", encode(12345, -3, Negative));
+    EXPECT_DECIMAL_STREQ("0.12345", encode(12345, -5, Positive));
+    EXPECT_DECIMAL_STREQ("-0.12345", encode(12345, -5, Negative));
+    EXPECT_DECIMAL_STREQ("50", encode(50, 0, Positive));
+    EXPECT_DECIMAL_STREQ("-50", encode(50, 0, Negative));
+    EXPECT_DECIMAL_STREQ("5e+1", encode(5, 1, Positive));
+    EXPECT_DECIMAL_STREQ("-5e+1", encode(5, 1, Negative));
+    EXPECT_DECIMAL_STREQ("5.678e+103", encode(5678, 100, Positive));
+    EXPECT_DECIMAL_STREQ("-5.678e+103", encode(5678, 100, Negative));
+    EXPECT_DECIMAL_STREQ("5.678e-97", encode(5678, -100, Positive));
+    EXPECT_DECIMAL_STREQ("-5.678e-97", encode(5678, -100, Negative));
 }
 
 TEST_F(DecimalTest, ToStringSpecialValues)
 {
-    EXPECT_EQ(String("Infinity"), Decimal::infinity(Positive).toString());
-    EXPECT_EQ(String("-Infinity"), Decimal::infinity(Negative).toString());
-    EXPECT_EQ(String("NaN"), Decimal::nan().toString());
+    EXPECT_DECIMAL_STREQ("Infinity", Decimal::infinity(Positive));
+    EXPECT_DECIMAL_STREQ("-Infinity", Decimal::infinity(Negative));
+    EXPECT_DECIMAL_STREQ("NaN", Decimal::nan());
 }

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to