#172-Test CppStringT::strip() with char and wchar_t

Completed. Validated.

Author: schmouk

cpp-strings-tests/cpp-strings-tests.cpp

@@ -2804,15 +2804,15 @@ namespace cppstringstests
 			sres = s.rstrip();
 			Assert::AreEqual("", sres.c_str());
 
-			s = "#124abcd#124efg#124#124#124"cs;
+			s = "#124abcd#124efg#1241#24#142"cs;
 			sres = s.rstrip("#124");
 			Assert::AreEqual("#124abcd#124efg", sres.c_str());
 
 			s = "#124abcd#124efg#124#124hij"cs;
 			sres = s.rstrip("#124");
 			Assert::AreEqual("#124abcd#124efg#124#124hij", sres.c_str());
 
-			s = "#124#124#124#124#124";
+			s = "#124#142#241124#421#";
 			sres = s.rstrip("#124");
 			Assert::AreEqual("", sres.c_str());
 
@@ -3737,5 +3737,32 @@ namespace cppstringstests
 			Assert::IsFalse(wtext.startswith_n({ L"def", L"ghi" }, 0, wlen - 4));
 			Assert::IsFalse(wtext.startswith_n({ L"def", L"ghi", L"Abcd" }, 0, wlen - 4));
 		}
+
+		TEST_METHOD(strip)
+		{
+			CppString text("abcdefedcbaea");
+
+			Assert::AreEqual("bcdefedcbae", text.strip("a").c_str());
+			Assert::AreEqual("cdefedcbae", text.strip("ba").c_str());
+			Assert::AreEqual("defedcbae", text.strip("acb").c_str());
+			Assert::AreEqual("efedcbae", text.strip("dacb").c_str());
+			Assert::AreEqual("f", text.strip("abcde").c_str());
+			Assert::AreEqual("bcdefedcb", text.strip("ea").c_str());
+			Assert::AreEqual("cdefedc", text.strip("eba").c_str());
+			Assert::AreEqual("abcdefedcbaea", text.strip("ghijZ").c_str());
+			Assert::AreEqual("abcdefedcbaea", text.strip("ABc").c_str());
+
+			CppWString wtext(L"abcdefedcbaea");
+
+			Assert::AreEqual(L"bcdefedcbae", wtext.strip(L"a").c_str());
+			Assert::AreEqual(L"cdefedcbae", wtext.strip(L"ba").c_str());
+			Assert::AreEqual(L"defedcbae", wtext.strip(L"acb").c_str());
+			Assert::AreEqual(L"efedcbae", wtext.strip(L"dacb").c_str());
+			Assert::AreEqual(L"f", wtext.strip(L"abcde").c_str());
+			Assert::AreEqual(L"bcdefedcb", wtext.strip(L"ea").c_str());
+			Assert::AreEqual(L"cdefedc", wtext.strip(L"eba").c_str());
+			Assert::AreEqual(L"abcdefedcbaea", wtext.strip(L"ghijZ").c_str());
+			Assert::AreEqual(L"abcdefedcbaea", wtext.strip(L"ABc").c_str());
+		}
 	};
 }

cpp-strings/cppstrings.h

@@ -1122,10 +1122,10 @@ namespace pcs // i.e. "pythonic c++ strings"
         * its values are stripped.
         * To remove a prefix, rather call method 'removeprefix()'.
         */
-        inline CppStringT lstrip(const CppStringT& prefix) const noexcept
+        inline CppStringT lstrip(const CppStringT& removedchars) const noexcept
         {
             for (auto it = this->cbegin(); it != this->cend(); ++it)
-                if (std::none_of(prefix.cbegin(), prefix.cend(), [it](const value_type ch) { return *it == ch; }))
+                if (std::none_of(removedchars.cbegin(), removedchars.cend(), [it](const value_type ch) { return *it == ch; }))
                     return CppStringT(it, this->cend());
             return CppStringT();
         }
@@ -1473,10 +1473,10 @@ namespace pcs // i.e. "pythonic c++ strings"
         * its values are stripped.
         * To remove a suffix, rather call method 'removesuffix()'.
         */
-        inline CppStringT rstrip(const CppStringT& suffix) const noexcept
+        inline CppStringT rstrip(const CppStringT& removedchars) const noexcept
         {
             for (auto it = this->crbegin(); it != this->crend(); ++it)
-                if (std::none_of(suffix.cbegin(), suffix.cend(), [it](const value_type ch) { return *it == ch; }))
+                if (std::none_of(removedchars.cbegin(), removedchars.cend(), [it](const value_type ch) { return *it == ch; }))
                     return CppStringT(this->cbegin(), this->cbegin() + this->size() - (it - this->crbegin()));
             return CppStringT();
         }
@@ -1715,9 +1715,9 @@ namespace pcs // i.e. "pythonic c++ strings"
         * The chars argument is not a prefix;  rather, all combinations of
         * its values are stripped.
         */
-        inline CppStringT strip(const CppStringT& prefix) const noexcept
+        inline CppStringT strip(const CppStringT& removedchars) const noexcept
         {
-            return this->rstrip(prefix).lstrip(prefix);
+            return this->rstrip(removedchars).lstrip(removedchars);
         }
 
         /** \brief Returns a copy of the string with the leading and trailing whitespaces removed. */