From c56a481f88c23ef394c723cd4ef4c7efec6a7aa9 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 17 May 2010 22:08:19 +0000 Subject: Use TS_ASSERT_EQUALS in test cases svn-id: r49065 --- test/common/rational.h | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'test/common') diff --git a/test/common/rational.h b/test/common/rational.h index 5425ec4d81..4248283ade 100644 --- a/test/common/rational.h +++ b/test/common/rational.h @@ -40,12 +40,12 @@ public: 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 @@ public: 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 @@ public: Common::Rational r0(6, 3); Common::Rational r1(1, 2); - TS_ASSERT(r0 / r1 == 4); + TS_ASSERT_EQUALS(r0 / r1, 4); } }; -- cgit v1.2.3