ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-05-21 05:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

TEST: Fix warning about signed/unsigned comparison

Browse Source
This commit is contained in:
Le Philousophe
2026-02-07 16:16:08 +01:00
parent f725d9c738
commit 96c9901a6e
6 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/common/formats/quicktime.h
+1 -1
View File
@@ -68,7 +68,7 @@ public:
Common::MemoryReadStream stream(VALID_MHDR_DATA, sizeof(VALID_MHDR_DATA));
bool result = parser.parseStream(&stream, DisposeAfterUse::NO);
TS_ASSERT(result);
TS_ASSERT_EQUALS(parser.getDuration(), 999*60 + 1);
TS_ASSERT_EQUALS(parser.getDuration(), 999u*60 + 1);
TS_ASSERT_EQUALS(parser.getScaleFactorX(), Common::Rational(0x10000, 0x8000));
TS_ASSERT_EQUALS(parser.getScaleFactorY(), Common::Rational(0x10000, 0xa000));
}
test/engines/ultima/ultima8/games/treasure_loader.h
+25 -25
View File
@@ -31,16 +31,16 @@ class U8TreasureLoaderTestSuite : public CxxTest::TestSuite {
bool result = loader.parse("shape=123,456 frame=2,3 count=4-20 map=23 chance=0.234", t);
TS_ASSERT(result);
TS_ASSERT_EQUALS(t.size(), 1);
TS_ASSERT_EQUALS(t.size(), 1u);
const Ultima::Ultima8::TreasureInfo ti = t[0];
TS_ASSERT_EQUALS(ti._shapes.size(), 2);
TS_ASSERT_EQUALS(ti._shapes[0], 123);
TS_ASSERT_EQUALS(ti._shapes[1], 456);
TS_ASSERT_EQUALS(ti._frames.size(), 2);
TS_ASSERT_EQUALS(ti._frames[0], 2);
TS_ASSERT_EQUALS(ti._frames[1], 3);
TS_ASSERT_EQUALS(ti._minCount, 4);
TS_ASSERT_EQUALS(ti._maxCount, 20);
TS_ASSERT_EQUALS(ti._shapes.size(), 2u);
TS_ASSERT_EQUALS(ti._shapes[0], 123u);
TS_ASSERT_EQUALS(ti._shapes[1], 456u);
TS_ASSERT_EQUALS(ti._frames.size(), 2u);
TS_ASSERT_EQUALS(ti._frames[0], 2u);
TS_ASSERT_EQUALS(ti._frames[1], 3u);
TS_ASSERT_EQUALS(ti._minCount, 4u);
TS_ASSERT_EQUALS(ti._maxCount, 20u);
TS_ASSERT_EQUALS(ti._special, "");
TS_ASSERT_EQUALS(ti._map, 23);
TS_ASSERT_EQUALS(ti._chance, 0.234);
@@ -53,27 +53,27 @@ class U8TreasureLoaderTestSuite : public CxxTest::TestSuite {
bool result = loader.parse("shape=123;shape=456 frame=2-5;shape=888 map=-12", t);
TS_ASSERT(result);
TS_ASSERT_EQUALS(t.size(), 3);
TS_ASSERT_EQUALS(t.size(), 3u);
TS_ASSERT_EQUALS(t[0]._shapes.size(), 1);
TS_ASSERT_EQUALS(t[0]._shapes[0], 123);
TS_ASSERT_EQUALS(t[0]._frames.size(), 0);
TS_ASSERT_EQUALS(t[0]._minCount, 1);
TS_ASSERT_EQUALS(t[0]._maxCount, 1);
TS_ASSERT_EQUALS(t[0]._shapes.size(), 1u);
TS_ASSERT_EQUALS(t[0]._shapes[0], 123u);
TS_ASSERT_EQUALS(t[0]._frames.size(), 0u);
TS_ASSERT_EQUALS(t[0]._minCount, 1u);
TS_ASSERT_EQUALS(t[0]._maxCount, 1u);
TS_ASSERT_EQUALS(t[0]._special, "");
TS_ASSERT_EQUALS(t[0]._map, 0);
TS_ASSERT_EQUALS(t[0]._chance, 1);
TS_ASSERT_EQUALS(t[0]._chance, 1u);
TS_ASSERT_EQUALS(t[1]._shapes.size(), 1);
TS_ASSERT_EQUALS(t[1]._shapes[0], 456);
TS_ASSERT_EQUALS(t[1]._frames.size(), 4);
TS_ASSERT_EQUALS(t[1]._frames[0], 2);
TS_ASSERT_EQUALS(t[1]._frames[1], 3);
TS_ASSERT_EQUALS(t[1]._frames[2], 4);
TS_ASSERT_EQUALS(t[1]._frames[3], 5);
TS_ASSERT_EQUALS(t[1]._shapes.size(), 1u);
TS_ASSERT_EQUALS(t[1]._shapes[0], 456u);
TS_ASSERT_EQUALS(t[1]._frames.size(), 4u);
TS_ASSERT_EQUALS(t[1]._frames[0], 2u);
TS_ASSERT_EQUALS(t[1]._frames[1], 3u);
TS_ASSERT_EQUALS(t[1]._frames[2], 4u);
TS_ASSERT_EQUALS(t[1]._frames[3], 5u);
TS_ASSERT_EQUALS(t[2]._shapes.size(), 1);
TS_ASSERT_EQUALS(t[2]._shapes[0], 888);
TS_ASSERT_EQUALS(t[2]._shapes.size(), 1u);
TS_ASSERT_EQUALS(t[2]._shapes[0], 888u);
TS_ASSERT_EQUALS(t[2]._map, -12);
}
test/engines/ultima/ultima8/misc/util.h
+5 -5
View File
@@ -15,18 +15,18 @@ class U8UtilTestSuite : public CxxTest::TestSuite {
Common::Array<Common::String> v1;
Ultima::Ultima8::SplitString(s1, ',', v1);
TS_ASSERT_EQUALS(v1.size(), 2);
TS_ASSERT_EQUALS(v1.size(), 2u);
TS_ASSERT_EQUALS(v1[0], "abc");
TS_ASSERT_EQUALS(v1[1], "def");
Common::String s2;
Common::Array<Common::String> v2;
Ultima::Ultima8::SplitString(s2, ',', v1);
TS_ASSERT_EQUALS(v1.size(), 0);
TS_ASSERT_EQUALS(v1.size(), 0u);
Common::String s3 = " aa bb ";
Ultima::Ultima8::SplitString(s3, ' ', v1);
TS_ASSERT_EQUALS(v1.size(), 6);
TS_ASSERT_EQUALS(v1.size(), 6u);
TS_ASSERT_EQUALS(v1[0], "");
TS_ASSERT_EQUALS(v1[1], "aa");
}
@@ -35,12 +35,12 @@ class U8UtilTestSuite : public CxxTest::TestSuite {
Common::Array<Common::String> v;
Common::String s;
Ultima::Ultima8::StringToArgv(s, v);
TS_ASSERT_EQUALS(v.size(), 0);
TS_ASSERT_EQUALS(v.size(), 0u);
// Test it strips leading space on args, and includes spaces inside ""s
s = "abc \\t\\nescape \"\\ me\\ \\\" !\" ";
Ultima::Ultima8::StringToArgv(s, v);
TS_ASSERT_EQUALS(v.size(), 3);
TS_ASSERT_EQUALS(v.size(), 3u);
TS_ASSERT_EQUALS(v[0], "abc");
TS_ASSERT_EQUALS(v[1], "escape");
TS_ASSERT_EQUALS(v[2], " me \" !");
test/engines/ultima/ultima8/usecode/bit_set.h
+10 -10
View File
@@ -16,20 +16,20 @@ class U8BitSetTestSuite : public CxxTest::TestSuite {
// Test with bit pattern in second byte of 01110100
// (pos goes from low bit to high bit)
bs.setEntries(10, 5, 0x1D);
TS_ASSERT_EQUALS(bs.getEntries(10, 5), 0x1D);
TS_ASSERT_EQUALS(bs.getEntries(10, 4), 0xD);
TS_ASSERT_EQUALS(bs.getEntries(8, 6), 0xD << 2);
TS_ASSERT_EQUALS(bs.getEntries(8, 7), 0x1D << 2);
TS_ASSERT_EQUALS(bs.getEntries(8, 8), 0x1D << 2);
TS_ASSERT_EQUALS(bs.getEntries(14, 2), 0x1);
TS_ASSERT_EQUALS(bs.getEntries(16, 32), 0);
TS_ASSERT_EQUALS(bs.getEntries(0, 10), 0);
TS_ASSERT_EQUALS(bs.getEntries(10, 5), 0x1Du);
TS_ASSERT_EQUALS(bs.getEntries(10, 4), 0xDu);
TS_ASSERT_EQUALS(bs.getEntries(8, 6), 0xDu << 2);
TS_ASSERT_EQUALS(bs.getEntries(8, 7), 0x1Du << 2);
TS_ASSERT_EQUALS(bs.getEntries(8, 8), 0x1Du << 2);
TS_ASSERT_EQUALS(bs.getEntries(14, 2), 0x1u);
TS_ASSERT_EQUALS(bs.getEntries(16, 32), 0u);
TS_ASSERT_EQUALS(bs.getEntries(0, 10), 0u);
}
void test_clear() {
bs.setEntries(10, 5, 0x15);
bs.setSize(0x1000);
TS_ASSERT_EQUALS(bs.getEntries(10, 5), 0);
TS_ASSERT_EQUALS(bs.getEntries(0, 32), 0);
TS_ASSERT_EQUALS(bs.getEntries(10, 5), 0u);
TS_ASSERT_EQUALS(bs.getEntries(0, 32), 0u);
}
};
test/engines/ultima/ultima8/usecode/uc_list.h
+6 -6
View File
@@ -12,25 +12,25 @@ class U8UCListTestSuite : public CxxTest::TestSuite {
void test_static_list() {
Ultima::Ultima8::UCList l(2);
TS_ASSERT_EQUALS(l.getSize(), 0);
TS_ASSERT_EQUALS(l.getElementSize(), 2);
TS_ASSERT_EQUALS(l.getSize(), 0u);
TS_ASSERT_EQUALS(l.getElementSize(), 2u);
uint16 test = 0xBEEF;
l.append((uint8*)&test);
TS_ASSERT_EQUALS(l.getSize(), 1);
TS_ASSERT_EQUALS(l.getSize(), 1u);
uint16 test2 = 0xF00D;
l.append((uint8*)&test2);
TS_ASSERT_EQUALS(l.getSize(), 2);
TS_ASSERT_EQUALS(l.getSize(), 2u);
TS_ASSERT(l.inList((uint8*)&test));
l.remove((uint8*)&test);
TS_ASSERT(!l.inList((uint8*)&test));
TS_ASSERT(l.inList((uint8*)&test2));
TS_ASSERT_EQUALS(l.getSize(), 1);
TS_ASSERT_EQUALS(l.getSize(), 1u);
l.free();
TS_ASSERT_EQUALS(l.getSize(), 0);
TS_ASSERT_EQUALS(l.getSize(), 0u);
}
};
test/engines/ultima/ultima8/usecode/uc_stack.h
+9 -9
View File
@@ -17,25 +17,25 @@ class U8UCStackTestSuite : public CxxTest::TestSuite {
void test_dynamic_stack() {
Ultima::Ultima8::DynamicUCStack stack;
Ultima::Ultima8::DynamicUCStack stack2(32);
TS_ASSERT_EQUALS(stack2.getSize(), 32);
TS_ASSERT_EQUALS(stack2.getSize(), 32u);
test_for_stack(stack);
test_for_stack(stack2);
}
private:
void test_for_stack(Ultima::Ultima8::BaseUCStack &s) {
TS_ASSERT_EQUALS(s.stacksize(), 0);
TS_ASSERT_EQUALS(s.stacksize(), 0u);
s.push4(0xDEADBEEF);
TS_ASSERT_EQUALS(s.stacksize(), 4);
TS_ASSERT_EQUALS(s.pop2(), 0xBEEF);
TS_ASSERT_EQUALS(s.pop2(), 0xDEAD);
TS_ASSERT_EQUALS(s.stacksize(), 4u);
TS_ASSERT_EQUALS(s.pop2(), 0xBEEFu);
TS_ASSERT_EQUALS(s.pop2(), 0xDEADu);
s.push1(0xFE);
TS_ASSERT_EQUALS(s.stacksize(), 1);
TS_ASSERT_EQUALS(s.stacksize(), 1u);
s.push1(0xED);
s.push2(0xC0DE);
TS_ASSERT_EQUALS(s.pop2(), 0xC0DE);
TS_ASSERT_EQUALS(s.pop2(), 0xFEED);
TS_ASSERT_EQUALS(s.stacksize(), 0);
TS_ASSERT_EQUALS(s.pop2(), 0xC0DEu);
TS_ASSERT_EQUALS(s.pop2(), 0xFEEDu);
TS_ASSERT_EQUALS(s.stacksize(), 0u);
TS_ASSERT_EQUALS(s.getSP(), s.getSize());
s.push4(0xCAFEF00D);
TS_ASSERT_EQUALS(s.getSP(), s.getSize()-4);