Unittests: Replace files with stubs in netsocket unit tests

Some netsocket unit tests depend on nanostack-libservice library, but should use stubs instead of including the source files. We remove the source files and link to mbed-stubs-nanostack-libservice.
ARMmbed · Jul 16, 2021 · 49a9b9a · 49a9b9a
1 parent 925df2f
commit 49a9b9a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
@@ -14,9 +14,7 @@ target_sources(${TEST_NAME}
     PRIVATE
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
         test_InternetSocket.cpp
@@ -30,6 +28,7 @@ target_link_libraries(${TEST_NAME}
         mbed-stubs
         mbed-stubs-headers
         mbed-stubs-netsocket
+        mbed-stubs-nanostack-libservice
         gmock_main
 )
 

diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
@@ -15,9 +15,7 @@ target_sources(${TEST_NAME}
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TCPSocket.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
         test_TCPSocket.cpp
@@ -31,6 +29,7 @@ target_link_libraries(${TEST_NAME}
         mbed-stubs
         mbed-stubs-headers
         mbed-stubs-netsocket
+        mbed-stubs-nanostack-libservice
         gmock_main
 )
 

diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
@@ -16,9 +16,7 @@ target_sources(${TEST_NAME}
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TCPSocket.cpp
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
         test_TLSSocketWrapper.cpp
@@ -34,6 +32,7 @@ target_link_libraries(${TEST_NAME}
         mbed-stubs-headers
         mbed-stubs-mbedtls
         mbed-stubs-netsocket
+        mbed-stubs-nanostack-libservice
         gmock_main
 )
 

diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
@@ -16,9 +16,7 @@ target_sources(${TEST_NAME}
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetDatagramSocket.cpp
         ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
         test_UDPSocket.cpp
@@ -32,6 +30,7 @@ target_link_libraries(${TEST_NAME}
         mbed-stubs
         mbed-stubs-headers
         mbed-stubs-netsocket
+        mbed-stubs-nanostack-libservice
         gmock_main
 )