Changeset 39903 in vbox for trunk/src

Timestamp:

Jan 27, 2012 7:05:59 PM (13 years ago)

Author:

vboxsync

Message:

IPRT/RTCString: fix find method, add testcase

Location:

trunk/src/VBox/Runtime

Files:

• common/string/ministring.cpp (modified) (2 diffs)
• testcase/tstIprtMiniString.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/string/ministring.cpp

@@ -8 +8 @@
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -207 +207 @@
         if (pszThis)
         {
-            const char *pszHit = strstr(pszThis, pcszFind);
+            const char *pszHit = strstr(pszThis + pos, pcszFind);
             if (pszHit)
                 return pszHit - pszThis;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -69 +69 @@
             RTTestIFailed("line %u: expected \"%s\" got \"%s\"", __LINE__, szExpect, (Str).c_str()); \
     } while (0)
+#define CHECK_EQUAL_I(iRes, iExpect) \
+    do { \
+        if (iRes != iExpect) \
+            RTTestIFailed("line %u: expected \"%zd\" got \"%zd\"", __LINE__, iExpect, iRes); \
+    } while (0)
 
     RTCString empty;
@@ -255 +260 @@
     size_t pos = strTest.find("ß");
     CHECK_EQUAL(strTest.substr(pos), "ßäbcdef");
+
+    /* check find() */
+    CHECK_EQUAL_I(strTest.find("f"), 5);
+    CHECK_EQUAL_I(strTest.find("f", 0), 5);
+    CHECK_EQUAL_I(strTest.find("f", 3), 5);
+    CHECK_EQUAL_I(strTest.find("f", 6), 14);
+    CHECK_EQUAL_I(strTest.find("f", 9), 14);
+    CHECK_EQUAL_I(strTest.substr(pos).find("d"), 6);
 
     /* split */