diff options
| author | ljfa-ag <ljfa-ag@web.de> | 2015-09-02 21:12:37 +0200 |
|---|---|---|
| committer | ljfa-ag <ljfa-ag@web.de> | 2015-09-02 21:12:37 +0200 |
| commit | 7b3e7818d0dd104f4a8da6e98b73d6def0f1407b (patch) | |
| tree | 7d6b543b53f4bfb08e520a8fd06026c0a051ecbb | |
| parent | f309f5c9665387128c1673e76d39944248bded2a (diff) | |
| download | Project-Tick-7b3e7818d0dd104f4a8da6e98b73d6def0f1407b.tar.gz Project-Tick-7b3e7818d0dd104f4a8da6e98b73d6def0f1407b.zip | |
Fix sign-compare warnings in tests
| -rw-r--r-- | test/endian_str_test.h | 8 | ||||
| -rw-r--r-- | test/nbttest.h | 18 | ||||
| -rw-r--r-- | test/read_test.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/test/endian_str_test.h b/test/endian_str_test.h index e0b960ee54..5c7897521f 100644 --- a/test/endian_str_test.h +++ b/test/endian_str_test.h @@ -65,18 +65,18 @@ public: read_little(str, u16); TS_ASSERT_EQUALS(u16, 0x0102); read_little(str, u32); - TS_ASSERT_EQUALS(u32, 0x01020304); + TS_ASSERT_EQUALS(u32, 0x01020304u); read(str, u64, endian::little); - TS_ASSERT_EQUALS(u64, 0x0102030405060708); + TS_ASSERT_EQUALS(u64, 0x0102030405060708u); read_big(str, u8); TS_ASSERT_EQUALS(u8, 0x09); read_big(str, u16); TS_ASSERT_EQUALS(u16, 0x090A); read(str, u32, endian::big); - TS_ASSERT_EQUALS(u32, 0x090A0B0C); + TS_ASSERT_EQUALS(u32, 0x090A0B0Cu); read_big(str, u64); - TS_ASSERT_EQUALS(u64, 0x090A0B0C0D0E0F10); + TS_ASSERT_EQUALS(u64, 0x090A0B0C0D0E0F10u); TS_ASSERT(str); //Check if stream has failed } diff --git a/test/nbttest.h b/test/nbttest.h index 8255d4f6dc..1eb53acc4f 100644 --- a/test/nbttest.h +++ b/test/nbttest.h @@ -318,7 +318,7 @@ public: TS_ASSERT(list[0] == tag_string("foo")); TS_ASSERT_EQUALS(static_cast<std::string>(list.at(1)), "bar"); - TS_ASSERT_EQUALS(list.size(), 2); + TS_ASSERT_EQUALS(list.size(), 2u); TS_ASSERT_THROWS(list.at(2), std::out_of_range); TS_ASSERT_THROWS(list.at(-1), std::out_of_range); @@ -327,7 +327,7 @@ public: TS_ASSERT_THROWS(list.set(1, value(tag_int(-42))), std::bad_cast); TS_ASSERT_EQUALS(static_cast<std::string>(list[1]), "baz"); - TS_ASSERT_EQUALS(list.size(), 2); + TS_ASSERT_EQUALS(list.size(), 2u); tag_string values[] = {"foo", "baz"}; TS_ASSERT_EQUALS(list.end() - list.begin(), int(list.size())); TS_ASSERT(std::equal(list.begin(), list.end(), values)); @@ -339,7 +339,7 @@ public: TS_ASSERT((list != tag_list{2, 3, 5, 7})); list.clear(); - TS_ASSERT_EQUALS(list.size(), 0); + TS_ASSERT_EQUALS(list.size(), 0u); TS_ASSERT_EQUALS(list.el_type(), tag_type::String) TS_ASSERT_THROWS(list.push_back(tag_short(25)), std::bad_cast); TS_ASSERT_THROWS(list.push_back(value(nullptr)), std::bad_cast); @@ -376,7 +376,7 @@ public: { std::vector<int8_t> vec{1, 2, 127, -128}; tag_byte_array arr{1, 2, 127, -128}; - TS_ASSERT_EQUALS(arr.size(), 4); + TS_ASSERT_EQUALS(arr.size(), 4u); TS_ASSERT(arr.at(0) == 1 && arr[1] == 2 && arr[2] == 127 && arr.at(3) == -128); TS_ASSERT_THROWS(arr.at(-1), std::out_of_range); TS_ASSERT_THROWS(arr.at(4), std::out_of_range); @@ -387,13 +387,13 @@ public: arr.push_back(42); vec.push_back(42); - TS_ASSERT_EQUALS(arr.size(), 5); + TS_ASSERT_EQUALS(arr.size(), 5u); TS_ASSERT_EQUALS(arr.end() - arr.begin(), int(arr.size())); TS_ASSERT(std::equal(arr.begin(), arr.end(), vec.begin())); arr.pop_back(); arr.pop_back(); - TS_ASSERT_EQUALS(arr.size(), 3); + TS_ASSERT_EQUALS(arr.size(), 3u); TS_ASSERT((arr == tag_byte_array{1, 2, 127})); TS_ASSERT((arr != tag_int_array{1, 2, 127})); TS_ASSERT((arr != tag_byte_array{1, 2, -1})); @@ -406,7 +406,7 @@ public: { std::vector<int32_t> vec{100, 200, INT32_MAX, INT32_MIN}; tag_int_array arr{100, 200, INT32_MAX, INT32_MIN}; - TS_ASSERT_EQUALS(arr.size(), 4); + TS_ASSERT_EQUALS(arr.size(), 4u); TS_ASSERT(arr.at(0) == 100 && arr[1] == 200 && arr[2] == INT32_MAX && arr.at(3) == INT32_MIN); TS_ASSERT_THROWS(arr.at(-1), std::out_of_range); TS_ASSERT_THROWS(arr.at(4), std::out_of_range); @@ -417,13 +417,13 @@ public: arr.push_back(42); vec.push_back(42); - TS_ASSERT_EQUALS(arr.size(), 5); + TS_ASSERT_EQUALS(arr.size(), 5u); TS_ASSERT_EQUALS(arr.end() - arr.begin(), int(arr.size())); TS_ASSERT(std::equal(arr.begin(), arr.end(), vec.begin())); arr.pop_back(); arr.pop_back(); - TS_ASSERT_EQUALS(arr.size(), 3); + TS_ASSERT_EQUALS(arr.size(), 3u); TS_ASSERT((arr == tag_int_array{100, 200, INT32_MAX})); TS_ASSERT((arr != tag_int_array{100, -56, -1})); diff --git a/test/read_test.h b/test/read_test.h index bb5618b2b4..891c2933d2 100644 --- a/test/read_test.h +++ b/test/read_test.h @@ -104,7 +104,7 @@ public: //Tests if comp equals an extended variant of Notch's bigtest NBT void verify_bigtest_structure(const tag_compound& comp) { - TS_ASSERT_EQUALS(comp.size(), 13); + TS_ASSERT_EQUALS(comp.size(), 13u); TS_ASSERT(comp.at("byteTest") == tag_byte(127)); TS_ASSERT(comp.at("shortTest") == tag_short(32767)); |
