From 2b32ba7cb375dd80a119f56f661811971c671ca3 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 19 May 2009 11:22:49 +0000
Subject: 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
---
 test/common/rect.h | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'test/common/rect.h')

diff --git a/test/common/rect.h b/test/common/rect.h
index 7b68a3b844..11c743dc9c 100644
--- a/test/common/rect.h
+++ b/test/common/rect.h
@@ -11,43 +11,43 @@ class RectTestSuite : public CxxTest::TestSuite
 		Common::Point p21(2, 1);
 		Common::Point p23(2, 3);
 		Common::Point p32(3, 2);
-		TS_ASSERT_EQUALS( p0.sqrDist(p11), (uint) 2 );
-		TS_ASSERT_EQUALS( p0.sqrDist(p21), (uint) 5 );
-		TS_ASSERT_EQUALS( p0.sqrDist(p23), p0.sqrDist(p32) );
-		TS_ASSERT_EQUALS( p11.sqrDist(p11), (uint) 0 );
-		TS_ASSERT_EQUALS( p11.sqrDist(p23), (uint) 5 );
+		TS_ASSERT_EQUALS(p0.sqrDist(p11), (uint) 2);
+		TS_ASSERT_EQUALS(p0.sqrDist(p21), (uint) 5);
+		TS_ASSERT_EQUALS(p0.sqrDist(p23), p0.sqrDist(p32));
+		TS_ASSERT_EQUALS(p11.sqrDist(p11), (uint) 0);
+		TS_ASSERT_EQUALS(p11.sqrDist(p23), (uint) 5);
 	}
 
 	void test_intersects() {
-		TS_ASSERT( Common::Rect(0, 0, 2, 2).intersects(Common::Rect(0, 0, 1, 1)) );
-		TS_ASSERT( Common::Rect(0, 0, 2, 2).intersects(Common::Rect(1, 1, 2, 2)) );
-		TS_ASSERT( !Common::Rect(0, 0, 1, 1).intersects(Common::Rect(1, 1, 2, 2)) );
+		TS_ASSERT(Common::Rect(0, 0, 2, 2).intersects(Common::Rect(0, 0, 1, 1)));
+		TS_ASSERT(Common::Rect(0, 0, 2, 2).intersects(Common::Rect(1, 1, 2, 2)));
+		TS_ASSERT(!Common::Rect(0, 0, 1, 1).intersects(Common::Rect(1, 1, 2, 2)));
 	}
 
 	void test_contains() {
 		Common::Rect r0;
 		Common::Rect r1(0, 0, 1, 1);
 		Common::Rect r2(0, 0, 2, 2);
-		TS_ASSERT( !r0.contains(r1) );
-		TS_ASSERT( !r0.contains(r2) );
-		TS_ASSERT( !r1.contains(r2) );
-		TS_ASSERT( r0.contains(r0) );
+		TS_ASSERT(!r0.contains(r1));
+		TS_ASSERT(!r0.contains(r2));
+		TS_ASSERT(!r1.contains(r2));
+		TS_ASSERT(r0.contains(r0));
 
-		TS_ASSERT( r1.contains(r0) );
-		TS_ASSERT( r1.contains(r1) );
+		TS_ASSERT(r1.contains(r0));
+		TS_ASSERT(r1.contains(r1));
 
-		TS_ASSERT( r2.contains(r0) );
-		TS_ASSERT( r2.contains(r1) );
-		TS_ASSERT( r2.contains(r2) );
+		TS_ASSERT(r2.contains(r0));
+		TS_ASSERT(r2.contains(r1));
+		TS_ASSERT(r2.contains(r2));
 	}
 
 	void test_extend() {
 		Common::Rect r0;
 		Common::Rect r1(0, 0, 1, 1);
 		Common::Rect r2(0, 0, 2, 2);
-		TS_ASSERT( !r0.contains(r1) );
+		TS_ASSERT(!r0.contains(r1));
 		r0.extend(r1);
-		TS_ASSERT( r0.contains(r1) );
+		TS_ASSERT(r0.contains(r1));
 		TS_ASSERT_EQUALS(r0.top,    0);
 		TS_ASSERT_EQUALS(r0.left,   0);
 		TS_ASSERT_EQUALS(r0.bottom, 1);
-- 
cgit v1.2.3