Converted unit tests to use TS_ASSERT_EQUALS / TS_ASSERT_DIFFERS where possible; also made them comply a bit more to our code formatting guideline

svn-id: r40722

1 files changed, 52 insertions, 52 deletions

diff --git a/test/common/array.h b/test/common/array.h
index 68b4fa3a93..cb793004a4 100644
--- a/test/common/array.h
+++ b/test/common/array.h
@@ -8,12 +8,12 @@ class ArrayTestSuite : public CxxTest::TestSuite
 	public:
 	void test_empty_clear() {
 		Common::Array<int> array;
-		TS_ASSERT( array.empty() );
+		TS_ASSERT(array.empty());
 		array.push_back(17);
 		array.push_back(33);
-		TS_ASSERT( !array.empty() );
+		TS_ASSERT(!array.empty());
 		array.clear();
-		TS_ASSERT( array.empty() );
+		TS_ASSERT(array.empty());
 	}
 
 	void test_iterator() {
@@ -30,18 +30,18 @@ class ArrayTestSuite : public CxxTest::TestSuite
 
 		iter = array.begin();
 
-		TS_ASSERT_EQUALS( *iter, 17 );
+		TS_ASSERT_EQUALS(*iter, 17);
 		++iter;
-		TS_ASSERT( iter != array.end() );
+		TS_ASSERT_DIFFERS(iter, array.end());
 
-		TS_ASSERT_EQUALS( *iter, 33 );
+		TS_ASSERT_EQUALS(*iter, 33);
 		++iter;
-		TS_ASSERT( iter != array.end() );
+		TS_ASSERT_DIFFERS(iter, array.end());
 
 		// Also test the postinc
-		TS_ASSERT_EQUALS( *iter, -11 );
+		TS_ASSERT_EQUALS(*iter, -11);
 		iter++;
-		TS_ASSERT( iter == array.end() );
+		TS_ASSERT_EQUALS(iter, array.end());
 	}
 
 	void test_direct_access() {
@@ -52,9 +52,9 @@ class ArrayTestSuite : public CxxTest::TestSuite
 		array.push_back(33);
 		array.push_back(-11);
 
-		TS_ASSERT_EQUALS( array[0], 17 );
-		TS_ASSERT_EQUALS( array[1], 33 );
-		TS_ASSERT_EQUALS( array[2], -11 );
+		TS_ASSERT_EQUALS(array[0], 17);
+		TS_ASSERT_EQUALS(array[1], 33);
+		TS_ASSERT_EQUALS(array[2], -11);
 	}
 
 	void test_insert_at() {
@@ -69,13 +69,13 @@ class ArrayTestSuite : public CxxTest::TestSuite
 		// Insert some data
 		array.insert_at(2, 33);
 
-		TS_ASSERT_EQUALS( array[0], -12 );
-		TS_ASSERT_EQUALS( array[1], 17 );
-		TS_ASSERT_EQUALS( array[2], 33 );
-		TS_ASSERT_EQUALS( array[3], 25 );
-		TS_ASSERT_EQUALS( array[4], -11 );
+		TS_ASSERT_EQUALS(array[0], -12);
+		TS_ASSERT_EQUALS(array[1], 17);
+		TS_ASSERT_EQUALS(array[2], 33);
+		TS_ASSERT_EQUALS(array[3], 25);
+		TS_ASSERT_EQUALS(array[4], -11);
 
-		TS_ASSERT_EQUALS( array.size(), (unsigned int)5 );
+		TS_ASSERT_EQUALS(array.size(), (unsigned int)5);
 	}
 
 	void test_remove_at() {
@@ -91,12 +91,12 @@ class ArrayTestSuite : public CxxTest::TestSuite
 		// Remove some data
 		array.remove_at(1);
 
-		TS_ASSERT_EQUALS( array[0], -12 );
-		TS_ASSERT_EQUALS( array[1], 33 );
-		TS_ASSERT_EQUALS( array[2], 25 );
-		TS_ASSERT_EQUALS( array[3], -11 );
+		TS_ASSERT_EQUALS(array[0], -12);
+		TS_ASSERT_EQUALS(array[1], 33);
+		TS_ASSERT_EQUALS(array[2], 25);
+		TS_ASSERT_EQUALS(array[3], -11);
 
-		TS_ASSERT_EQUALS( array.size(), (unsigned int)4 );
+		TS_ASSERT_EQUALS(array.size(), (unsigned int)4);
 	}
 
 	void test_push_back() {
@@ -113,15 +113,15 @@ class ArrayTestSuite : public CxxTest::TestSuite
 
 		array1.push_back(array2);
 
-		TS_ASSERT_EQUALS( array1[0], -3 );
-		TS_ASSERT_EQUALS( array1[1], 5 );
-		TS_ASSERT_EQUALS( array1[2], 9 );
-		TS_ASSERT_EQUALS( array1[3], 3 );
-		TS_ASSERT_EQUALS( array1[4], -2 );
-		TS_ASSERT_EQUALS( array1[5], -131 );
+		TS_ASSERT_EQUALS(array1[0], -3);
+		TS_ASSERT_EQUALS(array1[1], 5);
+		TS_ASSERT_EQUALS(array1[2], 9);
+		TS_ASSERT_EQUALS(array1[3], 3);
+		TS_ASSERT_EQUALS(array1[4], -2);
+		TS_ASSERT_EQUALS(array1[5], -131);
 
-		TS_ASSERT_EQUALS( array1.size(), (unsigned int)6 );
-		TS_ASSERT_EQUALS( array2.size(), (unsigned int)3 );
+		TS_ASSERT_EQUALS(array1.size(), (unsigned int)6);
+		TS_ASSERT_EQUALS(array2.size(), (unsigned int)3);
 	}
 
 	void test_copy_constructor() {
@@ -134,11 +134,11 @@ class ArrayTestSuite : public CxxTest::TestSuite
 
 		Common::Array<int> array2(array1);
 
-		TS_ASSERT_EQUALS( array2[0], -3 );
-		TS_ASSERT_EQUALS( array2[1], 5 );
-		TS_ASSERT_EQUALS( array2[2], 9 );
+		TS_ASSERT_EQUALS(array2[0], -3);
+		TS_ASSERT_EQUALS(array2[1], 5);
+		TS_ASSERT_EQUALS(array2[2], 9);
 
-		TS_ASSERT_EQUALS( array2.size(), (unsigned int)3 );
+		TS_ASSERT_EQUALS(array2.size(), (unsigned int)3);
 	}
 
 	void test_array_constructor() {
@@ -146,11 +146,11 @@ class ArrayTestSuite : public CxxTest::TestSuite
 
 		Common::Array<int> array2(array1, 3);
 
-		TS_ASSERT_EQUALS( array2[0], -3 );
-		TS_ASSERT_EQUALS( array2[1], 5 );
-		TS_ASSERT_EQUALS( array2[2], 9 );
+		TS_ASSERT_EQUALS(array2[0], -3);
+		TS_ASSERT_EQUALS(array2[1], 5);
+		TS_ASSERT_EQUALS(array2[2], 9);
 
-		TS_ASSERT_EQUALS( array2.size(), (unsigned int)3 );
+		TS_ASSERT_EQUALS(array2.size(), (unsigned int)3);
 	}
 
 	void test_array_constructor_str() {
@@ -158,11 +158,11 @@ class ArrayTestSuite : public CxxTest::TestSuite
 
 		Common::StringList array2(array1, 3);
 
-		TS_ASSERT_EQUALS( array2[0], "a" );
-		TS_ASSERT_EQUALS( array2[1], "b" );
-		TS_ASSERT_EQUALS( array2[2], "c" );
+		TS_ASSERT_EQUALS(array2[0], "a");
+		TS_ASSERT_EQUALS(array2[1], "b");
+		TS_ASSERT_EQUALS(array2[2], "c");
 
-		TS_ASSERT_EQUALS( array2.size(), (unsigned int)3 );
+		TS_ASSERT_EQUALS(array2.size(), (unsigned int)3);
 	}
 
 	void test_front_back_push_pop() {
@@ -188,24 +188,24 @@ class ArrayTestSuite : public CxxTest::TestSuite
 		Common::Array<int> array;
 
 		array.resize(3);
-		TS_ASSERT_EQUALS( array.size(), (unsigned int)3 );
+		TS_ASSERT_EQUALS(array.size(), (unsigned int)3);
 
 		array[0] = -3;
 		array[1] = 163;
 		array[2] = 17;
 
 		array.resize(100);
-		TS_ASSERT_EQUALS( array.size(), (unsigned int)100 );
-		TS_ASSERT_EQUALS( array[0], -3 );
-		TS_ASSERT_EQUALS( array[1], 163 );
-		TS_ASSERT_EQUALS( array[2], 17 );
+		TS_ASSERT_EQUALS(array.size(), (unsigned int)100);
+		TS_ASSERT_EQUALS(array[0], -3);
+		TS_ASSERT_EQUALS(array[1], 163);
+		TS_ASSERT_EQUALS(array[2], 17);
 
-		TS_ASSERT_EQUALS( array[99], 0 );
+		TS_ASSERT_EQUALS(array[99], 0);
 
 		array.resize(2);
-		TS_ASSERT_EQUALS( array.size(), (unsigned int)2 );
-		TS_ASSERT_EQUALS( array[0], -3 );
-		TS_ASSERT_EQUALS( array[1], 163 );
+		TS_ASSERT_EQUALS(array.size(), (unsigned int)2);
+		TS_ASSERT_EQUALS(array[0], -3);
+		TS_ASSERT_EQUALS(array[1], 163);
 	}
 
 };