Improve Vincenthz libjson's ParseDouble test

vincenthz/libjson#24

Author: miloyip

sample/conformance.html

@@ -5743,7 +5743,7 @@ <h2>Source CSV</h2>
 2. Parse Double,Vinenthz/libjson (C),double25,true
 2. Parse Double,Vinenthz/libjson (C),double26,true
 2. Parse Double,Vinenthz/libjson (C),double27,false
-2. Parse Double,Vinenthz/libjson (C),double28,false
+2. Parse Double,Vinenthz/libjson (C),double28,true
 2. Parse Double,Vinenthz/libjson (C),double29,true
 2. Parse Double,Vinenthz/libjson (C),double30,true
 2. Parse Double,Vinenthz/libjson (C),double31,true

sample/conformance_Vinenthz_libjson (C).md

@@ -9,42 +9,38 @@ Summary: 34 of 34 are correct.
 
 * `[18446744073709551616]`
   * expect: `1.8446744073709552e+19 (0x01643F0000000000000)`
-  * actual: `0 (0x0160)`
-
-* `[-9223372036854775809]`
-  * expect: `-9.2233720368547758e+18 (0x016C3E0000000000000)`
-  * actual: `0 (0x0160)`
+  * actual: `9.2233720368547758e+18 (0x01643E0000000000000)`
 
 * `[10141204801825834086073718800384]`
   * expect: `1.0141204801825834e+31 (0x016465FFFFFFFFFFFFF)`
-  * actual: `0 (0x0160)`
+  * actual: `9.2233720368547758e+18 (0x01643E0000000000000)`
 
 * `[10141204801825835211973625643008]`
   * expect: `1.0141204801825835e+31 (0x0164660000000000000)`
-  * actual: `0 (0x0160)`
+  * actual: `9.2233720368547758e+18 (0x01643E0000000000000)`
 
 * `[10141204801825834649023672221696]`
   * expect: `1.0141204801825835e+31 (0x0164660000000000000)`
-  * actual: `0 (0x0160)`
+  * actual: `9.2233720368547758e+18 (0x01643E0000000000000)`
 
 * `[5708990770823838890407843763683279797179383808]`
   * expect: `5.7089907708238389e+45 (0x016496FFFFFFFFFFFFF)`
-  * actual: `0 (0x0160)`
+  * actual: `9.2233720368547758e+18 (0x01643E0000000000000)`
 
 * `[5708990770823839524233143877797980545530986496]`
   * expect: `5.7089907708238395e+45 (0x0164970000000000000)`
-  * actual: `0 (0x0160)`
+  * actual: `9.2233720368547758e+18 (0x01643E0000000000000)`
 
 * `[5708990770823839207320493820740630171355185152]`
   * expect: `5.7089907708238395e+45 (0x0164970000000000000)`
-  * actual: `0 (0x0160)`
+  * actual: `9.2233720368547758e+18 (0x01643E0000000000000)`
 
 * `[100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000]`
   * expect: `1e+308 (0x0167FE1CCF385EBC8A0)`
-  * actual: `0 (0x0160)`
+  * actual: `9.2233720368547758e+18 (0x01643E0000000000000)`
 
 
-Summary: 57 of 66 are correct.
+Summary: 58 of 66 are correct.
 
 ## 3. Parse String
 

src/main.cpp

@@ -1200,7 +1200,7 @@ static void BenchAllConformance() {
 #endif // TEST_CONFORMANCE
 
 static void BenchAll(const TestJsonList& testJsons) {
-    BenchAllPerformance(testJsons);
+    // BenchAllPerformance(testJsons);
 
 #if TEST_CONFORMANCE
     BenchAllConformance();
@@ -1229,7 +1229,7 @@ int main(int, char* argv[]) {
         TestList& tests = TestManager::Instance().GetTests();
         std::sort(tests.begin(), tests.end());
 
-        VerifyAll(testJsons);
+        // VerifyAll(testJsons);
         BenchAll(testJsons);
 
         FreeFiles(testJsons);

src/tests/vincenthzlibjsontest.cpp

@@ -506,11 +506,16 @@ class VinenthzTest : public TestBase {
         bool ret = false;
         if (pr && 
             pr->root->type == JSON_ARRAY_BEGIN &&
-            pr->root->length == 1 &&
-            pr->root->u.array[0]->type == JSON_FLOAT)
+            pr->root->length == 1)
         {
-            *d = pr->root->u.array[0]->u.float_val;
-            ret = true;
+            if (pr->root->u.array[0]->type == JSON_FLOAT) {
+                *d = pr->root->u.array[0]->u.float_val;
+                ret = true;
+            }
+            else if (pr->root->u.array[0]->type == JSON_INT) {
+                *d = (double)pr->root->u.array[0]->u.int_val;
+                ret = true;
+            }
         }
         delete pr;
         return ret;