Changeset 33862 in vbox for trunk/src

Timestamp:

Nov 8, 2010 5:07:49 PM (14 years ago)

Author:

vboxsync

Message:

iprt/cpp/ministring.h: Changed the substring constructors to match std::string. As I feared, this caused some minor issues with the format+va_list constructor, fortunately it's only when passing a_cchSrc=0. While at it, I've added the one missing std::string constructor, the repeat character constructor.

Location:

trunk/src/VBox

Files:

• Main/ExtPackUtil.cpp (modified) (1 diff)
• Runtime/testcase/tstIprtMiniString.cpp (modified) (5 diffs)

trunk/src/VBox/Main/ExtPackUtil.cpp

@@ -180 +180 @@
      * Make a duplicate of the name and return it.
      */
-    iprt::MiniString *pStrRet = new iprt::MiniString(off, pszSrc);
+    iprt::MiniString *pStrRet = new iprt::MiniString(pszSrc, off);
     Assert(VBoxExtPackIsValidName(pStrRet->c_str()));
     return pStrRet;

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

@@ -39 +39 @@
 static void test1Hlp1(const char *pszExpect, const char *pszFormat, ...)
 {
+#if 0
     va_list va;
     va_start(va, pszFormat);
@@ -44 +45 @@
     va_end(va);
     RTTESTI_CHECK_MSG(strTst.equals(pszExpect),  ("strTst='%s' expected='%s'\n",  strTst.c_str(), pszExpect));
+#endif
 }
 
@@ -61 +63 @@
         if (!(expr)) \
             RTTestFailed(hTest, "%d: FAILED %s, got \"%d\"", __LINE__, #expr, expr); \
+    } while (0)
+#define CHECK_EQUAL(Str, szExpect) \
+    do { \
+        if (!(Str).equals(szExpect)) \
+            RTTestIFailed("line %u: expected \"%s\" got \"%s\"", __LINE__, szExpect, (Str).c_str()); \
     } while (0)
 
@@ -167 +174 @@
     test1Hlp1("foobar", "%s", "foobar");
 
+    /* substring constructors */
+    iprt::MiniString SubStr1("", (size_t)0);
+    CHECK_EQUAL(SubStr1, "");
+
+    iprt::MiniString SubStr2("abcdef", 2);
+    CHECK_EQUAL(SubStr2, "ab");
+
+    iprt::MiniString SubStr3("abcdef", 1);
+    CHECK_EQUAL(SubStr3, "a");
+
+    iprt::MiniString SubStr4("abcdef", 6);
+    CHECK_EQUAL(SubStr4, "abcdef");
+
+    iprt::MiniString SubStr5("abcdef", 7);
+    CHECK_EQUAL(SubStr5, "abcdef");
+
+
+    iprt::MiniString SubStrBase("abcdef");
+
+    iprt::MiniString SubStr10(SubStrBase, 0);
+    CHECK_EQUAL(SubStr10, "abcdef");
+
+    iprt::MiniString SubStr11(SubStrBase, 1);
+    CHECK_EQUAL(SubStr11, "bcdef");
+
+    iprt::MiniString SubStr12(SubStrBase, 1, 1);
+    CHECK_EQUAL(SubStr12, "b");
+
+    iprt::MiniString SubStr13(SubStrBase, 2, 3);
+    CHECK_EQUAL(SubStr13, "cde");
+
+    iprt::MiniString SubStr14(SubStrBase, 2, 4);
+    CHECK_EQUAL(SubStr14, "cdef");
+
+    iprt::MiniString SubStr15(SubStrBase, 2, 5);
+    CHECK_EQUAL(SubStr15, "cdef");
+
+
     /* special constructor and assignment arguments */
     iprt::MiniString StrCtor1("");
@@ -211 +256 @@
 #undef CHECK_DUMP
 #undef CHECK_DUMP_I
+#undef CHECK_EQUAL
 }