tests: Fix unsafe mix of types in comparison

Change-Id: Ifd88ba0d67dc72e7ce60df75f976d37a0ba503d0

diff --git a/tests/tc_policy.cpp b/tests/tc_policy.cpp
index 4f8a2cf..00ae725 100644 (file)
--- a/tests/tc_policy.cpp
+++ b/tests/tc_policy.cpp
@@ -2132,7 +2132,7 @@ TEST_F(PolicyTest, Req_SetAppId)
 
     EXPECT_TRUE(comp->mPid == pid)
         << comp->mPid << ", " << pid;
-    EXPECT_TRUE(comp->mAppId.compare(appid) == false)
+    EXPECT_EQ(comp->mAppId, appid)
         << comp->mAppId << ", " << appid;
 }
 
@@ -2451,7 +2451,7 @@ TEST_F(PolicyTest, Req_PolicySurfaceSetRole)
     surface_res_id = wl_proxy_get_id((struct wl_proxy *)surface_res);
     policy_surface = comp->FindPolicySurfaceWidthResId(surface_res_id);
 
-    EXPECT_TRUE(policy_surface->mRole.compare(role) == false)
+    EXPECT_EQ(policy_surface->mRole, role)
         << policy_surface->mRole << ", " << role;
 }
 
@@ -2605,9 +2605,9 @@ TEST_F(PolicyTest, Req_PolicySurfaceAddAuxHint)
     policy_surface = comp->FindPolicySurfaceWidthResId(surface_res_id);
 
     EXPECT_TRUE(policy_surface->mAuxHintId == auxhint_id);
-    EXPECT_TRUE(policy_surface->mAuxHintName.compare(auxhint_name) == false)
+    EXPECT_EQ(policy_surface->mAuxHintName, auxhint_name)
         << policy_surface->mAuxHintName << ", " << auxhint_name;
-    EXPECT_TRUE(policy_surface->mAuxHintValue.compare(auxhint_value) == false)
+    EXPECT_EQ(policy_surface->mAuxHintValue, auxhint_value)
         << policy_surface->mAuxHintValue << ", " << auxhint_value;
 }
 
@@ -2627,7 +2627,7 @@ TEST_F(PolicyTest, Req_PolicySurfaceChangeAuxHint)
     policy_surface = comp->FindPolicySurfaceWidthResId(surface_res_id);
 
     EXPECT_TRUE(policy_surface->mAuxHintId == auxhint_id);
-    EXPECT_TRUE(policy_surface->mAuxHintValue.compare(auxhint_value) == false)
+    EXPECT_EQ(policy_surface->mAuxHintValue, auxhint_value)
         << policy_surface->mAuxHintValue << ", " << auxhint_value;
 }