Skip to content

Commit c5a4fec

Browse files
rajkan01rajkan01
committed
CMake: Refactor netsocket unittest CMake
- Add Cmake configuration file - Fix the header inclusion in DTLSSocketWrapper and TLSSocketWrapper test
1 parent b664735 commit c5a4fec

File tree

19 files changed

+605
-2
lines changed

19 files changed

+605
-2
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_subdirectory(netsocket)

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_subdirectory(CellularNonIPSocket)
5+
add_subdirectory(DTLSSocket)
6+
add_subdirectory(DTLSSocketWrapper)
7+
add_subdirectory(EthernetInterface)
8+
add_subdirectory(IfaceDnsSocket)
9+
add_subdirectory(InternetSocket)
10+
add_subdirectory(NetworkInterface)
11+
add_subdirectory(NetworkStack)
12+
add_subdirectory(PPPInterface)
13+
add_subdirectory(SocketAddress)
14+
add_subdirectory(TCPSocket)
15+
add_subdirectory(TLSSocket)
16+
add_subdirectory(TLSSocketWrapper)
17+
add_subdirectory(UDPSocket)
18+
add_subdirectory(WiFiAccessPoint)

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
set(TEST_NAME netsocket-cellular-nonip-socket-unittest)
5+
6+
add_executable(${TEST_NAME})
7+
8+
target_compile_definitions(${TEST_NAME}
9+
PRIVATE
10+
MBED_CONF_CELLULAR_PRESENT=1
11+
DEVICE_SERIAL=1
12+
DEVICE_INTERRUPTIN=1
13+
MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
14+
15+
)
16+
17+
target_sources(${TEST_NAME}
18+
PRIVATE
19+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/CellularNonIPSocket.cpp
20+
test_CellularNonIPSocket.cpp
21+
)
22+
23+
target_link_libraries(${TEST_NAME}
24+
PRIVATE
25+
mbed-headers
26+
mbed-stubs
27+
mbed-stubs-headers
28+
gmock_main
29+
)
30+
31+
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
32+
33+
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
set(TEST_NAME netsocket-dtls-socket-unittest)
5+
6+
add_executable(${TEST_NAME})
7+
8+
target_compile_definitions(${TEST_NAME}
9+
PRIVATE
10+
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
11+
)
12+
13+
target_sources(${TEST_NAME}
14+
PRIVATE
15+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
16+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
17+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
18+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetDatagramSocket.cpp
19+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp
20+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocket.cpp
21+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.cpp
22+
${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
28+
test_DTLSSocket.cpp
29+
)
30+
31+
target_link_libraries(${TEST_NAME}
32+
PRIVATE
33+
mbed-headers
34+
mbed-stubs
35+
mbed-stubs-headers
36+
gmock_main
37+
)
38+
39+
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"${mbed-os_SOURCE_DIR}/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/dtls_test_config.h\"")
40+
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})
41+
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})
42+
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})
43+
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})
44+
45+
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
46+
47+
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
set(TEST_NAME netsocket-dtls-socket-wrapper-unittest)
5+
6+
add_executable(${TEST_NAME})
7+
8+
target_compile_definitions(${TEST_NAME}
9+
PRIVATE
10+
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
11+
)
12+
13+
target_sources(${TEST_NAME}
14+
PRIVATE
15+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
16+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
17+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
18+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetDatagramSocket.cpp
19+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp
20+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/DTLSSocketWrapper.cpp
21+
${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
27+
test_DTLSSocketWrapper.cpp
28+
)
29+
30+
target_link_libraries(${TEST_NAME}
31+
PRIVATE
32+
mbed-headers
33+
mbed-stubs
34+
mbed-stubs-headers
35+
gmock_main
36+
)
37+
38+
39+
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"${mbed-os_SOURCE_DIR}/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/dtls_test_config.h\"")
40+
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})
41+
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})
42+
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})
43+
44+
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
45+
46+
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "netsocket/UDPSocket.h"
2020
#include "netsocket/DTLSSocketWrapper.h"
2121
#include "NetworkStack_stub.h"
22-
#include "connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h"
22+
#include "mbedtls_stub.h"
2323
#include <cstring> //memset
2424

2525
#include "mbed_error.h"

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
set(TEST_NAME netsocket-ethernet-interface-unittest)
5+
6+
add_executable(${TEST_NAME})
7+
8+
target_compile_definitions(${TEST_NAME}
9+
PRIVATE
10+
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
11+
)
12+
13+
target_sources(${TEST_NAME}
14+
PRIVATE
15+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
16+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EthernetInterface.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
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
25+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
26+
test_EthernetInterface.cpp
27+
)
28+
29+
target_link_libraries(${TEST_NAME}
30+
PRIVATE
31+
mbed-headers
32+
mbed-stubs
33+
mbed-stubs-headers
34+
gmock_main
35+
)
36+
37+
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
38+
39+
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
set(TEST_NAME netsocket-iface-dns-socket-unittest)
5+
6+
add_executable(${TEST_NAME})
7+
8+
target_compile_definitions(${TEST_NAME}
9+
PRIVATE
10+
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
11+
DEVICE_EMAC
12+
MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=ETHERNET
13+
MBED_CONF_NSAPI_DNS_RESPONSE_WAIT_TIME=10000
14+
MBED_CONF_NSAPI_DNS_RETRIES=1
15+
MBED_CONF_NSAPI_DNS_TOTAL_ATTEMPTS=10
16+
MBED_CONF_NSAPI_DNS_CACHE_SIZE=5
17+
)
18+
19+
target_sources(${TEST_NAME}
20+
PRIVATE
21+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
22+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterface.cpp
23+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkInterfaceDefaults.cpp
24+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp #nsapi_create_stack
25+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
26+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/TCPSocket.cpp
27+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetDatagramSocket.cpp
28+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/UDPSocket.cpp
29+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketStats.cpp
30+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EthernetInterface.cpp
31+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/EMACInterface.cpp
32+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/nsapi_dns.cpp
33+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
34+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
35+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
36+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
37+
${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
39+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
40+
moduletest.cpp
41+
)
42+
43+
target_link_libraries(${TEST_NAME}
44+
PRIVATE
45+
mbed-headers
46+
mbed-stubs
47+
mbed-stubs-headers
48+
gmock_main
49+
)
50+
51+
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
52+
53+
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
set(TEST_NAME netsocket-internet-socket-unittest)
5+
6+
add_executable(${TEST_NAME})
7+
8+
target_compile_definitions(${TEST_NAME}
9+
PRIVATE
10+
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
11+
)
12+
13+
target_sources(${TEST_NAME}
14+
PRIVATE
15+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
16+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
17+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/InternetSocket.cpp
18+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
19+
${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
21+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
22+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
23+
test_InternetSocket.cpp
24+
)
25+
26+
target_link_libraries(${TEST_NAME}
27+
PRIVATE
28+
mbed-headers
29+
mbed-stubs
30+
mbed-stubs-headers
31+
gmock_main
32+
)
33+
34+
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
35+
36+
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
set(TEST_NAME netsocket-network-interface-unittest)
5+
6+
add_executable(${TEST_NAME})
7+
8+
target_compile_definitions(${TEST_NAME}
9+
PRIVATE
10+
MBED_CONF_PLATFORM_CALLBACK_COMPARABLE
11+
MBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
12+
13+
)
14+
15+
target_sources(${TEST_NAME}
16+
PRIVATE
17+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
18+
${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/NetworkStack.cpp
19+
${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
25+
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
26+
test_NetworkInterface.cpp
27+
)
28+
29+
target_link_libraries(${TEST_NAME}
30+
PRIVATE
31+
mbed-headers
32+
mbed-stubs
33+
mbed-stubs-headers
34+
gmock_main
35+
)
36+
37+
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
38+
39+
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "netsocket")

0 commit comments

Comments
 (0)