* Fixed warning.

* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39632 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-11-25 21:00:25 +00:00
parent 876a4a3cae
commit 742d83e3d2
@@ -8,14 +8,14 @@ StringAssignTest::StringAssignTest(std::string name) :
{ {
} }
StringAssignTest::~StringAssignTest() StringAssignTest::~StringAssignTest()
{ {
} }
void void
StringAssignTest::PerformTest(void) StringAssignTest::PerformTest(void)
{ {
//=(BString&) //=(BString&)
@@ -25,14 +25,14 @@ StringAssignTest::PerformTest(void)
string = string2; string = string2;
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;
@@ -40,47 +40,47 @@ StringAssignTest::PerformTest(void)
*str = s; *str = s;
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);
CPPUNIT_ASSERT(strcmp(str->String(), "") == 0); CPPUNIT_ASSERT(strcmp(str->String(), "") == 0);
delete str; delete str;
NextSubTest(); NextSubTest();
str = new BString; str = new BString;
str->SetTo("BLA"); str->SetTo("BLA");
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);
CPPUNIT_ASSERT(strcmp(str->String(), "CCCCCCCCCC") == 0); CPPUNIT_ASSERT(strcmp(str->String(), "CCCCCCCCCC") == 0);
delete str; delete str;
NextSubTest(); NextSubTest();
str = new BString("ASDSGAFA"); str = new BString("ASDSGAFA");
str->SetTo('C', 0); str->SetTo('C', 0);
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();
@@ -89,10 +89,9 @@ StringAssignTest::PerformTest(void)
CPPUNIT_ASSERT(strcmp(str->String(), oldString2) == 0); CPPUNIT_ASSERT(strcmp(str->String(), oldString2) == 0);
CPPUNIT_ASSERT(strcmp(string2.String(), "") == 0); CPPUNIT_ASSERT(strcmp(string2.String(), "") == 0);
delete str; delete str;
NextSubTest(); NextSubTest();
BString newstring("SomethingElseAgain"); BString newstring("SomethingElseAgain");
const char *oldString = newstring.String();
str = new BString; str = new BString;
str->Adopt(newstring, 2); str->Adopt(newstring, 2);
CPPUNIT_ASSERT(strncmp(str->String(), "SomethingElseAgain", 2) == 0); CPPUNIT_ASSERT(strncmp(str->String(), "SomethingElseAgain", 2) == 0);
@@ -120,9 +119,9 @@ StringAssignTest::PerformTest(void)
CppUnit::Test *StringAssignTest::suite(void) 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));
} }