Combine StrToInt methods.

core/src/fxcrt/fx_extension_unittest.cpp

Index: core/src/fxcrt/fx_extension_unittest.cpp
diff --git a/core/src/fxcrt/fx_extension_unittest.cpp b/core/src/fxcrt/fx_extension_unittest.cpp
index b12dcbe07f405fefea2e375018e85475cf6b9f9c..88a06483a1ad2ab785619c133c7168f0d924aa68 100644
--- a/core/src/fxcrt/fx_extension_unittest.cpp
+++ b/core/src/fxcrt/fx_extension_unittest.cpp
@@ -14,11 +14,28 @@ TEST(fxcrt, FXSYS_toHexDigit) {
 }
 
 TEST(fxcrt, FXSYS_toDecimalDigit) {
+  {
+    uint8_t ch = '7';
+    EXPECT_EQ(7, FXSYS_toDecimalDigit(ch));
+    ch = 'a';
+    EXPECT_EQ(0, FXSYS_toDecimalDigit(ch));
+  }
+  {
+    int ch = '7';
+    EXPECT_EQ(7, FXSYS_toDecimalDigit(ch));
+    ch = 'a';
+    EXPECT_EQ(0, FXSYS_toDecimalDigit(ch));
+  }
+
   EXPECT_EQ(7, FXSYS_toDecimalDigit('7'));
   EXPECT_EQ(0, FXSYS_toDecimalDigit('a'));
+  EXPECT_EQ(7, FXSYS_toDecimalDigit(L'7'));
+  EXPECT_EQ(0, FXSYS_toDecimalDigit(L'a'));
 }
 
-TEST(fxcrt, FXSYS_toDecimalDigitWide) {
-  EXPECT_EQ(7, FXSYS_toDecimalDigitWide(L'7'));
-  EXPECT_EQ(0, FXSYS_toDecimalDigitWide(L'a'));
+TEST(fxcrt, FXSYS_isDecimalDigit) {
+  EXPECT_TRUE(FXSYS_isDecimalDigit('7'));
+  EXPECT_TRUE(FXSYS_isDecimalDigit(L'7'));
+  EXPECT_FALSE(FXSYS_isDecimalDigit('a'));
+  EXPECT_FALSE(FXSYS_isDecimalDigit(L'a'));
 }