Changeset 74027 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

Sep 2, 2018 2:49:45 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

124774

Message:

IPRT/json: Implemented support for parsing floating point values. bugref:9167

File:

• trunk/src/VBox/Runtime/testcase/tstRTJson.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/testcase/tstRTJson.cpp

@@ -35 +35 @@
 static const char *g_pszJson =
     "{\n"
-    "    \"number\": 100,\n"
+    "    \"integer\": 100,\n"
+    "    \"number\": 22.22,\n"
     "    \"string\": \"test\",\n"
     "    \"array\": [1, 2, 3, 4, 5, \"6\"],\n"
@@ -142 +143 @@
     }
 
-    if (enmType != RTJSONVALTYPE_NUMBER)
+    if (enmType != RTJSONVALTYPE_INTEGER)
     {
         int64_t i64Num = 0;
         RTTEST_CHECK_RC(hTest, RTJsonValueQueryInteger(hJsonVal, &i64Num), VERR_JSON_VALUE_INVALID_TYPE);
+    }
+
+    if (enmType != RTJSONVALTYPE_NUMBER)
+    {
+        double rdNum = 0.0;
+        RTTEST_CHECK_RC(hTest, RTJsonValueQueryNumber(hJsonVal, &rdNum), VERR_JSON_VALUE_INVALID_TYPE);
     }
 
@@ -174 +181 @@
         RTJSONVAL hJsonValItem = NIL_RTJSONVAL;
         RTTEST_CHECK_RC_OK_RETV(hTest, RTJsonValueQueryByIndex(hJsonVal, i - 1, &hJsonValItem));
-        RTTEST_CHECK(hTest, RTJsonValueGetType(hJsonValItem) == RTJSONVALTYPE_NUMBER);
+        RTTEST_CHECK(hTest, RTJsonValueGetType(hJsonValItem) == RTJSONVALTYPE_INTEGER);
         RTTEST_CHECK_RC_OK_RETV(hTest, RTJsonValueQueryInteger(hJsonValItem, &i64Num));
         RTTEST_CHECK(hTest, i64Num == (int64_t)i);
@@ -230 +237 @@
                     break;
                 }
+                case RTJSONVALTYPE_INTEGER:
+                {
+                    RTTEST_CHECK(hTest, strcmp(pszName, "integer") == 0);
+                    int64_t i64Num = 0;
+                    RTTEST_CHECK_RC_OK(hTest, RTJsonValueQueryInteger(hJsonValMember, &i64Num));
+                    RTTEST_CHECK(hTest, i64Num == 100);
+                    break;
+                }
                 case RTJSONVALTYPE_NUMBER:
                 {
                     RTTEST_CHECK(hTest, strcmp(pszName, "number") == 0);
-                    int64_t i64Num = 0;
-                    RTTEST_CHECK_RC_OK(hTest, RTJsonValueQueryInteger(hJsonValMember, &i64Num));
-                    RTTEST_CHECK(hTest, i64Num == 100);
+                    double rdNum = 0.0;
+                    RTTEST_CHECK_RC_OK(hTest, RTJsonValueQueryNumber(hJsonValMember, &rdNum));
+                    double const rdExpect = 22.22;
+                    RTTEST_CHECK(hTest, rdNum == rdExpect);
                     break;
                 }