hrev51875 adds 1 changeset to branch 'master'
old head: 509c7718dde14a9317457a1f36dc56537679596d
new head: f960e7e9a2b236d50e202d5c46b4d759d46b233a
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=f960e7e9a2b2+%5E509c7718dde1
----------------------------------------------------------------------------
f960e7e9a2b2: Support kit: Fixed issues in BString unit tests
1: Changed CPPUNIT_ASSERT -> CPPUNIT_ASSERT_EQUAL
2: Fixed coding style: Added two lines after including libraries, maintained
80 characters(MAX) in each line and space at comment start
3: Fixed the failure for "BString::Search" test "i != 0 by chaning the
testing method(StartsWith->IStartsWith) and changed the string to be
searched(sT->st)
Change-Id: I1237d1f2d0e3af7757963cc940bae929f487f088
[ krish_iyer <krishnaniyer97@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51875
Commit: f960e7e9a2b236d50e202d5c46b4d759d46b233a
URL: http://cgit.haiku-os.org/haiku/commit/?id=f960e7e9a2b2
Author: krish_iyer <krishnaniyer97@xxxxxxxxx>
Date: Thu Mar 29 07:13:25 2018 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Sat Apr 7 16:52:44 2018 UTC
----------------------------------------------------------------------------
17 files changed, 274 insertions(+), 255 deletions(-)
.../kits/support/bstring/StringAccessTest.cpp | 19 ++--
.../kits/support/bstring/StringAppendTest.cpp | 37 ++++----
.../kits/support/bstring/StringAssignTest.cpp | 30 +++---
.../kits/support/bstring/StringCaseTest.cpp | 17 ++--
.../support/bstring/StringCharAccessTest.cpp | 14 +--
.../kits/support/bstring/StringCompareTest.cpp | 33 +++----
.../support/bstring/StringConstructionTest.cpp | 18 ++--
.../kits/support/bstring/StringEscapeTest.cpp | 39 ++++----
.../support/bstring/StringFormatAppendTest.cpp | 34 +++----
.../kits/support/bstring/StringInsertTest.cpp | 25 ++---
.../kits/support/bstring/StringPrependTest.cpp | 23 ++---
.../kits/support/bstring/StringRemoveTest.cpp | 51 +++++-----
.../kits/support/bstring/StringReplaceTest.cpp | 61 ++++++------
.../kits/support/bstring/StringSearchTest.cpp | 97 ++++++++++----------
.../kits/support/bstring/StringSplitTest.cpp | 17 ++--
.../kits/support/bstring/StringSubCopyTest.cpp | 13 +--
src/tests/kits/support/bstring/StringTest.cpp | 1 +
----------------------------------------------------------------------------
diff --git a/src/tests/kits/support/bstring/StringAccessTest.cpp
b/src/tests/kits/support/bstring/StringAccessTest.cpp
index bde3a0638d..8dad63e2eb 100644
--- a/src/tests/kits/support/bstring/StringAccessTest.cpp
+++ b/src/tests/kits/support/bstring/StringAccessTest.cpp
@@ -4,12 +4,12 @@
#include <String.h>
#include <UTF8.h>
-StringAccessTest::StringAccessTest(std::string name) :
- BTestCase(name)
+
+StringAccessTest::StringAccessTest(std::string name)
+ : BTestCase(name)
{
}
-
StringAccessTest::~StringAccessTest()
{
@@ -19,7 +19,7 @@ StringAccessTest::~StringAccessTest()
void
StringAccessTest::PerformTest(void)
{
- //CountChars(), Length(), String()
+ // CountChars(), Length(), String()
NextSubTest();
BString string("Something" B_UTF8_ELLIPSIS);
CPPUNIT_ASSERT(string.CountChars() == 10);
@@ -38,21 +38,21 @@ StringAccessTest::PerformTest(void)
CPPUNIT_ASSERT(string3.CountChars() == 2);
CPPUNIT_ASSERT((unsigned)string3.Length() == strlen(string3.String()));
- //An empty string
+ // An empty string
NextSubTest();
BString empty;
CPPUNIT_ASSERT(strcmp(empty.String(), "") == 0);
CPPUNIT_ASSERT(empty.Length() == 0);
CPPUNIT_ASSERT(empty.CountChars() == 0);
- //Truncate the string at end so we are left with an invalid
- //UTF8 character
+ // Truncate the string at end so we are left with an invalid
+ // UTF8 character
NextSubTest();
BString invalid("some text with utf8 characters" B_UTF8_ELLIPSIS);
invalid.Truncate(invalid.Length() -1);
CPPUNIT_ASSERT(invalid.CountChars() == 31);
- //LockBuffer(int32) and UnlockBuffer(int32)
+ // LockBuffer(int32) and UnlockBuffer(int32)
NextSubTest();
BString locked("a string");
char *ptrstr = locked.LockBuffer(20);
@@ -93,5 +93,6 @@ CppUnit::Test *StringAccessTest::suite(void)
typedef CppUnit::TestCaller<StringAccessTest>
StringAccessTestCaller;
- return(new StringAccessTestCaller("BString::Access Test",
&StringAccessTest::PerformTest));
+ return(new StringAccessTestCaller("BString::Access Test",
+ &StringAccessTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringAppendTest.cpp
b/src/tests/kits/support/bstring/StringAppendTest.cpp
index 0605de2ee7..130137553b 100644
--- a/src/tests/kits/support/bstring/StringAppendTest.cpp
+++ b/src/tests/kits/support/bstring/StringAppendTest.cpp
@@ -2,13 +2,13 @@
#include "cppunit/TestCaller.h"
#include <String.h>
-StringAppendTest::StringAppendTest(std::string name) :
- BTestCase(name)
+
+StringAppendTest::StringAppendTest(std::string name)
+ : BTestCase(name)
{
}
-
StringAppendTest::~StringAppendTest()
{
}
@@ -19,7 +19,7 @@ StringAppendTest::PerformTest(void)
{
BString *str1, *str2;
- //+=(BString&)
+ // +=(BString&)
NextSubTest();
str1 = new BString("BASE");
str2 = new BString("APPENDED");
@@ -28,7 +28,7 @@ StringAppendTest::PerformTest(void)
delete str1;
delete str2;
- //+=(const char *)
+ // +=(const char *)
NextSubTest();
str1 = new BString("Base");
*str1 += "APPENDED";
@@ -41,7 +41,7 @@ StringAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "APPENDEDTONOTHING") == 0);
delete str1;
- //char pointer is NULL
+ // char pointer is NULL
NextSubTest();
char *tmp = NULL;
str1 = new BString("Base");
@@ -49,14 +49,14 @@ StringAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "Base") == 0);
delete str1;
- //+=(char)
+ // +=(char)
NextSubTest();
str1 = new BString("Base");
*str1 += 'C';
CPPUNIT_ASSERT(strcmp(str1->String(), "BaseC") == 0);
delete str1;
- //Append(BString&)
+ // Append(BString&)
NextSubTest();
str1 = new BString("BASE");
str2 = new BString("APPENDED");
@@ -65,7 +65,7 @@ StringAppendTest::PerformTest(void)
delete str1;
delete str2;
- //Append(const char*)
+ // Append(const char*)
NextSubTest();
str1 = new BString("Base");
str1->Append("APPENDED");
@@ -78,14 +78,14 @@ StringAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "APPENDEDTONOTHING") == 0);
delete str1;
- //char ptr is NULL
+ // char ptr is NULL
NextSubTest();
str1 = new BString("Base");
str1->Append(tmp);
CPPUNIT_ASSERT(strcmp(str1->String(), "Base") == 0);
delete str1;
- //Append(BString&, int32)
+ // Append(BString&, int32)
NextSubTest();
str1 = new BString("BASE");
str2 = new BString("APPENDED");
@@ -94,7 +94,7 @@ StringAppendTest::PerformTest(void)
delete str1;
delete str2;
- //Append(const char*, int32)
+ // Append(const char*, int32)
NextSubTest();
str1 = new BString("Base");
str1->Append("APPENDED", 40);
@@ -102,14 +102,14 @@ StringAppendTest::PerformTest(void)
CPPUNIT_ASSERT(str1->Length() == (int32)strlen("BaseAPPENDED"));
delete str1;
- //char ptr is NULL
+ // char ptr is NULL
NextSubTest();
str1 = new BString("BLABLA");
str1->Append(tmp, 2);
CPPUNIT_ASSERT(strcmp(str1->String(), "BLABLA") == 0);
delete str1;
- //Append(char, int32)
+ // Append(char, int32)
NextSubTest();
str1 = new BString("Base");
str1->Append('C', 5);
@@ -118,8 +118,8 @@ StringAppendTest::PerformTest(void)
#ifndef TEST_R5
- const int32 OUT_OF_MEM_VAL = 2*1000*1000*1000;
- //Append(char, int32) with excessive length:
+ const int32 OUT_OF_MEM_VAL = 2 * 1000 * 1000 * 1000;
+ // Append(char, int32) with excessive length:
NextSubTest();
str1 = new BString("Base");
str1->Append('C', OUT_OF_MEM_VAL);
@@ -128,7 +128,7 @@ StringAppendTest::PerformTest(void)
#endif
#ifndef TEST_R5
- //Append(char*, int32) with excessive length:
+ // Append(char*, int32) with excessive length:
NextSubTest();
str1 = new BString("Base");
str1->Append("some more text", OUT_OF_MEM_VAL);
@@ -143,5 +143,6 @@ CppUnit::Test *StringAppendTest::suite(void)
typedef CppUnit::TestCaller<StringAppendTest>
StringAppendTestCaller;
- return(new StringAppendTestCaller("BString::Append Test",
&StringAppendTest::PerformTest));
+ return(new StringAppendTestCaller("BString::Append Test",
+ &StringAppendTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringAssignTest.cpp
b/src/tests/kits/support/bstring/StringAssignTest.cpp
index 5df3899ec7..edb26e2f98 100644
--- a/src/tests/kits/support/bstring/StringAssignTest.cpp
+++ b/src/tests/kits/support/bstring/StringAssignTest.cpp
@@ -3,13 +3,12 @@
#include <String.h>
-StringAssignTest::StringAssignTest(std::string name) :
- BTestCase(name)
+StringAssignTest::StringAssignTest(std::string name)
+ : BTestCase(name)
{
}
-
StringAssignTest::~StringAssignTest()
{
}
@@ -18,7 +17,7 @@ StringAssignTest::~StringAssignTest()
void
StringAssignTest::PerformTest(void)
{
- //=(BString&)
+ // =(BString&)
NextSubTest();
BString string;
BString string2("Something");
@@ -26,14 +25,14 @@ StringAssignTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string.String(), string2.String()) == 0);
CPPUNIT_ASSERT(strcmp(string.String(), "Something") == 0);
- //=(const char*)
+ // =(const char*)
NextSubTest();
BString *str = new BString();
*str = "Something Else";
CPPUNIT_ASSERT(strcmp(str->String(), "Something Else") == 0);
delete str;
- //char ptr is NULL
+ // char ptr is NULL
NextSubTest();
char *s = NULL;
str = new BString;
@@ -41,7 +40,7 @@ StringAssignTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str->String(), "") == 0);
delete str;
- //SetTo(const char *) (NULL)
+ // SetTo(const char *) (NULL)
NextSubTest();
str = new BString;
str->SetTo(s);
@@ -54,14 +53,14 @@ StringAssignTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str->String(), "BLA") == 0);
delete str;
- //SetTo(BString&)
+ // SetTo(BString&)
NextSubTest();
str = new BString;
str->SetTo(string);
CPPUNIT_ASSERT(strcmp(str->String(), string.String()) == 0);
delete str;
- //SetTo(char, int32)
+ // SetTo(char, int32)
NextSubTest();
str = new BString;
str->SetTo('C', 10);
@@ -74,14 +73,14 @@ StringAssignTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str->String(), "") == 0);
delete str;
- //SetTo(const char*, int32)
+ // SetTo(const char*, int32)
NextSubTest();
str = new BString;
str->SetTo("ABC", 10);
CPPUNIT_ASSERT(strcmp(str->String(), "ABC") == 0);
delete str;
- //Adopt(BString&)
+ // Adopt(BString&)
NextSubTest();
const char *oldString2 = string2.String();
str = new BString;
@@ -100,15 +99,15 @@ StringAssignTest::PerformTest(void)
delete str;
#ifndef TEST_R5
- const int32 OUT_OF_MEM_VAL = 2*1000*1000*1000;
- //SetTo(char, int32) with excessive length:
+ const int32 OUT_OF_MEM_VAL = 2 * 1000 * 1000 * 1000;
+ // SetTo(char, int32) with excessive length:
NextSubTest();
str = new BString("dummy");
str->SetTo('C', OUT_OF_MEM_VAL);
CPPUNIT_ASSERT(strcmp(str->String(), "dummy") == 0);
delete str;
- //SetTo(char*, int32) with excessive length:
+ // SetTo(char*, int32) with excessive length:
NextSubTest();
str = new BString("dummy");
str->SetTo("some more text", OUT_OF_MEM_VAL);
@@ -123,5 +122,6 @@ CppUnit::Test *StringAssignTest::suite(void)
typedef CppUnit::TestCaller<StringAssignTest>
StringAssignTestCaller;
- return(new StringAssignTestCaller("BString::Assign Test",
&StringAssignTest::PerformTest));
+ return(new StringAssignTestCaller("BString::Assign Test",
+ &StringAssignTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringCaseTest.cpp
b/src/tests/kits/support/bstring/StringCaseTest.cpp
index cb6d0bb527..4fa618f130 100644
--- a/src/tests/kits/support/bstring/StringCaseTest.cpp
+++ b/src/tests/kits/support/bstring/StringCaseTest.cpp
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h"
#include <String.h>
-StringCaseTest::StringCaseTest(std::string name) :
- BTestCase(name)
+
+StringCaseTest::StringCaseTest(std::string name)
+ : BTestCase(name)
{
}
-
StringCaseTest::~StringCaseTest()
{
@@ -19,7 +19,7 @@ StringCaseTest::PerformTest(void)
{
BString *string;
- //Capitalize
+ // Capitalize
NextSubTest();
string = new BString("this is a sentence");
string->Capitalize();
@@ -38,7 +38,7 @@ StringCaseTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
delete string;
- //ToLower
+ // ToLower
NextSubTest();
string = new BString("1a2B3c4d5e6f7G");
string->ToLower();
@@ -51,7 +51,7 @@ StringCaseTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
delete string;
- //ToUpper
+ // ToUpper
NextSubTest();
string = new BString("1a2b3c4d5E6f7g");
string->ToUpper();
@@ -64,7 +64,7 @@ StringCaseTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
delete string;
- //CapitalizeEachWord
+ // CapitalizeEachWord
NextSubTest();
string = new BString("each wOrd 3will_be >capiTalized");
string->CapitalizeEachWord();
@@ -84,5 +84,6 @@ CppUnit::Test *StringCaseTest::suite(void)
typedef CppUnit::TestCaller<StringCaseTest>
StringCaseTestCaller;
- return(new StringCaseTestCaller("BString::Case Test",
&StringCaseTest::PerformTest));
+ return(new StringCaseTestCaller("BString::Case Test",
+ &StringCaseTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringCharAccessTest.cpp
b/src/tests/kits/support/bstring/StringCharAccessTest.cpp
index 0859508352..df52fb7a76 100644
--- a/src/tests/kits/support/bstring/StringCharAccessTest.cpp
+++ b/src/tests/kits/support/bstring/StringCharAccessTest.cpp
@@ -3,12 +3,11 @@
#include <String.h>
-StringCharAccessTest::StringCharAccessTest(std::string name) :
- BTestCase(name)
+StringCharAccessTest::StringCharAccessTest(std::string name)
+ : BTestCase(name)
{
}
-
StringCharAccessTest::~StringCharAccessTest()
{
@@ -20,17 +19,17 @@ StringCharAccessTest::PerformTest(void)
{
BString string("A simple string");
- //operator[]
+ // operator[]
NextSubTest();
CPPUNIT_ASSERT(string[0] == 'A');
CPPUNIT_ASSERT(string[1] == ' ');
- //&operator[]
+ // &operator[]
NextSubTest();
string.SetByteAt(0, 'a');
CPPUNIT_ASSERT(strcmp(string.String(), "a simple string") == 0);
- //ByteAt(int32)
+ // ByteAt(int32)
NextSubTest();
CPPUNIT_ASSERT(string.ByteAt(-10) == 0);
CPPUNIT_ASSERT(string.ByteAt(200) == 0);
@@ -44,5 +43,6 @@ CppUnit::Test *StringCharAccessTest::suite(void)
typedef CppUnit::TestCaller<StringCharAccessTest>
StringCharAccessTestCaller;
- return(new StringCharAccessTestCaller("BString::CharAccess Test",
&StringCharAccessTest::PerformTest));
+ return(new StringCharAccessTestCaller("BString::CharAccess Test",
+ &StringCharAccessTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringCompareTest.cpp
b/src/tests/kits/support/bstring/StringCompareTest.cpp
index c060b1a349..6b3bdf748f 100644
--- a/src/tests/kits/support/bstring/StringCompareTest.cpp
+++ b/src/tests/kits/support/bstring/StringCompareTest.cpp
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h"
#include <String.h>
-StringCompareTest::StringCompareTest(std::string name) :
- BTestCase(name)
+
+StringCompareTest::StringCompareTest(std::string name)
+ : BTestCase(name)
{
}
-
StringCompareTest::~StringCompareTest()
{
@@ -19,7 +19,7 @@ StringCompareTest::PerformTest(void)
{
BString *string1, *string2;
- //operator<(const BString &) const;
+ // operator<(const BString &) const;
NextSubTest();
string1 = new BString("11111_a");
string2 = new BString("22222_b");
@@ -27,7 +27,7 @@ StringCompareTest::PerformTest(void)
delete string1;
delete string2;
- //operator<=(const BString &) const;
+ // operator<=(const BString &) const;
NextSubTest();
string1 = new BString("11111_a");
string2 = new BString("22222_b");
@@ -42,7 +42,7 @@ StringCompareTest::PerformTest(void)
delete string1;
delete string2;
- //operator==(const BString &) const;
+ // operator==(const BString &) const;
NextSubTest();
string1 = new BString("string");
string2 = new BString("string");
@@ -57,7 +57,7 @@ StringCompareTest::PerformTest(void)
delete string1;
delete string2;
- //operator>=(const BString &) const;
+ // operator>=(const BString &) const;
NextSubTest();
string1 = new BString("BBBBB");
string2 = new BString("AAAAA");
@@ -72,7 +72,7 @@ StringCompareTest::PerformTest(void)
delete string1;
delete string2;
- //operator>(const BString &) const;
+ // operator>(const BString &) const;
NextSubTest();
string1 = new BString("BBBBB");
string2 = new BString("AAAAA");
@@ -80,7 +80,7 @@ StringCompareTest::PerformTest(void)
delete string1;
delete string2;
- //operator!=(const BString &) const;
+ // operator!=(const BString &) const;
NextSubTest();
string1 = new BString("string");
string2 = new BString("string");
@@ -95,20 +95,20 @@ StringCompareTest::PerformTest(void)
delete string1;
delete string2;
- //operator<(const char *) const;
+ // operator<(const char *) const;
NextSubTest();
string1 = new BString("AAAAA");
CPPUNIT_ASSERT(*string1 < "BBBBB");
delete string1;
- //operator<=(const char *) const;
+ // operator<=(const char *) const;
NextSubTest();
string1 = new BString("AAAAA");
CPPUNIT_ASSERT(*string1 <= "BBBBB");
CPPUNIT_ASSERT(*string1 <= "AAAAA");
delete string1;
- //operator==(const char *) const;
+ // operator==(const char *) const;
NextSubTest();
string1 = new BString("AAAAA");
CPPUNIT_ASSERT(*string1 == "AAAAA");
@@ -119,20 +119,20 @@ StringCompareTest::PerformTest(void)
CPPUNIT_ASSERT((*string1 == "BBBB") == false);
delete string1;
- //operator>=(const char *) const;
+ // operator>=(const char *) const;
NextSubTest();
string1 = new BString("BBBBB");
CPPUNIT_ASSERT(*string1 >= "AAAAA");
CPPUNIT_ASSERT(*string1 >= "BBBBB");
delete string1;
- //operator>(const char *) const;
+ // operator>(const char *) const;
NextSubTest();
string1 = new BString("BBBBB");
CPPUNIT_ASSERT(*string1 > "AAAAA");
delete string1;
- //operator!=(const char *) const;
+ // operator!=(const char *) const;
NextSubTest();
string1 = new BString("AAAAA");
CPPUNIT_ASSERT((*string1 != "AAAAA") == false);
@@ -150,5 +150,6 @@ CppUnit::Test *StringCompareTest::suite(void)
typedef CppUnit::TestCaller<StringCompareTest>
StringCompareTestCaller;
- return(new StringCompareTestCaller("BString::Compare Test",
&StringCompareTest::PerformTest));
+ return(new StringCompareTestCaller("BString::Compare Test",
+ &StringCompareTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringConstructionTest.cpp
b/src/tests/kits/support/bstring/StringConstructionTest.cpp
index 2443032464..60dd112842 100644
--- a/src/tests/kits/support/bstring/StringConstructionTest.cpp
+++ b/src/tests/kits/support/bstring/StringConstructionTest.cpp
@@ -3,12 +3,11 @@
#include <String.h>
-StringConstructionTest::StringConstructionTest(std::string name) :
- BTestCase(name)
+StringConstructionTest::StringConstructionTest(std::string name)
+ : BTestCase(name)
{
}
-
StringConstructionTest::~StringConstructionTest()
{
@@ -21,28 +20,28 @@ StringConstructionTest::PerformTest(void)
BString *string;
const char *str = "Something";
- //BString()
+ // BString()
NextSubTest();
string = new BString;
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
CPPUNIT_ASSERT(string->Length() == 0);
delete string;
- //BString(const char*)
+ // BString(const char*)
NextSubTest();
string = new BString(str);
CPPUNIT_ASSERT(strcmp(string->String(), str) == 0);
CPPUNIT_ASSERT((unsigned)string->Length() == strlen(str));
delete string;
- //BString(NULL)
+ // BString(NULL)
NextSubTest();
string = new BString(NULL);
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
CPPUNIT_ASSERT(string->Length() == 0);
delete string;
- //BString(BString&)
+ // BString(BString&)
NextSubTest();
BString anotherString("Something Else");
string = new BString(anotherString);
@@ -50,7 +49,7 @@ StringConstructionTest::PerformTest(void)
CPPUNIT_ASSERT(string->Length() == anotherString.Length());
delete string;
- //BString(const char*, int32)
+ // BString(const char*, int32)
NextSubTest();
string = new BString(str, 5);
CPPUNIT_ASSERT(strcmp(string->String(), str) != 0);
@@ -71,5 +70,6 @@ CppUnit::Test *StringConstructionTest::suite(void)
typedef CppUnit::TestCaller<StringConstructionTest>
StringConstructionTestCaller;
- return(new StringConstructionTestCaller("BString::Construction Test",
&StringConstructionTest::PerformTest));
+ return(new StringConstructionTestCaller("BString::Construction Test",
+ &StringConstructionTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringEscapeTest.cpp
b/src/tests/kits/support/bstring/StringEscapeTest.cpp
index 1722982a3a..1c517f4cc2 100644
--- a/src/tests/kits/support/bstring/StringEscapeTest.cpp
+++ b/src/tests/kits/support/bstring/StringEscapeTest.cpp
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h"
#include <String.h>
-StringEscapeTest::StringEscapeTest(std::string name) :
- BTestCase(name)
+
+StringEscapeTest::StringEscapeTest(std::string name)
+ : BTestCase(name)
{
}
-
StringEscapeTest::~StringEscapeTest()
{
@@ -19,28 +19,28 @@ StringEscapeTest::PerformTest(void)
{
BString *string1;
- //CharacterEscape(char*, char)
+ // CharacterEscape(char*, char)
NextSubTest();
string1 = new BString("abcdefghi");
string1->CharacterEscape("acf", '/');
CPPUNIT_ASSERT(strcmp(string1->String(), "/ab/cde/fghi") == 0);
delete string1;
- //BString is null
+ // BString is null
NextSubTest();
string1 = new BString;
string1->CharacterEscape("abc", '/');
CPPUNIT_ASSERT(strcmp(string1->String(), "") == 0);
delete string1;
- //BString doesn't contain wanted characters
+ // BString doesn't contain wanted characters
NextSubTest();
string1 = new BString("abcdefghi");
string1->CharacterEscape("z34", 'z');
CPPUNIT_ASSERT(strcmp(string1->String(), "abcdefghi") == 0);
delete string1;
- //CharacterEscape(char *, char*, char)
+ // CharacterEscape(char *, char*, char)
NextSubTest();
string1 = new BString("something");
string1->CharacterEscape("newstring", "esi", '0');
@@ -48,8 +48,8 @@ StringEscapeTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //assigned string is NULL
- //it crashes r5 implementation, but not ours :)
+ // assigned string is NULL
+ // it crashes r5 implementation, but not ours :)
NextSubTest();
string1 = new BString("something");
string1->CharacterEscape((char*)NULL, "ei", '-');
@@ -57,42 +57,42 @@ StringEscapeTest::PerformTest(void)
delete string1;
#endif
- //String was empty
+ // String was empty
NextSubTest();
string1 = new BString;
string1->CharacterEscape("newstring", "esi", '0');
CPPUNIT_ASSERT(strcmp(string1->String(), "n0ew0str0ing") == 0);
delete string1;
- //CharacterDeescape(char)
+ // CharacterDeescape(char)
NextSubTest();
string1 = new BString("/a/nh/g/bhhgy/fgtuhjkb/");
string1->CharacterDeescape('/');
CPPUNIT_ASSERT(strcmp(string1->String(), "anhgbhhgyfgtuhjkb") == 0);
delete string1;
- //String was empty
+ // String was empty
NextSubTest();
string1 = new BString;
string1->CharacterDeescape('/');
CPPUNIT_ASSERT(strcmp(string1->String(), "") == 0);
delete string1;
- //String doesn't contain character to escape
+ // String doesn't contain character to escape
NextSubTest();
string1 = new BString("/a/nh/g/bhhgy/fgtuhjkb/");
string1->CharacterDeescape('-');
CPPUNIT_ASSERT(strcmp(string1->String(), "/a/nh/g/bhhgy/fgtuhjkb/") ==
0);
delete string1;
- //CharacterDeescape(char* original, char)
+ // CharacterDeescape(char* original, char)
NextSubTest();
string1 = new BString("oldString");
string1->CharacterDeescape("-ne-ws-tri-ng-", '-');
CPPUNIT_ASSERT(strcmp(string1->String(), "newstring") == 0);
delete string1;
- //String was empty
+ // String was empty
NextSubTest();
string1 = new BString;
string1->CharacterDeescape("new/str/ing", '/');
@@ -100,8 +100,8 @@ StringEscapeTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //assigned string is empty
- //it crashes r5 implementation, but not ours :)
+ // assigned string is empty
+ // it crashes r5 implementation, but not ours :)
NextSubTest();
string1 = new BString("pippo");
string1->CharacterDeescape((char*)NULL, '/');
@@ -109,7 +109,7 @@ StringEscapeTest::PerformTest(void)
delete string1;
#endif
- //String doesn't contain character to escape
+ // String doesn't contain character to escape
NextSubTest();
string1 = new BString("Old");
string1->CharacterDeescape("/a/nh/g/bhhgy/fgtuhjkb/", '-');
@@ -123,5 +123,6 @@ CppUnit::Test *StringEscapeTest::suite(void)
typedef CppUnit::TestCaller<StringEscapeTest>
StringEscapeTestCaller;
- return(new StringEscapeTestCaller("BString::Escape Test",
&StringEscapeTest::PerformTest));
+ return(new StringEscapeTestCaller("BString::Escape Test",
+ &StringEscapeTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringFormatAppendTest.cpp
b/src/tests/kits/support/bstring/StringFormatAppendTest.cpp
index c1a81049a4..0ca7d63dea 100644
--- a/src/tests/kits/support/bstring/StringFormatAppendTest.cpp
+++ b/src/tests/kits/support/bstring/StringFormatAppendTest.cpp
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h"
#include <String.h>
-StringFormatAppendTest::StringFormatAppendTest(std::string name) :
- BTestCase(name)
+
+StringFormatAppendTest::StringFormatAppendTest(std::string name)
+ : BTestCase(name)
{
}
-
StringFormatAppendTest::~StringFormatAppendTest()
{
@@ -19,7 +19,7 @@ StringFormatAppendTest::PerformTest(void)
{
BString *string, *string2;
- //operator<<(const char *);
+ // operator<<(const char *);
NextSubTest();
string = new BString("some");
*string << " ";
@@ -27,7 +27,7 @@ StringFormatAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "some text") == 0);
delete string;
- //operator<<(const BString &);
+ // operator<<(const BString &);
NextSubTest();
string = new BString("some ");
string2 = new BString("text");
@@ -36,14 +36,14 @@ StringFormatAppendTest::PerformTest(void)
delete string;
delete string2;
- //operator<<(char);
+ // operator<<(char);
NextSubTest();
string = new BString("str");
*string << 'i' << 'n' << 'g';
CPPUNIT_ASSERT(strcmp(string->String(), "string") == 0);
delete string;
- //operator<<(int);
+ // operator<<(int);
NextSubTest();
string = new BString("level ");
*string << (int)42;
@@ -56,21 +56,21 @@ StringFormatAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "error -1") == 0);
delete string;
- //operator<<(unsigned int);
+ // operator<<(unsigned int);
NextSubTest();
string = new BString("number ");
*string << (unsigned int)296;
CPPUNIT_ASSERT(strcmp(string->String(), "number 296") == 0);
delete string;
- //operator<<(uint32);
+ // operator<<(uint32);
NextSubTest();
string = new BString;
*string << (uint32)102456;
CPPUNIT_ASSERT(strcmp(string->String(), "102456") == 0);
delete string;
- //operator<<(int32);
+ // operator<<(int32);
NextSubTest();
string = new BString;
*string << (int32)112456;
@@ -83,14 +83,14 @@ StringFormatAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "-112475") == 0);
delete string;
- //operator<<(uint64);
+ // operator<<(uint64);
NextSubTest();
string = new BString;
*string << (uint64)1145267987;
CPPUNIT_ASSERT(strcmp(string->String(), "1145267987") == 0);
delete string;
- //operator<<(int64);
+ // operator<<(int64);
NextSubTest();
string = new BString;
*string << (int64)112456;
@@ -103,17 +103,18 @@ StringFormatAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "-112475") == 0);
delete string;
- //operator<<(float);
+ // operator<<(float);
NextSubTest();
string = new BString;
*string << (float)34.542;
CPPUNIT_ASSERT(strcmp(string->String(), "34.54") == 0);
delete string;
- //Misc test
+ // Misc test
NextSubTest();
BString s;
- s << "This" << ' ' << "is" << ' ' << 'a' << ' ' << "test" << ' ' <<
"sentence";
+ s << "This" << ' ' << "is" << ' ' << 'a' << ' ' << "test"
+ << ' ' << "sentence";
CPPUNIT_ASSERT(strcmp(s.String(), "This is a test sentence") == 0);
}
@@ -123,5 +124,6 @@ CppUnit::Test *StringFormatAppendTest::suite(void)
typedef CppUnit::TestCaller<StringFormatAppendTest>
StringFormatAppendTestCaller;
- return(new StringFormatAppendTestCaller("BString::FormatAppend Test",
&StringFormatAppendTest::PerformTest));
+ return(new StringFormatAppendTestCaller("BString::FormatAppend Test",
+ &StringFormatAppendTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringInsertTest.cpp
b/src/tests/kits/support/bstring/StringInsertTest.cpp
index 30fd1975bf..d9976ece2c 100644
--- a/src/tests/kits/support/bstring/StringInsertTest.cpp
+++ b/src/tests/kits/support/bstring/StringInsertTest.cpp
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h"
#include <String.h>
-StringInsertTest::StringInsertTest(std::string name) :
- BTestCase(name)
+
+StringInsertTest::StringInsertTest(std::string name)
+ : BTestCase(name)
{
}
-
StringInsertTest::~StringInsertTest()
{
@@ -19,7 +19,7 @@ StringInsertTest::PerformTest(void)
{
BString *str1, *str2;
- //&Insert(const char *, int32 pos);
+ // &Insert(const char *, int32 pos);
NextSubTest();
str1 = new BString("String");
str1->Insert("INSERTED", 3);
@@ -51,7 +51,7 @@ StringInsertTest::PerformTest(void)
delete str1;
#endif
- //&Insert(const char *, int32 length, int32 pos);
+ // &Insert(const char *, int32 length, int32 pos);
NextSubTest();
str1 = new BString("string");
str1->Insert("INSERTED", 2, 2);
@@ -74,28 +74,28 @@ StringInsertTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "stINSERTEDring") == 0);
delete str1;
- //&Insert(const char *, int32 fromOffset, int32 length, int32 pos);
+ // &Insert(const char *, int32 fromOffset, int32 length, int32 pos);
NextSubTest();
str1 = new BString("string");
str1->Insert("INSERTED", 4, 30, 2);
CPPUNIT_ASSERT(strcmp(str1->String(), "stRTEDring") == 0);
delete str1;
- //Insert(char c, int32 count, int32 pos)
+ // Insert(char c, int32 count, int32 pos)
NextSubTest();
str1 = new BString("string");
str1->Insert('P', 5, 3);
CPPUNIT_ASSERT(strcmp(str1->String(), "strPPPPPing") == 0);
delete str1;
- //Insert(char c, int32 count, int32 pos)
+ // Insert(char c, int32 count, int32 pos)
NextSubTest();
str1 = new BString("string");
str1->Insert('P', 5, -2);
CPPUNIT_ASSERT(strcmp(str1->String(), "PPPstring") == 0);
delete str1;
- //Insert(BString&)
+ // Insert(BString&)
NextSubTest();
str1 = new BString("string");
str2 = new BString("INSERTED");
@@ -118,7 +118,7 @@ StringInsertTest::PerformTest(void)
delete str1;
delete str2;
- //&Insert(BString &, int32 length, int32 pos);
+ // &Insert(BString &, int32 length, int32 pos);
NextSubTest();
str1 = new BString("string");
str2 = new BString("INSERTED");
@@ -127,7 +127,7 @@ StringInsertTest::PerformTest(void)
delete str1;
delete str2;
- //&Insert(BString&, int32 fromOffset, int32 length, int32 pos);
+ // &Insert(BString&, int32 fromOffset, int32 length, int32 pos);
NextSubTest();
str1 = new BString("string");
str2 = new BString("INSERTED");
@@ -143,5 +143,6 @@ CppUnit::Test *StringInsertTest::suite(void)
typedef CppUnit::TestCaller<StringInsertTest>
StringInsertTestCaller;
- return(new StringInsertTestCaller("BString::Insert Test",
&StringInsertTest::PerformTest));
+ return(new StringInsertTestCaller("BString::Insert Test",
+ &StringInsertTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringPrependTest.cpp
b/src/tests/kits/support/bstring/StringPrependTest.cpp
index a803e6ea99..6465a25a51 100644
--- a/src/tests/kits/support/bstring/StringPrependTest.cpp
+++ b/src/tests/kits/support/bstring/StringPrependTest.cpp
@@ -3,12 +3,12 @@
#include <String.h>
#include <UTF8.h>
-StringPrependTest::StringPrependTest(std::string name) :
- BTestCase(name)
+
+StringPrependTest::StringPrependTest(std::string name)
+ : BTestCase(name)
{
}
-
StringPrependTest::~StringPrependTest()
{
@@ -20,7 +20,7 @@ StringPrependTest::PerformTest(void)
{
BString *str1, *str2;
- //Prepend(BString&)
+ // Prepend(BString&)
NextSubTest();
str1 = new BString("a String");
str2 = new BString("PREPENDED");
@@ -29,28 +29,28 @@ StringPrependTest::PerformTest(void)
delete str1;
delete str2;
- //Prepend(const char*)
+ // Prepend(const char*)
NextSubTest();
str1 = new BString("String");
str1->Prepend("PREPEND");
CPPUNIT_ASSERT(strcmp(str1->String(), "PREPENDString") == 0);
delete str1;
- //Prepend(const char*) (NULL)
+ // Prepend(const char*) (NULL)
NextSubTest();
str1 = new BString("String");
str1->Prepend((char*)NULL);
CPPUNIT_ASSERT(strcmp(str1->String(), "String") == 0);
delete str1;
- //Prepend(const char*, int32
+ // Prepend(const char*, int32
NextSubTest();
str1 = new BString("String");
str1->Prepend("PREPENDED", 3);
CPPUNIT_ASSERT(strcmp(str1->String(), "PREString") == 0);
delete str1;
- //Prepend(BString&, int32)
+ // Prepend(BString&, int32)
NextSubTest();
str1 = new BString("String");
str2 = new BString("PREPEND", 4);
@@ -59,14 +59,14 @@ StringPrependTest::PerformTest(void)
delete str1;
delete str2;
- //Prepend(char, int32)
+ // Prepend(char, int32)
NextSubTest();
str1 = new BString("aString");
str1->Prepend('c', 4);
CPPUNIT_ASSERT(strcmp(str1->String(), "ccccaString") == 0);
delete str1;
- //String was empty
+ // String was empty
NextSubTest();
str1 = new BString;
str1->Prepend("PREPENDED");
@@ -81,5 +81,6 @@ CppUnit::Test *StringPrependTest::suite(void)
typedef CppUnit::TestCaller<StringPrependTest>
StringPrependTestCaller;
- return(new StringPrependTestCaller("BString::Prepend Test",
&StringPrependTest::PerformTest));
+ return(new StringPrependTestCaller("BString::Prepend Test",
+ &StringPrependTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringRemoveTest.cpp
b/src/tests/kits/support/bstring/StringRemoveTest.cpp
index cf387e8916..4798add275 100644
--- a/src/tests/kits/support/bstring/StringRemoveTest.cpp
+++ b/src/tests/kits/support/bstring/StringRemoveTest.cpp
@@ -3,12 +3,12 @@
#include <String.h>
#include <stdio.h>
-StringRemoveTest::StringRemoveTest(std::string name) :
- BTestCase(name)
+
+StringRemoveTest::StringRemoveTest(std::string name)
+ : BTestCase(name)
{
}
-
StringRemoveTest::~StringRemoveTest()
{
@@ -20,8 +20,8 @@ StringRemoveTest::PerformTest(void)
{
BString *string1, *string2;
- //Truncate(int32 newLength, bool lazy);
- //lazy = true
+ // Truncate(int32 newLength, bool lazy);
+ // lazy = true
NextSubTest();
string1 = new BString("This is a long string");
string1->Truncate(14, true);
@@ -29,7 +29,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(string1->Length() == 14);
delete string1;
- //lazy = false
+ // lazy = false
NextSubTest();
string1 = new BString("This is a long string");
string1->Truncate(14, false);
@@ -38,9 +38,9 @@ StringRemoveTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //new length is < 0
- //it crashes r5 implementation, but ours works fine here,
- //in this case, we just truncate to 0
+ // new length is < 0
+ // it crashes r5 implementation, but ours works fine here,
+ // in this case, we just truncate to 0
NextSubTest();
string1 = new BString("This is a long string");
string1->Truncate(-3);
@@ -49,7 +49,7 @@ StringRemoveTest::PerformTest(void)
delete string1;
#endif
- //new length is > old length
+ // new length is > old length
NextSubTest();
string1 = new BString("This is a long string");
string1->Truncate(45);
@@ -57,7 +57,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(string1->Length() == 21);
delete string1;
- //String was empty
+ // String was empty
NextSubTest();
string1 = new BString;
string1->Truncate(0);
@@ -65,28 +65,28 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(string1->Length() == 0);
delete string1;
- //Remove(int32 from, int32 length)
+ // Remove(int32 from, int32 length)
NextSubTest();
string1 = new BString("a String");
string1->Remove(2, 2);
CPPUNIT_ASSERT(strcmp(string1->String(), "a ring") == 0);
delete string1;
- //String was empty
+ // String was empty
NextSubTest();
string1 = new BString;
string1->Remove(2, 1);
CPPUNIT_ASSERT(strcmp(string1->String(), "") == 0);
delete string1;
- //from is beyond the end of the string
+ // from is beyond the end of the string
NextSubTest();
string1 = new BString("a String");
string1->Remove(20, 2);
CPPUNIT_ASSERT(strcmp(string1->String(), "a String") == 0);
delete string1;
- //from + length exceeds Length() (R5 fails)
+ // from + length exceeds Length() (R5 fails)
NextSubTest();
string1 = new BString("a String");
string1->Remove(4, 30);
@@ -99,7 +99,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "ing") == 0);
delete string1;
- //RemoveFirst(BString&)
+ // RemoveFirst(BString&)
NextSubTest();
string1 = new BString("first second first");
string2 = new BString("first");
@@ -116,7 +116,7 @@ StringRemoveTest::PerformTest(void)
delete string1;
delete string2;
- //RemoveLast(Bstring&)
+ // RemoveLast(Bstring&)
NextSubTest();
string1 = new BString("first second first");
string2 = new BString("first");
@@ -133,7 +133,7 @@ StringRemoveTest::PerformTest(void)
delete string1;
delete string2;
- //RemoveAll(BString&)
+ // RemoveAll(BString&)
NextSubTest();
string1 = new BString("first second first");
string2 = new BString("first");
@@ -150,7 +150,7 @@ StringRemoveTest::PerformTest(void)
delete string1;
delete string2;
- //RemoveFirst(const char*)
+ // RemoveFirst(const char*)
NextSubTest();
string1 = new BString("first second first");
string1->RemoveFirst("first");
@@ -169,7 +169,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "first second first") == 0);
delete string1;
- //RemoveLast(const char*)
+ // RemoveLast(const char*)
NextSubTest();
string1 = new BString("first second first");
string1->RemoveLast("first");
@@ -182,7 +182,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "first second first") == 0);
delete string1;
- //RemoveAll(const char*)
+ // RemoveAll(const char*)
NextSubTest();
string1 = new BString("first second first");
string1->RemoveAll("first");
@@ -195,7 +195,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "first second first") == 0);
delete string1;
- //RemoveSet(const char*)
+ // RemoveSet(const char*)
NextSubTest();
string1 = new BString("a sentence with (3) (642) numbers (2) in it");
string1->RemoveSet("()3624 ");
@@ -208,7 +208,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "a string") == 0);
delete string1;
- //MoveInto(BString &into, int32, int32)
+ // MoveInto(BString &into, int32, int32)
NextSubTest();
string1 = new BString("some text");
string2 = new BString("string");
@@ -227,7 +227,7 @@ StringRemoveTest::PerformTest(void)
delete string1;
delete string2;
- //MoveInto(char *, int32, int32)
+ // MoveInto(char *, int32, int32)
NextSubTest();
char dest[100];
memset(dest, 0, 100);
@@ -252,5 +252,6 @@ CppUnit::Test *StringRemoveTest::suite(void)
typedef CppUnit::TestCaller<StringRemoveTest>
StringRemoveTestCaller;
- return(new StringRemoveTestCaller("BString::Remove Test",
&StringRemoveTest::PerformTest));
+ return(new StringRemoveTestCaller("BString::Remove Test",
+ &StringRemoveTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringReplaceTest.cpp
b/src/tests/kits/support/bstring/StringReplaceTest.cpp
index ba04aae0a7..8e91bf3f0d 100644
--- a/src/tests/kits/support/bstring/StringReplaceTest.cpp
+++ b/src/tests/kits/support/bstring/StringReplaceTest.cpp
@@ -2,13 +2,13 @@
#include "cppunit/TestCaller.h"
#include <String.h>
-StringReplaceTest::StringReplaceTest(std::string name) :
- BTestCase(name)
+
+StringReplaceTest::StringReplaceTest(std::string name)
+ : BTestCase(name)
{
}
-
StringReplaceTest::~StringReplaceTest()
{
}
@@ -18,10 +18,10 @@ void
StringReplaceTest::PerformTest(void)
{
BString *str1;
- const int32 sz = 1024*50;
+ const int32 sz = 1024 * 50;
char* buf;
- //&ReplaceFirst(char, char);
+ // &ReplaceFirst(char, char);
NextSubTest();
str1 = new BString("test string");
str1->ReplaceFirst('t', 'b');
@@ -34,7 +34,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0);
delete str1;
- //&ReplaceLast(char, char);
+ // &ReplaceLast(char, char);
NextSubTest();
str1 = new BString("test string");
str1->ReplaceLast('t', 'w');
@@ -47,7 +47,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0);
delete str1;
- //&ReplaceAll(char, char, int32);
+ // &ReplaceAll(char, char, int32);
NextSubTest();
str1 = new BString("test string");
str1->ReplaceAll('t', 'i');
@@ -72,17 +72,19 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "tesi siring") == 0);
delete str1;
- //&Replace(char, char, int32, int32)
+ // &Replace(char, char, int32, int32)
NextSubTest();
str1 = new BString("she sells sea shells on the sea shore");
str1->Replace('s', 't', 4, 2);
- CPPUNIT_ASSERT(strcmp(str1->String(), "she tellt tea thells on the sea
shore") == 0);
+ CPPUNIT_ASSERT(strcmp(str1->String(),
+ "she tellt tea thells on the sea shore") == 0);
delete str1;
NextSubTest();
str1 = new BString("she sells sea shells on the sea shore");
str1->Replace('s', 's', 4, 2);
- CPPUNIT_ASSERT(strcmp(str1->String(), "she sells sea shells on the sea
shore") == 0);
+ CPPUNIT_ASSERT(strcmp(str1->String(),
+ "she sells sea shells on the sea shore") == 0);
delete str1;
NextSubTest();
@@ -91,7 +93,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "") == 0);
delete str1;
- //&ReplaceFirst(const char*, const char*)
+ // &ReplaceFirst(const char*, const char*)
NextSubTest();
str1 = new BString("she sells sea shells on the seashore");
str1->ReplaceFirst("sea", "the");
@@ -106,7 +108,7 @@ StringReplaceTest::PerformTest(void)
"she sells sea shells on the seashore") == 0);
delete str1;
- //&ReplaceLast(const char*, const char*)
+ // &ReplaceLast(const char*, const char*)
NextSubTest();
str1 = new BString("she sells sea shells on the seashore");
str1->ReplaceLast("sea", "the");
@@ -121,7 +123,7 @@ StringReplaceTest::PerformTest(void)
"she sells sea shells on the seashore") == 0);
delete str1;
- //&ReplaceAll(const char*, const char*, int32)
+ // &ReplaceAll(const char*, const char*, int32)
NextSubTest();
str1 = new BString("abc abc abc");
str1->ReplaceAll("ab", "abc");
@@ -155,7 +157,7 @@ StringReplaceTest::PerformTest(void)
"she sells sea shells on the seashore") == 0);
delete str1;
- //&IReplaceFirst(char, char);
+ // &IReplaceFirst(char, char);
NextSubTest();
str1 = new BString("test string");
str1->IReplaceFirst('t', 'b');
@@ -168,7 +170,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0);
delete str1;
- //&IReplaceLast(char, char);
+ // &IReplaceLast(char, char);
NextSubTest();
str1 = new BString("test string");
str1->IReplaceLast('t', 'w');
@@ -181,7 +183,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0);
delete str1;
- //&IReplaceAll(char, char, int32);
+ // &IReplaceAll(char, char, int32);
NextSubTest();
str1 = new BString("TEST string");
str1->IReplaceAll('t', 'i');
@@ -206,17 +208,19 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "TESi siring") == 0);
delete str1;
- //&IReplace(char, char, int32, int32)
+ // &IReplace(char, char, int32, int32)
NextSubTest();
str1 = new BString("She sells Sea shells on the sea shore");
str1->IReplace('s', 't', 4, 2);
- CPPUNIT_ASSERT(strcmp(str1->String(), "She tellt tea thells on the sea
shore") == 0);
+ CPPUNIT_ASSERT(strcmp(str1->String(),
+ "She tellt tea thells on the sea shore") == 0);
delete str1;
NextSubTest();
str1 = new BString("She sells Sea shells on the sea shore");
str1->IReplace('s', 's', 4, 2);
- CPPUNIT_ASSERT(strcmp(str1->String(), "She sells sea shells on the sea
shore") == 0);
+ CPPUNIT_ASSERT(strcmp(str1->String(),
+ "She sells sea shells on the sea shore") == 0);
delete str1;
NextSubTest();
@@ -225,7 +229,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "") == 0);
delete str1;
- //&IReplaceFirst(const char*, const char*)
+ // &IReplaceFirst(const char*, const char*)
NextSubTest();
str1 = new BString("she sells SeA shells on the seashore");
str1->IReplaceFirst("sea", "the");
@@ -240,7 +244,7 @@ StringReplaceTest::PerformTest(void)
"she sells sea shells on the seashore") == 0);
delete str1;
- //&IReplaceLast(const char*, const char*)
+ // &IReplaceLast(const char*, const char*)
#ifndef TEST_R5
NextSubTest();
str1 = new BString("she sells sea shells on the SEashore");
@@ -256,7 +260,7 @@ StringReplaceTest::PerformTest(void)
"she sells sea shells on the seashore") == 0);
delete str1;
- //&IReplaceAll(const char*, const char*, int32)
+ // &IReplaceAll(const char*, const char*, int32)
NextSubTest();
str1 = new BString("abc ABc aBc");
str1->IReplaceAll("ab", "abc");
@@ -278,7 +282,7 @@ StringReplaceTest::PerformTest(void)
"she sells SeA shells on the theshore") == 0);
delete str1;
- //ReplaceSet(const char*, char)
+ // ReplaceSet(const char*, char)
NextSubTest();
str1 = new BString("abc abc abc");
str1->ReplaceSet("ab", 'x');
@@ -298,7 +302,7 @@ StringReplaceTest::PerformTest(void)
delete str1;
#ifndef TEST_R5
- //ReplaceSet(const char*, const char*)
+ // ReplaceSet(const char*, const char*)
NextSubTest();
str1 = new BString("abcd abcd abcd");
str1->ReplaceSet("abcd ", "");
@@ -307,7 +311,7 @@ StringReplaceTest::PerformTest(void)
#endif
#ifndef TEST_R5
- //ReplaceSet(const char*, const char*)
+ // ReplaceSet(const char*, const char*)
NextSubTest();
str1 = new BString("abcd abcd abcd");
str1->ReplaceSet("ad", "da");
@@ -316,7 +320,7 @@ StringReplaceTest::PerformTest(void)
#endif
#ifndef TEST_R5
- //ReplaceSet(const char*, const char*)
+ // ReplaceSet(const char*, const char*)
NextSubTest();
str1 = new BString("abcd abcd abcd");
str1->ReplaceSet("ad", "");
@@ -362,7 +366,7 @@ StringReplaceTest::PerformTest(void)
memset( buf, 'x', sz);
str1->UnlockBuffer( sz);
str1->ReplaceAll("xx", "y");
- CPPUNIT_ASSERT(str1->Length() == sz/2);
+ CPPUNIT_ASSERT(str1->Length() == sz / 2);
delete str1;
NextSubTest();
@@ -382,5 +386,6 @@ CppUnit::Test *StringReplaceTest::suite(void)
typedef CppUnit::TestCaller<StringReplaceTest>
StringReplaceTestCaller;
- return(new StringReplaceTestCaller("BString::Replace Test",
&StringReplaceTest::PerformTest));
+ return(new StringReplaceTestCaller("BString::Replace Test",
+ &StringReplaceTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringSearchTest.cpp
b/src/tests/kits/support/bstring/StringSearchTest.cpp
index 91509c22eb..d096824c8d 100644
--- a/src/tests/kits/support/bstring/StringSearchTest.cpp
+++ b/src/tests/kits/support/bstring/StringSearchTest.cpp
@@ -3,13 +3,13 @@
#include <String.h>
#include <stdio.h>
-StringSearchTest::StringSearchTest(std::string name) :
- BTestCase(name)
+
+StringSearchTest::StringSearchTest(std::string name)
+ : BTestCase(name)
{
}
-
StringSearchTest::~StringSearchTest()
{
}
@@ -21,7 +21,7 @@ StringSearchTest::PerformTest(void)
BString *string1, *string2;
int32 i;
- //FindFirst(BString&)
+ // FindFirst(BString&)
NextSubTest();
string1 = new BString("last but not least");
string2 = new BString("st");
@@ -38,7 +38,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //FindFirst(char*)
+ // FindFirst(char*)
NextSubTest();
string1 = new BString("last but not least");
i = string1->FindFirst("st");
@@ -52,7 +52,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
-// Commented, since crashes R5
+// Commented, since crashes R5
NextSubTest();
string1 = new BString("string");
i = string1->FindFirst((char*)NULL);
@@ -60,7 +60,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#endif
- //FindFirst(BString&, int32)
+ // FindFirst(BString&, int32)
NextSubTest();
string1 = new BString("abc abc abc");
string2 = new BString("abc");
@@ -85,7 +85,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //FindFirst(const char*, int32)
+ // FindFirst(const char*, int32)
NextSubTest();
string1 = new BString("abc abc abc");
i = string1->FindFirst("abc", 2);
@@ -105,7 +105,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //Commented since crashes R5
+ // Commented since crashes R5
NextSubTest();
string1 = new BString("abc abc abc");
i = string1->FindFirst((char*)NULL, 3);
@@ -113,7 +113,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#endif
- //FindFirst(char)
+ // FindFirst(char)
NextSubTest();
string1 = new BString("abcd abcd");
i = string1->FindFirst('c');
@@ -126,7 +126,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == B_ERROR);
delete string1;
- //FindFirst(char, int32)
+ // FindFirst(char, int32)
NextSubTest();
string1 = new BString("abc abc abc");
i = string1->FindFirst("b", 3);
@@ -146,7 +146,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //StartsWith(BString&)
+ // StartsWith(BString&)
NextSubTest();
string1 = new BString("last but not least");
string2 = new BString("last");
@@ -155,14 +155,14 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //StartsWith(const char*)
+ // StartsWith(const char*)
NextSubTest();
string1 = new BString("last but not least");
i = (int32)string1->StartsWith("last");
CPPUNIT_ASSERT(i != 0);
delete string1;
- //StartsWith(const char*, int32)
+ // StartsWith(const char*, int32)
NextSubTest();
string1 = new BString("last but not least");
i = (int32)string1->StartsWith("last", 4);
@@ -170,7 +170,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#endif
- //FindLast(BString&)
+ // FindLast(BString&)
NextSubTest();
string1 = new BString("last but not least");
string2 = new BString("st");
@@ -187,7 +187,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //FindLast(char*)
+ // FindLast(char*)
NextSubTest();
string1 = new BString("last but not least");
i = string1->FindLast("st");
@@ -201,7 +201,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //Commented since crashes R5
+ // Commented since crashes R5
NextSubTest();
string1 = new BString("string");
i = string1->FindLast((char*)NULL);
@@ -209,7 +209,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#endif
- //FindLast(BString&, int32)
+ // FindLast(BString&, int32)
NextSubTest();
string1 = new BString("abcabcabc");
string2 = new BString("abc");
@@ -226,7 +226,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //FindLast(const char*, int32)
+ // FindLast(const char*, int32)
NextSubTest();
string1 = new BString("abc abc abc");
i = string1->FindLast("abc", 9);
@@ -240,7 +240,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //Commented since crashes r5
+ // Commented since crashes r5
NextSubTest();
string1 = new BString("abc abc abc");
i = string1->FindLast((char*)NULL, 3);
@@ -248,7 +248,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#endif
- //FindLast(char)
+ // FindLast(char)
NextSubTest();
string1 = new BString("abcd abcd");
i = string1->FindLast('c');
@@ -261,7 +261,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == B_ERROR);
delete string1;
- //FindLast(char, int32)
+ // FindLast(char, int32)
NextSubTest();
string1 = new BString("abc abc abc");
i = string1->FindLast("b", 5);
@@ -292,7 +292,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == B_ERROR);
delete string1;
- //IFindFirst(BString&)
+ // IFindFirst(BString&)
NextSubTest();
string1 = new BString("last but not least");
string2 = new BString("st");
@@ -325,7 +325,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //IFindFirst(const char*)
+ // IFindFirst(const char*)
NextSubTest();
string1 = new BString("last but not least");
i = string1->IFindFirst("st");
@@ -345,7 +345,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //Commented, since crashes R5
+ // Commented, since crashes R5
NextSubTest();
string1 = new BString("string");
i = string1->IFindFirst((char*)NULL);
@@ -353,7 +353,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#endif
- //IFindFirst(BString&, int32)
+ // IFindFirst(BString&, int32)
NextSubTest();
string1 = new BString("abc abc abc");
string2 = new BString("abc");
@@ -386,7 +386,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //IFindFirst(const char*, int32)
+ // IFindFirst(const char*, int32)
NextSubTest();
string1 = new BString("abc abc abc");
i = string1->IFindFirst("abc", 2);
@@ -412,30 +412,30 @@ StringSearchTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //IStartsWith(BString&)
+ // IStartsWith(BString&)
NextSubTest();
string1 = new BString("last but not least");
string2 = new BString("lAsT");
- i = (int32)string1->StartsWith(*string2);
+ i = (int32)string1->IStartsWith(*string2);
CPPUNIT_ASSERT(i != 0);
delete string1;
delete string2;
- //IStartsWith(const char*)
+ // IStartsWith(const char*)
NextSubTest();
string1 = new BString("last but not least");
- i = (int32)string1->StartsWith("lAsT");
+ i = (int32)string1->IStartsWith("lAsT");
CPPUNIT_ASSERT(i != 0);
delete string1;
- //IStartsWith(const char*, int32)
+ // IStartsWith(const char*, int32)
NextSubTest();
string1 = new BString("last but not least");
- i = (int32)string1->StartsWith("lAsT", 4);
+ i = (int32)string1->IStartsWith("lAsT", 4);
CPPUNIT_ASSERT(i != 0);
delete string1;
- //IFindLast(BString&)
+ // IFindLast(BString&)
NextSubTest();
string1 = new BString("last but not least");
string2 = new BString("st");
@@ -452,7 +452,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //EndsWith(BString&)
+ // EndsWith(BString&)
NextSubTest();
string1 = new BString("last but not least");
string2 = new BString("st");
@@ -469,7 +469,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //EndsWith(const char*)
+ // EndsWith(const char*)
NextSubTest();
string1 = new BString("last but not least");
i = (int32)string1->EndsWith("least");
@@ -482,10 +482,10 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == 0);
delete string1;
- //EndsWith(const char*, int32)
+ // EndsWith(const char*, int32)
NextSubTest();
string1 = new BString("last but not least");
- i = (int32)string1->EndsWith("sT", 2);
+ i = (int32)string1->EndsWith("st", 2);
CPPUNIT_ASSERT(i != 0);
delete string1;
@@ -495,7 +495,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == 0);
delete string1;
- //IEndsWith(BString&)
+ // IEndsWith(BString&)
NextSubTest();
string1 = new BString("last but not least");
string2 = new BString("st");
@@ -512,7 +512,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //IEndsWith(const char*)
+ // IEndsWith(const char*)
NextSubTest();
string1 = new BString("last but not least");
i = (int32)string1->IEndsWith("st");
@@ -525,7 +525,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i != 0);
delete string1;
- //IEndsWith(const char*, int32)
+ // IEndsWith(const char*, int32)
NextSubTest();
string1 = new BString("last but not least");
i = (int32)string1->IEndsWith("st", 2);
@@ -547,7 +547,7 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //IFindLast(const char*)
+ // IFindLast(const char*)
NextSubTest();
string1 = new BString("last but not least");
i = string1->IFindLast("st");
@@ -569,7 +569,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#ifndef TEST_R5
- //Commented since crashes R5
+ // Commented since crashes R5
NextSubTest();
string1 = new BString("string");
i = string1->IFindLast((char*)NULL);
@@ -577,7 +577,7 @@ StringSearchTest::PerformTest(void)
delete string1;
#endif
- //FindLast(BString&, int32)
+ // FindLast(BString&, int32)
NextSubTest();
string1 = new BString("abcabcabc");
string2 = new BString("abc");
@@ -602,14 +602,14 @@ StringSearchTest::PerformTest(void)
delete string1;
delete string2;
- //IFindLast(const char*, int32)
-//#ifndef TEST_R5
+ // IFindLast(const char*, int32)
+// #ifndef TEST_R5
NextSubTest();
string1 = new BString("abc abc abc");
i = string1->IFindLast("abc", 9);
CPPUNIT_ASSERT(i == 4);
delete string1;
-//#endif
+// #endif
#ifndef TEST_R5
NextSubTest();
string1 = new BString("ABc abC aBC");
@@ -636,5 +636,6 @@ CppUnit::Test *StringSearchTest::suite(void)
typedef CppUnit::TestCaller<StringSearchTest>
StringSearchTestCaller;
- return(new StringSearchTestCaller("BString::Search Test",
&StringSearchTest::PerformTest));
+ return(new StringSearchTestCaller("BString::Search Test",
+ &StringSearchTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringSplitTest.cpp
b/src/tests/kits/support/bstring/StringSplitTest.cpp
index 2edd287a49..e7e75c162f 100644
--- a/src/tests/kits/support/bstring/StringSplitTest.cpp
+++ b/src/tests/kits/support/bstring/StringSplitTest.cpp
@@ -3,13 +3,13 @@
#include <String.h>
#include <StringList.h>
-StringSplitTest::StringSplitTest(std::string name) :
- BTestCase(name)
+
+StringSplitTest::StringSplitTest(std::string name)
+ : BTestCase(name)
{
}
-
StringSplitTest::~StringSplitTest()
{
}
@@ -24,28 +24,28 @@ StringSplitTest::PerformTest(void)
BStringList stringList1;
str1 = new BString("test::string");
str1->Split(":", true, stringList1);
- CPPUNIT_ASSERT(stringList1.CountStrings() == 2);
+ CPPUNIT_ASSERT_EQUAL(2, stringList1.CountStrings());
delete str1;
NextSubTest();
BStringList stringList2;
str1 = new BString("test::string");
str1->Split("::", true, stringList2);
- CPPUNIT_ASSERT(stringList2.CountStrings() == 2);
+ CPPUNIT_ASSERT_EQUAL(2, stringList2.CountStrings());
delete str1;
NextSubTest();
BStringList stringList3;
str1 = new BString("test::string");
str1->Split("::", false, stringList3);
- CPPUNIT_ASSERT(stringList3.CountStrings() == 2);
+ CPPUNIT_ASSERT_EQUAL(2, stringList3.CountStrings());
delete str1;
NextSubTest();
BStringList stringList4;
str1 = new BString("test::string");
str1->Split(":", false, stringList4);
- CPPUNIT_ASSERT(stringList4.CountStrings() == 3);
+ CPPUNIT_ASSERT_EQUAL(3, stringList4.CountStrings());
delete str1;
}
@@ -56,5 +56,6 @@ CppUnit::Test *StringSplitTest::suite(void)
typedef CppUnit::TestCaller<StringSplitTest>
StringSplitTestCaller;
- return(new StringSplitTestCaller("BString::Split Test",
&StringSplitTest::PerformTest));
+ return(new StringSplitTestCaller("BString::Split Test",
+ &StringSplitTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringSubCopyTest.cpp
b/src/tests/kits/support/bstring/StringSubCopyTest.cpp
index 5b02639e95..cb125839d0 100644
--- a/src/tests/kits/support/bstring/StringSubCopyTest.cpp
+++ b/src/tests/kits/support/bstring/StringSubCopyTest.cpp
@@ -3,12 +3,12 @@
#include <String.h>
#include <stdio.h>
-StringSubCopyTest::StringSubCopyTest(std::string name) :
- BTestCase(name)
+
+StringSubCopyTest::StringSubCopyTest(std::string name)
+ : BTestCase(name)
{
}
-
StringSubCopyTest::~StringSubCopyTest()
{
@@ -20,7 +20,7 @@ StringSubCopyTest::PerformTest(void)
{
BString *string1, *string2;
- //CopyInto(BString&, int32, int32)
+ // CopyInto(BString&, int32, int32)
NextSubTest();
string1 = new BString;
string2 = new BString("Something");
@@ -29,7 +29,7 @@ StringSubCopyTest::PerformTest(void)
delete string1;
delete string2;
- //CopyInto(const char*, int32, int32)
+ // CopyInto(const char*, int32, int32)
NextSubTest();
char tmp[10];
memset(tmp, 0, 10);
@@ -46,5 +46,6 @@ CppUnit::Test *StringSubCopyTest::suite(void)
typedef CppUnit::TestCaller<StringSubCopyTest>
StringSubCopyTestCaller;
- return(new StringSubCopyTestCaller("BString::SubCopy Test",
&StringSubCopyTest::PerformTest));
+ return(new StringSubCopyTestCaller("BString::SubCopy Test",
+ &StringSubCopyTest::PerformTest));
}
diff --git a/src/tests/kits/support/bstring/StringTest.cpp
b/src/tests/kits/support/bstring/StringTest.cpp
index 8d3222306d..a88808f212 100644
--- a/src/tests/kits/support/bstring/StringTest.cpp
+++ b/src/tests/kits/support/bstring/StringTest.cpp
@@ -18,6 +18,7 @@
#include "StringSearchTest.h"
#include "StringSplitTest.h"
+
CppUnit::Test *StringTestSuite()
{
CppUnit::TestSuite *testSuite = new CppUnit::TestSuite();
