Move scan callback function to member

Change-Id: Ia43dcc861ab39e5f79b4ba4f605ed6cebbbecab6
Signed-off-by: hyunuk.tak <hyunuk.tak@samsung.com>

diff --git a/tests/unittest/mocks/thread-mock-util.cpp b/tests/unittest/mocks/thread-mock-util.cpp
index e6d2fb7..24da7c8 100644 (file)
--- a/tests/unittest/mocks/thread-mock-util.cpp
+++ b/tests/unittest/mocks/thread-mock-util.cpp
@@ -16,15 +16,6 @@
 
 #include "thread-mock-util.h"
 
-void ScanCallback(int result, thread_network_scanning_state_e state,
-               uint64_t ext_address, const char *network_name, uint64_t ext_panidi,
-               const uint8_t *steering_data, int length, uint16_t panid, uint16_t joiner_udp_port, uint16_t channel,
-               uint16_t rssi, uint8_t lqi, uint8_t version, bool is_native, bool is_joinable, void *user_data)
-{
-       if (state == THREAD_SCANNING_FINISHED)
-               QUIT_GMAIN_LOOP;
-}
-
 gboolean ThreadMainLoop::timeoutCallback(gpointer data)
 {
        GMainLoop *mainLoop = NULL;

diff --git a/tests/unittest/mocks/thread-mock-util.h b/tests/unittest/mocks/thread-mock-util.h
index bd9cc76..04e1a1d 100644 (file)
--- a/tests/unittest/mocks/thread-mock-util.h
+++ b/tests/unittest/mocks/thread-mock-util.h
@@ -24,11 +24,6 @@
 #define RUN_GMAIN_LOOP THREAD_MAIN_LOOP.RunMainLoop()
 #define QUIT_GMAIN_LOOP THREAD_MAIN_LOOP.QuitMainLoop()
 
-void ScanCallback(int result, thread_network_scanning_state_e state,
-               uint64_t ext_address, const char *network_name, uint64_t ext_panidi,
-               const uint8_t *steering_data, int length, uint16_t panid, uint16_t joiner_udp_port, uint16_t channel,
-               uint16_t rssi, uint8_t lqi, uint8_t version, bool is_native, bool is_joinable, void *user_data);
-
 class ThreadMainLoop
 {
 public:

diff --git a/tests/unittest/thread-unittest-core.cpp b/tests/unittest/thread-unittest-core.cpp
index 04b3488..71994b7 100644 (file)
--- a/tests/unittest/thread-unittest-core.cpp
+++ b/tests/unittest/thread-unittest-core.cpp
@@ -33,6 +33,10 @@ public:
 
 public:
        static void deviceRoleCb(thread_device_role_e device_role, void *user_data) {};
+       static void scanCallback(int result, thread_network_scanning_state_e state,
+               uint64_t ext_address, const char *network_name, uint64_t ext_panidi,
+               const uint8_t *steering_data, int length, uint16_t panid, uint16_t joiner_udp_port, uint16_t channel,
+               uint16_t rssi, uint8_t lqi, uint8_t version, bool is_native, bool is_joinable, void *user_data);
 
 protected:
        void SetUp() override
@@ -47,6 +51,15 @@ protected:
        }
 };
 
+void ThreadCoreTest::scanCallback(int result, thread_network_scanning_state_e state,
+               uint64_t ext_address, const char *network_name, uint64_t ext_panidi,
+               const uint8_t *steering_data, int length, uint16_t panid, uint16_t joiner_udp_port, uint16_t channel,
+               uint16_t rssi, uint8_t lqi, uint8_t version, bool is_native, bool is_joinable, void *user_data)
+{
+       if (state == THREAD_SCANNING_FINISHED)
+               QUIT_GMAIN_LOOP;
+}
+
 TEST_F(ThreadCoreTest, EnableNotInitialized)
 {
        EXPECT_EQ(THREAD_ERROR_NONE, thread_deinitialize());
@@ -267,13 +280,13 @@ TEST_F(ThreadCoreTest, ScanNotInitialized)
 {
        EXPECT_EQ(THREAD_ERROR_NONE, thread_deinitialize());
        EXPECT_EQ(THREAD_ERROR_NOT_INITIALIZED,
-               thread_scan(instance, scanParam, ScanCallback, nullptr));
+               thread_scan(instance, scanParam, scanCallback, nullptr));
 }
 
 TEST_F(ThreadCoreTest, ScanInvalidParameter)
 {
        EXPECT_EQ(THREAD_ERROR_INVALID_PARAMETER,
-               thread_scan(instance, scanParam, ScanCallback, nullptr));
+               thread_scan(instance, scanParam, scanCallback, nullptr));
 }
 
 TEST_F(ThreadCoreTest, ScanErrorNone)
@@ -282,7 +295,7 @@ TEST_F(ThreadCoreTest, ScanErrorNone)
        EXPECT_EQ(THREAD_ERROR_NONE,
                thread_scan_param_create(instance, THREAD_DEFAULT_SCAN_TIME, &scanParam));
        EXPECT_EQ(THREAD_ERROR_NONE,
-               thread_scan(instance, scanParam, ScanCallback, nullptr));
+               thread_scan(instance, scanParam, scanCallback, nullptr));
 
        RUN_GMAIN_LOOP;
 }