ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14873 from ARMmbed/move_connectivity_netsocket_stubs 

Move connectivity netsocket stubs
pull/14870/head
Martin Kojtal 2021-07-07 17:45:47 +02:00 committed by GitHub
parent 8287c5221b ef0e3f99e4
commit feb48fca2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 89 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UNITTESTS/stubs/CMakeLists.txt
View File

@ -33,7 +33,6 @@ target_include_directories(mbed-headers-connectivity
INTERFACE INTERFACE
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice
${mbed-os_SOURCE_DIR}/connectivity/netsocket/include
${mbed-os_SOURCE_DIR}/connectivity ${mbed-os_SOURCE_DIR}/connectivity
${mbed-os_SOURCE_DIR}/connectivity/mbedtls ${mbed-os_SOURCE_DIR}/connectivity/mbedtls
${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include ${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include

8
UNITTESTS/stubs/connectivity/CMakeLists.txt
View File

@ -19,17 +19,9 @@ target_compile_definitions(mbed-stubs-connectivity
target_sources(mbed-stubs-connectivity target_sources(mbed-stubs-connectivity
PRIVATE PRIVATE
aes_stub.c aes_stub.c
CellularInterface_stub.cpp
cipher_stub.c cipher_stub.c
cmac_stub.c cmac_stub.c
ip4tos_stub.c ip4tos_stub.c
MeshInterface_stub.cpp
NetworkInterfaceDefaults_stub.cpp
NetworkInterface_stub.cpp
NetworkStack_stub.cpp
nsapi_dns_stub.cpp
SocketAddress_stub.cpp
SocketStats_Stub.cpp
stoip4_stub.c stoip4_stub.c
${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
) )

2
connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
View File

@ -56,7 +56,9 @@ target_link_libraries(mbed-stubs-cellular
mbed-headers-drivers mbed-headers-drivers
mbed-headers-hal mbed-headers-hal
mbed-headers-events mbed-headers-events
mbed-headers-netsocket
mbed-headers-cellular mbed-headers-cellular
mbed-stubs-netsocket
mbed-stubs-headers mbed-stubs-headers
gtest gtest
) )

2
connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
View File

@ -24,9 +24,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-headers-cellular mbed-headers-cellular
mbed-headers-filesystem mbed-headers-filesystem
mbed-stubs mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-rtos-headers mbed-stubs-rtos-headers

2
connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
View File

@ -30,8 +30,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-headers-cellular mbed-headers-cellular
mbed-stubs mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-rtos mbed-stubs-rtos

2
connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
View File

@ -22,8 +22,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-headers-cellular mbed-headers-cellular
mbed-stubs mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-headers mbed-stubs-headers
gmock_main gmock_main

2
connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
View File

@ -23,8 +23,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-headers-cellular mbed-headers-cellular
mbed-stubs mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-headers mbed-stubs-headers
gmock_main gmock_main

2
connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
View File

@ -23,8 +23,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-headers-cellular mbed-headers-cellular
mbed-stubs mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-headers mbed-stubs-headers
gmock_main gmock_main

1
connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
View File

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

1
connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
View File

@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-headers-cellular mbed-headers-cellular
mbed-stubs-platform mbed-stubs-platform
gmock_main gmock_main

1
connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
View File

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

2
connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
View File

@ -36,9 +36,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-headers-cellular mbed-headers-cellular
mbed-stubs mbed-stubs
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-netsocket
mbed-stubs-headers mbed-stubs-headers
gmock_main gmock_main
) )

1
connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
View File

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

1
connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
View File

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

1
connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt
View File

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

38
connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt Normal file
View File

@ -0,0 +1,38 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_library(mbed-headers-netsocket INTERFACE)
target_include_directories(mbed-headers-netsocket
INTERFACE
${mbed-os_SOURCE_DIR}/connectivity/netsocket/include
)
add_library(mbed-stubs-netsocket)
target_include_directories(mbed-stubs-netsocket
PUBLIC
.
)
target_sources(mbed-stubs-netsocket
PRIVATE
CellularInterface_stub.cpp
MeshInterface_stub.cpp
NetworkInterfaceDefaults_stub.cpp
NetworkInterface_stub.cpp
NetworkStack_stub.cpp
nsapi_dns_stub.cpp
SocketAddress_stub.cpp
SocketStats_Stub.cpp
)
target_link_libraries(mbed-stubs-netsocket
PRIVATE
mbed-headers-netsocket
mbed-stubs-rtos-headers
mbed-headers
mbed-stubs-headers
mbed-stubs-rtos
gtest
)

0
UNITTESTS/stubs/connectivity/CellularInterface_stub.cpp → connectivity/netsocket/tests/UNITTESTS/doubles/CellularInterface_stub.cpp
View File

0
UNITTESTS/stubs/ControlPlane_netif_stub.h → connectivity/netsocket/tests/UNITTESTS/doubles/ControlPlane_netif_stub.h
View File

0
UNITTESTS/stubs/EMAC_mock.h → connectivity/netsocket/tests/UNITTESTS/doubles/EMAC_mock.h
View File

0
UNITTESTS/stubs/connectivity/MeshInterface_stub.cpp → connectivity/netsocket/tests/UNITTESTS/doubles/MeshInterface_stub.cpp
View File

0
UNITTESTS/stubs/connectivity/NetworkInterfaceDefaults_stub.cpp → connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterfaceDefaults_stub.cpp
View File

0
UNITTESTS/stubs/connectivity/NetworkInterface_stub.cpp → connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterface_stub.cpp
View File

4
UNITTESTS/stubs/connectivity/NetworkStack_stub.cpp → connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.cpp
View File

@ -94,7 +94,7 @@ nsapi_error_t NetworkStack::call_in(int delay, mbed::Callback<void()> func)
return NSAPI_ERROR_UNSUPPORTED; return NSAPI_ERROR_UNSUPPORTED;
} }
nsapi_error_t NetworkStack::get_ip_address(SocketAddress* address) nsapi_error_t NetworkStack::get_ip_address(SocketAddress *address)
{ {
return NSAPI_ERROR_UNSUPPORTED; return NSAPI_ERROR_UNSUPPORTED;
} }
@ -104,7 +104,7 @@ nsapi_error_t NetworkStack::get_ipv6_link_local_address(SocketAddress *address)
return NSAPI_ERROR_UNSUPPORTED; return NSAPI_ERROR_UNSUPPORTED;
} }
nsapi_error_t NetworkStack::get_ip_address_if(SocketAddress* address, const char *interface_name) nsapi_error_t NetworkStack::get_ip_address_if(SocketAddress *address, const char *interface_name)
{ {
return NSAPI_ERROR_UNSUPPORTED; return NSAPI_ERROR_UNSUPPORTED;
} }

2
UNITTESTS/stubs/NetworkStack_stub.h → connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.h
View File

@ -40,7 +40,7 @@ public:
{ {
} }
virtual nsapi_error_t get_ip_address(SocketAddress* address) virtual nsapi_error_t get_ip_address(SocketAddress *address)
{ {
address->set_ip_address("127.0.0.1"); address->set_ip_address("127.0.0.1");
return NSAPI_ERROR_OK; return NSAPI_ERROR_OK;

0
UNITTESTS/stubs/OnboardNetworkStack_mock.h → connectivity/netsocket/tests/UNITTESTS/doubles/OnboardNetworkStack_mock.h
View File

0
UNITTESTS/stubs/connectivity/SocketAddress_stub.cpp → connectivity/netsocket/tests/UNITTESTS/doubles/SocketAddress_stub.cpp
View File

0
UNITTESTS/stubs/connectivity/SocketStats_Stub.cpp → connectivity/netsocket/tests/UNITTESTS/doubles/SocketStats_Stub.cpp
View File

0
UNITTESTS/stubs/connectivity/nsapi_dns_stub.cpp → connectivity/netsocket/tests/UNITTESTS/doubles/nsapi_dns_stub.cpp
View File

2
connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
View File

@ -23,9 +23,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-headers-cellular mbed-headers-cellular
mbed-stubs mbed-stubs
mbed-stubs-cellular mbed-stubs-cellular
mbed-stubs-netsocket
mbed-stubs-headers mbed-stubs-headers
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
View File

@ -31,8 +31,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
View File

@ -30,8 +30,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
View File

@ -28,9 +28,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers-netsocket
mbed-headers mbed-headers
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
View File

@ -43,8 +43,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
View File

@ -26,8 +26,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
View File

@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
View File

@ -25,8 +25,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
View File

@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

1
connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt
View File

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

2
connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
View File

@ -27,8 +27,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
View File

@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
View File

@ -28,8 +28,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

2
connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
View File

@ -28,8 +28,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME} target_link_libraries(${TEST_NAME}
PRIVATE PRIVATE
mbed-headers mbed-headers
mbed-headers-netsocket
mbed-stubs mbed-stubs
mbed-stubs-headers mbed-stubs-headers
mbed-stubs-netsocket
gmock_main gmock_main
) )

1
connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt
View File

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