i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support kit: Fixed issues in BString unit tests

Browse Source 
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
This commit is contained in:
krish_iyer
2018-04-07 16:52:44 +00:00
committed by Jérôme Duval
parent 509c7718dd
commit f960e7e9a2
17 changed files with 274 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kits/support/bstring/StringAccessTest.cpp
+10 -9
View File
@@ -4,12 +4,12 @@
#include <String.h> #include <String.h>
#include <UTF8.h> #include <UTF8.h>
StringAccessTest::StringAccessTest(std::string name) :
BTestCase(name) StringAccessTest::StringAccessTest(std::string name)
: BTestCase(name)
{ {
} }
StringAccessTest::~StringAccessTest() StringAccessTest::~StringAccessTest()
{ {
@@ -19,7 +19,7 @@ StringAccessTest::~StringAccessTest()
void void
StringAccessTest::PerformTest(void) StringAccessTest::PerformTest(void)
{ {
//CountChars(), Length(), String() // CountChars(), Length(), String()
NextSubTest(); NextSubTest();
BString string("Something" B_UTF8_ELLIPSIS); BString string("Something" B_UTF8_ELLIPSIS);
CPPUNIT_ASSERT(string.CountChars() == 10); CPPUNIT_ASSERT(string.CountChars() == 10);
@@ -38,21 +38,21 @@ StringAccessTest::PerformTest(void)
CPPUNIT_ASSERT(string3.CountChars() == 2); CPPUNIT_ASSERT(string3.CountChars() == 2);
CPPUNIT_ASSERT((unsigned)string3.Length() == strlen(string3.String())); CPPUNIT_ASSERT((unsigned)string3.Length() == strlen(string3.String()));
//An empty string // An empty string
NextSubTest(); NextSubTest();
BString empty; BString empty;
CPPUNIT_ASSERT(strcmp(empty.String(), "") == 0); CPPUNIT_ASSERT(strcmp(empty.String(), "") == 0);
CPPUNIT_ASSERT(empty.Length() == 0); CPPUNIT_ASSERT(empty.Length() == 0);
CPPUNIT_ASSERT(empty.CountChars() == 0); CPPUNIT_ASSERT(empty.CountChars() == 0);
//Truncate the string at end so we are left with an invalid // Truncate the string at end so we are left with an invalid
//UTF8 character // UTF8 character
NextSubTest(); NextSubTest();
BString invalid("some text with utf8 characters" B_UTF8_ELLIPSIS); BString invalid("some text with utf8 characters" B_UTF8_ELLIPSIS);
invalid.Truncate(invalid.Length() -1); invalid.Truncate(invalid.Length() -1);
CPPUNIT_ASSERT(invalid.CountChars() == 31); CPPUNIT_ASSERT(invalid.CountChars() == 31);
//LockBuffer(int32) and UnlockBuffer(int32) // LockBuffer(int32) and UnlockBuffer(int32)
NextSubTest(); NextSubTest();
BString locked("a string"); BString locked("a string");
char *ptrstr = locked.LockBuffer(20); char *ptrstr = locked.LockBuffer(20);
@@ -93,5 +93,6 @@ CppUnit::Test *StringAccessTest::suite(void)
typedef CppUnit::TestCaller<StringAccessTest> typedef CppUnit::TestCaller<StringAccessTest>
StringAccessTestCaller; StringAccessTestCaller;
return(new StringAccessTestCaller("BString::Access Test", &StringAccessTest::PerformTest)); return(new StringAccessTestCaller("BString::Access Test",
&StringAccessTest::PerformTest));
} }
src/tests/kits/support/bstring/StringAppendTest.cpp
+19 -18
View File
@@ -2,13 +2,13 @@
#include "cppunit/TestCaller.h" #include "cppunit/TestCaller.h"
#include <String.h> #include <String.h>
StringAppendTest::StringAppendTest(std::string name) :
BTestCase(name) StringAppendTest::StringAppendTest(std::string name)
: BTestCase(name)
{ {
} }
StringAppendTest::~StringAppendTest() StringAppendTest::~StringAppendTest()
{ {
} }
@@ -19,7 +19,7 @@ StringAppendTest::PerformTest(void)
{ {
BString *str1, *str2; BString *str1, *str2;
//+=(BString&) // +=(BString&)
NextSubTest(); NextSubTest();
str1 = new BString("BASE"); str1 = new BString("BASE");
str2 = new BString("APPENDED"); str2 = new BString("APPENDED");
@@ -28,7 +28,7 @@ StringAppendTest::PerformTest(void)
delete str1; delete str1;
delete str2; delete str2;
//+=(const char *) // +=(const char *)
NextSubTest(); NextSubTest();
str1 = new BString("Base"); str1 = new BString("Base");
*str1 += "APPENDED"; *str1 += "APPENDED";
@@ -41,7 +41,7 @@ StringAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "APPENDEDTONOTHING") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "APPENDEDTONOTHING") == 0);
delete str1; delete str1;
//char pointer is NULL // char pointer is NULL
NextSubTest(); NextSubTest();
char *tmp = NULL; char *tmp = NULL;
str1 = new BString("Base"); str1 = new BString("Base");
@@ -49,14 +49,14 @@ StringAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "Base") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "Base") == 0);
delete str1; delete str1;
//+=(char) // +=(char)
NextSubTest(); NextSubTest();
str1 = new BString("Base"); str1 = new BString("Base");
*str1 += 'C'; *str1 += 'C';
CPPUNIT_ASSERT(strcmp(str1->String(), "BaseC") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "BaseC") == 0);
delete str1; delete str1;
//Append(BString&) // Append(BString&)
NextSubTest(); NextSubTest();
str1 = new BString("BASE"); str1 = new BString("BASE");
str2 = new BString("APPENDED"); str2 = new BString("APPENDED");
@@ -65,7 +65,7 @@ StringAppendTest::PerformTest(void)
delete str1; delete str1;
delete str2; delete str2;
//Append(const char*) // Append(const char*)
NextSubTest(); NextSubTest();
str1 = new BString("Base"); str1 = new BString("Base");
str1->Append("APPENDED"); str1->Append("APPENDED");
@@ -78,14 +78,14 @@ StringAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "APPENDEDTONOTHING") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "APPENDEDTONOTHING") == 0);
delete str1; delete str1;
//char ptr is NULL // char ptr is NULL
NextSubTest(); NextSubTest();
str1 = new BString("Base"); str1 = new BString("Base");
str1->Append(tmp); str1->Append(tmp);
CPPUNIT_ASSERT(strcmp(str1->String(), "Base") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "Base") == 0);
delete str1; delete str1;
//Append(BString&, int32) // Append(BString&, int32)
NextSubTest(); NextSubTest();
str1 = new BString("BASE"); str1 = new BString("BASE");
str2 = new BString("APPENDED"); str2 = new BString("APPENDED");
@@ -94,7 +94,7 @@ StringAppendTest::PerformTest(void)
delete str1; delete str1;
delete str2; delete str2;
//Append(const char*, int32) // Append(const char*, int32)
NextSubTest(); NextSubTest();
str1 = new BString("Base"); str1 = new BString("Base");
str1->Append("APPENDED", 40); str1->Append("APPENDED", 40);
@@ -102,14 +102,14 @@ StringAppendTest::PerformTest(void)
CPPUNIT_ASSERT(str1->Length() == (int32)strlen("BaseAPPENDED")); CPPUNIT_ASSERT(str1->Length() == (int32)strlen("BaseAPPENDED"));
delete str1; delete str1;
//char ptr is NULL // char ptr is NULL
NextSubTest(); NextSubTest();
str1 = new BString("BLABLA"); str1 = new BString("BLABLA");
str1->Append(tmp, 2); str1->Append(tmp, 2);
CPPUNIT_ASSERT(strcmp(str1->String(), "BLABLA") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "BLABLA") == 0);
delete str1; delete str1;
//Append(char, int32) // Append(char, int32)
NextSubTest(); NextSubTest();
str1 = new BString("Base"); str1 = new BString("Base");
str1->Append('C', 5); str1->Append('C', 5);
@@ -118,8 +118,8 @@ StringAppendTest::PerformTest(void)
#ifndef TEST_R5 #ifndef TEST_R5
const int32 OUT_OF_MEM_VAL = 2*1000*1000*1000; const int32 OUT_OF_MEM_VAL = 2 * 1000 * 1000 * 1000;
//Append(char, int32) with excessive length: // Append(char, int32) with excessive length:
NextSubTest(); NextSubTest();
str1 = new BString("Base"); str1 = new BString("Base");
str1->Append('C', OUT_OF_MEM_VAL); str1->Append('C', OUT_OF_MEM_VAL);
@@ -128,7 +128,7 @@ StringAppendTest::PerformTest(void)
#endif #endif
#ifndef TEST_R5 #ifndef TEST_R5
//Append(char*, int32) with excessive length: // Append(char*, int32) with excessive length:
NextSubTest(); NextSubTest();
str1 = new BString("Base"); str1 = new BString("Base");
str1->Append("some more text", OUT_OF_MEM_VAL); str1->Append("some more text", OUT_OF_MEM_VAL);
@@ -143,5 +143,6 @@ CppUnit::Test *StringAppendTest::suite(void)
typedef CppUnit::TestCaller<StringAppendTest> typedef CppUnit::TestCaller<StringAppendTest>
StringAppendTestCaller; StringAppendTestCaller;
return(new StringAppendTestCaller("BString::Append Test", &StringAppendTest::PerformTest)); return(new StringAppendTestCaller("BString::Append Test",
&StringAppendTest::PerformTest));
} }
src/tests/kits/support/bstring/StringAssignTest.cpp
+15 -15
View File
@@ -3,13 +3,12 @@
#include <String.h> #include <String.h>
StringAssignTest::StringAssignTest(std::string name) : StringAssignTest::StringAssignTest(std::string name)
BTestCase(name) : BTestCase(name)
{ {
} }
StringAssignTest::~StringAssignTest() StringAssignTest::~StringAssignTest()
{ {
} }
@@ -18,7 +17,7 @@ StringAssignTest::~StringAssignTest()
void void
StringAssignTest::PerformTest(void) StringAssignTest::PerformTest(void)
{ {
//=(BString&) // =(BString&)
NextSubTest(); NextSubTest();
BString string; BString string;
BString string2("Something"); BString string2("Something");
@@ -26,14 +25,14 @@ StringAssignTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string.String(), string2.String()) == 0); CPPUNIT_ASSERT(strcmp(string.String(), string2.String()) == 0);
CPPUNIT_ASSERT(strcmp(string.String(), "Something") == 0); CPPUNIT_ASSERT(strcmp(string.String(), "Something") == 0);
//=(const char*) // =(const char*)
NextSubTest(); NextSubTest();
BString *str = new BString(); BString *str = new BString();
*str = "Something Else"; *str = "Something Else";
CPPUNIT_ASSERT(strcmp(str->String(), "Something Else") == 0); CPPUNIT_ASSERT(strcmp(str->String(), "Something Else") == 0);
delete str; delete str;
//char ptr is NULL // char ptr is NULL
NextSubTest(); NextSubTest();
char *s = NULL; char *s = NULL;
str = new BString; str = new BString;
@@ -41,7 +40,7 @@ StringAssignTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str->String(), "") == 0); CPPUNIT_ASSERT(strcmp(str->String(), "") == 0);
delete str; delete str;
//SetTo(const char *) (NULL) // SetTo(const char *) (NULL)
NextSubTest(); NextSubTest();
str = new BString; str = new BString;
str->SetTo(s); str->SetTo(s);
@@ -54,14 +53,14 @@ StringAssignTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str->String(), "BLA") == 0); CPPUNIT_ASSERT(strcmp(str->String(), "BLA") == 0);
delete str; delete str;
//SetTo(BString&) // SetTo(BString&)
NextSubTest(); NextSubTest();
str = new BString; str = new BString;
str->SetTo(string); str->SetTo(string);
CPPUNIT_ASSERT(strcmp(str->String(), string.String()) == 0); CPPUNIT_ASSERT(strcmp(str->String(), string.String()) == 0);
delete str; delete str;
//SetTo(char, int32) // SetTo(char, int32)
NextSubTest(); NextSubTest();
str = new BString; str = new BString;
str->SetTo('C', 10); str->SetTo('C', 10);
@@ -74,14 +73,14 @@ StringAssignTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str->String(), "") == 0); CPPUNIT_ASSERT(strcmp(str->String(), "") == 0);
delete str; delete str;
//SetTo(const char*, int32) // SetTo(const char*, int32)
NextSubTest(); NextSubTest();
str = new BString; str = new BString;
str->SetTo("ABC", 10); str->SetTo("ABC", 10);
CPPUNIT_ASSERT(strcmp(str->String(), "ABC") == 0); CPPUNIT_ASSERT(strcmp(str->String(), "ABC") == 0);
delete str; delete str;
//Adopt(BString&) // Adopt(BString&)
NextSubTest(); NextSubTest();
const char *oldString2 = string2.String(); const char *oldString2 = string2.String();
str = new BString; str = new BString;
@@ -100,15 +99,15 @@ StringAssignTest::PerformTest(void)
delete str; delete str;
#ifndef TEST_R5 #ifndef TEST_R5
const int32 OUT_OF_MEM_VAL = 2*1000*1000*1000; const int32 OUT_OF_MEM_VAL = 2 * 1000 * 1000 * 1000;
//SetTo(char, int32) with excessive length: // SetTo(char, int32) with excessive length:
NextSubTest(); NextSubTest();
str = new BString("dummy"); str = new BString("dummy");
str->SetTo('C', OUT_OF_MEM_VAL); str->SetTo('C', OUT_OF_MEM_VAL);
CPPUNIT_ASSERT(strcmp(str->String(), "dummy") == 0); CPPUNIT_ASSERT(strcmp(str->String(), "dummy") == 0);
delete str; delete str;
//SetTo(char*, int32) with excessive length: // SetTo(char*, int32) with excessive length:
NextSubTest(); NextSubTest();
str = new BString("dummy"); str = new BString("dummy");
str->SetTo("some more text", OUT_OF_MEM_VAL); str->SetTo("some more text", OUT_OF_MEM_VAL);
@@ -123,5 +122,6 @@ CppUnit::Test *StringAssignTest::suite(void)
typedef CppUnit::TestCaller<StringAssignTest> typedef CppUnit::TestCaller<StringAssignTest>
StringAssignTestCaller; StringAssignTestCaller;
return(new StringAssignTestCaller("BString::Assign Test", &StringAssignTest::PerformTest)); return(new StringAssignTestCaller("BString::Assign Test",
&StringAssignTest::PerformTest));
} }
src/tests/kits/support/bstring/StringCaseTest.cpp
+9 -8
View File
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h" #include "cppunit/TestCaller.h"
#include <String.h> #include <String.h>
StringCaseTest::StringCaseTest(std::string name) :
BTestCase(name) StringCaseTest::StringCaseTest(std::string name)
: BTestCase(name)
{ {
} }
StringCaseTest::~StringCaseTest() StringCaseTest::~StringCaseTest()
{ {
@@ -19,7 +19,7 @@ StringCaseTest::PerformTest(void)
{ {
BString *string; BString *string;
//Capitalize // Capitalize
NextSubTest(); NextSubTest();
string = new BString("this is a sentence"); string = new BString("this is a sentence");
string->Capitalize(); string->Capitalize();
@@ -38,7 +38,7 @@ StringCaseTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
delete string; delete string;
//ToLower // ToLower
NextSubTest(); NextSubTest();
string = new BString("1a2B3c4d5e6f7G"); string = new BString("1a2B3c4d5e6f7G");
string->ToLower(); string->ToLower();
@@ -51,7 +51,7 @@ StringCaseTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
delete string; delete string;
//ToUpper // ToUpper
NextSubTest(); NextSubTest();
string = new BString("1a2b3c4d5E6f7g"); string = new BString("1a2b3c4d5E6f7g");
string->ToUpper(); string->ToUpper();
@@ -64,7 +64,7 @@ StringCaseTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
delete string; delete string;
//CapitalizeEachWord // CapitalizeEachWord
NextSubTest(); NextSubTest();
string = new BString("each wOrd 3will_be >capiTalized"); string = new BString("each wOrd 3will_be >capiTalized");
string->CapitalizeEachWord(); string->CapitalizeEachWord();
@@ -84,5 +84,6 @@ CppUnit::Test *StringCaseTest::suite(void)
typedef CppUnit::TestCaller<StringCaseTest> typedef CppUnit::TestCaller<StringCaseTest>
StringCaseTestCaller; StringCaseTestCaller;
return(new StringCaseTestCaller("BString::Case Test", &StringCaseTest::PerformTest)); return(new StringCaseTestCaller("BString::Case Test",
&StringCaseTest::PerformTest));
} }
src/tests/kits/support/bstring/StringCharAccessTest.cpp
+7 -7
View File
@@ -3,12 +3,11 @@
#include <String.h> #include <String.h>
StringCharAccessTest::StringCharAccessTest(std::string name) : StringCharAccessTest::StringCharAccessTest(std::string name)
BTestCase(name) : BTestCase(name)
{ {
} }
StringCharAccessTest::~StringCharAccessTest() StringCharAccessTest::~StringCharAccessTest()
{ {
@@ -20,17 +19,17 @@ StringCharAccessTest::PerformTest(void)
{ {
BString string("A simple string"); BString string("A simple string");
//operator[] // operator[]
NextSubTest(); NextSubTest();
CPPUNIT_ASSERT(string[0] == 'A'); CPPUNIT_ASSERT(string[0] == 'A');
CPPUNIT_ASSERT(string[1] == ' '); CPPUNIT_ASSERT(string[1] == ' ');
//&operator[] // &operator[]
NextSubTest(); NextSubTest();
string.SetByteAt(0, 'a'); string.SetByteAt(0, 'a');
CPPUNIT_ASSERT(strcmp(string.String(), "a simple string") == 0); CPPUNIT_ASSERT(strcmp(string.String(), "a simple string") == 0);
//ByteAt(int32) // ByteAt(int32)
NextSubTest(); NextSubTest();
CPPUNIT_ASSERT(string.ByteAt(-10) == 0); CPPUNIT_ASSERT(string.ByteAt(-10) == 0);
CPPUNIT_ASSERT(string.ByteAt(200) == 0); CPPUNIT_ASSERT(string.ByteAt(200) == 0);
@@ -44,5 +43,6 @@ CppUnit::Test *StringCharAccessTest::suite(void)
typedef CppUnit::TestCaller<StringCharAccessTest> typedef CppUnit::TestCaller<StringCharAccessTest>
StringCharAccessTestCaller; StringCharAccessTestCaller;
return(new StringCharAccessTestCaller("BString::CharAccess Test", &StringCharAccessTest::PerformTest)); return(new StringCharAccessTestCaller("BString::CharAccess Test",
&StringCharAccessTest::PerformTest));
} }
src/tests/kits/support/bstring/StringCompareTest.cpp
+17 -16
View File
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h" #include "cppunit/TestCaller.h"
#include <String.h> #include <String.h>
StringCompareTest::StringCompareTest(std::string name) :
BTestCase(name) StringCompareTest::StringCompareTest(std::string name)
: BTestCase(name)
{ {
} }
StringCompareTest::~StringCompareTest() StringCompareTest::~StringCompareTest()
{ {
@@ -19,7 +19,7 @@ StringCompareTest::PerformTest(void)
{ {
BString *string1, *string2; BString *string1, *string2;
//operator<(const BString &) const; // operator<(const BString &) const;
NextSubTest(); NextSubTest();
string1 = new BString("11111_a"); string1 = new BString("11111_a");
string2 = new BString("22222_b"); string2 = new BString("22222_b");
@@ -27,7 +27,7 @@ StringCompareTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//operator<=(const BString &) const; // operator<=(const BString &) const;
NextSubTest(); NextSubTest();
string1 = new BString("11111_a"); string1 = new BString("11111_a");
string2 = new BString("22222_b"); string2 = new BString("22222_b");
@@ -42,7 +42,7 @@ StringCompareTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//operator==(const BString &) const; // operator==(const BString &) const;
NextSubTest(); NextSubTest();
string1 = new BString("string"); string1 = new BString("string");
string2 = new BString("string"); string2 = new BString("string");
@@ -57,7 +57,7 @@ StringCompareTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//operator>=(const BString &) const; // operator>=(const BString &) const;
NextSubTest(); NextSubTest();
string1 = new BString("BBBBB"); string1 = new BString("BBBBB");
string2 = new BString("AAAAA"); string2 = new BString("AAAAA");
@@ -72,7 +72,7 @@ StringCompareTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//operator>(const BString &) const; // operator>(const BString &) const;
NextSubTest(); NextSubTest();
string1 = new BString("BBBBB"); string1 = new BString("BBBBB");
string2 = new BString("AAAAA"); string2 = new BString("AAAAA");
@@ -80,7 +80,7 @@ StringCompareTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//operator!=(const BString &) const; // operator!=(const BString &) const;
NextSubTest(); NextSubTest();
string1 = new BString("string"); string1 = new BString("string");
string2 = new BString("string"); string2 = new BString("string");
@@ -95,20 +95,20 @@ StringCompareTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//operator<(const char *) const; // operator<(const char *) const;
NextSubTest(); NextSubTest();
string1 = new BString("AAAAA"); string1 = new BString("AAAAA");
CPPUNIT_ASSERT(*string1 < "BBBBB"); CPPUNIT_ASSERT(*string1 < "BBBBB");
delete string1; delete string1;
//operator<=(const char *) const; // operator<=(const char *) const;
NextSubTest(); NextSubTest();
string1 = new BString("AAAAA"); string1 = new BString("AAAAA");
CPPUNIT_ASSERT(*string1 <= "BBBBB"); CPPUNIT_ASSERT(*string1 <= "BBBBB");
CPPUNIT_ASSERT(*string1 <= "AAAAA"); CPPUNIT_ASSERT(*string1 <= "AAAAA");
delete string1; delete string1;
//operator==(const char *) const; // operator==(const char *) const;
NextSubTest(); NextSubTest();
string1 = new BString("AAAAA"); string1 = new BString("AAAAA");
CPPUNIT_ASSERT(*string1 == "AAAAA"); CPPUNIT_ASSERT(*string1 == "AAAAA");
@@ -119,20 +119,20 @@ StringCompareTest::PerformTest(void)
CPPUNIT_ASSERT((*string1 == "BBBB") == false); CPPUNIT_ASSERT((*string1 == "BBBB") == false);
delete string1; delete string1;
//operator>=(const char *) const; // operator>=(const char *) const;
NextSubTest(); NextSubTest();
string1 = new BString("BBBBB"); string1 = new BString("BBBBB");
CPPUNIT_ASSERT(*string1 >= "AAAAA"); CPPUNIT_ASSERT(*string1 >= "AAAAA");
CPPUNIT_ASSERT(*string1 >= "BBBBB"); CPPUNIT_ASSERT(*string1 >= "BBBBB");
delete string1; delete string1;
//operator>(const char *) const; // operator>(const char *) const;
NextSubTest(); NextSubTest();
string1 = new BString("BBBBB"); string1 = new BString("BBBBB");
CPPUNIT_ASSERT(*string1 > "AAAAA"); CPPUNIT_ASSERT(*string1 > "AAAAA");
delete string1; delete string1;
//operator!=(const char *) const; // operator!=(const char *) const;
NextSubTest(); NextSubTest();
string1 = new BString("AAAAA"); string1 = new BString("AAAAA");
CPPUNIT_ASSERT((*string1 != "AAAAA") == false); CPPUNIT_ASSERT((*string1 != "AAAAA") == false);
@@ -150,5 +150,6 @@ CppUnit::Test *StringCompareTest::suite(void)
typedef CppUnit::TestCaller<StringCompareTest> typedef CppUnit::TestCaller<StringCompareTest>
StringCompareTestCaller; StringCompareTestCaller;
return(new StringCompareTestCaller("BString::Compare Test", &StringCompareTest::PerformTest)); return(new StringCompareTestCaller("BString::Compare Test",
&StringCompareTest::PerformTest));
} }
src/tests/kits/support/bstring/StringConstructionTest.cpp
+9 -9
View File
@@ -3,12 +3,11 @@
#include <String.h> #include <String.h>
StringConstructionTest::StringConstructionTest(std::string name) : StringConstructionTest::StringConstructionTest(std::string name)
BTestCase(name) : BTestCase(name)
{ {
} }
StringConstructionTest::~StringConstructionTest() StringConstructionTest::~StringConstructionTest()
{ {
@@ -21,28 +20,28 @@ StringConstructionTest::PerformTest(void)
BString *string; BString *string;
const char *str = "Something"; const char *str = "Something";
//BString() // BString()
NextSubTest(); NextSubTest();
string = new BString; string = new BString;
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
CPPUNIT_ASSERT(string->Length() == 0); CPPUNIT_ASSERT(string->Length() == 0);
delete string; delete string;
//BString(const char*) // BString(const char*)
NextSubTest(); NextSubTest();
string = new BString(str); string = new BString(str);
CPPUNIT_ASSERT(strcmp(string->String(), str) == 0); CPPUNIT_ASSERT(strcmp(string->String(), str) == 0);
CPPUNIT_ASSERT((unsigned)string->Length() == strlen(str)); CPPUNIT_ASSERT((unsigned)string->Length() == strlen(str));
delete string; delete string;
//BString(NULL) // BString(NULL)
NextSubTest(); NextSubTest();
string = new BString(NULL); string = new BString(NULL);
CPPUNIT_ASSERT(strcmp(string->String(), "") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "") == 0);
CPPUNIT_ASSERT(string->Length() == 0); CPPUNIT_ASSERT(string->Length() == 0);
delete string; delete string;
//BString(BString&) // BString(BString&)
NextSubTest(); NextSubTest();
BString anotherString("Something Else"); BString anotherString("Something Else");
string = new BString(anotherString); string = new BString(anotherString);
@@ -50,7 +49,7 @@ StringConstructionTest::PerformTest(void)
CPPUNIT_ASSERT(string->Length() == anotherString.Length()); CPPUNIT_ASSERT(string->Length() == anotherString.Length());
delete string; delete string;
//BString(const char*, int32) // BString(const char*, int32)
NextSubTest(); NextSubTest();
string = new BString(str, 5); string = new BString(str, 5);
CPPUNIT_ASSERT(strcmp(string->String(), str) != 0); CPPUNIT_ASSERT(strcmp(string->String(), str) != 0);
@@ -71,5 +70,6 @@ CppUnit::Test *StringConstructionTest::suite(void)
typedef CppUnit::TestCaller<StringConstructionTest> typedef CppUnit::TestCaller<StringConstructionTest>
StringConstructionTestCaller; StringConstructionTestCaller;
return(new StringConstructionTestCaller("BString::Construction Test", &StringConstructionTest::PerformTest)); return(new StringConstructionTestCaller("BString::Construction Test",
&StringConstructionTest::PerformTest));
} }
src/tests/kits/support/bstring/StringEscapeTest.cpp
+20 -19
View File
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h" #include "cppunit/TestCaller.h"
#include <String.h> #include <String.h>
StringEscapeTest::StringEscapeTest(std::string name) :
BTestCase(name) StringEscapeTest::StringEscapeTest(std::string name)
: BTestCase(name)
{ {
} }
StringEscapeTest::~StringEscapeTest() StringEscapeTest::~StringEscapeTest()
{ {
@@ -19,28 +19,28 @@ StringEscapeTest::PerformTest(void)
{ {
BString *string1; BString *string1;
//CharacterEscape(char*, char) // CharacterEscape(char*, char)
NextSubTest(); NextSubTest();
string1 = new BString("abcdefghi"); string1 = new BString("abcdefghi");
string1->CharacterEscape("acf", '/'); string1->CharacterEscape("acf", '/');
CPPUNIT_ASSERT(strcmp(string1->String(), "/ab/cde/fghi") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "/ab/cde/fghi") == 0);
delete string1; delete string1;
//BString is null // BString is null
NextSubTest(); NextSubTest();
string1 = new BString; string1 = new BString;
string1->CharacterEscape("abc", '/'); string1->CharacterEscape("abc", '/');
CPPUNIT_ASSERT(strcmp(string1->String(), "") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "") == 0);
delete string1; delete string1;
//BString doesn't contain wanted characters // BString doesn't contain wanted characters
NextSubTest(); NextSubTest();
string1 = new BString("abcdefghi"); string1 = new BString("abcdefghi");
string1->CharacterEscape("z34", 'z'); string1->CharacterEscape("z34", 'z');
CPPUNIT_ASSERT(strcmp(string1->String(), "abcdefghi") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "abcdefghi") == 0);
delete string1; delete string1;
//CharacterEscape(char *, char*, char) // CharacterEscape(char *, char*, char)
NextSubTest(); NextSubTest();
string1 = new BString("something"); string1 = new BString("something");
string1->CharacterEscape("newstring", "esi", '0'); string1->CharacterEscape("newstring", "esi", '0');
@@ -48,8 +48,8 @@ StringEscapeTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//assigned string is NULL // assigned string is NULL
//it crashes r5 implementation, but not ours :) // it crashes r5 implementation, but not ours :)
NextSubTest(); NextSubTest();
string1 = new BString("something"); string1 = new BString("something");
string1->CharacterEscape((char*)NULL, "ei", '-'); string1->CharacterEscape((char*)NULL, "ei", '-');
@@ -57,42 +57,42 @@ StringEscapeTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//String was empty // String was empty
NextSubTest(); NextSubTest();
string1 = new BString; string1 = new BString;
string1->CharacterEscape("newstring", "esi", '0'); string1->CharacterEscape("newstring", "esi", '0');
CPPUNIT_ASSERT(strcmp(string1->String(), "n0ew0str0ing") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "n0ew0str0ing") == 0);
delete string1; delete string1;
//CharacterDeescape(char) // CharacterDeescape(char)
NextSubTest(); NextSubTest();
string1 = new BString("/a/nh/g/bhhgy/fgtuhjkb/"); string1 = new BString("/a/nh/g/bhhgy/fgtuhjkb/");
string1->CharacterDeescape('/'); string1->CharacterDeescape('/');
CPPUNIT_ASSERT(strcmp(string1->String(), "anhgbhhgyfgtuhjkb") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "anhgbhhgyfgtuhjkb") == 0);
delete string1; delete string1;
//String was empty // String was empty
NextSubTest(); NextSubTest();
string1 = new BString; string1 = new BString;
string1->CharacterDeescape('/'); string1->CharacterDeescape('/');
CPPUNIT_ASSERT(strcmp(string1->String(), "") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "") == 0);
delete string1; delete string1;
//String doesn't contain character to escape // String doesn't contain character to escape
NextSubTest(); NextSubTest();
string1 = new BString("/a/nh/g/bhhgy/fgtuhjkb/"); string1 = new BString("/a/nh/g/bhhgy/fgtuhjkb/");
string1->CharacterDeescape('-'); string1->CharacterDeescape('-');
CPPUNIT_ASSERT(strcmp(string1->String(), "/a/nh/g/bhhgy/fgtuhjkb/") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "/a/nh/g/bhhgy/fgtuhjkb/") == 0);
delete string1; delete string1;
//CharacterDeescape(char* original, char) // CharacterDeescape(char* original, char)
NextSubTest(); NextSubTest();
string1 = new BString("oldString"); string1 = new BString("oldString");
string1->CharacterDeescape("-ne-ws-tri-ng-", '-'); string1->CharacterDeescape("-ne-ws-tri-ng-", '-');
CPPUNIT_ASSERT(strcmp(string1->String(), "newstring") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "newstring") == 0);
delete string1; delete string1;
//String was empty // String was empty
NextSubTest(); NextSubTest();
string1 = new BString; string1 = new BString;
string1->CharacterDeescape("new/str/ing", '/'); string1->CharacterDeescape("new/str/ing", '/');
@@ -100,8 +100,8 @@ StringEscapeTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//assigned string is empty // assigned string is empty
//it crashes r5 implementation, but not ours :) // it crashes r5 implementation, but not ours :)
NextSubTest(); NextSubTest();
string1 = new BString("pippo"); string1 = new BString("pippo");
string1->CharacterDeescape((char*)NULL, '/'); string1->CharacterDeescape((char*)NULL, '/');
@@ -109,7 +109,7 @@ StringEscapeTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//String doesn't contain character to escape // String doesn't contain character to escape
NextSubTest(); NextSubTest();
string1 = new BString("Old"); string1 = new BString("Old");
string1->CharacterDeescape("/a/nh/g/bhhgy/fgtuhjkb/", '-'); string1->CharacterDeescape("/a/nh/g/bhhgy/fgtuhjkb/", '-');
@@ -123,5 +123,6 @@ CppUnit::Test *StringEscapeTest::suite(void)
typedef CppUnit::TestCaller<StringEscapeTest> typedef CppUnit::TestCaller<StringEscapeTest>
StringEscapeTestCaller; StringEscapeTestCaller;
return(new StringEscapeTestCaller("BString::Escape Test", &StringEscapeTest::PerformTest)); return(new StringEscapeTestCaller("BString::Escape Test",
&StringEscapeTest::PerformTest));
} }
src/tests/kits/support/bstring/StringFormatAppendTest.cpp
+18 -16
View File
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h" #include "cppunit/TestCaller.h"
#include <String.h> #include <String.h>
StringFormatAppendTest::StringFormatAppendTest(std::string name) :
BTestCase(name) StringFormatAppendTest::StringFormatAppendTest(std::string name)
: BTestCase(name)
{ {
} }
StringFormatAppendTest::~StringFormatAppendTest() StringFormatAppendTest::~StringFormatAppendTest()
{ {
@@ -19,7 +19,7 @@ StringFormatAppendTest::PerformTest(void)
{ {
BString *string, *string2; BString *string, *string2;
//operator<<(const char *); // operator<<(const char *);
NextSubTest(); NextSubTest();
string = new BString("some"); string = new BString("some");
*string << " "; *string << " ";
@@ -27,7 +27,7 @@ StringFormatAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "some text") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "some text") == 0);
delete string; delete string;
//operator<<(const BString &); // operator<<(const BString &);
NextSubTest(); NextSubTest();
string = new BString("some "); string = new BString("some ");
string2 = new BString("text"); string2 = new BString("text");
@@ -36,14 +36,14 @@ StringFormatAppendTest::PerformTest(void)
delete string; delete string;
delete string2; delete string2;
//operator<<(char); // operator<<(char);
NextSubTest(); NextSubTest();
string = new BString("str"); string = new BString("str");
*string << 'i' << 'n' << 'g'; *string << 'i' << 'n' << 'g';
CPPUNIT_ASSERT(strcmp(string->String(), "string") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "string") == 0);
delete string; delete string;
//operator<<(int); // operator<<(int);
NextSubTest(); NextSubTest();
string = new BString("level "); string = new BString("level ");
*string << (int)42; *string << (int)42;
@@ -56,21 +56,21 @@ StringFormatAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "error -1") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "error -1") == 0);
delete string; delete string;
//operator<<(unsigned int); // operator<<(unsigned int);
NextSubTest(); NextSubTest();
string = new BString("number "); string = new BString("number ");
*string << (unsigned int)296; *string << (unsigned int)296;
CPPUNIT_ASSERT(strcmp(string->String(), "number 296") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "number 296") == 0);
delete string; delete string;
//operator<<(uint32); // operator<<(uint32);
NextSubTest(); NextSubTest();
string = new BString; string = new BString;
*string << (uint32)102456; *string << (uint32)102456;
CPPUNIT_ASSERT(strcmp(string->String(), "102456") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "102456") == 0);
delete string; delete string;
//operator<<(int32); // operator<<(int32);
NextSubTest(); NextSubTest();
string = new BString; string = new BString;
*string << (int32)112456; *string << (int32)112456;
@@ -83,14 +83,14 @@ StringFormatAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "-112475") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "-112475") == 0);
delete string; delete string;
//operator<<(uint64); // operator<<(uint64);
NextSubTest(); NextSubTest();
string = new BString; string = new BString;
*string << (uint64)1145267987; *string << (uint64)1145267987;
CPPUNIT_ASSERT(strcmp(string->String(), "1145267987") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "1145267987") == 0);
delete string; delete string;
//operator<<(int64); // operator<<(int64);
NextSubTest(); NextSubTest();
string = new BString; string = new BString;
*string << (int64)112456; *string << (int64)112456;
@@ -103,17 +103,18 @@ StringFormatAppendTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string->String(), "-112475") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "-112475") == 0);
delete string; delete string;
//operator<<(float); // operator<<(float);
NextSubTest(); NextSubTest();
string = new BString; string = new BString;
*string << (float)34.542; *string << (float)34.542;
CPPUNIT_ASSERT(strcmp(string->String(), "34.54") == 0); CPPUNIT_ASSERT(strcmp(string->String(), "34.54") == 0);
delete string; delete string;
//Misc test // Misc test
NextSubTest(); NextSubTest();
BString s; 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); CPPUNIT_ASSERT(strcmp(s.String(), "This is a test sentence") == 0);
} }
@@ -123,5 +124,6 @@ CppUnit::Test *StringFormatAppendTest::suite(void)
typedef CppUnit::TestCaller<StringFormatAppendTest> typedef CppUnit::TestCaller<StringFormatAppendTest>
StringFormatAppendTestCaller; StringFormatAppendTestCaller;
return(new StringFormatAppendTestCaller("BString::FormatAppend Test", &StringFormatAppendTest::PerformTest)); return(new StringFormatAppendTestCaller("BString::FormatAppend Test",
&StringFormatAppendTest::PerformTest));
} }
src/tests/kits/support/bstring/StringInsertTest.cpp
+13 -12
View File
@@ -2,12 +2,12 @@
#include "cppunit/TestCaller.h" #include "cppunit/TestCaller.h"
#include <String.h> #include <String.h>
StringInsertTest::StringInsertTest(std::string name) :
BTestCase(name) StringInsertTest::StringInsertTest(std::string name)
: BTestCase(name)
{ {
} }
StringInsertTest::~StringInsertTest() StringInsertTest::~StringInsertTest()
{ {
@@ -19,7 +19,7 @@ StringInsertTest::PerformTest(void)
{ {
BString *str1, *str2; BString *str1, *str2;
//&Insert(const char *, int32 pos); // &Insert(const char *, int32 pos);
NextSubTest(); NextSubTest();
str1 = new BString("String"); str1 = new BString("String");
str1->Insert("INSERTED", 3); str1->Insert("INSERTED", 3);
@@ -51,7 +51,7 @@ StringInsertTest::PerformTest(void)
delete str1; delete str1;
#endif #endif
//&Insert(const char *, int32 length, int32 pos); // &Insert(const char *, int32 length, int32 pos);
NextSubTest(); NextSubTest();
str1 = new BString("string"); str1 = new BString("string");
str1->Insert("INSERTED", 2, 2); str1->Insert("INSERTED", 2, 2);
@@ -74,28 +74,28 @@ StringInsertTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "stINSERTEDring") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "stINSERTEDring") == 0);
delete str1; delete str1;
//&Insert(const char *, int32 fromOffset, int32 length, int32 pos); // &Insert(const char *, int32 fromOffset, int32 length, int32 pos);
NextSubTest(); NextSubTest();
str1 = new BString("string"); str1 = new BString("string");
str1->Insert("INSERTED", 4, 30, 2); str1->Insert("INSERTED", 4, 30, 2);
CPPUNIT_ASSERT(strcmp(str1->String(), "stRTEDring") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "stRTEDring") == 0);
delete str1; delete str1;
//Insert(char c, int32 count, int32 pos) // Insert(char c, int32 count, int32 pos)
NextSubTest(); NextSubTest();
str1 = new BString("string"); str1 = new BString("string");
str1->Insert('P', 5, 3); str1->Insert('P', 5, 3);
CPPUNIT_ASSERT(strcmp(str1->String(), "strPPPPPing") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "strPPPPPing") == 0);
delete str1; delete str1;
//Insert(char c, int32 count, int32 pos) // Insert(char c, int32 count, int32 pos)
NextSubTest(); NextSubTest();
str1 = new BString("string"); str1 = new BString("string");
str1->Insert('P', 5, -2); str1->Insert('P', 5, -2);
CPPUNIT_ASSERT(strcmp(str1->String(), "PPPstring") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "PPPstring") == 0);
delete str1; delete str1;
//Insert(BString&) // Insert(BString&)
NextSubTest(); NextSubTest();
str1 = new BString("string"); str1 = new BString("string");
str2 = new BString("INSERTED"); str2 = new BString("INSERTED");
@@ -118,7 +118,7 @@ StringInsertTest::PerformTest(void)
delete str1; delete str1;
delete str2; delete str2;
//&Insert(BString &, int32 length, int32 pos); // &Insert(BString &, int32 length, int32 pos);
NextSubTest(); NextSubTest();
str1 = new BString("string"); str1 = new BString("string");
str2 = new BString("INSERTED"); str2 = new BString("INSERTED");
@@ -127,7 +127,7 @@ StringInsertTest::PerformTest(void)
delete str1; delete str1;
delete str2; delete str2;
//&Insert(BString&, int32 fromOffset, int32 length, int32 pos); // &Insert(BString&, int32 fromOffset, int32 length, int32 pos);
NextSubTest(); NextSubTest();
str1 = new BString("string"); str1 = new BString("string");
str2 = new BString("INSERTED"); str2 = new BString("INSERTED");
@@ -143,5 +143,6 @@ CppUnit::Test *StringInsertTest::suite(void)
typedef CppUnit::TestCaller<StringInsertTest> typedef CppUnit::TestCaller<StringInsertTest>
StringInsertTestCaller; StringInsertTestCaller;
return(new StringInsertTestCaller("BString::Insert Test", &StringInsertTest::PerformTest)); return(new StringInsertTestCaller("BString::Insert Test",
&StringInsertTest::PerformTest));
} }
src/tests/kits/support/bstring/StringPrependTest.cpp
+12 -11
View File
@@ -3,12 +3,12 @@
#include <String.h> #include <String.h>
#include <UTF8.h> #include <UTF8.h>
StringPrependTest::StringPrependTest(std::string name) :
BTestCase(name) StringPrependTest::StringPrependTest(std::string name)
: BTestCase(name)
{ {
} }
StringPrependTest::~StringPrependTest() StringPrependTest::~StringPrependTest()
{ {
@@ -20,7 +20,7 @@ StringPrependTest::PerformTest(void)
{ {
BString *str1, *str2; BString *str1, *str2;
//Prepend(BString&) // Prepend(BString&)
NextSubTest(); NextSubTest();
str1 = new BString("a String"); str1 = new BString("a String");
str2 = new BString("PREPENDED"); str2 = new BString("PREPENDED");
@@ -29,28 +29,28 @@ StringPrependTest::PerformTest(void)
delete str1; delete str1;
delete str2; delete str2;
//Prepend(const char*) // Prepend(const char*)
NextSubTest(); NextSubTest();
str1 = new BString("String"); str1 = new BString("String");
str1->Prepend("PREPEND"); str1->Prepend("PREPEND");
CPPUNIT_ASSERT(strcmp(str1->String(), "PREPENDString") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "PREPENDString") == 0);
delete str1; delete str1;
//Prepend(const char*) (NULL) // Prepend(const char*) (NULL)
NextSubTest(); NextSubTest();
str1 = new BString("String"); str1 = new BString("String");
str1->Prepend((char*)NULL); str1->Prepend((char*)NULL);
CPPUNIT_ASSERT(strcmp(str1->String(), "String") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "String") == 0);
delete str1; delete str1;
//Prepend(const char*, int32 // Prepend(const char*, int32
NextSubTest(); NextSubTest();
str1 = new BString("String"); str1 = new BString("String");
str1->Prepend("PREPENDED", 3); str1->Prepend("PREPENDED", 3);
CPPUNIT_ASSERT(strcmp(str1->String(), "PREString") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "PREString") == 0);
delete str1; delete str1;
//Prepend(BString&, int32) // Prepend(BString&, int32)
NextSubTest(); NextSubTest();
str1 = new BString("String"); str1 = new BString("String");
str2 = new BString("PREPEND", 4); str2 = new BString("PREPEND", 4);
@@ -59,14 +59,14 @@ StringPrependTest::PerformTest(void)
delete str1; delete str1;
delete str2; delete str2;
//Prepend(char, int32) // Prepend(char, int32)
NextSubTest(); NextSubTest();
str1 = new BString("aString"); str1 = new BString("aString");
str1->Prepend('c', 4); str1->Prepend('c', 4);
CPPUNIT_ASSERT(strcmp(str1->String(), "ccccaString") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "ccccaString") == 0);
delete str1; delete str1;
//String was empty // String was empty
NextSubTest(); NextSubTest();
str1 = new BString; str1 = new BString;
str1->Prepend("PREPENDED"); str1->Prepend("PREPENDED");
@@ -81,5 +81,6 @@ CppUnit::Test *StringPrependTest::suite(void)
typedef CppUnit::TestCaller<StringPrependTest> typedef CppUnit::TestCaller<StringPrependTest>
StringPrependTestCaller; StringPrependTestCaller;
return(new StringPrependTestCaller("BString::Prepend Test", &StringPrependTest::PerformTest)); return(new StringPrependTestCaller("BString::Prepend Test",
&StringPrependTest::PerformTest));
} }
src/tests/kits/support/bstring/StringRemoveTest.cpp
+26 -25
View File
@@ -3,12 +3,12 @@
#include <String.h> #include <String.h>
#include <stdio.h> #include <stdio.h>
StringRemoveTest::StringRemoveTest(std::string name) :
BTestCase(name) StringRemoveTest::StringRemoveTest(std::string name)
: BTestCase(name)
{ {
} }
StringRemoveTest::~StringRemoveTest() StringRemoveTest::~StringRemoveTest()
{ {
@@ -20,8 +20,8 @@ StringRemoveTest::PerformTest(void)
{ {
BString *string1, *string2; BString *string1, *string2;
//Truncate(int32 newLength, bool lazy); // Truncate(int32 newLength, bool lazy);
//lazy = true // lazy = true
NextSubTest(); NextSubTest();
string1 = new BString("This is a long string"); string1 = new BString("This is a long string");
string1->Truncate(14, true); string1->Truncate(14, true);
@@ -29,7 +29,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(string1->Length() == 14); CPPUNIT_ASSERT(string1->Length() == 14);
delete string1; delete string1;
//lazy = false // lazy = false
NextSubTest(); NextSubTest();
string1 = new BString("This is a long string"); string1 = new BString("This is a long string");
string1->Truncate(14, false); string1->Truncate(14, false);
@@ -38,9 +38,9 @@ StringRemoveTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//new length is < 0 // new length is < 0
//it crashes r5 implementation, but ours works fine here, // it crashes r5 implementation, but ours works fine here,
//in this case, we just truncate to 0 // in this case, we just truncate to 0
NextSubTest(); NextSubTest();
string1 = new BString("This is a long string"); string1 = new BString("This is a long string");
string1->Truncate(-3); string1->Truncate(-3);
@@ -49,7 +49,7 @@ StringRemoveTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//new length is > old length // new length is > old length
NextSubTest(); NextSubTest();
string1 = new BString("This is a long string"); string1 = new BString("This is a long string");
string1->Truncate(45); string1->Truncate(45);
@@ -57,7 +57,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(string1->Length() == 21); CPPUNIT_ASSERT(string1->Length() == 21);
delete string1; delete string1;
//String was empty // String was empty
NextSubTest(); NextSubTest();
string1 = new BString; string1 = new BString;
string1->Truncate(0); string1->Truncate(0);
@@ -65,28 +65,28 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(string1->Length() == 0); CPPUNIT_ASSERT(string1->Length() == 0);
delete string1; delete string1;
//Remove(int32 from, int32 length) // Remove(int32 from, int32 length)
NextSubTest(); NextSubTest();
string1 = new BString("a String"); string1 = new BString("a String");
string1->Remove(2, 2); string1->Remove(2, 2);
CPPUNIT_ASSERT(strcmp(string1->String(), "a ring") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "a ring") == 0);
delete string1; delete string1;
//String was empty // String was empty
NextSubTest(); NextSubTest();
string1 = new BString; string1 = new BString;
string1->Remove(2, 1); string1->Remove(2, 1);
CPPUNIT_ASSERT(strcmp(string1->String(), "") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "") == 0);
delete string1; delete string1;
//from is beyond the end of the string // from is beyond the end of the string
NextSubTest(); NextSubTest();
string1 = new BString("a String"); string1 = new BString("a String");
string1->Remove(20, 2); string1->Remove(20, 2);
CPPUNIT_ASSERT(strcmp(string1->String(), "a String") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "a String") == 0);
delete string1; delete string1;
//from + length exceeds Length() (R5 fails) // from + length exceeds Length() (R5 fails)
NextSubTest(); NextSubTest();
string1 = new BString("a String"); string1 = new BString("a String");
string1->Remove(4, 30); string1->Remove(4, 30);
@@ -99,7 +99,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "ing") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "ing") == 0);
delete string1; delete string1;
//RemoveFirst(BString&) // RemoveFirst(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("first second first"); string1 = new BString("first second first");
string2 = new BString("first"); string2 = new BString("first");
@@ -116,7 +116,7 @@ StringRemoveTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//RemoveLast(Bstring&) // RemoveLast(Bstring&)
NextSubTest(); NextSubTest();
string1 = new BString("first second first"); string1 = new BString("first second first");
string2 = new BString("first"); string2 = new BString("first");
@@ -133,7 +133,7 @@ StringRemoveTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//RemoveAll(BString&) // RemoveAll(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("first second first"); string1 = new BString("first second first");
string2 = new BString("first"); string2 = new BString("first");
@@ -150,7 +150,7 @@ StringRemoveTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//RemoveFirst(const char*) // RemoveFirst(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("first second first"); string1 = new BString("first second first");
string1->RemoveFirst("first"); string1->RemoveFirst("first");
@@ -169,7 +169,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "first second first") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "first second first") == 0);
delete string1; delete string1;
//RemoveLast(const char*) // RemoveLast(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("first second first"); string1 = new BString("first second first");
string1->RemoveLast("first"); string1->RemoveLast("first");
@@ -182,7 +182,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "first second first") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "first second first") == 0);
delete string1; delete string1;
//RemoveAll(const char*) // RemoveAll(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("first second first"); string1 = new BString("first second first");
string1->RemoveAll("first"); string1->RemoveAll("first");
@@ -195,7 +195,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "first second first") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "first second first") == 0);
delete string1; delete string1;
//RemoveSet(const char*) // RemoveSet(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("a sentence with (3) (642) numbers (2) in it"); string1 = new BString("a sentence with (3) (642) numbers (2) in it");
string1->RemoveSet("()3624 "); string1->RemoveSet("()3624 ");
@@ -208,7 +208,7 @@ StringRemoveTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(string1->String(), "a string") == 0); CPPUNIT_ASSERT(strcmp(string1->String(), "a string") == 0);
delete string1; delete string1;
//MoveInto(BString &into, int32, int32) // MoveInto(BString &into, int32, int32)
NextSubTest(); NextSubTest();
string1 = new BString("some text"); string1 = new BString("some text");
string2 = new BString("string"); string2 = new BString("string");
@@ -227,7 +227,7 @@ StringRemoveTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//MoveInto(char *, int32, int32) // MoveInto(char *, int32, int32)
NextSubTest(); NextSubTest();
char dest[100]; char dest[100];
memset(dest, 0, 100); memset(dest, 0, 100);
@@ -252,5 +252,6 @@ CppUnit::Test *StringRemoveTest::suite(void)
typedef CppUnit::TestCaller<StringRemoveTest> typedef CppUnit::TestCaller<StringRemoveTest>
StringRemoveTestCaller; StringRemoveTestCaller;
return(new StringRemoveTestCaller("BString::Remove Test", &StringRemoveTest::PerformTest)); return(new StringRemoveTestCaller("BString::Remove Test",
&StringRemoveTest::PerformTest));
} }
src/tests/kits/support/bstring/StringReplaceTest.cpp
+33 -28
View File
@@ -2,13 +2,13 @@
#include "cppunit/TestCaller.h" #include "cppunit/TestCaller.h"
#include <String.h> #include <String.h>
StringReplaceTest::StringReplaceTest(std::string name) :
BTestCase(name) StringReplaceTest::StringReplaceTest(std::string name)
: BTestCase(name)
{ {
} }
StringReplaceTest::~StringReplaceTest() StringReplaceTest::~StringReplaceTest()
{ {
} }
@@ -18,10 +18,10 @@ void
StringReplaceTest::PerformTest(void) StringReplaceTest::PerformTest(void)
{ {
BString *str1; BString *str1;
const int32 sz = 1024*50; const int32 sz = 1024 * 50;
char* buf; char* buf;
//&ReplaceFirst(char, char); // &ReplaceFirst(char, char);
NextSubTest(); NextSubTest();
str1 = new BString("test string"); str1 = new BString("test string");
str1->ReplaceFirst('t', 'b'); str1->ReplaceFirst('t', 'b');
@@ -34,7 +34,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0);
delete str1; delete str1;
//&ReplaceLast(char, char); // &ReplaceLast(char, char);
NextSubTest(); NextSubTest();
str1 = new BString("test string"); str1 = new BString("test string");
str1->ReplaceLast('t', 'w'); str1->ReplaceLast('t', 'w');
@@ -47,7 +47,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0);
delete str1; delete str1;
//&ReplaceAll(char, char, int32); // &ReplaceAll(char, char, int32);
NextSubTest(); NextSubTest();
str1 = new BString("test string"); str1 = new BString("test string");
str1->ReplaceAll('t', 'i'); str1->ReplaceAll('t', 'i');
@@ -72,17 +72,19 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "tesi siring") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "tesi siring") == 0);
delete str1; delete str1;
//&Replace(char, char, int32, int32) // &Replace(char, char, int32, int32)
NextSubTest(); NextSubTest();
str1 = new BString("she sells sea shells on the sea shore"); str1 = new BString("she sells sea shells on the sea shore");
str1->Replace('s', 't', 4, 2); 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; delete str1;
NextSubTest(); NextSubTest();
str1 = new BString("she sells sea shells on the sea shore"); str1 = new BString("she sells sea shells on the sea shore");
str1->Replace('s', 's', 4, 2); 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; delete str1;
NextSubTest(); NextSubTest();
@@ -91,7 +93,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "") == 0);
delete str1; delete str1;
//&ReplaceFirst(const char*, const char*) // &ReplaceFirst(const char*, const char*)
NextSubTest(); NextSubTest();
str1 = new BString("she sells sea shells on the seashore"); str1 = new BString("she sells sea shells on the seashore");
str1->ReplaceFirst("sea", "the"); str1->ReplaceFirst("sea", "the");
@@ -106,7 +108,7 @@ StringReplaceTest::PerformTest(void)
"she sells sea shells on the seashore") == 0); "she sells sea shells on the seashore") == 0);
delete str1; delete str1;
//&ReplaceLast(const char*, const char*) // &ReplaceLast(const char*, const char*)
NextSubTest(); NextSubTest();
str1 = new BString("she sells sea shells on the seashore"); str1 = new BString("she sells sea shells on the seashore");
str1->ReplaceLast("sea", "the"); str1->ReplaceLast("sea", "the");
@@ -121,7 +123,7 @@ StringReplaceTest::PerformTest(void)
"she sells sea shells on the seashore") == 0); "she sells sea shells on the seashore") == 0);
delete str1; delete str1;
//&ReplaceAll(const char*, const char*, int32) // &ReplaceAll(const char*, const char*, int32)
NextSubTest(); NextSubTest();
str1 = new BString("abc abc abc"); str1 = new BString("abc abc abc");
str1->ReplaceAll("ab", "abc"); str1->ReplaceAll("ab", "abc");
@@ -155,7 +157,7 @@ StringReplaceTest::PerformTest(void)
"she sells sea shells on the seashore") == 0); "she sells sea shells on the seashore") == 0);
delete str1; delete str1;
//&IReplaceFirst(char, char); // &IReplaceFirst(char, char);
NextSubTest(); NextSubTest();
str1 = new BString("test string"); str1 = new BString("test string");
str1->IReplaceFirst('t', 'b'); str1->IReplaceFirst('t', 'b');
@@ -168,7 +170,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0);
delete str1; delete str1;
//&IReplaceLast(char, char); // &IReplaceLast(char, char);
NextSubTest(); NextSubTest();
str1 = new BString("test string"); str1 = new BString("test string");
str1->IReplaceLast('t', 'w'); str1->IReplaceLast('t', 'w');
@@ -181,7 +183,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "test string") == 0);
delete str1; delete str1;
//&IReplaceAll(char, char, int32); // &IReplaceAll(char, char, int32);
NextSubTest(); NextSubTest();
str1 = new BString("TEST string"); str1 = new BString("TEST string");
str1->IReplaceAll('t', 'i'); str1->IReplaceAll('t', 'i');
@@ -206,17 +208,19 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "TESi siring") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "TESi siring") == 0);
delete str1; delete str1;
//&IReplace(char, char, int32, int32) // &IReplace(char, char, int32, int32)
NextSubTest(); NextSubTest();
str1 = new BString("She sells Sea shells on the sea shore"); str1 = new BString("She sells Sea shells on the sea shore");
str1->IReplace('s', 't', 4, 2); 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; delete str1;
NextSubTest(); NextSubTest();
str1 = new BString("She sells Sea shells on the sea shore"); str1 = new BString("She sells Sea shells on the sea shore");
str1->IReplace('s', 's', 4, 2); 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; delete str1;
NextSubTest(); NextSubTest();
@@ -225,7 +229,7 @@ StringReplaceTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str1->String(), "") == 0); CPPUNIT_ASSERT(strcmp(str1->String(), "") == 0);
delete str1; delete str1;
//&IReplaceFirst(const char*, const char*) // &IReplaceFirst(const char*, const char*)
NextSubTest(); NextSubTest();
str1 = new BString("she sells SeA shells on the seashore"); str1 = new BString("she sells SeA shells on the seashore");
str1->IReplaceFirst("sea", "the"); str1->IReplaceFirst("sea", "the");
@@ -240,7 +244,7 @@ StringReplaceTest::PerformTest(void)
"she sells sea shells on the seashore") == 0); "she sells sea shells on the seashore") == 0);
delete str1; delete str1;
//&IReplaceLast(const char*, const char*) // &IReplaceLast(const char*, const char*)
#ifndef TEST_R5 #ifndef TEST_R5
NextSubTest(); NextSubTest();
str1 = new BString("she sells sea shells on the SEashore"); 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); "she sells sea shells on the seashore") == 0);
delete str1; delete str1;
//&IReplaceAll(const char*, const char*, int32) // &IReplaceAll(const char*, const char*, int32)
NextSubTest(); NextSubTest();
str1 = new BString("abc ABc aBc"); str1 = new BString("abc ABc aBc");
str1->IReplaceAll("ab", "abc"); str1->IReplaceAll("ab", "abc");
@@ -278,7 +282,7 @@ StringReplaceTest::PerformTest(void)
"she sells SeA shells on the theshore") == 0); "she sells SeA shells on the theshore") == 0);
delete str1; delete str1;
//ReplaceSet(const char*, char) // ReplaceSet(const char*, char)
NextSubTest(); NextSubTest();
str1 = new BString("abc abc abc"); str1 = new BString("abc abc abc");
str1->ReplaceSet("ab", 'x'); str1->ReplaceSet("ab", 'x');
@@ -298,7 +302,7 @@ StringReplaceTest::PerformTest(void)
delete str1; delete str1;
#ifndef TEST_R5 #ifndef TEST_R5
//ReplaceSet(const char*, const char*) // ReplaceSet(const char*, const char*)
NextSubTest(); NextSubTest();
str1 = new BString("abcd abcd abcd"); str1 = new BString("abcd abcd abcd");
str1->ReplaceSet("abcd ", ""); str1->ReplaceSet("abcd ", "");
@@ -307,7 +311,7 @@ StringReplaceTest::PerformTest(void)
#endif #endif
#ifndef TEST_R5 #ifndef TEST_R5
//ReplaceSet(const char*, const char*) // ReplaceSet(const char*, const char*)
NextSubTest(); NextSubTest();
str1 = new BString("abcd abcd abcd"); str1 = new BString("abcd abcd abcd");
str1->ReplaceSet("ad", "da"); str1->ReplaceSet("ad", "da");
@@ -316,7 +320,7 @@ StringReplaceTest::PerformTest(void)
#endif #endif
#ifndef TEST_R5 #ifndef TEST_R5
//ReplaceSet(const char*, const char*) // ReplaceSet(const char*, const char*)
NextSubTest(); NextSubTest();
str1 = new BString("abcd abcd abcd"); str1 = new BString("abcd abcd abcd");
str1->ReplaceSet("ad", ""); str1->ReplaceSet("ad", "");
@@ -362,7 +366,7 @@ StringReplaceTest::PerformTest(void)
memset( buf, 'x', sz); memset( buf, 'x', sz);
str1->UnlockBuffer( sz); str1->UnlockBuffer( sz);
str1->ReplaceAll("xx", "y"); str1->ReplaceAll("xx", "y");
CPPUNIT_ASSERT(str1->Length() == sz/2); CPPUNIT_ASSERT(str1->Length() == sz / 2);
delete str1; delete str1;
NextSubTest(); NextSubTest();
@@ -382,5 +386,6 @@ CppUnit::Test *StringReplaceTest::suite(void)
typedef CppUnit::TestCaller<StringReplaceTest> typedef CppUnit::TestCaller<StringReplaceTest>
StringReplaceTestCaller; StringReplaceTestCaller;
return(new StringReplaceTestCaller("BString::Replace Test", &StringReplaceTest::PerformTest)); return(new StringReplaceTestCaller("BString::Replace Test",
&StringReplaceTest::PerformTest));
} }
src/tests/kits/support/bstring/StringSearchTest.cpp
+49 -48
View File
@@ -3,13 +3,13 @@
#include <String.h> #include <String.h>
#include <stdio.h> #include <stdio.h>
StringSearchTest::StringSearchTest(std::string name) :
BTestCase(name) StringSearchTest::StringSearchTest(std::string name)
: BTestCase(name)
{ {
} }
StringSearchTest::~StringSearchTest() StringSearchTest::~StringSearchTest()
{ {
} }
@@ -21,7 +21,7 @@ StringSearchTest::PerformTest(void)
BString *string1, *string2; BString *string1, *string2;
int32 i; int32 i;
//FindFirst(BString&) // FindFirst(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
string2 = new BString("st"); string2 = new BString("st");
@@ -38,7 +38,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//FindFirst(char*) // FindFirst(char*)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = string1->FindFirst("st"); i = string1->FindFirst("st");
@@ -52,7 +52,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
// Commented, since crashes R5 // Commented, since crashes R5
NextSubTest(); NextSubTest();
string1 = new BString("string"); string1 = new BString("string");
i = string1->FindFirst((char*)NULL); i = string1->FindFirst((char*)NULL);
@@ -60,7 +60,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//FindFirst(BString&, int32) // FindFirst(BString&, int32)
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
string2 = new BString("abc"); string2 = new BString("abc");
@@ -85,7 +85,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//FindFirst(const char*, int32) // FindFirst(const char*, int32)
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
i = string1->FindFirst("abc", 2); i = string1->FindFirst("abc", 2);
@@ -105,7 +105,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//Commented since crashes R5 // Commented since crashes R5
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
i = string1->FindFirst((char*)NULL, 3); i = string1->FindFirst((char*)NULL, 3);
@@ -113,7 +113,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//FindFirst(char) // FindFirst(char)
NextSubTest(); NextSubTest();
string1 = new BString("abcd abcd"); string1 = new BString("abcd abcd");
i = string1->FindFirst('c'); i = string1->FindFirst('c');
@@ -126,7 +126,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == B_ERROR); CPPUNIT_ASSERT(i == B_ERROR);
delete string1; delete string1;
//FindFirst(char, int32) // FindFirst(char, int32)
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
i = string1->FindFirst("b", 3); i = string1->FindFirst("b", 3);
@@ -146,7 +146,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//StartsWith(BString&) // StartsWith(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
string2 = new BString("last"); string2 = new BString("last");
@@ -155,14 +155,14 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//StartsWith(const char*) // StartsWith(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = (int32)string1->StartsWith("last"); i = (int32)string1->StartsWith("last");
CPPUNIT_ASSERT(i != 0); CPPUNIT_ASSERT(i != 0);
delete string1; delete string1;
//StartsWith(const char*, int32) // StartsWith(const char*, int32)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = (int32)string1->StartsWith("last", 4); i = (int32)string1->StartsWith("last", 4);
@@ -170,7 +170,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//FindLast(BString&) // FindLast(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
string2 = new BString("st"); string2 = new BString("st");
@@ -187,7 +187,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//FindLast(char*) // FindLast(char*)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = string1->FindLast("st"); i = string1->FindLast("st");
@@ -201,7 +201,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//Commented since crashes R5 // Commented since crashes R5
NextSubTest(); NextSubTest();
string1 = new BString("string"); string1 = new BString("string");
i = string1->FindLast((char*)NULL); i = string1->FindLast((char*)NULL);
@@ -209,7 +209,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//FindLast(BString&, int32) // FindLast(BString&, int32)
NextSubTest(); NextSubTest();
string1 = new BString("abcabcabc"); string1 = new BString("abcabcabc");
string2 = new BString("abc"); string2 = new BString("abc");
@@ -226,7 +226,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//FindLast(const char*, int32) // FindLast(const char*, int32)
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
i = string1->FindLast("abc", 9); i = string1->FindLast("abc", 9);
@@ -240,7 +240,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//Commented since crashes r5 // Commented since crashes r5
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
i = string1->FindLast((char*)NULL, 3); i = string1->FindLast((char*)NULL, 3);
@@ -248,7 +248,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//FindLast(char) // FindLast(char)
NextSubTest(); NextSubTest();
string1 = new BString("abcd abcd"); string1 = new BString("abcd abcd");
i = string1->FindLast('c'); i = string1->FindLast('c');
@@ -261,7 +261,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == B_ERROR); CPPUNIT_ASSERT(i == B_ERROR);
delete string1; delete string1;
//FindLast(char, int32) // FindLast(char, int32)
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
i = string1->FindLast("b", 5); i = string1->FindLast("b", 5);
@@ -292,7 +292,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == B_ERROR); CPPUNIT_ASSERT(i == B_ERROR);
delete string1; delete string1;
//IFindFirst(BString&) // IFindFirst(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
string2 = new BString("st"); string2 = new BString("st");
@@ -325,7 +325,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//IFindFirst(const char*) // IFindFirst(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = string1->IFindFirst("st"); i = string1->IFindFirst("st");
@@ -345,7 +345,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//Commented, since crashes R5 // Commented, since crashes R5
NextSubTest(); NextSubTest();
string1 = new BString("string"); string1 = new BString("string");
i = string1->IFindFirst((char*)NULL); i = string1->IFindFirst((char*)NULL);
@@ -353,7 +353,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//IFindFirst(BString&, int32) // IFindFirst(BString&, int32)
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
string2 = new BString("abc"); string2 = new BString("abc");
@@ -386,7 +386,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//IFindFirst(const char*, int32) // IFindFirst(const char*, int32)
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
i = string1->IFindFirst("abc", 2); i = string1->IFindFirst("abc", 2);
@@ -412,30 +412,30 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//IStartsWith(BString&) // IStartsWith(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
string2 = new BString("lAsT"); string2 = new BString("lAsT");
i = (int32)string1->StartsWith(*string2); i = (int32)string1->IStartsWith(*string2);
CPPUNIT_ASSERT(i != 0); CPPUNIT_ASSERT(i != 0);
delete string1; delete string1;
delete string2; delete string2;
//IStartsWith(const char*) // IStartsWith(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = (int32)string1->StartsWith("lAsT"); i = (int32)string1->IStartsWith("lAsT");
CPPUNIT_ASSERT(i != 0); CPPUNIT_ASSERT(i != 0);
delete string1; delete string1;
//IStartsWith(const char*, int32) // IStartsWith(const char*, int32)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = (int32)string1->StartsWith("lAsT", 4); i = (int32)string1->IStartsWith("lAsT", 4);
CPPUNIT_ASSERT(i != 0); CPPUNIT_ASSERT(i != 0);
delete string1; delete string1;
//IFindLast(BString&) // IFindLast(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
string2 = new BString("st"); string2 = new BString("st");
@@ -452,7 +452,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//EndsWith(BString&) // EndsWith(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
string2 = new BString("st"); string2 = new BString("st");
@@ -469,7 +469,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//EndsWith(const char*) // EndsWith(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = (int32)string1->EndsWith("least"); i = (int32)string1->EndsWith("least");
@@ -482,10 +482,10 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == 0); CPPUNIT_ASSERT(i == 0);
delete string1; delete string1;
//EndsWith(const char*, int32) // EndsWith(const char*, int32)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = (int32)string1->EndsWith("sT", 2); i = (int32)string1->EndsWith("st", 2);
CPPUNIT_ASSERT(i != 0); CPPUNIT_ASSERT(i != 0);
delete string1; delete string1;
@@ -495,7 +495,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i == 0); CPPUNIT_ASSERT(i == 0);
delete string1; delete string1;
//IEndsWith(BString&) // IEndsWith(BString&)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
string2 = new BString("st"); string2 = new BString("st");
@@ -512,7 +512,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//IEndsWith(const char*) // IEndsWith(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = (int32)string1->IEndsWith("st"); i = (int32)string1->IEndsWith("st");
@@ -525,7 +525,7 @@ StringSearchTest::PerformTest(void)
CPPUNIT_ASSERT(i != 0); CPPUNIT_ASSERT(i != 0);
delete string1; delete string1;
//IEndsWith(const char*, int32) // IEndsWith(const char*, int32)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = (int32)string1->IEndsWith("st", 2); i = (int32)string1->IEndsWith("st", 2);
@@ -547,7 +547,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//IFindLast(const char*) // IFindLast(const char*)
NextSubTest(); NextSubTest();
string1 = new BString("last but not least"); string1 = new BString("last but not least");
i = string1->IFindLast("st"); i = string1->IFindLast("st");
@@ -569,7 +569,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#ifndef TEST_R5 #ifndef TEST_R5
//Commented since crashes R5 // Commented since crashes R5
NextSubTest(); NextSubTest();
string1 = new BString("string"); string1 = new BString("string");
i = string1->IFindLast((char*)NULL); i = string1->IFindLast((char*)NULL);
@@ -577,7 +577,7 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
#endif #endif
//FindLast(BString&, int32) // FindLast(BString&, int32)
NextSubTest(); NextSubTest();
string1 = new BString("abcabcabc"); string1 = new BString("abcabcabc");
string2 = new BString("abc"); string2 = new BString("abc");
@@ -602,14 +602,14 @@ StringSearchTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//IFindLast(const char*, int32) // IFindLast(const char*, int32)
//#ifndef TEST_R5 // #ifndef TEST_R5
NextSubTest(); NextSubTest();
string1 = new BString("abc abc abc"); string1 = new BString("abc abc abc");
i = string1->IFindLast("abc", 9); i = string1->IFindLast("abc", 9);
CPPUNIT_ASSERT(i == 4); CPPUNIT_ASSERT(i == 4);
delete string1; delete string1;
//#endif // #endif
#ifndef TEST_R5 #ifndef TEST_R5
NextSubTest(); NextSubTest();
string1 = new BString("ABc abC aBC"); string1 = new BString("ABc abC aBC");
@@ -636,5 +636,6 @@ CppUnit::Test *StringSearchTest::suite(void)
typedef CppUnit::TestCaller<StringSearchTest> typedef CppUnit::TestCaller<StringSearchTest>
StringSearchTestCaller; StringSearchTestCaller;
return(new StringSearchTestCaller("BString::Search Test", &StringSearchTest::PerformTest)); return(new StringSearchTestCaller("BString::Search Test",
&StringSearchTest::PerformTest));
} }
src/tests/kits/support/bstring/StringSplitTest.cpp
+9 -8
View File
@@ -3,13 +3,13 @@
#include <String.h> #include <String.h>
#include <StringList.h> #include <StringList.h>
StringSplitTest::StringSplitTest(std::string name) :
BTestCase(name) StringSplitTest::StringSplitTest(std::string name)
: BTestCase(name)
{ {
} }
StringSplitTest::~StringSplitTest() StringSplitTest::~StringSplitTest()
{ {
} }
@@ -24,28 +24,28 @@ StringSplitTest::PerformTest(void)
BStringList stringList1; BStringList stringList1;
str1 = new BString("test::string"); str1 = new BString("test::string");
str1->Split(":", true, stringList1); str1->Split(":", true, stringList1);
CPPUNIT_ASSERT(stringList1.CountStrings() == 2); CPPUNIT_ASSERT_EQUAL(2, stringList1.CountStrings());
delete str1; delete str1;
NextSubTest(); NextSubTest();
BStringList stringList2; BStringList stringList2;
str1 = new BString("test::string"); str1 = new BString("test::string");
str1->Split("::", true, stringList2); str1->Split("::", true, stringList2);
CPPUNIT_ASSERT(stringList2.CountStrings() == 2); CPPUNIT_ASSERT_EQUAL(2, stringList2.CountStrings());
delete str1; delete str1;
NextSubTest(); NextSubTest();
BStringList stringList3; BStringList stringList3;
str1 = new BString("test::string"); str1 = new BString("test::string");
str1->Split("::", false, stringList3); str1->Split("::", false, stringList3);
CPPUNIT_ASSERT(stringList3.CountStrings() == 2); CPPUNIT_ASSERT_EQUAL(2, stringList3.CountStrings());
delete str1; delete str1;
NextSubTest(); NextSubTest();
BStringList stringList4; BStringList stringList4;
str1 = new BString("test::string"); str1 = new BString("test::string");
str1->Split(":", false, stringList4); str1->Split(":", false, stringList4);
CPPUNIT_ASSERT(stringList4.CountStrings() == 3); CPPUNIT_ASSERT_EQUAL(3, stringList4.CountStrings());
delete str1; delete str1;
} }
@@ -56,5 +56,6 @@ CppUnit::Test *StringSplitTest::suite(void)
typedef CppUnit::TestCaller<StringSplitTest> typedef CppUnit::TestCaller<StringSplitTest>
StringSplitTestCaller; StringSplitTestCaller;
return(new StringSplitTestCaller("BString::Split Test", &StringSplitTest::PerformTest)); return(new StringSplitTestCaller("BString::Split Test",
&StringSplitTest::PerformTest));
} }
src/tests/kits/support/bstring/StringSubCopyTest.cpp
+7 -6
View File
@@ -3,12 +3,12 @@
#include <String.h> #include <String.h>
#include <stdio.h> #include <stdio.h>
StringSubCopyTest::StringSubCopyTest(std::string name) :
BTestCase(name) StringSubCopyTest::StringSubCopyTest(std::string name)
: BTestCase(name)
{ {
} }
StringSubCopyTest::~StringSubCopyTest() StringSubCopyTest::~StringSubCopyTest()
{ {
@@ -20,7 +20,7 @@ StringSubCopyTest::PerformTest(void)
{ {
BString *string1, *string2; BString *string1, *string2;
//CopyInto(BString&, int32, int32) // CopyInto(BString&, int32, int32)
NextSubTest(); NextSubTest();
string1 = new BString; string1 = new BString;
string2 = new BString("Something"); string2 = new BString("Something");
@@ -29,7 +29,7 @@ StringSubCopyTest::PerformTest(void)
delete string1; delete string1;
delete string2; delete string2;
//CopyInto(const char*, int32, int32) // CopyInto(const char*, int32, int32)
NextSubTest(); NextSubTest();
char tmp[10]; char tmp[10];
memset(tmp, 0, 10); memset(tmp, 0, 10);
@@ -46,5 +46,6 @@ CppUnit::Test *StringSubCopyTest::suite(void)
typedef CppUnit::TestCaller<StringSubCopyTest> typedef CppUnit::TestCaller<StringSubCopyTest>
StringSubCopyTestCaller; StringSubCopyTestCaller;
return(new StringSubCopyTestCaller("BString::SubCopy Test", &StringSubCopyTest::PerformTest)); return(new StringSubCopyTestCaller("BString::SubCopy Test",
&StringSubCopyTest::PerformTest));
} }
src/tests/kits/support/bstring/StringTest.cpp
+1
View File
@@ -18,6 +18,7 @@
#include "StringSearchTest.h" #include "StringSearchTest.h"
#include "StringSplitTest.h" #include "StringSplitTest.h"
CppUnit::Test *StringTestSuite() CppUnit::Test *StringTestSuite()
{ {
CppUnit::TestSuite *testSuite = new CppUnit::TestSuite(); CppUnit::TestSuite *testSuite = new CppUnit::TestSuite();