[Scummvm-cvs-logs] SF.net SVN: scummvm:[49065] scummvm/trunk/test/common/rational.h

[fingolfin at users.sourceforge.net]

Revision: 49065
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49065&view=rev
Author:   fingolfin
Date:     2010-05-17 22:08:19 +0000 (Mon, 17 May 2010)

Log Message:
-----------
Use TS_ASSERT_EQUALS in test cases

Modified Paths:
--------------
    scummvm/trunk/test/common/rational.h

Modified: scummvm/trunk/test/common/rational.h
===================================================================
--- scummvm/trunk/test/common/rational.h	2010-05-17 22:07:58 UTC (rev 49064)
+++ scummvm/trunk/test/common/rational.h	2010-05-17 22:08:19 UTC (rev 49065)
@@ -40,12 +40,12 @@
 		Common::Rational r0(6, 3);
 		Common::Rational r1(1, 2);
 
-		TS_ASSERT(r0 == 2);
-		TS_ASSERT(r1 == Common::Rational(1, 2));
+		TS_ASSERT_EQUALS(r0, 2);
+		TS_ASSERT_EQUALS(r1, Common::Rational(1, 2));
 
 		r0 = r1;
-		TS_ASSERT(r0 == r1);
-		TS_ASSERT(r0 == Common::Rational(1, 2));
+		TS_ASSERT_EQUALS(r0, r1);
+		TS_ASSERT_EQUALS(r0, Common::Rational(1, 2));
 	}
 
 	void test_negative() {
@@ -54,19 +54,22 @@
 
 		r0 = -r0;
 		r1 = -r1;
-		TS_ASSERT(r0 == -2);
-		TS_ASSERT(r1 == Common::Rational(-1, 2));
-		TS_ASSERT(r1 == Common::Rational(1, -2));
+		TS_ASSERT_EQUALS(r0, -2);
+		TS_ASSERT_EQUALS(r1, Common::Rational(-1, 2));
+		TS_ASSERT_EQUALS(r1, Common::Rational(1, -2));
+
+		TS_ASSERT_EQUALS(r1, Common::Rational(-25, 50));
+		TS_ASSERT_EQUALS(r1, Common::Rational(25, -50));
 	}
 
 	void test_add_sub() {
 		const Common::Rational r0(6, 3);
 		const Common::Rational r1(1, 2);
 
-		TS_ASSERT(r0 + r1 == Common::Rational(5, 2));
-		TS_ASSERT(r1 + r0 == Common::Rational(5, 2));
-		TS_ASSERT(r0 - r1 == Common::Rational(3, 2));
-		TS_ASSERT(r1 - r0 == Common::Rational(-3, 2));
+		TS_ASSERT_EQUALS(r0 + r1, Common::Rational(5, 2));
+		TS_ASSERT_EQUALS(r1 + r0, Common::Rational(5, 2));
+		TS_ASSERT_EQUALS(r0 - r1, Common::Rational(3, 2));
+		TS_ASSERT_EQUALS(r1 - r0, Common::Rational(-3, 2));
 	}
 
 	void test_mul() {
@@ -89,6 +92,6 @@
 		Common::Rational r0(6, 3);
 		Common::Rational r1(1, 2);
 
-		TS_ASSERT(r0 / r1 == 4);
+		TS_ASSERT_EQUALS(r0 / r1, 4);
 	}
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.