Skip to content

Commit 146c98c

Browse files
0xc01700xc0170
authored
Merge pull request #14920 from hazzlim/refactor-connectivity-netsocket-unittests
Refactor connectivity netsocket unittests
2 parents 2181d7c + 14cab32 commit 146c98c

File tree

15 files changed

+44
-77
lines changed

15 files changed

+44
-77
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ target_sources(${TEST_NAME}
2222

2323
target_link_libraries(${TEST_NAME}
2424
PRIVATE
25-
mbed-headers
25+
mbed-headers-events
26+
mbed-headers-drivers
27+
mbed-headers-rtos
2628
mbed-headers-netsocket
2729
mbed-headers-cellular
2830
mbed-stubs

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,26 @@ set(TEST_NAME netsocket-dtls-socket-unittest)
66
add_executable(${TEST_NAME})
77

88
target_compile_definitions(${TEST_NAME}
9-
PRIVATE
9+
PRIVATE
1010
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
1111
)
1212

1313
target_sources(${TEST_NAME}
1414
PRIVATE
15-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
16-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
1715
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
1816
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetDatagramSocket.cpp
1917
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp
2018
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocket.cpp
2119
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.cpp
2220
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp
23-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
24-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
25-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
26-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
27-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2821
test_DTLSSocket.cpp
2922
)
3023

3124
target_link_libraries(${TEST_NAME}
3225
PRIVATE
33-
mbed-headers
26+
mbed-headers-events
27+
mbed-headers-drivers
28+
mbed-headers-rtos
3429
mbed-headers-nanostack-libservice
3530
mbed-headers-mbedtls
3631
mbed-headers-netsocket

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,25 @@ set(TEST_NAME netsocket-dtls-socket-wrapper-unittest)
66
add_executable(${TEST_NAME})
77

88
target_compile_definitions(${TEST_NAME}
9-
PRIVATE
9+
PRIVATE
1010
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
1111
)
1212

1313
target_sources(${TEST_NAME}
1414
PRIVATE
15-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
16-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
1715
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
1816
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetDatagramSocket.cpp
1917
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp
2018
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.cpp
2119
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TLSSocketWrapper.cpp
22-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
23-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
24-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
25-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
26-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2720
test_DTLSSocketWrapper.cpp
2821
)
2922

3023
target_link_libraries(${TEST_NAME}
3124
PRIVATE
32-
mbed-headers
25+
mbed-headers-events
26+
mbed-headers-drivers
27+
mbed-headers-rtos
3328
mbed-headers-nanostack-libservice
3429
mbed-headers-mbedtls
3530
mbed-headers-netsocket

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(TEST_NAME netsocket-ethernet-interface-unittest)
66
add_executable(${TEST_NAME})
77

88
target_compile_definitions(${TEST_NAME}
9-
PRIVATE
9+
PRIVATE
1010
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
1111
)
1212

@@ -15,23 +15,21 @@ target_sources(${TEST_NAME}
1515
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
1616
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EthernetInterface.cpp
1717
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EMACInterface.cpp
18-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp
19-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
2018
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
2119
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
2220
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
2321
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
2422
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
25-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
2623
test_EthernetInterface.cpp
2724
)
2825

2926
target_link_libraries(${TEST_NAME}
3027
PRIVATE
28+
mbed-headers-drivers
29+
mbed-headers-rtos
3130
mbed-headers-nanostack-libservice
3231
mbed-headers-mbedtls
3332
mbed-headers-netsocket
34-
mbed-headers
3533
mbed-stubs
3634
mbed-stubs-headers
3735
mbed-stubs-netsocket

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(TEST_NAME netsocket-iface-dns-socket-unittest)
66
add_executable(${TEST_NAME})
77

88
target_compile_definitions(${TEST_NAME}
9-
PRIVATE
9+
PRIVATE
1010
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
1111
DEVICE_EMAC
1212
MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=ETHERNET
@@ -20,13 +20,10 @@ target_sources(${TEST_NAME}
2020
PRIVATE
2121
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
2222
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp
23-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterfaceDefaults.cpp
2423
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp #nsapi_create_stack
2524
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
26-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TCPSocket.cpp
2725
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetDatagramSocket.cpp
2826
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp
29-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketStats.cpp
3027
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EthernetInterface.cpp
3128
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EMACInterface.cpp
3229
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/nsapi_dns.cpp
@@ -35,14 +32,15 @@ target_sources(${TEST_NAME}
3532
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
3633
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
3734
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
38-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
3935
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
4036
moduletest.cpp
4137
)
4238

4339
target_link_libraries(${TEST_NAME}
4440
PRIVATE
45-
mbed-headers
41+
mbed-headers-events
42+
mbed-headers-drivers
43+
mbed-headers-rtos
4644
mbed-headers-nanostack-libservice
4745
mbed-headers-mbedtls
4846
mbed-headers-netsocket

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,30 @@ set(TEST_NAME netsocket-internet-socket-unittest)
66
add_executable(${TEST_NAME})
77

88
target_compile_definitions(${TEST_NAME}
9-
PRIVATE
9+
PRIVATE
1010
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
1111
)
1212

1313
target_sources(${TEST_NAME}
1414
PRIVATE
1515
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
16-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
1716
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
18-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
1917
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
20-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
2118
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
2219
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2320
test_InternetSocket.cpp
2421
)
2522

2623
target_link_libraries(${TEST_NAME}
2724
PRIVATE
28-
mbed-headers
25+
mbed-headers-drivers
26+
mbed-headers-rtos
2927
mbed-headers-nanostack-libservice
3028
mbed-headers-netsocket
3129
mbed-stubs
3230
mbed-stubs-headers
3331
mbed-stubs-netsocket
32+
mbed-stubs-nanostack-libservice
3433
gmock_main
3534
)
3635

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,21 @@ set(TEST_NAME netsocket-network-interface-unittest)
66
add_executable(${TEST_NAME})
77

88
target_compile_definitions(${TEST_NAME}
9-
PRIVATE
9+
PRIVATE
1010
MBED_CONF_PLATFORM_CALLBACK_COMPARABLE
1111
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
12-
12+
1313
)
1414

1515
target_sources(${TEST_NAME}
1616
PRIVATE
17-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
18-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
1917
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp
20-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
21-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
22-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
23-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
24-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2518
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
2619
test_NetworkInterface.cpp
2720
)
2821

2922
target_link_libraries(${TEST_NAME}
3023
PRIVATE
31-
mbed-headers
3224
mbed-headers-nanostack-libservice
3325
mbed-headers-netsocket
3426
mbed-stubs

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ add_executable(${TEST_NAME})
77

88
target_compile_definitions(${TEST_NAME}
99
PRIVATE
10-
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
10+
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
1111
)
1212

1313
target_sources(${TEST_NAME}
1414
PRIVATE
1515
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
16-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
16+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
1717
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
1818
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
1919
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
2020
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
21-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
21+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2222
test_NetworkStack.cpp
2323
)
2424

2525
target_link_libraries(${TEST_NAME}
2626
PRIVATE
27-
mbed-headers
27+
mbed-headers-events
2828
mbed-headers-nanostack-libservice
2929
mbed-headers-netsocket
3030
mbed-stubs

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,18 @@ target_sources(${TEST_NAME}
1414
PRIVATE
1515
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
1616
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/PPPInterface.cpp
17-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EMACInterface.cpp
18-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp
19-
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
2017
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
2118
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
2219
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
2320
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
2421
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
25-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
2622
test_PPPInterface.cpp
2723
)
2824

2925
target_link_libraries(${TEST_NAME}
3026
PRIVATE
31-
mbed-headers
27+
mbed-headers-drivers
28+
mbed-headers-rtos
3229
mbed-headers-nanostack-libservice
3330
mbed-headers-mbedtls
3431
mbed-headers-netsocket

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ target_sources(${TEST_NAME}
1212
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
1313
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
1414
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
15-
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
15+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
1616
test_SocketAddress.cpp
1717
)
1818

1919
target_link_libraries(${TEST_NAME}
2020
PRIVATE
21-
mbed-headers
2221
mbed-headers-nanostack-libservice
2322
mbed-headers-netsocket
2423
mbed-stubs

0 commit comments

Comments
 (0)