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/list.h | 120 ++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'test/common/list.h') diff --git a/test/common/list.h b/test/common/list.h index 3b6b9a1721..232aa82bd8 100644 --- a/test/common/list.h +++ b/test/common/list.h @@ -7,39 +7,39 @@ class ListTestSuite : public CxxTest::TestSuite public: void test_empty_clear() { Common::List container; - TS_ASSERT( container.empty() ); + TS_ASSERT(container.empty()); container.push_back(17); container.push_back(33); - TS_ASSERT( !container.empty() ); + TS_ASSERT(!container.empty()); container.clear(); - TS_ASSERT( container.empty() ); + TS_ASSERT(container.empty()); } public: void test_size() { Common::List container; - TS_ASSERT_EQUALS( container.size(), (unsigned int)0 ); + TS_ASSERT_EQUALS(container.size(), (unsigned int)0); container.push_back(17); - TS_ASSERT_EQUALS( container.size(), (unsigned int)1 ); + TS_ASSERT_EQUALS(container.size(), (unsigned int)1); container.push_back(33); - TS_ASSERT_EQUALS( container.size(), (unsigned int)2 ); + TS_ASSERT_EQUALS(container.size(), (unsigned int)2); container.clear(); - TS_ASSERT_EQUALS( container.size(), (unsigned int)0 ); + TS_ASSERT_EQUALS(container.size(), (unsigned int)0); } void test_iterator_begin_end() { Common::List container; // The container is initially empty ... - TS_ASSERT( container.begin() == container.end() ); + TS_ASSERT_EQUALS(container.begin(), container.end()); // ... then non-empty ... container.push_back(33); - TS_ASSERT( container.begin() != container.end() ); + TS_ASSERT_DIFFERS(container.begin(), container.end()); // ... and again empty. container.clear(); - TS_ASSERT( container.begin() == container.end() ); + TS_ASSERT_EQUALS(container.begin(), container.end()); } void test_iterator() { @@ -58,32 +58,32 @@ class ListTestSuite : public CxxTest::TestSuite iter = container.begin(); cIter = container.begin(); - TS_ASSERT( iter == cIter ); + TS_ASSERT_EQUALS(iter, cIter); - TS_ASSERT_EQUALS( *iter, 17 ); + TS_ASSERT_EQUALS(*iter, 17); ++iter; ++cIter; - TS_ASSERT( iter != container.end() ); - TS_ASSERT( cIter != container.end() ); - TS_ASSERT( iter == cIter ); + TS_ASSERT_DIFFERS(iter, container.end()); + TS_ASSERT_DIFFERS(cIter, container.end()); + TS_ASSERT_EQUALS(iter, cIter); - TS_ASSERT_EQUALS( *iter, 33 ); + TS_ASSERT_EQUALS(*iter, 33); ++iter; ++cIter; - TS_ASSERT( iter != container.end() ); - TS_ASSERT( cIter != container.end() ); - TS_ASSERT( iter == cIter ); + TS_ASSERT_DIFFERS(iter, container.end()); + TS_ASSERT_DIFFERS(cIter, container.end()); + TS_ASSERT_EQUALS(iter, cIter); // Also test the postinc - TS_ASSERT_EQUALS( *iter, -11 ); + TS_ASSERT_EQUALS(*iter, -11); iter++; cIter++; - TS_ASSERT( iter == container.end() ); - TS_ASSERT( cIter == container.end() ); - TS_ASSERT( iter == cIter ); + TS_ASSERT_EQUALS(iter, container.end()); + TS_ASSERT_EQUALS(cIter, container.end()); + TS_ASSERT_EQUALS(iter, cIter); cIter = iter; - TS_ASSERT( iter == cIter ); + TS_ASSERT_EQUALS(iter, cIter); } void test_insert() { @@ -107,25 +107,25 @@ class ListTestSuite : public CxxTest::TestSuite // Verify contents are correct iter = container.begin(); - TS_ASSERT_EQUALS( *iter, 17 ); + TS_ASSERT_EQUALS(*iter, 17); ++iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, 33 ); + TS_ASSERT_EQUALS(*iter, 33); ++iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, 42 ); + TS_ASSERT_EQUALS(*iter, 42); ++iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, 43 ); + TS_ASSERT_EQUALS(*iter, 43); ++iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, -11 ); + TS_ASSERT_EQUALS(*iter, -11); ++iter; - TS_ASSERT( iter == container.end() ); + TS_ASSERT_EQUALS(iter, container.end()); } void test_erase() { @@ -155,17 +155,17 @@ class ListTestSuite : public CxxTest::TestSuite // Verify contents are correct Common::List::iterator iter = container.begin(); - TS_ASSERT_EQUALS( *iter, 17 ); + TS_ASSERT_EQUALS(*iter, 17); ++iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, 33 ); + TS_ASSERT_EQUALS(*iter, 33); ++iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, 43 ); + TS_ASSERT_EQUALS(*iter, 43); ++iter; - TS_ASSERT( iter == container.end() ); + TS_ASSERT_EQUALS(iter, container.end()); } void test_remove() { @@ -191,17 +191,17 @@ class ListTestSuite : public CxxTest::TestSuite // Verify contents are correct Common::List::iterator iter = container.begin(); - TS_ASSERT_EQUALS( *iter, 17 ); + TS_ASSERT_EQUALS(*iter, 17); ++iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, 33 ); + TS_ASSERT_EQUALS(*iter, 33); ++iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, 43 ); + TS_ASSERT_EQUALS(*iter, 43); ++iter; - TS_ASSERT( iter == container.end() ); + TS_ASSERT_EQUALS(iter, container.end()); } void test_reverse() { @@ -214,36 +214,36 @@ class ListTestSuite : public CxxTest::TestSuite container.push_back(-11); iter = container.reverse_begin(); - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, -11 ); + TS_ASSERT_EQUALS(*iter, -11); --iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, 33 ); + TS_ASSERT_EQUALS(*iter, 33); --iter; - TS_ASSERT( iter != container.end() ); + TS_ASSERT_DIFFERS(iter, container.end()); - TS_ASSERT_EQUALS( *iter, 17 ); + TS_ASSERT_EQUALS(*iter, 17); --iter; - TS_ASSERT( iter == container.end() ); + TS_ASSERT_EQUALS(iter, container.end()); iter = container.reverse_begin(); iter = container.reverse_erase(iter); - TS_ASSERT( iter != container.end() ); - TS_ASSERT_EQUALS( *iter, 33 ); + TS_ASSERT_DIFFERS(iter, container.end()); + TS_ASSERT_EQUALS(*iter, 33); iter = container.reverse_erase(iter); - TS_ASSERT( iter != container.end() ); - TS_ASSERT_EQUALS( *iter, 17 ); + TS_ASSERT_DIFFERS(iter, container.end()); + TS_ASSERT_EQUALS(*iter, 17); iter = container.reverse_erase(iter); - TS_ASSERT( iter == container.end() ); + TS_ASSERT_EQUALS(iter, container.end()); - TS_ASSERT( container.begin() == container.end() ); - TS_ASSERT( container.reverse_begin() == container.end() ); + TS_ASSERT_EQUALS(container.begin(), container.end()); + TS_ASSERT_EQUALS(container.reverse_begin(), container.end()); } void test_front_back_push_pop() { -- cgit v1.2.3