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

Timestamp:

Apr 7, 2025 11:36:49 AM (3 weeks ago)

Author:

vboxsync

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

168319

Message:

Runtime/RTJson*: Add support for a subset of the JSON5 specification, bugref:10388

Location:

trunk/src/VBox/Runtime/testcase

Files:

• tstRTCRest-1.cpp (modified) (2 diffs)
• tstRTJson.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/testcase/tstRTCRest-1.cpp

@@ -73 +73 @@
 {
     RTJSONVAL hValue;
-    RTTESTI_CHECK_RC_OK_RET(RTJsonParseFromString(&hValue, pszJson, pErrInfo ? RTErrInfoInitStatic(pErrInfo) : NULL), rcCheck);
+    RTTESTI_CHECK_RC_OK_RET(RTJsonParseFromString(&hValue, 0 /*fFlags*/, pszJson, pErrInfo ? RTErrInfoInitStatic(pErrInfo) : NULL), rcCheck);
     RTCRestJsonPrimaryCursor Cursor(hValue, pszName, pErrInfo ? RTErrInfoInitStatic(pErrInfo) : NULL);
     return pObj->deserializeFromJson(Cursor.m_Cursor);
@@ -778 +778 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
         RTJSONVAL hTmpValue = NIL_RTJSONVAL;
-        int rcTmp = RTJsonParseFromString(&hTmpValue, TST_DBL_MIN_STRING1, NULL);
+        int rcTmp = RTJsonParseFromString(&hTmpValue, 0 /*fFlags*/, TST_DBL_MIN_STRING1, NULL);
         RTJsonValueRelease(hTmpValue);
         if (rcTmp == VERR_INVALID_PARAMETER || rcTmp == VERR_OUT_OF_RANGE)

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

@@ -126 +126 @@
         RTERRINFOSTATIC ErrInfo;
         RTJSONVAL hJsonVal = NIL_RTJSONVAL;
-        int rc = RTJsonParseFromString(&hJsonVal, aTests[iTest].pszJson, RTErrInfoInitStatic(&ErrInfo));
+        int rc = RTJsonParseFromString(&hJsonVal, 0 /*fFlags*/, aTests[iTest].pszJson, RTErrInfoInitStatic(&ErrInfo));
+        if (rc != aTests[iTest].iRcResult)
+        {
+            if (RTErrInfoIsSet(&ErrInfo.Core))
+                RTTestFailed(hTest, "RTJsonParseFromString() for \"%s\" failed, expected %Rrc got %Rrc\n%s",
+                             aTests[iTest].pszJson, aTests[iTest].iRcResult, rc, ErrInfo.Core.pszMsg);
+            else
+                RTTestFailed(hTest, "RTJsonParseFromString() for \"%s\" failed, expected %Rrc got %Rrc",
+                             aTests[iTest].pszJson, aTests[iTest].iRcResult, rc);
+        }
+        else if (rc == VERR_JSON_MALFORMED && !RTErrInfoIsSet(&ErrInfo.Core))
+            RTTestFailed(hTest, "RTJsonParseFromString() did not return error info for \"%s\" failed", aTests[iTest].pszJson);
+        if (RT_SUCCESS(rc))
+        {
+            if (hJsonVal != NIL_RTJSONVAL)
+                RTJsonValueRelease(hJsonVal);
+            else
+                RTTestFailed(hTest, "RTJsonParseFromString() returned success but no value\n");
+        }
+        else if (hJsonVal != NIL_RTJSONVAL)
+            RTTestFailed(hTest, "RTJsonParseFromString() failed but a JSON value was returned\n");
+    }
+}
+
+/**
+ * Some basic tests to detect malformed JSON5.
+ */
+static void tstBasic5(RTTEST hTest)
+{
+    RTTestSub(hTest, "Basic JSON5 valid/malformed tests");
+    static struct
+    {
+        const char *pszJson;
+        int         iRcResult;
+    } const aTests[] =
+    {
+        { "// This is a single line comment\nnull",     VINF_SUCCESS },
+        { "/* This is a multi line comment\n **/ null", VINF_SUCCESS },
+        { "\'Single quoted \"string\"\'",               VINF_SUCCESS },
+        { "0xc0dec0ffee",                               VINF_SUCCESS },
+        { "-0xffffffffffffffff",                        VINF_SUCCESS },
+        { "0xfffffffffffffffff",                        VERR_JSON_MALFORMED },
+        { "[0, 1, ]",                                   VINF_SUCCESS },
+        { "{ \"name\": 1 , }",                          VINF_SUCCESS },
+        { "{ name: 1 , }",                              VINF_SUCCESS },
+        { "{ _name0: 1 , }",                            VINF_SUCCESS },
+        { "{ $name0x: 1 , }",                           VINF_SUCCESS },
+
+    };
+    for (unsigned iTest = 0; iTest < RT_ELEMENTS(aTests); iTest++)
+    {
+        RTERRINFOSTATIC ErrInfo;
+        RTJSONVAL hJsonVal = NIL_RTJSONVAL;
+        int rc = RTJsonParseFromString(&hJsonVal, RTJSON_PARSE_F_JSON5, aTests[iTest].pszJson, RTErrInfoInitStatic(&ErrInfo));
         if (rc != aTests[iTest].iRcResult)
         {
@@ -325 +378 @@
 
     RTJSONVAL hJsonVal = NIL_RTJSONVAL;
-    RTTEST_CHECK_RC_OK_RETV(hTest, RTJsonParseFromString(&hJsonVal, g_szJson, NULL));
+    RTTEST_CHECK_RC_OK_RETV(hTest, RTJsonParseFromString(&hJsonVal, 0 /*fFlags*/, g_szJson, NULL));
 
     if (hJsonVal != NIL_RTJSONVAL)
@@ -353 +406 @@
 
     tstBasic(hTest);
+    tstBasic5(hTest);
     tstCorrectness(hTest);
     for (int i = 1; i < argc; i++)
@@ -359 +413 @@
         RTERRINFOSTATIC ErrInfo;
         RTJSONVAL       hFileValue = NIL_RTJSONVAL;
-        rc = RTJsonParseFromFile(&hFileValue, argv[i], RTErrInfoInitStatic(&ErrInfo));
+        rc = RTJsonParseFromFile(&hFileValue, 0 /*fFlags*/, argv[i], RTErrInfoInitStatic(&ErrInfo));
         if (RT_SUCCESS(rc))
             RTJsonValueRelease(hFileValue);