[Scummvm-cvs-logs] SF.net SVN: scummvm:[40722] scummvm/trunk/test/common
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue May 19 13:22:49 CEST 2009
Revision: 40722
http://scummvm.svn.sourceforge.net/scummvm/?rev=40722&view=rev
Author: fingolfin
Date: 2009-05-19 11:22:49 +0000 (Tue, 19 May 2009)
Log Message:
-----------
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
Modified Paths:
--------------
scummvm/trunk/test/common/array.h
scummvm/trunk/test/common/bufferedreadstream.h
scummvm/trunk/test/common/bufferedseekablereadstream.h
scummvm/trunk/test/common/hashmap.h
scummvm/trunk/test/common/list.h
scummvm/trunk/test/common/pack.h
scummvm/trunk/test/common/ptr.h
scummvm/trunk/test/common/rect.h
scummvm/trunk/test/common/seekablesubreadstream.h
scummvm/trunk/test/common/str.h
scummvm/trunk/test/common/stream.h
scummvm/trunk/test/common/subreadstream.h
Modified: scummvm/trunk/test/common/array.h
===================================================================
--- scummvm/trunk/test/common/array.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/array.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -8,12 +8,12 @@
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 @@
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 @@
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 @@
// 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 @@
// 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 @@
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 @@
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 @@
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 @@
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 @@
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);
}
};
Modified: scummvm/trunk/test/common/bufferedreadstream.h
===================================================================
--- scummvm/trunk/test/common/bufferedreadstream.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/bufferedreadstream.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -15,16 +15,16 @@
byte i, b;
for (i = 0; i < 10; ++i) {
- TS_ASSERT( !srs.eos() );
+ TS_ASSERT(!srs.eos());
b = srs.readByte();
- TS_ASSERT_EQUALS( i, b );
+ TS_ASSERT_EQUALS(i, b);
}
- TS_ASSERT( !srs.eos() );
+ TS_ASSERT(!srs.eos());
b = srs.readByte();
- TS_ASSERT ( srs.eos() );
+ TS_ASSERT(srs.eos());
}
};
Modified: scummvm/trunk/test/common/bufferedseekablereadstream.h
===================================================================
--- scummvm/trunk/test/common/bufferedseekablereadstream.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/bufferedseekablereadstream.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -12,18 +12,18 @@
byte i, b;
for (i = 0; i < 10; ++i) {
- TS_ASSERT( !ssrs.eos() );
+ TS_ASSERT(!ssrs.eos());
- TS_ASSERT_EQUALS( i, ssrs.pos() );
+ TS_ASSERT_EQUALS(i, ssrs.pos());
ssrs.read(&b, 1);
- TS_ASSERT_EQUALS( i, b );
+ TS_ASSERT_EQUALS(i, b);
}
- TS_ASSERT( !ssrs.eos() );
+ TS_ASSERT(!ssrs.eos());
- TS_ASSERT( 0 == ssrs.read(&b, 1) );
- TS_ASSERT( ssrs.eos() );
+ TS_ASSERT_EQUALS(0, ssrs.read(&b, 1));
+ TS_ASSERT(ssrs.eos());
}
void test_seek() {
@@ -33,38 +33,38 @@
Common::BufferedSeekableReadStream ssrs(&ms, 4);
byte b;
- TS_ASSERT_EQUALS( ssrs.pos(), 0 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 0);
ssrs.seek(1, SEEK_SET);
- TS_ASSERT_EQUALS( ssrs.pos(), 1 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 1);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 1 );
+ TS_ASSERT_EQUALS(b, 1);
ssrs.seek(5, SEEK_CUR);
- TS_ASSERT_EQUALS( ssrs.pos(), 7 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 7);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 7 );
+ TS_ASSERT_EQUALS(b, 7);
ssrs.seek(-3, SEEK_CUR);
- TS_ASSERT_EQUALS( ssrs.pos(), 5 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 5);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 5 );
+ TS_ASSERT_EQUALS(b, 5);
ssrs.seek(0, SEEK_END);
- TS_ASSERT_EQUALS( ssrs.pos(), 10 );
- TS_ASSERT( !ssrs.eos() );
+ TS_ASSERT_EQUALS(ssrs.pos(), 10);
+ TS_ASSERT(!ssrs.eos());
b = ssrs.readByte();
- TS_ASSERT( ssrs.eos() );
+ TS_ASSERT(ssrs.eos());
ssrs.seek(-3, SEEK_END);
- TS_ASSERT( !ssrs.eos() );
- TS_ASSERT_EQUALS( ssrs.pos(), 7 );
+ TS_ASSERT(!ssrs.eos());
+ TS_ASSERT_EQUALS(ssrs.pos(), 7);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 7 );
+ TS_ASSERT_EQUALS(b, 7);
ssrs.seek(-8, SEEK_END);
- TS_ASSERT_EQUALS( ssrs.pos(), 2 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 2);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 2 );
+ TS_ASSERT_EQUALS(b, 2);
}
};
Modified: scummvm/trunk/test/common/hashmap.h
===================================================================
--- scummvm/trunk/test/common/hashmap.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/hashmap.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -8,38 +8,38 @@
public:
void test_empty_clear() {
Common::HashMap<int, int> container;
- TS_ASSERT( container.empty() );
+ TS_ASSERT(container.empty());
container[0] = 17;
container[1] = 33;
- TS_ASSERT( !container.empty() );
+ TS_ASSERT(!container.empty());
container.clear();
- TS_ASSERT( container.empty() );
+ TS_ASSERT(container.empty());
Common::StringMap container2;
- TS_ASSERT( container2.empty() );
+ TS_ASSERT(container2.empty());
container2["foo"] = "bar";
container2["quux"] = "blub";
- TS_ASSERT( !container2.empty() );
+ TS_ASSERT(!container2.empty());
container2.clear();
- TS_ASSERT( container2.empty() );
+ TS_ASSERT(container2.empty());
}
void test_contains() {
Common::HashMap<int, int> container;
container[0] = 17;
container[1] = 33;
- TS_ASSERT( container.contains(0) );
- TS_ASSERT( container.contains(1) );
- TS_ASSERT( !container.contains(17) );
- TS_ASSERT( !container.contains(-1) );
+ TS_ASSERT(container.contains(0));
+ TS_ASSERT(container.contains(1));
+ TS_ASSERT(!container.contains(17));
+ TS_ASSERT(!container.contains(-1));
Common::StringMap container2;
container2["foo"] = "bar";
container2["quux"] = "blub";
- TS_ASSERT( container2.contains("foo") );
- TS_ASSERT( container2.contains("quux") );
- TS_ASSERT( !container2.contains("bar") );
- TS_ASSERT( !container2.contains("asdf") );
+ TS_ASSERT(container2.contains("foo"));
+ TS_ASSERT(container2.contains("quux"));
+ TS_ASSERT(!container2.contains("bar"));
+ TS_ASSERT(!container2.contains("asdf"));
}
void test_add_remove() {
@@ -49,26 +49,26 @@
container[2] = 45;
container[3] = 12;
container[4] = 96;
- TS_ASSERT( container.contains(1) );
+ TS_ASSERT(container.contains(1));
container.erase(1);
- TS_ASSERT( !container.contains(1) );
+ TS_ASSERT(!container.contains(1));
container[1] = 42;
- TS_ASSERT( container.contains(1) );
+ TS_ASSERT(container.contains(1));
container.erase(0);
- TS_ASSERT( !container.empty() );
+ TS_ASSERT(!container.empty());
container.erase(1);
- TS_ASSERT( !container.empty() );
+ TS_ASSERT(!container.empty());
container.erase(2);
- TS_ASSERT( !container.empty() );
+ TS_ASSERT(!container.empty());
container.erase(3);
- TS_ASSERT( !container.empty() );
+ TS_ASSERT(!container.empty());
container.erase(4);
- TS_ASSERT( container.empty() );
+ TS_ASSERT(container.empty());
container[1] = 33;
- TS_ASSERT( container.contains(1) );
- TS_ASSERT( !container.empty() );
+ TS_ASSERT(container.contains(1));
+ TS_ASSERT(!container.empty());
container.erase(1);
- TS_ASSERT( container.empty() );
+ TS_ASSERT(container.empty());
}
void test_lookup() {
@@ -79,26 +79,26 @@
container[3] = 12;
container[4] = 96;
- TS_ASSERT_EQUALS( container[0], 17 );
- TS_ASSERT_EQUALS( container[1], -1 );
- TS_ASSERT_EQUALS( container[2], 45 );
- TS_ASSERT_EQUALS( container[3], 12 );
- TS_ASSERT_EQUALS( container[4], 96 );
+ TS_ASSERT_EQUALS(container[0], 17);
+ TS_ASSERT_EQUALS(container[1], -1);
+ TS_ASSERT_EQUALS(container[2], 45);
+ TS_ASSERT_EQUALS(container[3], 12);
+ TS_ASSERT_EQUALS(container[4], 96);
}
void test_iterator_begin_end() {
Common::HashMap<int, int> container;
// The container is initially empty ...
- TS_ASSERT( container.begin() == container.end() );
+ TS_ASSERT_EQUALS(container.begin(), container.end());
// ... then non-empty ...
container[324] = 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_hash_map_copy() {
Modified: scummvm/trunk/test/common/list.h
===================================================================
--- scummvm/trunk/test/common/list.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/list.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -7,39 +7,39 @@
public:
void test_empty_clear() {
Common::List<int> 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<int> 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<int> 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 @@
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 @@
// 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 @@
// Verify contents are correct
Common::List<int>::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 @@
// Verify contents are correct
Common::List<int>::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 @@
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() {
Modified: scummvm/trunk/test/common/pack.h
===================================================================
--- scummvm/trunk/test/common/pack.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/pack.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -21,14 +21,14 @@
{
public:
void test_packing() {
- TS_ASSERT_EQUALS( sizeof(TestStruct), size_t(4+1+2+4+1) );
+ TS_ASSERT_EQUALS(sizeof(TestStruct), size_t(4+1+2+4+1));
}
void test_offsets() {
- TS_ASSERT_EQUALS( OFFS(TestStruct, x), (ptrdiff_t)0 );
- TS_ASSERT_EQUALS( OFFS(TestStruct, y), (ptrdiff_t)4 );
- TS_ASSERT_EQUALS( OFFS(TestStruct, z), (ptrdiff_t)5 );
- TS_ASSERT_EQUALS( OFFS(TestStruct, a), (ptrdiff_t)7 );
- TS_ASSERT_EQUALS( OFFS(TestStruct, b), (ptrdiff_t)11 );
+ TS_ASSERT_EQUALS(OFFS(TestStruct, x), (ptrdiff_t)0);
+ TS_ASSERT_EQUALS(OFFS(TestStruct, y), (ptrdiff_t)4);
+ TS_ASSERT_EQUALS(OFFS(TestStruct, z), (ptrdiff_t)5);
+ TS_ASSERT_EQUALS(OFFS(TestStruct, a), (ptrdiff_t)7);
+ TS_ASSERT_EQUALS(OFFS(TestStruct, b), (ptrdiff_t)11);
}
};
Modified: scummvm/trunk/test/common/ptr.h
===================================================================
--- scummvm/trunk/test/common/ptr.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/ptr.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -13,21 +13,22 @@
{
Common::SharedPtr<int> p2 = p1;
TS_ASSERT(!p1.unique());
- TS_ASSERT(p1.refCount() == p2.refCount());
- TS_ASSERT(p1.refCount() == 2);
- TS_ASSERT(p1 == p2);
+ TS_ASSERT_EQUALS(p1.refCount(), p2.refCount());
+ TS_ASSERT_EQUALS(p1.refCount(), 2);
+ TS_ASSERT_EQUALS(p1, p2);
TS_ASSERT_EQUALS(*p2, 1);
{
Common::SharedPtr<int> p3;
p3 = p2;
- TS_ASSERT(p3 == p2 && p3 == p1);
- TS_ASSERT(p1.refCount() == 3);
+ TS_ASSERT_EQUALS(p3, p2);
+ TS_ASSERT_EQUALS(p3, p1);
+ TS_ASSERT_EQUALS(p1.refCount(), 3);
TS_ASSERT_EQUALS(*p3, 1);
*p3 = 0;
TS_ASSERT_EQUALS(*p3, 0);
}
TS_ASSERT_EQUALS(*p2, 0);
- TS_ASSERT(p1.refCount() == 2);
+ TS_ASSERT_EQUALS(p1.refCount(), 2);
}
TS_ASSERT_EQUALS(*p1, 0);
Modified: scummvm/trunk/test/common/rect.h
===================================================================
--- scummvm/trunk/test/common/rect.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/rect.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -11,43 +11,43 @@
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);
Modified: scummvm/trunk/test/common/seekablesubreadstream.h
===================================================================
--- scummvm/trunk/test/common/seekablesubreadstream.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/seekablesubreadstream.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -15,17 +15,17 @@
int i;
byte b;
for (i = start; i < end; ++i) {
- TS_ASSERT( !ssrs.eos() );
+ TS_ASSERT(!ssrs.eos());
- TS_ASSERT_EQUALS( i - start, ssrs.pos() );
+ TS_ASSERT_EQUALS(i - start, ssrs.pos());
ssrs.read(&b, 1);
- TS_ASSERT_EQUALS( i, b );
+ TS_ASSERT_EQUALS(i, b);
}
- TS_ASSERT( !ssrs.eos() );
- TS_ASSERT( 0 == ssrs.read(&b, 1) );
- TS_ASSERT( ssrs.eos() );
+ TS_ASSERT(!ssrs.eos());
+ TS_ASSERT_EQUALS(0, ssrs.read(&b, 1));
+ TS_ASSERT(ssrs.eos());
}
void test_seek() {
@@ -35,38 +35,38 @@
Common::SeekableSubReadStream ssrs(&ms, 1, 9);
byte b;
- TS_ASSERT_EQUALS( ssrs.pos(), 0 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 0);
ssrs.seek(1, SEEK_SET);
- TS_ASSERT_EQUALS( ssrs.pos(), 1 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 1);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 2 );
+ TS_ASSERT_EQUALS(b, 2);
ssrs.seek(5, SEEK_CUR);
- TS_ASSERT_EQUALS( ssrs.pos(), 7 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 7);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 8 );
+ TS_ASSERT_EQUALS(b, 8);
ssrs.seek(-3, SEEK_CUR);
- TS_ASSERT_EQUALS( ssrs.pos(), 5 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 5);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 6 );
+ TS_ASSERT_EQUALS(b, 6);
ssrs.seek(0, SEEK_END);
- TS_ASSERT_EQUALS( ssrs.pos(), 8 );
- TS_ASSERT( !ssrs.eos() );
+ TS_ASSERT_EQUALS(ssrs.pos(), 8);
+ TS_ASSERT(!ssrs.eos());
b = ssrs.readByte();
- TS_ASSERT( ssrs.eos() );
+ TS_ASSERT(ssrs.eos());
ssrs.seek(-3, SEEK_END);
- TS_ASSERT( !ssrs.eos() );
- TS_ASSERT_EQUALS( ssrs.pos(), 5 );
+ TS_ASSERT(!ssrs.eos());
+ TS_ASSERT_EQUALS(ssrs.pos(), 5);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 6 );
+ TS_ASSERT_EQUALS(b, 6);
ssrs.seek(-8, SEEK_END);
- TS_ASSERT_EQUALS( ssrs.pos(), 0 );
+ TS_ASSERT_EQUALS(ssrs.pos(), 0);
b = ssrs.readByte();
- TS_ASSERT_EQUALS( b, 1 );
+ TS_ASSERT_EQUALS(b, 1);
}
};
Modified: scummvm/trunk/test/common/str.h
===================================================================
--- scummvm/trunk/test/common/str.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/str.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -7,28 +7,28 @@
public:
void test_constructors() {
Common::String str("test-string");
- TS_ASSERT( str == "test-string");
+ TS_ASSERT_EQUALS(str, "test-string");
str = Common::String(str.c_str()+5, 3);
- TS_ASSERT( str == "str");
+ TS_ASSERT_EQUALS(str, "str");
str = "test-string";
- TS_ASSERT( str == "test-string");
+ TS_ASSERT_EQUALS(str, "test-string");
str = Common::String(str.c_str()+5, str.c_str()+8);
- TS_ASSERT( str == "str");
+ TS_ASSERT_EQUALS(str, "str");
}
void test_trim() {
Common::String str(" This is a s tring with spaces ");
Common::String str2 = str;
str.trim();
- TS_ASSERT( str == "This is a s tring with spaces");
- TS_ASSERT( str2 == " This is a s tring with spaces ");
+ TS_ASSERT_EQUALS(str, "This is a s tring with spaces");
+ TS_ASSERT_EQUALS(str2, " This is a s tring with spaces ");
}
void test_empty_clear() {
Common::String str("test");
- TS_ASSERT( !str.empty());
+ TS_ASSERT(!str.empty());
str.clear();
- TS_ASSERT( str.empty());
+ TS_ASSERT(str.empty());
}
void test_lastChar() {
@@ -161,75 +161,75 @@
void test_deleteChar() {
Common::String str("01234567890123456789012345678901");
str.deleteChar(10);
- TS_ASSERT_EQUALS( str, "0123456789123456789012345678901" );
+ TS_ASSERT_EQUALS(str, "0123456789123456789012345678901");
str.deleteChar(10);
- TS_ASSERT_EQUALS( str, "012345678923456789012345678901" );
+ TS_ASSERT_EQUALS(str, "012345678923456789012345678901");
}
void test_sharing() {
Common::String str("01234567890123456789012345678901");
Common::String str2(str);
- TS_ASSERT_EQUALS( str2, "01234567890123456789012345678901" );
+ TS_ASSERT_EQUALS(str2, "01234567890123456789012345678901");
str.deleteLastChar();
- TS_ASSERT_EQUALS( str, "0123456789012345678901234567890" );
- TS_ASSERT_EQUALS( str2, "01234567890123456789012345678901" );
+ TS_ASSERT_EQUALS(str, "0123456789012345678901234567890");
+ TS_ASSERT_EQUALS(str2, "01234567890123456789012345678901");
}
void test_lastPathComponent() {
- TS_ASSERT(Common::lastPathComponent("/", '/') == "");
- TS_ASSERT(Common::lastPathComponent("/foo/bar", '/') == "bar");
- TS_ASSERT(Common::lastPathComponent("/foo//bar/", '/') == "bar");
- TS_ASSERT(Common::lastPathComponent("/foo/./bar", '/') == "bar");
- TS_ASSERT(Common::lastPathComponent("/foo//./bar//", '/') == "bar");
- TS_ASSERT(Common::lastPathComponent("/foo//.bar//", '/') == ".bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("/", '/'), "");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("/foo/bar", '/'), "bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("/foo//bar/", '/'), "bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("/foo/./bar", '/'), "bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("/foo//./bar//", '/'), "bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("/foo//.bar//", '/'), ".bar");
- TS_ASSERT(Common::lastPathComponent("", '/') == "");
- TS_ASSERT(Common::lastPathComponent("foo/bar", '/') == "bar");
- TS_ASSERT(Common::lastPathComponent("foo//bar/", '/') == "bar");
- TS_ASSERT(Common::lastPathComponent("foo/./bar", '/') == "bar");
- TS_ASSERT(Common::lastPathComponent("foo//./bar//", '/') == "bar");
- TS_ASSERT(Common::lastPathComponent("foo//.bar//", '/') == ".bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("", '/'), "");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("foo/bar", '/'), "bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("foo//bar/", '/'), "bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("foo/./bar", '/'), "bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("foo//./bar//", '/'), "bar");
+ TS_ASSERT_EQUALS(Common::lastPathComponent("foo//.bar//", '/'), ".bar");
}
void test_normalizePath() {
- TS_ASSERT(Common::normalizePath("/", '/') == "/");
- TS_ASSERT(Common::normalizePath("/foo/bar", '/') == "/foo/bar");
- TS_ASSERT(Common::normalizePath("/foo//bar/", '/') == "/foo/bar");
- TS_ASSERT(Common::normalizePath("/foo/./bar", '/') == "/foo/bar");
- TS_ASSERT(Common::normalizePath("/foo//./bar//", '/') == "/foo/bar");
- TS_ASSERT(Common::normalizePath("/foo//.bar//", '/') == "/foo/.bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("/", '/'), "/");
+ TS_ASSERT_EQUALS(Common::normalizePath("/foo/bar", '/'), "/foo/bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("/foo//bar/", '/'), "/foo/bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("/foo/./bar", '/'), "/foo/bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("/foo//./bar//", '/'), "/foo/bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("/foo//.bar//", '/'), "/foo/.bar");
- TS_ASSERT(Common::normalizePath("", '/') == "");
- TS_ASSERT(Common::normalizePath("foo/bar", '/') == "foo/bar");
- TS_ASSERT(Common::normalizePath("foo//bar/", '/') == "foo/bar");
- TS_ASSERT(Common::normalizePath("foo/./bar", '/') == "foo/bar");
- TS_ASSERT(Common::normalizePath("foo//./bar//", '/') == "foo/bar");
- TS_ASSERT(Common::normalizePath("foo//.bar//", '/') == "foo/.bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("", '/'), "");
+ TS_ASSERT_EQUALS(Common::normalizePath("foo/bar", '/'), "foo/bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("foo//bar/", '/'), "foo/bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("foo/./bar", '/'), "foo/bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("foo//./bar//", '/'), "foo/bar");
+ TS_ASSERT_EQUALS(Common::normalizePath("foo//.bar//", '/'), "foo/.bar");
}
void test_matchString() {
- TS_ASSERT( Common::matchString("", "*"));
- TS_ASSERT( Common::matchString("a", "*"));
- TS_ASSERT( Common::matchString("monkey.s01", "*"));
+ TS_ASSERT(Common::matchString("", "*"));
+ TS_ASSERT(Common::matchString("a", "*"));
+ TS_ASSERT(Common::matchString("monkey.s01", "*"));
TS_ASSERT(!Common::matchString("", "?"));
- TS_ASSERT( Common::matchString("a", "?"));
+ TS_ASSERT(Common::matchString("a", "?"));
TS_ASSERT(!Common::matchString("monkey.s01", "?"));
- TS_ASSERT( Common::matchString("monkey.s01", "monkey.s??"));
- TS_ASSERT( Common::matchString("monkey.s99", "monkey.s??"));
+ TS_ASSERT(Common::matchString("monkey.s01", "monkey.s??"));
+ TS_ASSERT(Common::matchString("monkey.s99", "monkey.s??"));
TS_ASSERT(!Common::matchString("monkey.s101", "monkey.s??"));
- TS_ASSERT( Common::matchString("monkey.s01", "monkey.s?1"));
+ TS_ASSERT(Common::matchString("monkey.s01", "monkey.s?1"));
TS_ASSERT(!Common::matchString("monkey.s99", "monkey.s?1"));
TS_ASSERT(!Common::matchString("monkey.s101", "monkey.s?1"));
- TS_ASSERT( Common::matchString("monkey.s01", "monkey.s*"));
- TS_ASSERT( Common::matchString("monkey.s99", "monkey.s*"));
- TS_ASSERT( Common::matchString("monkey.s101", "monkey.s*"));
+ TS_ASSERT(Common::matchString("monkey.s01", "monkey.s*"));
+ TS_ASSERT(Common::matchString("monkey.s99", "monkey.s*"));
+ TS_ASSERT(Common::matchString("monkey.s101", "monkey.s*"));
- TS_ASSERT( Common::matchString("monkey.s01", "monkey.s*1"));
+ TS_ASSERT(Common::matchString("monkey.s01", "monkey.s*1"));
TS_ASSERT(!Common::matchString("monkey.s99", "monkey.s*1"));
- TS_ASSERT( Common::matchString("monkey.s101", "monkey.s*1"));
+ TS_ASSERT(Common::matchString("monkey.s101", "monkey.s*1"));
}
};
Modified: scummvm/trunk/test/common/stream.h
===================================================================
--- scummvm/trunk/test/common/stream.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/stream.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -10,18 +10,18 @@
char buffer[100];
- TS_ASSERT(0 != ms.readLine_NEW(buffer, sizeof(buffer)));
- TS_ASSERT(0 == strcmp(buffer, "ab\n"));
+ TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+ TS_ASSERT_EQUALS(0, strcmp(buffer, "ab\n"));
- TS_ASSERT(0 != ms.readLine_NEW(buffer, sizeof(buffer)));
- TS_ASSERT(0 == strcmp(buffer, "\n"));
+ TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+ TS_ASSERT_EQUALS(0, strcmp(buffer, "\n"));
- TS_ASSERT(0 != ms.readLine_NEW(buffer, sizeof(buffer)));
- TS_ASSERT(0 == strcmp(buffer, "c\n"));
+ TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+ TS_ASSERT_EQUALS(0, strcmp(buffer, "c\n"));
TS_ASSERT(!ms.eos());
- TS_ASSERT(0 == ms.readLine_NEW(buffer, sizeof(buffer)));
+ TS_ASSERT_EQUALS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
TS_ASSERT(ms.eos());
}
@@ -32,14 +32,14 @@
char buffer[100];
- TS_ASSERT(0 != ms.readLine_NEW(buffer, sizeof(buffer)));
- TS_ASSERT(0 == strcmp(buffer, "ab\n"));
+ TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+ TS_ASSERT_EQUALS(0, strcmp(buffer, "ab\n"));
- TS_ASSERT(0 != ms.readLine_NEW(buffer, sizeof(buffer)));
- TS_ASSERT(0 == strcmp(buffer, "\n"));
+ TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+ TS_ASSERT_EQUALS(0, strcmp(buffer, "\n"));
- TS_ASSERT(0 != ms.readLine_NEW(buffer, sizeof(buffer)));
- TS_ASSERT(0 == strcmp(buffer, "c"));
+ TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+ TS_ASSERT_EQUALS(0, strcmp(buffer, "c"));
TS_ASSERT(ms.eos());
}
Modified: scummvm/trunk/test/common/subreadstream.h
===================================================================
--- scummvm/trunk/test/common/subreadstream.h 2009-05-19 11:22:20 UTC (rev 40721)
+++ scummvm/trunk/test/common/subreadstream.h 2009-05-19 11:22:49 UTC (rev 40722)
@@ -15,14 +15,14 @@
int i;
byte b;
for (i = 0; i < end; ++i) {
- TS_ASSERT( !srs.eos() );
+ TS_ASSERT(!srs.eos());
b = srs.readByte();
- TS_ASSERT_EQUALS( i, b );
+ TS_ASSERT_EQUALS(i, b);
}
- TS_ASSERT( !srs.eos() );
+ TS_ASSERT(!srs.eos());
b = srs.readByte();
- TS_ASSERT( srs.eos() );
+ TS_ASSERT(srs.eos());
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list