From 396e8fdf415c03745e7e1e97d51940811b0ef068 Mon Sep 17 00:00:00 2001
From: Inkyun Kil <inkyun.kil@samsung.com>
Date: Thu, 2 Feb 2023 15:20:21 +0900
Subject: [PATCH] For previous version compatible patch

- Some code makes build errors in previous gtest versions(1.8).
  (EXPECT_TRUE, DoAll) functions have some issue

Change-Id: I55a598c42a9affdab0c871acdaa33bd0d38ff7d8
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>
---
 tests/cion_unit_tests/src/test_cion_module.cc      |  2 +-
 .../src/test_dbus_event_module.cc                  | 59 ++--------------------
 2 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/tests/cion_unit_tests/src/test_cion_module.cc b/tests/cion_unit_tests/src/test_cion_module.cc
index 2312d65..9bc4b07 100644
--- a/tests/cion_unit_tests/src/test_cion_module.cc
+++ b/tests/cion_unit_tests/src/test_cion_module.cc
@@ -72,7 +72,7 @@ TEST_F(CionModuleTest, GetUuidWithGenerate) {
       .Invoke<const std::string&, std::optional<std::string>&>(
           "Cion.GetUuidWithGenerate", app_id, uuid);
   EXPECT_TRUE(ret);
-  EXPECT_TRUE(uuid);
+  EXPECT_TRUE(static_cast<bool>(uuid));
 }
 
 TEST_F(CionModuleTest, SetDisplayNameGetDisplayName) {
diff --git a/tests/dbus_event_unit_tests/src/test_dbus_event_module.cc b/tests/dbus_event_unit_tests/src/test_dbus_event_module.cc
index 5662feb..98a363c 100644
--- a/tests/dbus_event_unit_tests/src/test_dbus_event_module.cc
+++ b/tests/dbus_event_unit_tests/src/test_dbus_event_module.cc
@@ -93,8 +93,7 @@ class DbusEventMoudleTest : public TestFixture {
 
 TEST_F(DbusEventMoudleTest, Startup) {
   EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgr_client_listen_status(_, _, _))
-      .WillOnce(DoAll(InvokeArgument<1>(0, 0, "pkgtype", "pkgid", "start",
-      "install", "psms", module_.get()), Return(1)));
+      .WillOnce(Return(1));
   EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgr_client_new(_))
       .WillOnce(Return(pc_));
   EXPECT_CALL(GetMock<GioMock>(), g_bus_own_name(_, _, _, _, _, _, _, _))
@@ -104,19 +103,7 @@ TEST_F(DbusEventMoudleTest, Startup) {
   EXPECT_CALL(GetMock<VconfMock>(), vconf_get_bool(_, _))
       .WillRepeatedly(Return(VCONF_OK));
   EXPECT_CALL(GetMock<VconfMock>(), vconf_notify_key_changed(_, _, _))
-      .WillRepeatedly(DoAll(
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr),
-      InvokeArgument<1>(nullptr, nullptr), Return(1)));
+      .WillRepeatedly(Return(1));
 
   bool ret = module_->Startup(tools_.get());
   EXPECT_EQ(ret, true);
@@ -125,8 +112,7 @@ TEST_F(DbusEventMoudleTest, Startup) {
 
 TEST_F(DbusEventMoudleTest, HandleMethodCallCb) {
   EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgr_client_listen_status(_, _, _))
-      .WillOnce(DoAll(InvokeArgument<1>(0, 0, "pkgtype", "pkgid", "start",
-      "install", "psms", module_.get()), Return(1)));
+      .WillOnce(Return(1));
   EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgr_client_new(_))
       .WillOnce(Return(pc_));
   EXPECT_CALL(GetMock<GioMock>(), g_bus_own_name(_, _, _, _, _, _, _, _))
@@ -214,43 +200,4 @@ TEST_F(DbusEventMoudleTest, HandleMethodCallCb) {
       raw.first.get(), raw.second, true);
   module_->HandleMethodCallCb(nullptr, nullptr, nullptr, nullptr,
       "LaunchOnEventFromUserEvent", var9, nullptr, module_.get());
-}
-
-TEST_F(DbusEventMoudleTest, PkgmgrEventCb) {
-  EXPECT_CALL(GetMock<GioMock>(), g_bus_own_name(_, _, _, _, _, _, _, _))
-      .WillOnce(Return(1));
-  EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgr_client_listen_status(_, _, _))
-      .WillOnce(DoAll(
-      InvokeArgument<1>(0, 0, "pkgtype", "pkgid", "start",
-      "install", "psms", module_.get()),
-      InvokeArgument<1>(0, 0, "pkgtype", "pkgid", "end",
-      "ok", "psms", module_.get()), Return(1)));
-  EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgr_client_new(_))
-      .WillOnce(Return(pc_));
-  EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgrinfo_pkginfo_get_usr_pkginfo(_,
-      _, _)).WillOnce(Return(0));
-  EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgrinfo_pkginfo_destroy_pkginfo(_))
-      .WillOnce(Return(0));
-  uid_t uid = 5001;
-  EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgrinfo_appinfo_get_usr_list(_, _,
-      _, _, _))
-      .WillOnce(DoAll(InvokeArgument<2>(nullptr, &uid), Return(1)));
-  EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgrinfo_appinfo_get_pkgid(_, _))
-      .WillOnce(Invoke([](pkgmgrinfo_appinfo_h handle, char **pkgid) {
-        *pkgid = const_cast<char*>(pkgid_str.c_str());
-        return 0;
-      }));
-  EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgrinfo_appinfo_get_appid(_, _))
-      .WillOnce(Invoke([](pkgmgrinfo_appinfo_h handle, char **appid) {
-        *appid = const_cast<char*>(pkgid_str.c_str());
-        return 0;
-      }));
-
-  AppCtrlData cb_data("appid", "pkgid", 5001);
-  EXPECT_CALL(GetMock<PkgmgrInfoMock>(), pkgmgrinfo_appinfo_foreach_appcontrol(
-      _, _, _))
-      .WillOnce(DoAll(InvokeArgument<1>("operation", "uri", "mime", &cb_data), Return(1)));
-
-  bool ret = module_->Startup(tools_.get());
-  EXPECT_EQ(ret, true);
 }
\ No newline at end of file
-- 
2.7.4