CMake: Refactor netsocket unittest CMake

- Add Cmake configuration file
- Fix the header inclusion in DTLSSocketWrapper and TLSSocketWrapper test

connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt

@@ -0,0 +1,4 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(netsocket)

connectivity/netsocket/tests/UNITTESTS/netsocket/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(CellularNonIPSocket)
+add_subdirectory(DTLSSocket)
+add_subdirectory(DTLSSocketWrapper)
+add_subdirectory(EthernetInterface)
+add_subdirectory(IfaceDnsSocket)
+add_subdirectory(InternetSocket)
+add_subdirectory(NetworkInterface)
+add_subdirectory(NetworkStack)
+add_subdirectory(PPPInterface)
+add_subdirectory(SocketAddress)
+add_subdirectory(TCPSocket)
+add_subdirectory(TLSSocket)
+add_subdirectory(TLSSocketWrapper)
+add_subdirectory(UDPSocket)
+add_subdirectory(WiFiAccessPoint)

connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt

@@ -0,0 +1,33 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(TEST_NAME netsocket-cellular-nonip-socket-unittest)
+
+add_executable(${TEST_NAME})
+
+target_compile_definitions(${TEST_NAME}
+    PRIVATE
+        MBED_CONF_CELLULAR_PRESENT=1
+        DEVICE_SERIAL=1
+        DEVICE_INTERRUPTIN=1
+        MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
+
+)
+
+target_sources(${TEST_NAME}
+    PRIVATE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/CellularNonIPSocket.cpp
+        test_CellularNonIPSocket.cpp
+)
+
+target_link_libraries(${TEST_NAME}
+    PRIVATE
+        mbed-headers
+        mbed-stubs
+        mbed-stubs-headers
+        gmock_main
+)
+
+add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
+
+set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt

@@ -0,0 +1,47 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(TEST_NAME netsocket-dtls-socket-unittest)
+
+add_executable(${TEST_NAME})
+
+target_compile_definitions(${TEST_NAME}
+    PRIVATE        
+        MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
+)
+
+target_sources(${TEST_NAME}
+    PRIVATE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
+        ${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/netsocket/source/DTLSSocket.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.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_DTLSSocket.cpp
+)
+
+target_link_libraries(${TEST_NAME}
+    PRIVATE
+        mbed-headers
+        mbed-stubs
+        mbed-stubs-headers
+        gmock_main
+)
+
+set(MBEDTLS_USER_CONFIG_FILE_PATH "\"${mbed-os_SOURCE_DIR}/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/dtls_test_config.h\"")
+set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/test_DTLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+
+add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
+
+set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt

@@ -0,0 +1,46 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(TEST_NAME netsocket-dtls-socket-wrapper-unittest)
+
+add_executable(${TEST_NAME})
+
+target_compile_definitions(${TEST_NAME}
+    PRIVATE        
+        MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
+)
+
+target_sources(${TEST_NAME}
+    PRIVATE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
+        ${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/netsocket/source/DTLSSocketWrapper.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_DTLSSocketWrapper.cpp
+)
+
+target_link_libraries(${TEST_NAME}
+    PRIVATE
+        mbed-headers
+        mbed-stubs
+        mbed-stubs-headers
+        gmock_main
+)
+
+
+set(MBEDTLS_USER_CONFIG_FILE_PATH "\"${mbed-os_SOURCE_DIR}/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/dtls_test_config.h\"")
+set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+set_source_files_properties(${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
+
+add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
+
+set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp

@@ -19,7 +19,7 @@
 #include "netsocket/UDPSocket.h"
 #include "netsocket/DTLSSocketWrapper.h"
 #include "NetworkStack_stub.h"
-#include "connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h"
+#include "mbedtls_stub.h"
 #include <cstring> //memset
 
 #include "mbed_error.h"

connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt

@@ -0,0 +1,39 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(TEST_NAME netsocket-ethernet-interface-unittest)
+
+add_executable(${TEST_NAME})
+
+target_compile_definitions(${TEST_NAME}
+    PRIVATE        
+        MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
+)
+
+target_sources(${TEST_NAME}
+    PRIVATE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EthernetInterface.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EMACInterface.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.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
+        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
+        test_EthernetInterface.cpp
+)
+
+target_link_libraries(${TEST_NAME}
+    PRIVATE
+        mbed-headers
+        mbed-stubs
+        mbed-stubs-headers
+        gmock_main
+)
+
+add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
+
+set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt

@@ -0,0 +1,53 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(TEST_NAME netsocket-iface-dns-socket-unittest)
+
+add_executable(${TEST_NAME})
+
+target_compile_definitions(${TEST_NAME}
+    PRIVATE        
+        MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
+        DEVICE_EMAC
+        MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=ETHERNET
+        MBED_CONF_NSAPI_DNS_RESPONSE_WAIT_TIME=10000
+        MBED_CONF_NSAPI_DNS_RETRIES=1
+        MBED_CONF_NSAPI_DNS_TOTAL_ATTEMPTS=10
+        MBED_CONF_NSAPI_DNS_CACHE_SIZE=5
+)
+
+target_sources(${TEST_NAME}
+    PRIVATE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterfaceDefaults.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp #nsapi_create_stack
+        ${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/InternetDatagramSocket.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketStats.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EthernetInterface.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EMACInterface.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/nsapi_dns.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
+        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
+        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
+        moduletest.cpp
+)
+
+target_link_libraries(${TEST_NAME}
+    PRIVATE
+        mbed-headers
+        mbed-stubs
+        mbed-stubs-headers
+        gmock_main
+)
+
+add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
+
+set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt

@@ -0,0 +1,36 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(TEST_NAME netsocket-internet-socket-unittest)
+
+add_executable(${TEST_NAME})
+
+target_compile_definitions(${TEST_NAME}
+    PRIVATE        
+        MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
+)
+
+target_sources(${TEST_NAME}
+    PRIVATE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.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
+)
+
+target_link_libraries(${TEST_NAME}
+    PRIVATE
+        mbed-headers
+        mbed-stubs
+        mbed-stubs-headers
+        gmock_main
+)
+
+add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
+
+set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt

@@ -0,0 +1,39 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(TEST_NAME netsocket-network-interface-unittest)
+
+add_executable(${TEST_NAME})
+
+target_compile_definitions(${TEST_NAME}
+    PRIVATE        
+        MBED_CONF_PLATFORM_CALLBACK_COMPARABLE
+        MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
+
+)
+
+target_sources(${TEST_NAME}
+    PRIVATE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.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
+        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
+        test_NetworkInterface.cpp
+)
+
+target_link_libraries(${TEST_NAME}
+    PRIVATE
+        mbed-headers
+        mbed-stubs
+        mbed-stubs-headers
+        gmock_main
+)
+
+add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
+
+set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt

@@ -0,0 +1,35 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(TEST_NAME netsocket-network-stack-unittest)
+
+add_executable(${TEST_NAME})
+
+target_compile_definitions(${TEST_NAME}
+    PRIVATE
+        MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10        
+)
+
+target_sources(${TEST_NAME}
+    PRIVATE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.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_NetworkStack.cpp
+)
+
+target_link_libraries(${TEST_NAME}
+    PRIVATE
+        mbed-headers
+        mbed-stubs
+        mbed-stubs-headers
+        gmock_main
+)
+
+add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
+
+set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")