Fix Setup() method of unit tests

Calling EXPECT_CALL() of the send() is not needed.
The default behavior of the send() is defined in the constructor of
the SocketMock class.
This patch removes it from the Setup() method.

Change-Id: I9064e8d59d6a73e05c9c54bdaad41ecaeb3e73f7
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 61409ca..687387e 100644 (file)
--- a/test/unit_tests/test_comp_context.cc
+++ b/test/unit_tests/test_comp_context.cc
@@ -56,17 +56,6 @@ class CompContextTest : public TestFixture {
   CompContextTest() : TestFixture(std::make_unique<::Mocks>()) {}
 
   virtual void SetUp() {
-    int times = 2;
-    if (aul_is_initialized())
-      times--;
-
-    EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
-      .Times(times)
-      .WillRepeatedly(Invoke([&](int fd, const void* buf, size_t n, int flags)
-          -> ssize_t {
-        return n;
-      }));
-
     if (!aul_is_initialized())
       aul_launch_init(nullptr, nullptr);
 

diff --git a/test/unit_tests/test_comp_info.cc b/test/unit_tests/test_comp_info.cc
index 2aec828..df97189 100644 (file)
--- a/test/unit_tests/test_comp_info.cc
+++ b/test/unit_tests/test_comp_info.cc
@@ -62,17 +62,6 @@ class CompInfoTest : public TestFixture {
   CompInfoTest() : TestFixture(std::make_unique<::Mocks>()) {}
 
   virtual void SetUp() {
-    int times = 2;
-    if (aul_is_initialized())
-      times--;
-
-    EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
-      .Times(times)
-      .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
-          -> ssize_t {
-        return n;
-      }));
-
     if (!aul_is_initialized())
       aul_launch_init(nullptr, nullptr);
 

diff --git a/test/unit_tests/test_launch_with_result.cc b/test/unit_tests/test_launch_with_result.cc
index 333510a..16decc7 100644 (file)
--- a/test/unit_tests/test_launch_with_result.cc
+++ b/test/unit_tests/test_launch_with_result.cc
@@ -56,11 +56,6 @@ class LaunchWithResultTest : public TestFixture {
     if (aul_is_initialized())
       return;
 
-    EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
-      .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
-          -> ssize_t {
-        return n;
-      }));
     aul_launch_init(nullptr, nullptr);
   }
 

diff --git a/test/unit_tests/test_pkginfo.cc b/test/unit_tests/test_pkginfo.cc
index 31b289b..76286fa 100644 (file)
--- a/test/unit_tests/test_pkginfo.cc
+++ b/test/unit_tests/test_pkginfo.cc
@@ -52,11 +52,6 @@ class PkgInfoTest : public TestFixture {
     if (aul_is_initialized())
       return;
 
-    EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
-      .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
-          -> ssize_t {
-        return n;
-      }));
     aul_launch_init(nullptr, nullptr);
   }
 

diff --git a/test/unit_tests/test_watchdog.cc b/test/unit_tests/test_watchdog.cc
index ce702fa..57dc671 100644 (file)
--- a/test/unit_tests/test_watchdog.cc
+++ b/test/unit_tests/test_watchdog.cc
@@ -52,11 +52,6 @@ class WatchdogTest : public TestFixture {
     if (aul_is_initialized())
       return;
 
-    EXPECT_CALL(GetMock<SocketMock>(), send(_, _, _, _))
-      .WillOnce(Invoke([&](int fd, const void* buf, size_t n, int flags)
-          -> ssize_t {
-        return n;
-      }));
     aul_launch_init(nullptr, nullptr);
   }