Changeset 74161 in vbox for trunk/src/VBox/Runtime

Timestamp:

Sep 9, 2018 2:12:40 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: Added testcases for RTCRestBool and RTCRestIntXY. bugref:9167

Location:

trunk/src/VBox/Runtime

Files:

• common/rest/rest-primary-object-types.cpp (modified) (13 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstRTCRest-1.cpp (added)

trunk/src/VBox/Runtime/common/rest/rest-primary-object-types.cpp

@@ -207 +207 @@
 int RTCRestBool::deserializeFromJson(RTCRestJsonCursor const &a_rCursor)
 {
+    m_fValue = false;
+    m_fNullIndicator = false;
+
     RTJSONVALTYPE enmType = RTJsonValueGetType(a_rCursor.m_hValue);
 
@@ -212 +215 @@
     {
         m_fValue = true;
-        m_fNullIndicator = false;
         return VINF_SUCCESS;
     }
 
     if (enmType == RTJSONVALTYPE_FALSE)
-    {
-        m_fValue = false;
-        m_fNullIndicator = false;
-        return VINF_SUCCESS;
-    }
+        return VINF_SUCCESS;
 
     if (enmType == RTJSONVALTYPE_NULL)
     {
-        m_fValue = false;
         m_fNullIndicator = true;
         return VINF_SUCCESS;
     }
 
-    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_WRONG_TYPE, "wrong JSON type %s for boolean",
+    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_REST_WRONG_JSON_TYPE_FOR_BOOL, "wrong JSON type %s for boolean",
                                           RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
 }
@@ -279 +276 @@
     }
     else
-        return RTErrInfoSetF(a_pErrInfo, VERR_INVALID_PARAMETER, "%s: unable to parse '%s' as bool", a_pszName, a_rValue.c_str());
+        return RTErrInfoSetF(a_pErrInfo, VERR_REST_UNABLE_TO_PARSE_STRING_AS_BOOL,
+                             "%s: unable to parse '%s' as bool", a_pszName, a_rValue.c_str());
     return VINF_SUCCESS;
 }
@@ -405 +403 @@
         m_iValue = 1;
 
-    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_WRONG_TYPE, "wrong JSON type %s for 64-bit integer",
+    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_REST_WRONG_JSON_TYPE_FOR_INTEGER, "wrong JSON type %s for 64-bit integer",
                                           RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
 }
@@ -432 +430 @@
     m_fNullIndicator = false;
 
-    int rc = RTStrToInt64Full(RTStrStripL(a_rValue.c_str()), 10, &m_iValue);
+/** @todo RTStrStripL and RTStrToInt64Full has a different idea what consitutes spaces... */
+    int rc = RTStrToInt64Full(RTStrStripL(a_rValue.c_str()), 0, &m_iValue);
     if (rc == VINF_SUCCESS || rc == VERR_TRAILING_SPACES)
         return VINF_SUCCESS;
@@ -574 +573 @@
         m_iValue = 1;
 
-    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_WRONG_TYPE, "wrong JSON type %s for 32-bit integer",
+    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_REST_WRONG_JSON_TYPE_FOR_INTEGER, "wrong JSON type %s for 32-bit integer",
                                           RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
 }
@@ -601 +600 @@
     m_fNullIndicator = false;
 
-    int rc = RTStrToInt32Full(RTStrStripL(a_rValue.c_str()), 10, &m_iValue);
+/** @todo RTStrStripL and RTStrToInt32Full has a different idea what consitutes spaces... */
+    int rc = RTStrToInt32Full(RTStrStripL(a_rValue.c_str()), 0, &m_iValue);
     if (rc == VINF_SUCCESS || rc == VERR_TRAILING_SPACES)
         return VINF_SUCCESS;
@@ -743 +743 @@
         m_iValue = 1;
 
-    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_WRONG_TYPE, "wrong JSON type %s for 16-bit integer",
+    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_REST_WRONG_JSON_TYPE_FOR_INTEGER, "wrong JSON type %s for 16-bit integer",
                                           RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
 }
@@ -770 +770 @@
     m_fNullIndicator = false;
 
-    int rc = RTStrToInt16Full(RTStrStripL(a_rValue.c_str()), 10, &m_iValue);
+/** @todo RTStrStripL and RTStrToInt16Full has a different idea what consitutes spaces... */
+    int rc = RTStrToInt16Full(RTStrStripL(a_rValue.c_str()), 0, &m_iValue);
     if (rc == VINF_SUCCESS || rc == VERR_TRAILING_SPACES)
         return VINF_SUCCESS;
@@ -930 +931 @@
         m_rdValue = 1.0;
 
-    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_WRONG_TYPE, "wrong JSON type %s for a double",
+    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_REST_WRONG_JSON_TYPE_FOR_DOUBLE, "wrong JSON type %s for a double",
                                           RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
 }
@@ -1118 +1119 @@
     }
 
-    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_WRONG_TYPE, "wrong JSON type %s for string",
+    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_REST_WRONG_JSON_TYPE_FOR_STRING, "wrong JSON type %s for string",
                                           RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
 }
@@ -1264 +1265 @@
     }
 
-    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_WRONG_TYPE, "wrong JSON type for date: %s",
+    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_REST_WRONG_JSON_TYPE_FOR_DATE, "wrong JSON type for date: %s",
                                           RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
 }
@@ -1676 +1677 @@
     }
 
-    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_WRONG_TYPE, "wrong JSON type %s for string/enum",
+    return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_REST_WRONG_JSON_TYPE_FOR_STRING, "wrong JSON type %s for string/enum",
                                           RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
 }

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -56 +56 @@
         tstRTCrX509-1 \
         tstRTCType \
+        tstRTCRest-1 \
         tstRTDigest \
         tstRTDigest-2 \
@@ -308 +309 @@
 tstRTCType_SOURCES = tstRTCType.cpp
 
+tstRTCRest-1_TEMPLATE = VBOXR3TSTEXE
+tstRTCRest-1_SOURCES = tstRTCRest-1.cpp
+
 tstRTDigest_TEMPLATE = VBOXR3TSTEXE
 tstRTDigest_SOURCES = tstRTDigest.cpp