aboutsummaryrefslogtreecommitdiff
path: root/test/common
diff options
context:
space:
mode:
Diffstat (limited to 'test/common')
-rw-r--r--test/common/bufferedseekablereadstream.h14
-rw-r--r--test/common/seekablesubreadstream.h16
2 files changed, 15 insertions, 15 deletions
diff --git a/test/common/bufferedseekablereadstream.h b/test/common/bufferedseekablereadstream.h
index aa3bd9225c..f039acd2a8 100644
--- a/test/common/bufferedseekablereadstream.h
+++ b/test/common/bufferedseekablereadstream.h
@@ -33,37 +33,37 @@ class BufferedSeekableReadStreamTestSuite : public CxxTest::TestSuite {
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 );
}
diff --git a/test/common/seekablesubreadstream.h b/test/common/seekablesubreadstream.h
index 24df380a60..68febc7fd6 100644
--- a/test/common/seekablesubreadstream.h
+++ b/test/common/seekablesubreadstream.h
@@ -17,7 +17,7 @@ class SeekableSubReadStreamTestSuite : public CxxTest::TestSuite {
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 @@ class SeekableSubReadStreamTestSuite : public CxxTest::TestSuite {
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 );
}