Skip to content

Commit 022b5a2

Browse files
0xc01700xc0170
authored
Merge pull request ARMmbed#14834 from ARMmbed/move_connectivity_cellular_stubs
Move connectivity cellular stubs
2 parents 66a770e + d8add9e commit 022b5a2

File tree

33 files changed

+89
-21
lines changed

33 files changed

+89
-21
lines changed

‎UNITTESTS/stubs/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ target_include_directories(mbed-headers-connectivity
6767
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice
6868
${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice
6969
${mbed-os_SOURCE_DIR}/connectivity/netsocket/include
70-
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/API
71-
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/AT
72-
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/device
73-
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework
74-
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/common
7570
${mbed-os_SOURCE_DIR}/connectivity
7671
${mbed-os_SOURCE_DIR}/connectivity/lorawan/include/lorawan
7772
${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack

‎UNITTESTS/stubs/connectivity/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ target_compile_definitions(mbed-stubs-connectivity
77
PRIVATE
88
DEVICE_SERIAL=1
99
DEVICE_INTERRUPTIN=1
10-
MBED_CONF_CELLULAR_USE_SMS=1
11-
MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN=NULL
1210
MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
1311
MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION=true
1412
MBED_CONF_LORA_AUTOMATIC_UPLINK_MESSAGE=true
@@ -21,19 +19,7 @@ target_compile_definitions(mbed-stubs-connectivity
2119
target_sources(mbed-stubs-connectivity
2220
PRIVATE
2321
aes_stub.c
24-
AT_CellularContext_stub.cpp
25-
AT_CellularDevice_stub.cpp
26-
AT_CellularInformation_stub.cpp
27-
AT_CellularNetwork_stub.cpp
28-
AT_CellularSMS_stub.cpp
29-
AT_CellularStack_stub.cpp
30-
AT_ControlPlane_netif_stub.cpp
31-
ATHandler_stub.cpp
32-
CellularContext_stub.cpp
33-
CellularDevice_stub.cpp
3422
CellularInterface_stub.cpp
35-
CellularStateMachine_stub.cpp
36-
CellularUtil_stub.cpp
3723
cipher_stub.c
3824
cmac_stub.c
3925
ip4tos_stub.c

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
add_subdirectory(doubles)
45
add_subdirectory(framework)

‎UNITTESTS/stubs/connectivity/ATHandler_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/ATHandler_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/connectivity/AT_CellularContext_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularContext_stub.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ bool AT_CellularContext::get_context()
171171
return true;
172172
}
173173

174-
const char* AT_CellularContext::get_nonip_context_type_str() {
174+
const char *AT_CellularContext::get_nonip_context_type_str()
175+
{
175176
return "Non-IP";
176177
}
177178

‎UNITTESTS/stubs/connectivity/AT_CellularDevice_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularDevice_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/connectivity/AT_CellularInformation_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularInformation_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/connectivity/AT_CellularNetwork_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularNetwork_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/connectivity/AT_CellularSMS_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularSMS_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/connectivity/AT_CellularStack_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularStack_stub.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ AT_CellularStack::~AT_CellularStack()
3131
{
3232
}
3333

34-
nsapi_error_t AT_CellularStack::get_ip_address(SocketAddress* address)
34+
nsapi_error_t AT_CellularStack::get_ip_address(SocketAddress *address)
3535
{
3636
return NSAPI_ERROR_UNSUPPORTED;
3737
}

‎UNITTESTS/stubs/connectivity/AT_ControlPlane_netif_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/AT_ControlPlane_netif_stub.cpp

File renamed without changes.

‎connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_library(mbed-headers-cellular INTERFACE)
5+
6+
target_include_directories(mbed-headers-cellular
7+
INTERFACE
8+
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/API
9+
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/AT
10+
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/device
11+
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework
12+
${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/common
13+
)
14+
15+
add_library(mbed-stubs-cellular)
16+
17+
target_compile_definitions(mbed-stubs-cellular
18+
PRIVATE
19+
DEVICE_SERIAL=1
20+
DEVICE_INTERRUPTIN=1
21+
MBED_CONF_CELLULAR_USE_SMS=1
22+
MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN=NULL
23+
MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
24+
MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
25+
MDMTXD=NC
26+
MDMRXD=NC
27+
)
28+
29+
target_sources(mbed-stubs-cellular
30+
PRIVATE
31+
AT_CellularContext_stub.cpp
32+
AT_CellularDevice_stub.cpp
33+
AT_CellularInformation_stub.cpp
34+
AT_CellularNetwork_stub.cpp
35+
AT_CellularSMS_stub.cpp
36+
AT_CellularStack_stub.cpp
37+
AT_ControlPlane_netif_stub.cpp
38+
ATHandler_stub.cpp
39+
CellularContext_stub.cpp
40+
CellularDevice_stub.cpp
41+
CellularStateMachine_stub.cpp
42+
CellularUtil_stub.cpp
43+
)
44+
45+
target_link_libraries(mbed-stubs-cellular
46+
PRIVATE
47+
mbed-headers-base
48+
mbed-headers-connectivity
49+
mbed-headers-platform
50+
mbed-headers-rtos
51+
mbed-headers-drivers
52+
mbed-headers-hal
53+
mbed-headers-events
54+
mbed-headers-cellular
55+
mbed-stubs-headers
56+
gtest
57+
)

‎UNITTESTS/stubs/connectivity/CellularContext_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/CellularContext_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/connectivity/CellularDevice_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/CellularDevice_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/connectivity/CellularStateMachine_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/CellularStateMachine_stub.cpp

File renamed without changes.

‎UNITTESTS/stubs/connectivity/CellularUtil_stub.cpp renamed to ‎connectivity/cellular/tests/UNITTESTS/doubles/CellularUtil_stub.cpp

File renamed without changes.

‎connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ target_sources(${TEST_NAME}
2424
target_link_libraries(${TEST_NAME}
2525
PRIVATE
2626
mbed-headers
27+
mbed-headers-cellular
2728
mbed-stubs
29+
mbed-stubs-cellular
2830
mbed-stubs-headers
2931
mbed-stubs-rtos-headers
3032
gmock_main

‎connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ target_sources(${TEST_NAME}
3030
target_link_libraries(${TEST_NAME}
3131
PRIVATE
3232
mbed-headers
33+
mbed-headers-cellular
3334
mbed-stubs
35+
mbed-stubs-cellular
3436
mbed-stubs-headers
3537
mbed-stubs-rtos
3638
gmock_main

‎connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ target_sources(${TEST_NAME}
2222
target_link_libraries(${TEST_NAME}
2323
PRIVATE
2424
mbed-headers
25+
mbed-headers-cellular
2526
mbed-stubs
27+
mbed-stubs-cellular
2628
mbed-stubs-headers
2729
gmock_main
2830
)

‎connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ target_sources(${TEST_NAME}
2323
target_link_libraries(${TEST_NAME}
2424
PRIVATE
2525
mbed-headers
26+
mbed-headers-cellular
2627
mbed-stubs
28+
mbed-stubs-cellular
2729
mbed-stubs-headers
2830
gmock_main
2931
)

‎connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ target_sources(${TEST_NAME}
2323
target_link_libraries(${TEST_NAME}
2424
PRIVATE
2525
mbed-headers
26+
mbed-headers-cellular
2627
mbed-stubs
28+
mbed-stubs-cellular
2729
mbed-stubs-headers
2830
gmock_main
2931
)

‎connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ target_sources(${TEST_NAME}
2828
target_link_libraries(${TEST_NAME}
2929
PRIVATE
3030
mbed-headers
31+
mbed-headers-cellular
3132
mbed-stubs
33+
mbed-stubs-cellular
3234
mbed-stubs-headers
3335
mbed-stubs-rtos-headers
3436
gmock_main

‎connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ target_sources(${TEST_NAME}
1313
target_link_libraries(${TEST_NAME}
1414
PRIVATE
1515
mbed-headers
16+
mbed-headers-cellular
1617
gmock_main
1718
)
1819

‎connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
1414
target_link_libraries(${TEST_NAME}
1515
PRIVATE
1616
mbed-headers
17+
mbed-headers-cellular
1718
mbed-stubs-platform
1819
gmock_main
1920
)

‎connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ target_sources(${TEST_NAME}
2424
target_link_libraries(${TEST_NAME}
2525
PRIVATE
2626
mbed-headers
27+
mbed-headers-cellular
2728
mbed-stubs
29+
mbed-stubs-cellular
2830
mbed-stubs-headers
2931
gmock_main
3032
)

‎connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ target_sources(${TEST_NAME}
3636
target_link_libraries(${TEST_NAME}
3737
PRIVATE
3838
mbed-headers
39+
mbed-headers-cellular
3940
mbed-stubs
41+
mbed-stubs-cellular
4042
mbed-stubs-headers
4143
gmock_main
4244
)

‎connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ target_sources(${TEST_NAME}
2828
target_link_libraries(${TEST_NAME}
2929
PRIVATE
3030
mbed-headers
31+
mbed-headers-cellular
3132
mbed-stubs
33+
mbed-stubs-cellular
3234
mbed-stubs-headers
3335
gmock_main
3436
)

‎connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ target_sources(${TEST_NAME}
2929
target_link_libraries(${TEST_NAME}
3030
PRIVATE
3131
mbed-headers
32+
mbed-headers-cellular
3233
mbed-stubs
34+
mbed-stubs-cellular
3335
mbed-stubs-headers
3436
mbed-stubs-rtos-headers
3537
gmock_main

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ target_sources(${TEST_NAME}
2121
target_link_libraries(${TEST_NAME}
2222
PRIVATE
2323
mbed-headers
24+
mbed-headers-cellular
2425
mbed-stubs
2526
mbed-stubs-headers
2627
gmock_main

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ target_sources(${TEST_NAME}
2121
target_link_libraries(${TEST_NAME}
2222
PRIVATE
2323
mbed-headers
24+
mbed-headers-cellular
2425
mbed-stubs
2526
mbed-stubs-headers
2627
gmock_main

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ target_sources(${TEST_NAME}
2727
target_link_libraries(${TEST_NAME}
2828
PRIVATE
2929
mbed-headers
30+
mbed-headers-cellular
3031
mbed-stubs
3132
mbed-stubs-headers
3233
gmock_main

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ target_sources(${TEST_NAME}
2020
target_link_libraries(${TEST_NAME}
2121
PRIVATE
2222
mbed-headers
23+
mbed-headers-cellular
2324
mbed-stubs
2425
mbed-stubs-headers
2526
gmock_main

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ target_sources(${TEST_NAME}
2323
target_link_libraries(${TEST_NAME}
2424
PRIVATE
2525
mbed-headers
26+
mbed-headers-cellular
2627
mbed-stubs
28+
mbed-stubs-cellular
2729
mbed-stubs-headers
2830
gmock_main
2931
)

0 commit comments

Comments
 (0)