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

[fingolfin at users.sourceforge.net]

Revision: 34580
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34580&view=rev
Author:   fingolfin
Date:     2008-09-16 11:57:45 +0000 (Tue, 16 Sep 2008)

Log Message:
-----------
Fix sign warnings in unit tests

Modified Paths:
--------------
    scummvm/trunk/test/common/bufferedseekablereadstream.h
    scummvm/trunk/test/common/seekablesubreadstream.h

Modified: scummvm/trunk/test/common/bufferedseekablereadstream.h
===================================================================
--- scummvm/trunk/test/common/bufferedseekablereadstream.h	2008-09-16 11:54:37 UTC (rev 34579)
+++ scummvm/trunk/test/common/bufferedseekablereadstream.h	2008-09-16 11:57:45 UTC (rev 34580)
@@ -33,37 +33,37 @@
 		Common::BufferedSeekableReadStream ssrs(&ms, 4);
 		byte b;
 
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)0 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 0 );
 
 		ssrs.seek(1, SEEK_SET);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)1 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 1 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 1 );
 
 		ssrs.seek(5, SEEK_CUR);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)7 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 7 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 7 );
 
 		ssrs.seek(-3, SEEK_CUR);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)5 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 5 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 5 );
 
 		ssrs.seek(0, SEEK_END);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)10 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 10 );
 		TS_ASSERT( !ssrs.eos() );
 		b = ssrs.readByte();
 		TS_ASSERT( ssrs.eos() );
 
 		ssrs.seek(3, SEEK_END);
 		TS_ASSERT( !ssrs.eos() );
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)7 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 7 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 7 );
 
 		ssrs.seek(8, SEEK_END);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)2 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 2 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 2 );
 	}

Modified: scummvm/trunk/test/common/seekablesubreadstream.h
===================================================================
--- scummvm/trunk/test/common/seekablesubreadstream.h	2008-09-16 11:54:37 UTC (rev 34579)
+++ scummvm/trunk/test/common/seekablesubreadstream.h	2008-09-16 11:57:45 UTC (rev 34580)
@@ -17,7 +17,7 @@
 		for (i = start; i < end; ++i) {
 			TS_ASSERT( !ssrs.eos() );
 
-			TS_ASSERT_EQUALS( uint32(i - start), ssrs.pos() );
+			TS_ASSERT_EQUALS( i - start, ssrs.pos() );
 
 			ssrs.read(&b, 1);
 			TS_ASSERT_EQUALS( i, b );
@@ -35,37 +35,37 @@
 		Common::SeekableSubReadStream ssrs(&ms, 1, 9);
 		byte b;
 
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)0 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 0 );
 
 		ssrs.seek(1, SEEK_SET);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)1 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 1 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 2 );
 
 		ssrs.seek(5, SEEK_CUR);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)7 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 7 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 8 );
 
 		ssrs.seek(-3, SEEK_CUR);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)5 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 5 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 6 );
 
 		ssrs.seek(0, SEEK_END);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)8 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 8 );
 		TS_ASSERT( !ssrs.eos() );
 		b = ssrs.readByte();
 		TS_ASSERT( ssrs.eos() );
 
 		ssrs.seek(3, SEEK_END);
 		TS_ASSERT( !ssrs.eos() );
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)5 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 5 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 6 );
 
 		ssrs.seek(8, SEEK_END);
-		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)0 );
+		TS_ASSERT_EQUALS( ssrs.pos(), 0 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 1 );
 	}


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