Merge pull request #13261 from LDong-Arm/move_cellular

Refactor cellular directory structure

.travis.yml

@@ -248,8 +248,8 @@ matrix:
         # Check that example compiles without rtos
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
         - |
-          rm -r rtos/source/TARGET_CORTEX drivers/source/usb features/cellular features/netsocket features/nanostack \
-            connectivity/libraries/ppp features/lwipstack features/frameworks/greentea-client \
+          rm -r rtos/source/TARGET_CORTEX drivers/source/usb connectivity/cellular connectivity/drivers/cellular \
+            connectivity/libraries/ppp features/netsocket features/nanostack features/lwipstack features/frameworks/greentea-client \
             features/frameworks/utest features/frameworks/unity components BUILD
         - python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
         # Run local equeue tests

UNITTESTS/CMakeLists.txt

@@ -134,11 +134,11 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features/filesystem/"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/littlefs"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/littlefs/littlefs"
-  "${PROJECT_SOURCE_DIR}/../features/cellular/framework/API"
-  "${PROJECT_SOURCE_DIR}/../features/cellular/framework/AT"
-  "${PROJECT_SOURCE_DIR}/../features/cellular/framework/device"
-  "${PROJECT_SOURCE_DIR}/../features/cellular/framework"
-  "${PROJECT_SOURCE_DIR}/../features/cellular/framework/common"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/API"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/AT"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/device"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework"
+  "${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/common"
   "${PROJECT_SOURCE_DIR}/../features/lorawan"
   "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack"
   "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/mac"

connectivity/cellular/README.md

@@ -51,4 +51,4 @@ Cellular connectivity can be tested with generic Mbed OS netsocket and network i
 
 ## Unit tests
 
-Cellular unit tests are in Mbed OS root `UNITTESTS/features/cellular`.
+Cellular unit tests are in Mbed OS root `UNITTESTS/connectivity/cellular`.

connectivity/cellular/tests/UNITTESTS/.mbedignore

@@ -0,0 +1 @@
+*

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/unittest.cmake

@@ -5,21 +5,21 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  features/cellular/framework/common/util
-  ../features/cellular/framework/common
-  ../features/cellular/framework/AT
-  ../features/cellular/framework/device
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
+  ../connectivity/cellular/include/cellular/framework/device
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../features/cellular/framework/AT/AT_CellularContext.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularContext.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularcontexttest.cpp
   stubs/ATHandler_stub.cpp
   stubs/AT_CellularDevice_stub.cpp
   stubs/AT_CellularStack_stub.cpp

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake

@@ -5,10 +5,10 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  ../features/cellular/framework/common/util
-  ../features/cellular/framework/common
-  ../features/cellular/framework/AT
-  ../features/cellular/framework/device
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
+  ../connectivity/cellular/include/cellular/framework/device
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../drivers
   ../hal
@@ -18,12 +18,12 @@ set(unittest-includes ${unittest-includes}
 # Source files
 set(unittest-sources
   stubs/randLIB_stub.c
-  ../features/cellular/framework/AT/AT_CellularDevice.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularDevice.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/AT/at_cellulardevice/at_cellulardevicetest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellulardevicetest.cpp
   stubs/AT_CellularNetwork_stub.cpp
   stubs/ATHandler_stub.cpp
   stubs/AT_CellularSMS_stub.cpp

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake

@@ -5,9 +5,9 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  features/cellular/framework/common/util
-  ../features/cellular/framework/common
-  ../features/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../features/netsocket/cellular
 )
@@ -15,12 +15,12 @@ set(unittest-includes ${unittest-includes}
 # Source files
 set(unittest-sources
   stubs/randLIB_stub.c
-  ../features/cellular/framework/AT/AT_CellularInformation.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularInformation.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/AT//at_cellularinformation/at_cellularinformationtest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularinformationtest.cpp
   stubs/ATHandler_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake

@@ -5,22 +5,22 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  features/cellular/framework/common/util
-  ../features/cellular/framework/common
-  ../features/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../features/cellular/framework/AT/AT_CellularNetwork.cpp
-  ../features/cellular/framework/common/CellularUtil.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularNetwork.cpp
+  ../connectivity/cellular/source/framework/common/CellularUtil.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularnetworktest.cpp
   stubs/ATHandler_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake

@@ -5,21 +5,21 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  features/cellular/framework/common/util
-  ../features/cellular/framework/common
-  ../features/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../features/cellular/framework/AT/AT_CellularSMS.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularSMS.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/AT/at_cellularsms/at_cellularsmstest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularsmstest.cpp
   stubs/ATHandler_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake

@@ -5,16 +5,16 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  features/cellular/framework/common/util
-  ../features/cellular/framework/common
-  ../features/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../features/cellular/framework/AT/AT_CellularStack.cpp
+  ../connectivity/cellular/source/framework/AT/AT_CellularStack.cpp
   ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
   ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
   ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
@@ -25,7 +25,7 @@ set(unittest-sources
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/AT/at_cellularstack/at_cellularstacktest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/at_cellularstacktest.cpp
   stubs/ATHandler_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp

connectivity/cellular/tests/UNITTESTS/framework/common/list/unittest.cmake

@@ -5,8 +5,8 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  features/cellular/framework/common/util
-  ../features/cellular/framework/common
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
 )
 
 # Source files
@@ -15,5 +15,5 @@ set(unittest-sources
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/common/list/listtest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/listtest.cpp
 )

connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake

@@ -5,18 +5,18 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  features/cellular/framework/common/util
-  ../features/cellular/framework/common
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
 )
 
 # Source files
 set(unittest-sources
-  ../features/cellular/framework/common/CellularUtil.cpp
+  ../connectivity/cellular/source/framework/common/CellularUtil.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/common/util/utiltest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/utiltest.cpp
   stubs/randLIB_stub.cpp
 )

connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake

@@ -6,21 +6,21 @@
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   ../platform
-  ../features/cellular/framework/common/util
-  ../features/cellular/framework/common
-  ../features/cellular/framework/AT
+  ../connectivity/cellular/tests/UNITTESTS/framework/common/util
+  ../connectivity/cellular/include/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
 
 )
 
 # Source files
 set(unittest-sources
-  ../features/cellular/framework/device/ATHandler.cpp
+  ../connectivity/cellular/source/framework/device/ATHandler.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/device/athandler/athandlertest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/athandlertest.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp
   stubs/us_ticker_stub.cpp

connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/unittest.cmake

@@ -5,15 +5,15 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-    /features/cellular/framework/device/cellulardevice
-  ../features/cellular/framework/device
-  ../features/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/device/cellulardevice
+  ../connectivity/cellular/include/cellular/framework/device
+  ../connectivity/cellular/include/cellular/framework/common
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../features/cellular/framework/device/CellularContext.cpp
+  ../connectivity/cellular/source/framework/device/CellularContext.cpp
   ../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
   ../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
   ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
@@ -24,7 +24,7 @@ set(unittest-sources
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/device/cellularcontext/cellularcontexttest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/cellularcontexttest.cpp
   stubs/FileHandle_stub.cpp
   stubs/CellularStateMachine_stub.cpp
   stubs/EventQueue_stub.cpp

connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/unittest.cmake

@@ -5,20 +5,20 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-    /features/cellular/framework/device/cellulardevice
-  ../features/cellular/framework/device
-  ../features/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/device/cellulardevice
+  ../connectivity/cellular/include/cellular/framework/device
+  ../connectivity/cellular/include/cellular/framework/common
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../features/cellular/framework/device/CellularDevice.cpp
+  ../connectivity/cellular/source/framework/device/CellularDevice.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/device/cellulardevice/cellulardevicetest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/cellulardevicetest.cpp
   stubs/FileHandle_stub.cpp
   stubs/CellularStateMachine_stub.cpp
   stubs/EventQueue_stub.cpp

connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/unittest.cmake

@@ -5,20 +5,20 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-    /features/cellular/framework/device/cellularstatemachine
-  ../features/cellular/framework/device
-  ../features/cellular/framework/common
+  ../connectivity/cellular/include/cellular/framework/device/cellularstatemachine
+  ../connectivity/cellular/include/cellular/framework/device
+  ../connectivity/cellular/include/cellular/framework/common
   ../features/netsocket/cellular
 )
 
 # Source files
 set(unittest-sources
-  ../features/cellular/framework/device/CellularStateMachine.cpp
+  ../connectivity/cellular/source/framework/device/CellularStateMachine.cpp
 )
 
 # Test files
 set(unittest-test-sources
-  features/cellular/framework/device/cellularstatemachine/cellularstatemachinetest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/cellularstatemachinetest.cpp
   stubs/FileHandle_stub.cpp
   stubs/CellularDevice_stub.cpp
   stubs/EventQueue_stub.cpp