From 691cee64b3db552866520f23f8b9e0d222d26bdd Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 21 Aug 2018 01:27:30 +0800 Subject: [PATCH] test: silence -Wsign-compare warnings Signed-off-by: Kefu Chai --- src/test/common/test_json_formattable.cc | 24 +++++++++---------- src/test/objectstore/Allocator_test.cc | 6 ++--- .../objectstore/fastbmap_allocator_test.cc | 4 ++-- src/test/objectstore/test_bluestore_types.cc | 2 +- src/test/objectstore/test_memstore_clone.cc | 4 ++-- src/test/osd/TestPGLog.cc | 2 +- src/test/test_ipaddr.cc | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/test/common/test_json_formattable.cc b/src/test/common/test_json_formattable.cc index f0aad27885ef9..5cb6505300de8 100644 --- a/src/test/common/test_json_formattable.cc +++ b/src/test/common/test_json_formattable.cc @@ -223,24 +223,24 @@ TEST(formatable, set_array) { JSONFormattable f, f2; f.set("asd[0]", "\"xyz\""); - ASSERT_EQ(f["asd"].array().size(), 1); + ASSERT_EQ(1u, f["asd"].array().size()); ASSERT_EQ((string)f["asd"][0], "xyz"); f.set("bbb[0][0]", "10"); f.set("bbb[0][1]", "20"); - ASSERT_EQ(f["bbb"].array().size(), 1); - ASSERT_EQ(f["bbb"][0].array().size(), 2); - ASSERT_EQ((string)f["bbb"][0][0], "10"); - ASSERT_EQ((int)f["bbb"][0][1], 20); + ASSERT_EQ(1u, f["bbb"].array().size()); + ASSERT_EQ(2u, f["bbb"][0].array().size()); + ASSERT_EQ("10", (string)f["bbb"][0][0]); + ASSERT_EQ(20, (int)f["bbb"][0][1]); f.set("bbb[0][1]", "25"); - ASSERT_EQ(f["bbb"][0].array().size(), 2); - ASSERT_EQ((int)f["bbb"][0][1], 25); + ASSERT_EQ(2u, f["bbb"][0].array().size()); + ASSERT_EQ(25, (int)f["bbb"][0][1]); f.set("bbb[0][]", "26"); /* append operation */ - ASSERT_EQ((int)f["bbb"][0][2], 26); + ASSERT_EQ(26, (int)f["bbb"][0][2]); f.set("bbb[0][-1]", "27"); /* replace last */ - ASSERT_EQ((int)f["bbb"][0][2], 27); - ASSERT_EQ(f["bbb"][0].array().size(), 3); + ASSERT_EQ(27, (int)f["bbb"][0][2]); + ASSERT_EQ(3u, f["bbb"][0].array().size()); f.set("foo.asd[0][0]", "{ \"field\": \"xyz\"}"); ASSERT_EQ((string)f["foo"]["asd"][0][0]["field"], "xyz"); @@ -255,8 +255,8 @@ TEST(formatable, erase_array) { JSONFormattable f; f.set("asd[0]", "\"xyz\""); - ASSERT_EQ(f["asd"].array().size(), 1); - ASSERT_EQ((string)f["asd"][0], "xyz"); + ASSERT_EQ(1u, f["asd"].array().size()); + ASSERT_EQ("xyz", (string)f["asd"][0]); ASSERT_TRUE(f["asd"].exists(0)); f.erase("asd[0]"); ASSERT_FALSE(f["asd"].exists(0)); diff --git a/src/test/objectstore/Allocator_test.cc b/src/test/objectstore/Allocator_test.cc index 8900da7dcbd04..9e468748d4ad2 100644 --- a/src/test/objectstore/Allocator_test.cc +++ b/src/test/objectstore/Allocator_test.cc @@ -313,9 +313,9 @@ TEST_P(AllocTest, test_alloc_bug_24598) EXPECT_EQ(static_cast(want_size), alloc->allocate(want_size, 0x100000, 0, 0, &tmp)); - EXPECT_EQ(tmp[0].offset, 0x4b00000U); - EXPECT_EQ(tmp[0].length, 0x200000U); - EXPECT_EQ(tmp.size(), 1); + EXPECT_EQ(0x4b00000u, tmp[0].offset); + EXPECT_EQ(0x200000u, tmp[0].length); + EXPECT_EQ(1u, tmp.size()); } INSTANTIATE_TEST_CASE_P( diff --git a/src/test/objectstore/fastbmap_allocator_test.cc b/src/test/objectstore/fastbmap_allocator_test.cc index 78343d5cf8a32..a4ef142bf76a2 100755 --- a/src/test/objectstore/fastbmap_allocator_test.cc +++ b/src/test/objectstore/fastbmap_allocator_test.cc @@ -109,8 +109,8 @@ TEST(TestAllocatorLevel01, test_l1) // Free: 1M~1M, 4M+4K ~ 2M-4K, 6M ~... // auto i4 = al1.allocate_l1_cont(1024 * 1024, 0x1000, 0, num_l1_entries); - ASSERT_EQ(i4.offset, 1 * 1024 * 1024); - ASSERT_EQ(i4.length, 1024 * 1024); + ASSERT_EQ(1 * 1024 * 1024u, i4.offset); + ASSERT_EQ(1024 * 1024u, i4.length); al1.free_l1(i4); i4 = al1.allocate_l1_cont(1024 * 1024 - 0x1000, 0x1000, 0, num_l1_entries); diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc index 1f64d770f416b..b022cfe9ecb05 100644 --- a/src/test/objectstore/test_bluestore_types.cc +++ b/src/test/objectstore/test_bluestore_types.cc @@ -1526,7 +1526,7 @@ TEST(BlueStoreRepairer, StoreSpaceTracker) extents.insert(0xa001,1); extents.insert(0xa0000,0xff8); - ASSERT_EQ(bmap.filter_out(extents), 3); + ASSERT_EQ(3u, bmap.filter_out(extents)); ASSERT_TRUE(bmap.is_used(cid)); ASSERT_TRUE(bmap.is_used(hoid)); } diff --git a/src/test/objectstore/test_memstore_clone.cc b/src/test/objectstore/test_memstore_clone.cc index c526a293a2c3f..0da4f3ceef89e 100644 --- a/src/test/objectstore/test_memstore_clone.cc +++ b/src/test/objectstore/test_memstore_clone.cc @@ -77,7 +77,7 @@ TEST_F(MemStoreClone, CloneRangeAllocated) t.write(cid, src, 0, 12, srcbl); t.write(cid, dst, 0, 12, dstbl); t.clone_range(cid, src, dst, 2, 8, 2); - ASSERT_EQ(0u, store->queue_transaction(ch, std::move(t))); + ASSERT_EQ(0, store->queue_transaction(ch, std::move(t))); ASSERT_EQ(12, store->read(ch, dst, 0, 12, result)); ASSERT_EQ(expected, result); } @@ -101,7 +101,7 @@ TEST_F(MemStoreClone, CloneRangeHole) t.write(cid, src, 12, 4, srcbl); t.write(cid, dst, 0, 12, dstbl); t.clone_range(cid, src, dst, 2, 8, 2); - ASSERT_EQ(0u, store->queue_transaction(ch, std::move(t))); + ASSERT_EQ(0, store->queue_transaction(ch, std::move(t))); ASSERT_EQ(12, store->read(ch, dst, 0, 12, result)); ASSERT_EQ(expected, result); } diff --git a/src/test/osd/TestPGLog.cc b/src/test/osd/TestPGLog.cc index c5340eb1e2007..7d5581c6aabc0 100644 --- a/src/test/osd/TestPGLog.cc +++ b/src/test/osd/TestPGLog.cc @@ -2469,7 +2469,7 @@ public: t.omap_setkeys(test_coll, log_oid, km); } auto ch = store->open_collection(test_coll); - ASSERT_EQ(0u, store->queue_transaction(ch, std::move(t))); + ASSERT_EQ(0, store->queue_transaction(ch, std::move(t))); auto orig_dups = log.dups; clear(); diff --git a/src/test/test_ipaddr.cc b/src/test/test_ipaddr.cc index e8e61c17ff033..1a476545394a8 100644 --- a/src/test/test_ipaddr.cc +++ b/src/test/test_ipaddr.cc @@ -687,7 +687,7 @@ TEST(pick_address, filtering) &one, &av); cout << av << std::endl; ASSERT_EQ(0, r); - ASSERT_EQ(1, av.v.size()); + ASSERT_EQ(1u, av.v.size()); ASSERT_EQ(string("0.0.0.0:0/0"), stringify(av.v[0])); } { @@ -710,7 +710,7 @@ TEST(pick_address, filtering) &one, &av); cout << av << std::endl; ASSERT_EQ(0, r); - ASSERT_EQ(1, av.v.size()); + ASSERT_EQ(1u, av.v.size()); ASSERT_EQ(string("10.2.1.123:0/0"), stringify(av.v[0])); cct->_conf.set_val("public_network", ""); } -- 2.39.5