[XPTI] Clean up sign-compare warnings from xpti tests

Author: Fznamznon

xptifw/unit_test/xpti_api_tests.cpp

@@ -73,7 +73,7 @@ TEST_F(xptiApiTest, xptiRegisterPayloadGoodInput) {
   xpti::payload_t p("foo", "foo.cpp", 10, 0, (void *)(0xdeadbeefull));
 
   auto ID = xptiRegisterPayload(&p);
-  EXPECT_NE(ID, xpti::invalid_id);
+  EXPECT_NE(ID, xpti::invalid_uid);
   EXPECT_EQ(p.internal, ID);
   EXPECT_EQ(p.uid.hash(), ID);
 }
@@ -128,7 +128,7 @@ TEST_F(xptiApiTest, xptiMakeEventBadInput) {
       xptiMakeEvent(nullptr, &P, 0, (xpti::trace_activity_type_t)1, nullptr);
   EXPECT_EQ(Result, nullptr);
   P = xpti::payload_t("foo", "foo.cpp", 1, 0, (void *)13);
-  EXPECT_NE(P.flags, 0);
+  EXPECT_NE(P.flags, 0u);
   Result =
       xptiMakeEvent(nullptr, &P, 0, (xpti::trace_activity_type_t)1, nullptr);
   EXPECT_EQ(Result, nullptr);
@@ -142,12 +142,12 @@ TEST_F(xptiApiTest, xptiMakeEventGoodInput) {
   auto Result = xptiMakeEvent("foo", &Payload, 0,
                               (xpti::trace_activity_type_t)1, &instance);
   EXPECT_NE(Result, nullptr);
-  EXPECT_EQ(instance, 1);
+  EXPECT_EQ(instance, 1u);
   Payload = xpti::payload_t("foo", "foo.cpp", 1, 0, (void *)13);
   auto NewResult = xptiMakeEvent("foo", &Payload, 0,
                                  (xpti::trace_activity_type_t)1, &instance);
   EXPECT_EQ(Result, NewResult);
-  EXPECT_EQ(instance, 2);
+  EXPECT_EQ(instance, 2u);
 }
 
 TEST_F(xptiApiTest, xptiFindEventBadInput) {
@@ -164,7 +164,7 @@ TEST_F(xptiApiTest, xptiFindEventGoodInput) {
   auto Result = xptiMakeEvent("foo", &Payload, 0,
                               (xpti::trace_activity_type_t)1, &Instance);
   ASSERT_NE(Result, nullptr);
-  EXPECT_EQ(Instance, 1);
+  EXPECT_EQ(Instance, 1u);
   auto NewResult = xptiFindEvent(Result->unique_id);
   EXPECT_EQ(Result, NewResult);
 }
@@ -180,7 +180,7 @@ TEST_F(xptiApiTest, xptiQueryPayloadGoodInput) {
   auto Result = xptiMakeEvent("foo", &Payload, 0,
                               (xpti::trace_activity_type_t)1, &instance);
   EXPECT_NE(Result, nullptr);
-  EXPECT_EQ(instance, 1);
+  EXPECT_EQ(instance, 1u);
   auto NewResult = xptiQueryPayload(Result);
   ASSERT_NE(NewResult, nullptr);
   EXPECT_STREQ(Payload.name, NewResult->name);
@@ -195,7 +195,7 @@ TEST_F(xptiApiTest, xptiQueryPayloadByUIDGoodInput) {
   xpti::payload_t p("foo", "foo.cpp", 10, 0, (void *)(0xdeadbeefull));
 
   auto ID = xptiRegisterPayload(&p);
-  EXPECT_NE(ID, xpti::invalid_id);
+  EXPECT_NE(ID, xpti::invalid_uid);
   EXPECT_EQ(p.internal, ID);
   EXPECT_EQ(p.uid.hash(), ID);
 
@@ -559,7 +559,7 @@ TEST_F(xptiApiTest, xptiQueryMetadata) {
   EXPECT_EQ(Result, xpti::result_t::XPTI_RESULT_SUCCESS);
 
   char *ts;
-  EXPECT_EQ(md->size(), 1);
+  EXPECT_EQ(md->size(), 1u);
   auto MDID = (*md)[xptiRegisterString("foo1", &ts)];
   auto obj = xptiLookupObject(MDID);
   std::string str{obj.data, obj.size};

xptifw/unit_test/xpti_correctness_tests.cpp

@@ -53,7 +53,7 @@ TEST_F(xptiCorrectnessTest, xptiMakeEvent) {
   EXPECT_EQ(Result->reserved.payload, NewResult->reserved.payload);
   EXPECT_STREQ(Result->reserved.payload->name, "foo");
   EXPECT_STREQ(Result->reserved.payload->source_file, "foo.cpp");
-  EXPECT_EQ(Result->reserved.payload->line_no, 1);
+  EXPECT_EQ(Result->reserved.payload->line_no, 1u);
 }
 
 TEST_F(xptiCorrectnessTest, xptiRegisterString) {
@@ -340,7 +340,7 @@ TEST_F(xptiCorrectnessTest,
 
 TEST_F(xptiCorrectnessTest, xptiGetUniqueId) {
   auto Result = xptiGetUniqueId();
-  EXPECT_NE(Result, 0);
+  EXPECT_NE(Result, 0u);
   auto Result1 = xptiGetUniqueId();
   EXPECT_NE(Result, Result1);
 }
@@ -384,7 +384,7 @@ TEST_F(xptiCorrectnessTest, xptiUniversalIDRandomTest) {
     id.p3 = (uint64_t)MAddr(Gen);
 
     uint64_t hash = id.hash();
-    EXPECT_EQ(HashSet.count(hash), 0);
+    EXPECT_EQ(HashSet.count(hash), 0u);
     HashSet.insert(hash);
   }
 
@@ -413,15 +413,15 @@ TEST_F(xptiCorrectnessTest, xptiUniversalIDMapTest) {
   MLineNo = uniform_int_distribution<uint32_t>(1, 200000);
   MAddr = uniform_int_distribution<uint32_t>(0x10000000, 0xffffffff);
 
-  constexpr int Count = 100000;
-  for (int i = 0; i < Count; ++i) {
+  constexpr unsigned int Count = 100000;
+  for (unsigned int i = 0; i < Count; ++i) {
     xpti::uid_t id;
     id.p1 = XPTI_PACK32_RET64(MStringID(Gen), MLineNo(Gen));
     id.p2 = XPTI_PACK32_RET64(0, MStringID(Gen));
     id.p3 = (uint64_t)MAddr(Gen);
 
     uint64_t hash = id.hash();
-    EXPECT_EQ(MapTest.count(id), 0);
+    EXPECT_EQ(MapTest.count(id), 0u);
     MapTest[id] = hash;
   }
 
@@ -448,15 +448,15 @@ TEST_F(xptiCorrectnessTest, xptiUniversalIDUnorderedMapTest) {
   MLineNo = uniform_int_distribution<uint32_t>(1, 200000);
   MAddr = uniform_int_distribution<uint32_t>(0x10000000, 0xffffffff);
 
-  constexpr int Count = 100000;
-  for (int i = 0; i < Count; ++i) {
+  constexpr unsigned int Count = 100000;
+  for (unsigned int i = 0; i < Count; ++i) {
     xpti::uid_t id;
     id.p1 = XPTI_PACK32_RET64(MStringID(Gen), MLineNo(Gen));
     id.p2 = XPTI_PACK32_RET64(0, MStringID(Gen));
     id.p3 = (uint64_t)MAddr(Gen);
 
     uint64_t hash = id.hash();
-    EXPECT_EQ(MapTest.count(id), 0);
+    EXPECT_EQ(MapTest.count(id), 0u);
     MapTest[id] = hash;
   }