Merge pull request #14920 from hazzlim/refactor-connectivity-netsocket-unittests

Refactor connectivity netsocket unittests
pull/14941/head
Martin Kojtal 2021-07-20 14:58:40 +02:00 committed by GitHub
commit 146c98ccd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 44 additions and 77 deletions

View File

@ -22,7 +22,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-events
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs

View File

@ -6,31 +6,26 @@ set(TEST_NAME netsocket-dtls-socket-unittest)
add_executable(${TEST_NAME})
target_compile_definitions(${TEST_NAME}
PRIVATE
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-headers-events
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket

View File

@ -6,30 +6,25 @@ set(TEST_NAME netsocket-dtls-socket-wrapper-unittest)
add_executable(${TEST_NAME})
target_compile_definitions(${TEST_NAME}
PRIVATE
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-headers-events
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket

View File

@ -6,7 +6,7 @@ set(TEST_NAME netsocket-ethernet-interface-unittest)
add_executable(${TEST_NAME})
target_compile_definitions(${TEST_NAME}
PRIVATE
PRIVATE
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)
@ -15,23 +15,21 @@ target_sources(${TEST_NAME}
${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-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket
mbed-headers
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket

View File

@ -6,7 +6,7 @@ set(TEST_NAME netsocket-iface-dns-socket-unittest)
add_executable(${TEST_NAME})
target_compile_definitions(${TEST_NAME}
PRIVATE
PRIVATE
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
DEVICE_EMAC
MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=ETHERNET
@ -20,13 +20,10 @@ 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
@ -35,14 +32,15 @@ target_sources(${TEST_NAME}
${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-headers-events
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket

View File

@ -6,18 +6,15 @@ set(TEST_NAME netsocket-internet-socket-unittest)
add_executable(${TEST_NAME})
target_compile_definitions(${TEST_NAME}
PRIVATE
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
@ -25,12 +22,14 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
mbed-stubs-nanostack-libservice
gmock_main
)

View File

@ -6,29 +6,21 @@ set(TEST_NAME netsocket-network-interface-unittest)
add_executable(${TEST_NAME})
target_compile_definitions(${TEST_NAME}
PRIVATE
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-headers-nanostack-libservice
mbed-headers-netsocket
mbed-stubs

View File

@ -7,24 +7,24 @@ add_executable(${TEST_NAME})
target_compile_definitions(${TEST_NAME}
PRIVATE
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
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/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/libBits/common_functions.c
test_NetworkStack.cpp
)
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-events
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-stubs

View File

@ -14,21 +14,18 @@ target_sources(${TEST_NAME}
PRIVATE
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/PPPInterface.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_PPPInterface.cpp
)
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket

View File

@ -12,13 +12,12 @@ target_sources(${TEST_NAME}
${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
test_SocketAddress.cpp
)
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-stubs

View File

@ -13,12 +13,9 @@ target_compile_definitions(${TEST_NAME}
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/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
@ -26,12 +23,14 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
mbed-stubs-nanostack-libservice
gmock_main
)

View File

@ -12,23 +12,18 @@ target_compile_definitions(${TEST_NAME}
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/TCPSocket.cpp
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocket.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_TLSSocket.cpp
)
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-events
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket

View File

@ -13,13 +13,10 @@ target_compile_definitions(${TEST_NAME}
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/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
@ -27,7 +24,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-events
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-mbedtls
mbed-headers-netsocket
@ -35,6 +34,7 @@ target_link_libraries(${TEST_NAME}
mbed-stubs-headers
mbed-stubs-mbedtls
mbed-stubs-netsocket
mbed-stubs-nanostack-libservice
gmock_main
)

View File

@ -13,13 +13,10 @@ target_compile_definitions(${TEST_NAME}
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/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
@ -27,12 +24,14 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-drivers
mbed-headers-rtos
mbed-headers-nanostack-libservice
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
mbed-stubs-nanostack-libservice
gmock_main
)

View File

@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers