Skip to content

Move connectivity netsocket stubs #14873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 7, 2021
Merged

Move connectivity netsocket stubs #14873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5433365
CMake: Move netsocket stubs to the netsocket dir
rajkan01 Jul 5, 2021
cb343f9
CMake: Update netsocket, cellular unittest to use mbed-stubs-netsocket
rajkan01 Jul 5, 2021
68b46f6
CMake: Add mbed-headers-netsocket headers library
rajkan01 Jul 5, 2021
ef0e3f9
CMake: Move netsocket stub headers to the netsocket doubles dir
rajkan01 Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion UNITTESTS/stubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ target_include_directories(mbed-headers-connectivity
INTERFACE
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-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/mbedtls
${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include
Expand Down
8 changes: 0 additions & 8 deletions UNITTESTS/stubs/connectivity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,9 @@ target_compile_definitions(mbed-stubs-connectivity
target_sources(mbed-stubs-connectivity
PRIVATE
aes_stub.c
CellularInterface_stub.cpp
cipher_stub.c
cmac_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
${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
)
Expand Down
2 changes: 2 additions & 0 deletions connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ target_link_libraries(mbed-stubs-cellular
mbed-headers-drivers
mbed-headers-hal
mbed-headers-events
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs-netsocket
mbed-stubs-headers
gtest
)
2 changes: 2 additions & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-headers-filesystem
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
mbed-stubs-rtos-headers
Expand Down
2 changes: 2 additions & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
mbed-stubs-rtos
Expand Down
2 changes: 2 additions & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
gmock_main
Expand Down
2 changes: 2 additions & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
gmock_main
Expand Down
2 changes: 2 additions & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-netsocket
mbed-stubs-cellular
mbed-stubs-headers
gmock_main
Expand Down
1 change: 1 addition & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
Expand Down
1 change: 1 addition & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs-platform
gmock_main
Expand Down
1 change: 1 addition & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
Expand Down
2 changes: 2 additions & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-netsocket
mbed-stubs-headers
gmock_main
)
Expand Down
1 change: 1 addition & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ target_sources(${TEST_NAME}

target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers-netsocket
mbed-headers
mbed-headers-cellular
mbed-stubs
Expand Down
1 change: 1 addition & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

add_subdirectory(doubles)
add_subdirectory(netsocket)
38 changes: 38 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ...s/connectivity/CellularInterface_stub.cpp → ...TTESTS/doubles/CellularInterface_stub.cpp
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/ControlPlane_netif_stub.h → ...ITTESTS/doubles/ControlPlane_netif_stub.h
View file
Open in desktop
File renamed without changes.
0 UNITTESTS/stubs/EMAC_mock.h → ...ocket/tests/UNITTESTS/doubles/EMAC_mock.h
View file
Open in desktop
File renamed without changes.
0 ...stubs/connectivity/MeshInterface_stub.cpp → .../UNITTESTS/doubles/MeshInterface_stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...ctivity/NetworkInterfaceDefaults_stub.cpp → ...doubles/NetworkInterfaceDefaults_stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...bs/connectivity/NetworkInterface_stub.cpp → ...ITTESTS/doubles/NetworkInterface_stub.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../stubs/connectivity/NetworkStack_stub.cpp → ...s/UNITTESTS/doubles/NetworkStack_stub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ nsapi_error_t NetworkStack::call_in(int delay, mbed::Callback<void()> func)
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;
}
Expand All @@ -104,7 +104,7 @@ nsapi_error_t NetworkStack::get_ipv6_link_local_address(SocketAddress *address)
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;
}
2 changes: 1 addition & 1 deletion UNITTESTS/stubs/NetworkStack_stub.h → ...sts/UNITTESTS/doubles/NetworkStack_stub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class NetworkStackstub : public NetworkStack {
{
}

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");
return NSAPI_ERROR_OK;
Expand Down
0 UNITTESTS/stubs/OnboardNetworkStack_mock.h → ...TTESTS/doubles/OnboardNetworkStack_mock.h
View file
Open in desktop
File renamed without changes.
0 ...stubs/connectivity/SocketAddress_stub.cpp → .../UNITTESTS/doubles/SocketAddress_stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...S/stubs/connectivity/SocketStats_Stub.cpp → ...ts/UNITTESTS/doubles/SocketStats_Stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...STS/stubs/connectivity/nsapi_dns_stub.cpp → ...ests/UNITTESTS/doubles/nsapi_dns_stub.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-netsocket
mbed-stubs-headers
gmock_main
)
Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ target_sources(${TEST_NAME}

target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers-netsocket
mbed-headers
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
gmock_main
Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
2 changes: 2 additions & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not included in mbed-headers?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will fix this part of #14879 issue

mbed-stubs
mbed-stubs-headers
mbed-stubs-netsocket
gmock_main
)

Expand Down
1 change: 1 addition & 0 deletions connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
mbed-stubs
mbed-stubs-headers
gmock_main
Expand Down