Merge pull request #14834 from ARMmbed/move_connectivity_cellular_stubs

0xc0170 · web-flow · commit 022b5a2b8593 · 2021-06-30T17:18:28.000+02:00
Move connectivity cellular stubs
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -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
diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt
@@ -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
@@ -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
diff --git a/connectivity/cellular/tests/UNITTESTS/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(doubles)
 add_subdirectory(framework)
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/ATHandler_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/ATHandler_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularContext_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularContext_stub.cpp
@@ -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";
 }
 
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularDevice_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularDevice_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularInformation_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularInformation_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularNetwork_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularNetwork_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularSMS_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularSMS_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularStack_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularStack_stub.cpp
@@ -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;
 }
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/AT_ControlPlane_netif_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/AT_ControlPlane_netif_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -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
+)
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CellularContext_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/CellularContext_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CellularDevice_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/CellularDevice_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CellularStateMachine_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/CellularStateMachine_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CellularUtil_stub.cpp b/connectivity/cellular/tests/UNITTESTS/doubles/CellularUtil_stub.cpp
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@@ -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
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
@@ -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
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
@@ -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
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
@@ -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
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
@@ -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
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@@ -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
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt
@@ -13,6 +13,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-cellular
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-cellular
         mbed-stubs-platform
         gmock_main
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@@ -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
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@@ -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
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@@ -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
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@@ -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
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt
@@ -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
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt
@@ -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
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt
@@ -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
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
@@ -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
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
@@ -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
 )

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,8 @@ bool AT_CellularContext::get_context()`
`171`	`171`	`return true;`
`172`	`172`	`}`
`173`	`173`
`174`		`-const char* AT_CellularContext::get_nonip_context_type_str() {`
	`174`	`+const char *AT_CellularContext::get_nonip_context_type_str()`
	`175`	`+{`
`175`	`176`	`return "Non-IP";`
`176`	`177`	`}`
`177`	`178`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ AT_CellularStack::~AT_CellularStack()`
`31`	`31`	`{`
`32`	`32`	`}`
`33`	`33`
`34`		`-nsapi_error_t AT_CellularStack::get_ip_address(SocketAddress* address)`
	`34`	`+nsapi_error_t AT_CellularStack::get_ip_address(SocketAddress *address)`
`35`	`35`	`{`
`36`	`36`	`return NSAPI_ERROR_UNSUPPORTED;`
`37`	`37`	`}`