Fix unit tests

The socket option check and the bundle data check are added.

Change-Id: If8a758b4e741a65660e8b267855b4150445a4d43
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/test/unit_tests/test_comp_context.cc b/test/unit_tests/test_comp_context.cc
index 687387e..5257dca 100644 (file)
--- a/test/unit_tests/test_comp_context.cc
+++ b/test/unit_tests/test_comp_context.cc
@@ -135,6 +135,7 @@ class CompContextTest : public TestFixture {
 
 TEST_F(CompContextTest, aul_comp_context_foreach_comp_context_P) {
   int cmd = -1;
+  int opt = -1;
   auto pkt = MakePacket(std::move(MakeCompContextBundle()));
   EXPECT_NE(pkt, nullptr);
 
@@ -144,6 +145,7 @@ TEST_F(CompContextTest, aul_comp_context_foreach_comp_context_P) {
           -> ssize_t {
         const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
         cmd = header->cmd;
+        opt = header->opt;
         return n;
       }));
   EXPECT_CALL(GetMock<SocketMock>(), recv(_, _, _, _))
@@ -185,6 +187,7 @@ TEST_F(CompContextTest, aul_comp_context_foreach_comp_context_P) {
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_EQ(touched_, true);
   EXPECT_EQ(cmd, COMP_CONTEXT_FOREACH);
+  EXPECT_EQ(opt, (AUL_SOCK_BUNDLE | AUL_SOCK_ASYNC));
 }
 
 TEST_F(CompContextTest, aul_comp_context_foreach_comp_context_N) {
@@ -194,6 +197,8 @@ TEST_F(CompContextTest, aul_comp_context_foreach_comp_context_N) {
 
 TEST_F(CompContextTest, aul_comp_context_create_P) {
   int cmd = -1;
+  int opt = -1;
+  bundle* kb = nullptr;
   auto pkt = MakePacket(std::move(MakeCompContextBundle()));
   EXPECT_NE(pkt, nullptr);
 
@@ -201,8 +206,10 @@ TEST_F(CompContextTest, aul_comp_context_create_P) {
       .Times(1)
       .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
           -> ssize_t {
-        const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
-        cmd = header->cmd;
+        const app_pkt_t* app_pkt = reinterpret_cast<const app_pkt_t*>(buf);
+        cmd = app_pkt->cmd;
+        opt = app_pkt->opt;
+        kb = bundle_decode(app_pkt->data, app_pkt->len);
         return n;
       }));
   EXPECT_CALL(GetMock<SocketMock>(), recv(_, _, _, _))
@@ -219,6 +226,9 @@ TEST_F(CompContextTest, aul_comp_context_create_P) {
 
   aul_comp_context_h handle = nullptr;
   int ret = aul_comp_context_create(kComponentId, &handle);
+  EXPECT_NE(kb, nullptr);
+  tizen_base::Bundle b(kb, false, true);
+
   auto handle_auto =
       std::unique_ptr<std::remove_pointer<aul_comp_context_h>::type,
           decltype(aul_comp_context_destroy)*>(
@@ -227,6 +237,8 @@ TEST_F(CompContextTest, aul_comp_context_create_P) {
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_NE(handle, nullptr);
   EXPECT_EQ(cmd, COMP_CONTEXT_GET);
+  EXPECT_EQ(opt, (AUL_SOCK_BUNDLE | AUL_SOCK_ASYNC));
+  EXPECT_EQ(b.GetString(AUL_K_COMPONENT_ID), kComponentId);
 }
 
 TEST_F(CompContextTest, aul_comp_context_create_N) {
@@ -389,13 +401,17 @@ TEST_F(CompContextTest, aul_comp_context_clone_N) {
 
 TEST_F(CompContextTest, aul_comp_context_is_running_P) {
   int cmd = -1;
+  int opt = -1;
+  bundle* kb = nullptr;
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
       .Times(1)
       .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
           -> ssize_t {
-        const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
-        cmd = header->cmd;
+        const app_pkt_t* app_pkt = reinterpret_cast<const app_pkt_t*>(buf);
+        cmd = app_pkt->cmd;
+        opt = app_pkt->opt;
+        kb = bundle_decode(app_pkt->data, app_pkt->len);
         return n;
       }));
   EXPECT_CALL(GetMock<SocketMock>(), recv(_, _, _, _))
@@ -408,9 +424,15 @@ TEST_F(CompContextTest, aul_comp_context_is_running_P) {
 
   bool running = false;
   int ret = aul_comp_context_is_running(handle_, &running);
+  EXPECT_NE(kb, nullptr);
+  tizen_base::Bundle b(kb, false, true);
+
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_EQ(running , true);
   EXPECT_EQ(cmd, COMP_CONTEXT_IS_RUNNING);
+  EXPECT_EQ(opt, (AUL_SOCK_BUNDLE | AUL_SOCK_NONE));
+  EXPECT_EQ(b.GetString(AUL_K_COMPONENT_ID), kComponentId);
+  EXPECT_EQ(b.GetString(AUL_K_INSTANCE_ID), kInstanceId);
 }
 
 TEST_F(CompContextTest, aul_comp_context_is_running_N) {
@@ -424,13 +446,17 @@ TEST_F(CompContextTest, aul_comp_context_is_running_N) {
 
 TEST_F(CompContextTest, aul_comp_context_resume_P) {
   int cmd = -1;
+  int opt = -1;
+  bundle* kb = nullptr;
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
       .Times(1)
       .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
           -> ssize_t {
-        const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
-        cmd = header->cmd;
+        const app_pkt_t* app_pkt = reinterpret_cast<const app_pkt_t*>(buf);
+        cmd = app_pkt->cmd;
+        opt = app_pkt->opt;
+        kb = bundle_decode(app_pkt->data, app_pkt->len);
         return n;
       }));
   EXPECT_CALL(GetMock<SocketMock>(), recv(_, _, _, _))
@@ -442,8 +468,14 @@ TEST_F(CompContextTest, aul_comp_context_resume_P) {
       }));
 
   int ret = aul_comp_context_resume(handle_);
+  EXPECT_NE(kb, nullptr);
+  tizen_base::Bundle b(kb, false, true);
+
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_EQ(cmd, COMP_CONTEXT_RESUME);
+  EXPECT_EQ(opt, (AUL_SOCK_BUNDLE | AUL_SOCK_NONE));
+  EXPECT_EQ(b.GetString(AUL_K_COMPONENT_ID), kComponentId);
+  EXPECT_EQ(b.GetString(AUL_K_INSTANCE_ID), kInstanceId);
 }
 
 TEST_F(CompContextTest, aul_comp_context_resume_N) {
@@ -453,13 +485,17 @@ TEST_F(CompContextTest, aul_comp_context_resume_N) {
 
 TEST_F(CompContextTest, aul_comp_context_pause_P) {
   int cmd = -1;
+  int opt = -1;
+  bundle* kb = nullptr;
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
       .Times(1)
       .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
           -> ssize_t {
-        const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
-        cmd = header->cmd;
+        const app_pkt_t* app_pkt = reinterpret_cast<const app_pkt_t*>(buf);
+        cmd = app_pkt->cmd;
+        opt = app_pkt->opt;
+        kb = bundle_decode(app_pkt->data, app_pkt->len);
         return n;
       }));
   EXPECT_CALL(GetMock<SocketMock>(), recv(_, _, _, _))
@@ -471,8 +507,14 @@ TEST_F(CompContextTest, aul_comp_context_pause_P) {
       }));
 
   int ret = aul_comp_context_pause(handle_);
+  EXPECT_NE(kb, nullptr);
+  tizen_base::Bundle b(kb, false, true);
+
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_EQ(cmd, COMP_CONTEXT_PAUSE);
+  EXPECT_EQ(opt, (AUL_SOCK_BUNDLE | AUL_SOCK_NONE));
+  EXPECT_EQ(b.GetString(AUL_K_COMPONENT_ID), kComponentId);
+  EXPECT_EQ(b.GetString(AUL_K_INSTANCE_ID), kInstanceId);
 }
 
 TEST_F(CompContextTest, aul_comp_context_pause_N) {
@@ -482,13 +524,17 @@ TEST_F(CompContextTest, aul_comp_context_pause_N) {
 
 TEST_F(CompContextTest, aul_comp_context_terminate_bg_comp_P) {
   int cmd = -1;
+  int opt = -1;
+  bundle* kb = nullptr;
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
       .Times(1)
       .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
           -> ssize_t {
-        const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
-        cmd = header->cmd;
+        const app_pkt_t* app_pkt = reinterpret_cast<const app_pkt_t*>(buf);
+        cmd = app_pkt->cmd;
+        opt = app_pkt->opt;
+        kb = bundle_decode(app_pkt->data, app_pkt->len);
         return n;
       }));
   EXPECT_CALL(GetMock<SocketMock>(), recv(_, _, _, _))
@@ -500,8 +546,15 @@ TEST_F(CompContextTest, aul_comp_context_terminate_bg_comp_P) {
       }));
 
   int ret = aul_comp_context_terminate_bg_comp(handle_);
+  EXPECT_NE(kb, nullptr);
+  tizen_base::Bundle b(kb, false, true);
+
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_EQ(cmd, COMP_CONTEXT_TERMINATE_BG_COMP);
+  EXPECT_EQ(opt, (AUL_SOCK_BUNDLE | AUL_SOCK_NONE));
+  EXPECT_EQ(b.GetString(AUL_K_COMPONENT_ID), kComponentId);
+  EXPECT_EQ(b.GetString(AUL_K_INSTANCE_ID), kInstanceId);
+
 }
 
 TEST_F(CompContextTest, aul_comp_context_terminate_bg_comp_N) {
@@ -511,13 +564,17 @@ TEST_F(CompContextTest, aul_comp_context_terminate_bg_comp_N) {
 
 TEST_F(CompContextTest, aul_comp_context_terminate_P) {
   int cmd = -1;
+  int opt = -1;
+  bundle* kb = nullptr;
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
       .Times(1)
       .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
           -> ssize_t {
-        const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
-        cmd = header->cmd;
+        const app_pkt_t* app_pkt = reinterpret_cast<const app_pkt_t*>(buf);
+        cmd = app_pkt->cmd;
+        opt = app_pkt->opt;
+        kb = bundle_decode(app_pkt->data, app_pkt->len);
         return n;
       }));
   EXPECT_CALL(GetMock<SocketMock>(), recv(_, _, _, _))
@@ -529,8 +586,14 @@ TEST_F(CompContextTest, aul_comp_context_terminate_P) {
       }));
 
   int ret = aul_comp_context_terminate(handle_);
+  EXPECT_NE(kb, nullptr);
+  tizen_base::Bundle b(kb, false, true);
+
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_EQ(cmd, COMP_CONTEXT_TERMINATE);
+  EXPECT_EQ(opt, (AUL_SOCK_BUNDLE | AUL_SOCK_NONE));
+  EXPECT_EQ(b.GetString(AUL_K_COMPONENT_ID), kComponentId);
+  EXPECT_EQ(b.GetString(AUL_K_INSTANCE_ID), kInstanceId);
 }
 
 TEST_F(CompContextTest, aul_comp_context_terminateN) {

diff --git a/test/unit_tests/test_watchdog.cc b/test/unit_tests/test_watchdog.cc
index 57dc671..60587b3 100644 (file)
--- a/test/unit_tests/test_watchdog.cc
+++ b/test/unit_tests/test_watchdog.cc
@@ -62,6 +62,7 @@ class WatchdogTest : public TestFixture {
 
 TEST_F(WatchdogTest, aul_watchdog_enable_P) {
   int cmd = -1;
+  int opt = -1;
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
       .Times(2)
@@ -69,12 +70,14 @@ TEST_F(WatchdogTest, aul_watchdog_enable_P) {
           -> ssize_t {
         const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
         cmd = header->cmd;
+        opt = header->opt;
         return n;
       }));
 
   int ret = aul_watchdog_enable();
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_EQ(cmd, WATCHDOG_ENABLE);
+  EXPECT_EQ(opt, AUL_SOCK_NOREPLY);
 
   // Post: Disable watchdog
   aul_watchdog_disable();
@@ -82,6 +85,7 @@ TEST_F(WatchdogTest, aul_watchdog_enable_P) {
 
 TEST_F(WatchdogTest, aul_watchdog_disable_P) {
   int cmd = -1;
+  int opt = -1;
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
       .Times(2)
@@ -89,6 +93,7 @@ TEST_F(WatchdogTest, aul_watchdog_disable_P) {
           -> ssize_t {
         const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
         cmd = header->cmd;
+        opt = header->opt;
         return n;
       }));
 
@@ -99,6 +104,7 @@ TEST_F(WatchdogTest, aul_watchdog_disable_P) {
   ret = aul_watchdog_disable();
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_EQ(cmd, WATCHDOG_DISABLE);
+  EXPECT_EQ(opt, AUL_SOCK_NOREPLY);
 }
 
 TEST_F(WatchdogTest, aul_watchdog_disable_N) {
@@ -108,6 +114,7 @@ TEST_F(WatchdogTest, aul_watchdog_disable_N) {
 
 TEST_F(WatchdogTest, aul_watchdog_kick_P) {
   int cmd = -1;
+  int opt = -1;
 
   EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
       .Times(3)
@@ -115,6 +122,7 @@ TEST_F(WatchdogTest, aul_watchdog_kick_P) {
           -> ssize_t {
         const app_pkt_t* header = reinterpret_cast<const app_pkt_t*>(buf);
         cmd = header->cmd;
+        opt = header->opt;
         return n;
       }));
 
@@ -125,6 +133,7 @@ TEST_F(WatchdogTest, aul_watchdog_kick_P) {
   ret = aul_watchdog_kick();
   EXPECT_EQ(ret, AUL_R_OK);
   EXPECT_EQ(cmd, WATCHDOG_KICK);
+  EXPECT_EQ(opt, AUL_SOCK_NOREPLY);
 
   // Post: Disable watchdog
   aul_watchdog_disable();