Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33450

1 files changed, 73 insertions, 43 deletions

diff --git a/test/common/str.h b/test/common/str.h
index 76574ea70f..72d4df6f61 100644
--- a/test/common/str.h
+++ b/test/common/str.h
@@ -7,124 +7,154 @@ class StringTestSuite : public CxxTest::TestSuite
 	public:
 	void test_constructors(void) {
 		Common::String str("test-string");
-		TS_ASSERT( str == "test-string" );
+		TS_ASSERT( str == "test-string");
 		str = Common::String(str.c_str()+5, 3);
-		TS_ASSERT( str == "str" );
+		TS_ASSERT( str == "str");
 		str = "test-string";
-		TS_ASSERT( str == "test-string" );
+		TS_ASSERT( str == "test-string");
 		str = Common::String(str.c_str()+5, str.c_str()+8);
-		TS_ASSERT( str == "str" );
+		TS_ASSERT( str == "str");
+	}
+
+	void test_trim(void) {
+		Common::String str("  This is a s tring with spaces  ");
+		Common::String str2 = str;
+		str.trim();
+		TS_ASSERT( str == "This is a s tring with spaces");
+		TS_ASSERT( str2 == "  This is a s tring with spaces  ");
 	}
 
 	void test_empty_clear(void) {
 		Common::String str("test");
-		TS_ASSERT( !str.empty() );
+		TS_ASSERT( !str.empty());
 		str.clear();
-		TS_ASSERT( str.empty() );
+		TS_ASSERT( str.empty());
 	}
 
 	void test_lastChar(void) {
 		Common::String str;
-		TS_ASSERT_EQUALS( str.lastChar(), '\0' );
+		TS_ASSERT_EQUALS(str.lastChar(), '\0');
 		str = "test";
-		TS_ASSERT_EQUALS( str.lastChar(), 't' );
+		TS_ASSERT_EQUALS(str.lastChar(), 't');
 		Common::String str2("bar");
-		TS_ASSERT_EQUALS( str2.lastChar(), 'r' );
+		TS_ASSERT_EQUALS(str2.lastChar(), 'r');
 	}
 
 	void test_concat1(void) {
 		Common::String str("foo");
 		Common::String str2("bar");
 		str += str2;
-		TS_ASSERT_EQUALS( str, "foobar" );
-		TS_ASSERT_EQUALS( str2, "bar" );
+		TS_ASSERT_EQUALS(str, "foobar");
+		TS_ASSERT_EQUALS(str2, "bar");
 	}
 
 	void test_concat2(void) {
 		Common::String str("foo");
 		str += "bar";
-		TS_ASSERT_EQUALS( str, "foobar" );
+		TS_ASSERT_EQUALS(str, "foobar");
 	}
 
 	void test_concat3(void) {
 		Common::String str("foo");
 		str += 'X';
-		TS_ASSERT_EQUALS( str, "fooX" );
+		TS_ASSERT_EQUALS(str, "fooX");
 	}
 
 	void test_refCount(void) {
+		// using internal storage
 		Common::String foo1("foo");
-		Common::String foo2("foo");
+		Common::String foo2(foo1);
 		Common::String foo3(foo2);
 		foo3 += 'X';
-		TS_ASSERT_EQUALS( foo2, foo1 );
-		TS_ASSERT_EQUALS( foo2, "foo" );
-		TS_ASSERT_EQUALS( foo3, "foo""X" );
+		TS_ASSERT_EQUALS(foo1, "foo");
+		TS_ASSERT_EQUALS(foo2, "foo");
+		TS_ASSERT_EQUALS(foo3, "foo""X");
+		foo2 = 'x';
+		TS_ASSERT_EQUALS(foo1, "foo");
+		TS_ASSERT_EQUALS(foo2, "x");
+		TS_ASSERT_EQUALS(foo3, "foo""X");
 	}
 
 	void test_refCount2(void) {
+		// using external storage
 		Common::String foo1("fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
-		Common::String foo2("fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
+		Common::String foo2(foo1);
 		Common::String foo3(foo2);
 		foo3 += 'X';
-		TS_ASSERT_EQUALS( foo2, foo1 );
-		TS_ASSERT_EQUALS( foo2, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd" );
-		TS_ASSERT_EQUALS( foo3, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd""X" );
+		TS_ASSERT_EQUALS(foo1, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
+		TS_ASSERT_EQUALS(foo2, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
+		TS_ASSERT_EQUALS(foo3, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd""X");
+		foo2 = 'x';
+		TS_ASSERT_EQUALS(foo1, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
+		TS_ASSERT_EQUALS(foo2, "x");
+		TS_ASSERT_EQUALS(foo3, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd""X");
 	}
 
 	void test_refCount3(void) {
 		Common::String foo1("0123456789abcdefghijk");
-		Common::String foo2("0123456789abcdefghijk");
+		Common::String foo2(foo1);
 		Common::String foo3(foo2);
 		foo3 += "0123456789abcdefghijk";
-		TS_ASSERT_EQUALS( foo2, foo1 );
-		TS_ASSERT_EQUALS( foo2, "0123456789abcdefghijk" );
-		TS_ASSERT_EQUALS( foo3, "0123456789abcdefghijk""0123456789abcdefghijk" );
+		TS_ASSERT_EQUALS(foo1, foo2);
+		TS_ASSERT_EQUALS(foo2, "0123456789abcdefghijk");
+		TS_ASSERT_EQUALS(foo3, "0123456789abcdefghijk""0123456789abcdefghijk");
+		foo2 = 'x';
+		TS_ASSERT_EQUALS(foo1, "0123456789abcdefghijk");
+		TS_ASSERT_EQUALS(foo2, "x");
+		TS_ASSERT_EQUALS(foo3, "0123456789abcdefghijk""0123456789abcdefghijk");
 	}
 
 	void test_refCount4(void) {
 		Common::String foo1("fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
-		Common::String foo2("fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
+		Common::String foo2(foo1);
 		Common::String foo3(foo2);
 		foo3 += "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd";
-		TS_ASSERT_EQUALS( foo2, foo1 );
-		TS_ASSERT_EQUALS( foo2, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd" );
-		TS_ASSERT_EQUALS( foo3, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd""fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd" );
+		TS_ASSERT_EQUALS(foo1, foo2);
+		TS_ASSERT_EQUALS(foo2, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
+		TS_ASSERT_EQUALS(foo3, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd""fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
+		foo2 = 'x';
+		TS_ASSERT_EQUALS(foo1, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
+		TS_ASSERT_EQUALS(foo2, "x");
+		TS_ASSERT_EQUALS(foo3, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd""fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
 	}
 
 	void test_hasPrefix(void) {
 		Common::String str("this/is/a/test, haha");
-		TS_ASSERT_EQUALS( str.hasPrefix(""), true );
-		TS_ASSERT_EQUALS( str.hasPrefix("this"), true );
-		TS_ASSERT_EQUALS( str.hasPrefix("thit"), false );
-		TS_ASSERT_EQUALS( str.hasPrefix("foo"), false );
+		TS_ASSERT_EQUALS(str.hasPrefix(""), true);
+		TS_ASSERT_EQUALS(str.hasPrefix("this"), true);
+		TS_ASSERT_EQUALS(str.hasPrefix("thit"), false);
+		TS_ASSERT_EQUALS(str.hasPrefix("foo"), false);
 	}
 
 	void test_hasSuffix(void) {
 		Common::String str("this/is/a/test, haha");
-		TS_ASSERT_EQUALS( str.hasSuffix(""), true );
-		TS_ASSERT_EQUALS( str.hasSuffix("haha"), true );
-		TS_ASSERT_EQUALS( str.hasSuffix("hahb"), false );
-		TS_ASSERT_EQUALS( str.hasSuffix("hahah"), false );
+		TS_ASSERT_EQUALS(str.hasSuffix(""), true);
+		TS_ASSERT_EQUALS(str.hasSuffix("haha"), true);
+		TS_ASSERT_EQUALS(str.hasSuffix("hahb"), false);
+		TS_ASSERT_EQUALS(str.hasSuffix("hahah"), false);
 	}
 
 	void test_contains(void) {
 		Common::String str("this/is/a/test, haha");
-		TS_ASSERT_EQUALS( str.contains(""), true );
-		TS_ASSERT_EQUALS( str.contains("haha"), true );
-		TS_ASSERT_EQUALS( str.contains("hahb"), false );
-		TS_ASSERT_EQUALS( str.contains("test"), true );
+		TS_ASSERT_EQUALS(str.contains(""), true);
+		TS_ASSERT_EQUALS(str.contains("haha"), true);
+		TS_ASSERT_EQUALS(str.contains("hahb"), false);
+		TS_ASSERT_EQUALS(str.contains("test"), true);
 	}
 
 	void test_toLowercase(void) {
 		Common::String str("Test it, NOW! 42");
+		Common::String str2 = str;
 		str.toLowercase();
-		TS_ASSERT_EQUALS( str, "test it, now! 42" );
+		TS_ASSERT_EQUALS(str, "test it, now! 42");
+		TS_ASSERT_EQUALS(str2, "Test it, NOW! 42");
 	}
 
 	void test_toUppercase(void) {
 		Common::String str("Test it, NOW! 42");
+		Common::String str2 = str;
 		str.toUppercase();
-		TS_ASSERT_EQUALS( str, "TEST IT, NOW! 42" );
+		TS_ASSERT_EQUALS(str, "TEST IT, NOW! 42");
+		TS_ASSERT_EQUALS(str2, "Test it, NOW! 42");
 	}
 };