Fix unit test failure

Add mock and make bundle not empty to pass unit test

Change-Id: I4e97f9f5c6a5305627dbb9866705723260257df7
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/test/unit_tests/mock/gio_mock.cc b/test/unit_tests/mock/gio_mock.cc
index 4e048fc..652e100 100644 (file)
--- a/test/unit_tests/mock/gio_mock.cc
+++ b/test/unit_tests/mock/gio_mock.cc
@@ -97,3 +97,8 @@ extern "C" GDBusMessage* g_dbus_connection_send_message_with_reply_finish(
   return MOCK_HOOK_P3(GioMock, g_dbus_connection_send_message_with_reply_finish,
       arg0, arg1, arg2);
 }
+
+extern "C" GDBusMessageType g_dbus_message_get_message_type(
+    GDBusMessage* arg1) {
+  return MOCK_HOOK_P1(GioMock, g_dbus_message_get_message_type, arg1);
+}
\ No newline at end of file

diff --git a/test/unit_tests/mock/gio_mock.h b/test/unit_tests/mock/gio_mock.h
index a85f992..c598d86 100755 (executable)
--- a/test/unit_tests/mock/gio_mock.h
+++ b/test/unit_tests/mock/gio_mock.h
@@ -62,6 +62,9 @@ class GioMock : public virtual ModuleMock {
 
   MOCK_METHOD2(g_dbus_method_invocation_return_value,
       GDBusNodeInfo*(GDBusMethodInvocation*, GVariant*));
+
+  MOCK_METHOD1(g_dbus_message_get_message_type,
+      GDBusMessageType(GDBusMessage*));
 };
 
 #endif  // UNIT_TESTS_MOCK_GIO_MOCK_H_

diff --git a/test/unit_tests/test_request_broker.cc b/test/unit_tests/test_request_broker.cc
index f3c91f9..dc33ee6 100644 (file)
--- a/test/unit_tests/test_request_broker.cc
+++ b/test/unit_tests/test_request_broker.cc
@@ -230,6 +230,9 @@ TEST_F(RequestBrokerTest, SendData_N3) {
           WillOnce(Return(msg));
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_message_get_body(_)).WillOnce(Return(nullptr));
+  EXPECT_CALL(GetMock<GioMock>(),
+      g_dbus_message_get_message_type(_)).
+          WillOnce(Return(G_DBUS_MESSAGE_TYPE_METHOD_RETURN));
   tizen_base::Bundle b;
   b = broker_.SendData(ttm::dbus::Command::ADD, b);
   std::string result = b.GetString(ttm::dbus::kCmdResultKey);

diff --git a/test/unit_tests/test_theme_loader.cc b/test/unit_tests/test_theme_loader.cc
index 05f7260..015642e 100644 (file)
--- a/test/unit_tests/test_theme_loader.cc
+++ b/test/unit_tests/test_theme_loader.cc
@@ -92,6 +92,10 @@ TEST_F(ThemeLoaderTest, SetCurrent) {
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_connection_send_message_with_reply_sync(_, _, _, _, _, _, _)).
           WillOnce(Return(msg));
+
+  EXPECT_CALL(GetMock<GioMock>(),
+      g_dbus_message_get_message_type(_)).
+          WillOnce(Return(G_DBUS_MESSAGE_TYPE_METHOD_RETURN));
   tizen_base::Bundle b;
   ThemeInfo ti;
   b.Add(ttm::dbus::kCmdResultKey, "ok");
@@ -102,7 +106,6 @@ TEST_F(ThemeLoaderTest, SetCurrent) {
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_message_get_body(_)).WillOnce(
           Return(reinterpret_cast<GVariant*>(g_variant_new("(s)", b_raw))));
-
   int ret;
 
   ret = theme_loader_set_current(loader_handle_, "id");
@@ -125,11 +128,16 @@ TEST_F(ThemeLoaderTest, LoadCurrent) {
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_connection_send_message_with_reply_sync(_, _, _, _, _, _, _)).
           WillOnce(Return(msg));
+  EXPECT_CALL(GetMock<GioMock>(),
+      g_dbus_message_get_message_type(_)).
+          WillOnce(Return(G_DBUS_MESSAGE_TYPE_METHOD_RETURN));
   tizen_base::Bundle b;
   ThemeInfo ti;
-  b.Add(ttm::dbus::kCmdResultKey, "ok");
+  auto ti_bundle = ti.Serialize();
+  ti_bundle.Add("testkey", "testval");
+  ti_bundle.Add(ttm::dbus::kCmdResultKey, "ok");
   b.Add(ttm::dbus::kCmdDataKey,
-      reinterpret_cast<char*>(ti.Serialize().ToRaw().first.get()));
+      reinterpret_cast<char*>(ti_bundle.ToRaw().first.get()));
   auto br = b.ToRaw();
   char* b_raw = reinterpret_cast<char*>(br.first.get());
   EXPECT_CALL(GetMock<GioMock>(),
@@ -162,11 +170,17 @@ TEST_F(ThemeLoaderTest, Load) {
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_connection_send_message_with_reply_sync(_, _, _, _, _, _, _)).
           WillOnce(Return(msg));
+  EXPECT_CALL(GetMock<GioMock>(),
+      g_dbus_message_get_message_type(_)).
+          WillOnce(Return(G_DBUS_MESSAGE_TYPE_METHOD_RETURN));
   tizen_base::Bundle b;
   ThemeInfo ti;
+  auto ti_bundle = ti.Serialize();
+  ti_bundle.Add("testkey", "testval");
+  ti_bundle.Add(ttm::dbus::kCmdResultKey, "ok");
   b.Add(ttm::dbus::kCmdResultKey, "ok");
   b.Add(ttm::dbus::kCmdDataKey,
-      reinterpret_cast<char*>(ti.Serialize().ToRaw().first.get()));
+      reinterpret_cast<char*>(ti_bundle.ToRaw().first.get()));
   auto br = b.ToRaw();
   char* b_raw = reinterpret_cast<char*>(br.first.get());
   EXPECT_CALL(GetMock<GioMock>(),
@@ -199,6 +213,9 @@ TEST_F(ThemeLoaderTest, QueryID) {
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_connection_send_message_with_reply_sync(_, _, _, _, _, _, _)).
           WillOnce(Return(msg));
+  EXPECT_CALL(GetMock<GioMock>(),
+      g_dbus_message_get_message_type(_)).
+          WillOnce(Return(G_DBUS_MESSAGE_TYPE_METHOD_RETURN));
   tizen_base::Bundle b;
   std::vector<std::string> ids_vec;
   b.Add(ttm::dbus::kCmdResultKey, "ok");