Skip to content

Move connectivity cellular stubs #14834

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 3 commits into from
Jun 30, 2021
Merged

Move connectivity cellular stubs #14834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa0ab53
CMake: Move connectivity/cellular stubs to the mbed-os/connectivity/c…
rajkan01 Jun 25, 2021
ee67310
CMake: unit-tests: Add mbed-headers-cellular headers library
rajkan01 Jun 25, 2021
d8add9e
CMake: unit-tests: Make cellular stub only depend on headers it uses
rajkan01 Jun 25, 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
5 changes: 0 additions & 5 deletions UNITTESTS/stubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ target_include_directories(mbed-headers-connectivity
${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/cellular/include/cellular/framework/API
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/AT
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/device
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/common
${mbed-os_SOURCE_DIR}/connectivity
${mbed-os_SOURCE_DIR}/connectivity/lorawan/include/lorawan
${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack
Expand Down
14 changes: 0 additions & 14 deletions UNITTESTS/stubs/connectivity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ target_compile_definitions(mbed-stubs-connectivity
PRIVATE
DEVICE_SERIAL=1
DEVICE_INTERRUPTIN=1
MBED_CONF_CELLULAR_USE_SMS=1
MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN=NULL
MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION=true
MBED_CONF_LORA_AUTOMATIC_UPLINK_MESSAGE=true
Expand All @@ -21,19 +19,7 @@ target_compile_definitions(mbed-stubs-connectivity
target_sources(mbed-stubs-connectivity
PRIVATE
aes_stub.c
AT_CellularContext_stub.cpp
AT_CellularDevice_stub.cpp
AT_CellularInformation_stub.cpp
AT_CellularNetwork_stub.cpp
AT_CellularSMS_stub.cpp
AT_CellularStack_stub.cpp
AT_ControlPlane_netif_stub.cpp
ATHandler_stub.cpp
CellularContext_stub.cpp
CellularDevice_stub.cpp
CellularInterface_stub.cpp
CellularStateMachine_stub.cpp
CellularUtil_stub.cpp
cipher_stub.c
cmac_stub.c
ip4tos_stub.c
Expand Down
1 change: 1 addition & 0 deletions connectivity/cellular/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(framework)
0 ...STS/stubs/connectivity/ATHandler_stub.cpp → ...ests/UNITTESTS/doubles/ATHandler_stub.cpp
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion .../connectivity/AT_CellularContext_stub.cpp → ...TESTS/doubles/AT_CellularContext_stub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ bool AT_CellularContext::get_context()
return true;
}

const char* AT_CellularContext::get_nonip_context_type_str() {
const char *AT_CellularContext::get_nonip_context_type_str()
{
return "Non-IP";
}

Expand Down
0 ...s/connectivity/AT_CellularDevice_stub.cpp → ...TTESTS/doubles/AT_CellularDevice_stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...nectivity/AT_CellularInformation_stub.cpp → ...S/doubles/AT_CellularInformation_stub.cpp
View file
Open in desktop
File renamed without changes.
0 .../connectivity/AT_CellularNetwork_stub.cpp → ...TESTS/doubles/AT_CellularNetwork_stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...tubs/connectivity/AT_CellularSMS_stub.cpp → ...UNITTESTS/doubles/AT_CellularSMS_stub.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...bs/connectivity/AT_CellularStack_stub.cpp → ...ITTESTS/doubles/AT_CellularStack_stub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ AT_CellularStack::~AT_CellularStack()
{
}

nsapi_error_t AT_CellularStack::get_ip_address(SocketAddress* address)
nsapi_error_t AT_CellularStack::get_ip_address(SocketAddress *address)
{
return NSAPI_ERROR_UNSUPPORTED;
}
Expand Down
0 ...nnectivity/AT_ControlPlane_netif_stub.cpp → ...TS/doubles/AT_ControlPlane_netif_stub.cpp
View file
Open in desktop
File renamed without changes.
57 changes: 57 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
@@ -0,0 +1,57 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

add_library(mbed-headers-cellular INTERFACE)

target_include_directories(mbed-headers-cellular
INTERFACE
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/API
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/AT
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/device
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/common
)

add_library(mbed-stubs-cellular)

target_compile_definitions(mbed-stubs-cellular
PRIVATE
DEVICE_SERIAL=1
DEVICE_INTERRUPTIN=1
MBED_CONF_CELLULAR_USE_SMS=1
MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN=NULL
MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
MDMTXD=NC
MDMRXD=NC
)

target_sources(mbed-stubs-cellular
PRIVATE
AT_CellularContext_stub.cpp
AT_CellularDevice_stub.cpp
AT_CellularInformation_stub.cpp
AT_CellularNetwork_stub.cpp
AT_CellularSMS_stub.cpp
AT_CellularStack_stub.cpp
AT_ControlPlane_netif_stub.cpp
ATHandler_stub.cpp
CellularContext_stub.cpp
CellularDevice_stub.cpp
CellularStateMachine_stub.cpp
CellularUtil_stub.cpp
)

target_link_libraries(mbed-stubs-cellular
PRIVATE
mbed-headers-base
mbed-headers-connectivity
mbed-headers-platform
mbed-headers-rtos
mbed-headers-drivers
mbed-headers-hal
mbed-headers-events
mbed-headers-cellular
mbed-stubs-headers
gtest
)
0 ...ubs/connectivity/CellularContext_stub.cpp → ...NITTESTS/doubles/CellularContext_stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...tubs/connectivity/CellularDevice_stub.cpp → ...UNITTESTS/doubles/CellularDevice_stub.cpp
View file
Open in desktop
File renamed without changes.
0 ...onnectivity/CellularStateMachine_stub.cpp → ...STS/doubles/CellularStateMachine_stub.cpp
View file
Open in desktop
File renamed without changes.
0 .../stubs/connectivity/CellularUtil_stub.cpp → ...s/UNITTESTS/doubles/CellularUtil_stub.cpp
View file
Open in desktop
File renamed without changes.
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,7 +24,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-headers
mbed-stubs-rtos-headers
gmock_main
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,7 +30,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-headers
mbed-stubs-rtos
gmock_main
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,7 +22,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
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,7 +23,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
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,7 +23,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-headers
gmock_main
)
Expand Down
2 changes: 2 additions & 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,7 +28,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-headers
mbed-stubs-rtos-headers
gmock_main
Expand Down
1 change: 1 addition & 0 deletions connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
gmock_main
)

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-cellular
mbed-stubs-platform
gmock_main
)
Expand Down
2 changes: 2 additions & 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,7 +24,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-headers
gmock_main
)
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,7 +36,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-headers
gmock_main
)
Expand Down
2 changes: 2 additions & 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 @@ -28,7 +28,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-headers
gmock_main
)
Expand Down
2 changes: 2 additions & 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,7 +29,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-headers
mbed-stubs-rtos-headers
gmock_main
Expand Down
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-headers
gmock_main
Expand Down
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-headers
gmock_main
Expand Down
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/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
mbed-headers-cellular
mbed-stubs
mbed-stubs-headers
gmock_main
Expand Down
1 change: 1 addition & 0 deletions connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-headers
gmock_main
Expand Down
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,7 +23,9 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-cellular
mbed-stubs
mbed-stubs-cellular
mbed-stubs-headers
gmock_main
)
Expand Down