Skip to content

Commit 22ea1e8

Browse files
LDong-ArmLDong-Arm
committed
Update unittest.cmake files for cellular
1 parent 6188822 commit 22ea1e8

File tree

13 files changed

+65
-65
lines changed

13 files changed

+65
-65
lines changed

‎UNITTESTS/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ set(unittest-includes-base
134134
"${PROJECT_SOURCE_DIR}/../features/filesystem/"
135135
"${PROJECT_SOURCE_DIR}/../features/filesystem/littlefs"
136136
"${PROJECT_SOURCE_DIR}/../features/filesystem/littlefs/littlefs"
137-
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/API"
138-
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/AT"
139-
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/device"
140-
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework"
141-
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/framework/common"
137+
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/API"
138+
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/AT"
139+
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/device"
140+
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework"
141+
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/common"
142142
"${PROJECT_SOURCE_DIR}/../features/lorawan"
143143
"${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack"
144144
"${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/mac"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55

66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
8-
connectivity/cellular/framework/common/util
9-
../connectivity/cellular/framework/common
10-
../connectivity/cellular/framework/AT
11-
../connectivity/cellular/framework/device
8+
../connectivity/cellular/tests/UNITTESTS/framework/common/util
9+
../connectivity/cellular/include/cellular/framework/common
10+
../connectivity/cellular/include/cellular/framework/AT
11+
../connectivity/cellular/include/cellular/framework/device
1212
../features/netsocket/cellular
1313
)
1414

1515
# Source files
1616
set(unittest-sources
17-
../connectivity/cellular/framework/AT/AT_CellularContext.cpp
17+
../connectivity/cellular/source/framework/AT/AT_CellularContext.cpp
1818
)
1919

2020
# Test files
2121
set(unittest-test-sources
22-
connectivity/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp
22+
${CMAKE_CURRENT_LIST_DIR}/at_cellularcontexttest.cpp
2323
stubs/ATHandler_stub.cpp
2424
stubs/AT_CellularDevice_stub.cpp
2525
stubs/AT_CellularStack_stub.cpp

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
8-
../connectivity/cellular/framework/common/util
9-
../connectivity/cellular/framework/common
10-
../connectivity/cellular/framework/AT
11-
../connectivity/cellular/framework/device
8+
../connectivity/cellular/tests/UNITTESTS/framework/common/util
9+
../connectivity/cellular/include/cellular/framework/common
10+
../connectivity/cellular/include/cellular/framework/AT
11+
../connectivity/cellular/include/cellular/framework/device
1212
../features/frameworks/mbed-client-randlib/mbed-client-randlib
1313
../drivers
1414
../hal
@@ -18,12 +18,12 @@ set(unittest-includes ${unittest-includes}
1818
# Source files
1919
set(unittest-sources
2020
stubs/randLIB_stub.c
21-
../connectivity/cellular/framework/AT/AT_CellularDevice.cpp
21+
../connectivity/cellular/source/framework/AT/AT_CellularDevice.cpp
2222
)
2323

2424
# Test files
2525
set(unittest-test-sources
26-
connectivity/cellular/framework/AT/at_cellulardevice/at_cellulardevicetest.cpp
26+
${CMAKE_CURRENT_LIST_DIR}/at_cellulardevicetest.cpp
2727
stubs/AT_CellularNetwork_stub.cpp
2828
stubs/ATHandler_stub.cpp
2929
stubs/AT_CellularSMS_stub.cpp

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55

66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
8-
connectivity/cellular/framework/common/util
9-
../connectivity/cellular/framework/common
10-
../connectivity/cellular/framework/AT
8+
../connectivity/cellular/tests/UNITTESTS/framework/common/util
9+
../connectivity/cellular/include/cellular/framework/common
10+
../connectivity/cellular/include/cellular/framework/AT
1111
../features/frameworks/mbed-client-randlib/mbed-client-randlib
1212
../features/netsocket/cellular
1313
)
1414

1515
# Source files
1616
set(unittest-sources
1717
stubs/randLIB_stub.c
18-
../connectivity/cellular/framework/AT/AT_CellularInformation.cpp
18+
../connectivity/cellular/source/framework/AT/AT_CellularInformation.cpp
1919
)
2020

2121
# Test files
2222
set(unittest-test-sources
23-
connectivity/cellular/framework/AT//at_cellularinformation/at_cellularinformationtest.cpp
23+
${CMAKE_CURRENT_LIST_DIR}/at_cellularinformationtest.cpp
2424
stubs/ATHandler_stub.cpp
2525
stubs/EventQueue_stub.cpp
2626
stubs/FileHandle_stub.cpp

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55

66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
8-
connectivity/cellular/framework/common/util
9-
../connectivity/cellular/framework/common
10-
../connectivity/cellular/framework/AT
8+
../connectivity/cellular/tests/UNITTESTS/framework/common/util
9+
../connectivity/cellular/include/cellular/framework/common
10+
../connectivity/cellular/include/cellular/framework/AT
1111
../features/frameworks/mbed-client-randlib/mbed-client-randlib
1212
../features/netsocket/cellular
1313
)
1414

1515
# Source files
1616
set(unittest-sources
17-
../connectivity/cellular/framework/AT/AT_CellularNetwork.cpp
18-
../connectivity/cellular/framework/common/CellularUtil.cpp
17+
../connectivity/cellular/source/framework/AT/AT_CellularNetwork.cpp
18+
../connectivity/cellular/source/framework/common/CellularUtil.cpp
1919
)
2020

2121
# Test files
2222
set(unittest-test-sources
23-
connectivity/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp
23+
${CMAKE_CURRENT_LIST_DIR}/at_cellularnetworktest.cpp
2424
stubs/ATHandler_stub.cpp
2525
stubs/EventQueue_stub.cpp
2626
stubs/FileHandle_stub.cpp

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55

66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
8-
connectivity/cellular/framework/common/util
9-
../connectivity/cellular/framework/common
10-
../connectivity/cellular/framework/AT
8+
../connectivity/cellular/tests/UNITTESTS/framework/common/util
9+
../connectivity/cellular/include/cellular/framework/common
10+
../connectivity/cellular/include/cellular/framework/AT
1111
../features/frameworks/mbed-client-randlib/mbed-client-randlib
1212
../features/netsocket/cellular
1313
)
1414

1515
# Source files
1616
set(unittest-sources
17-
../connectivity/cellular/framework/AT/AT_CellularSMS.cpp
17+
../connectivity/cellular/source/framework/AT/AT_CellularSMS.cpp
1818
)
1919

2020
# Test files
2121
set(unittest-test-sources
22-
connectivity/cellular/framework/AT/at_cellularsms/at_cellularsmstest.cpp
22+
${CMAKE_CURRENT_LIST_DIR}/at_cellularsmstest.cpp
2323
stubs/ATHandler_stub.cpp
2424
stubs/EventQueue_stub.cpp
2525
stubs/FileHandle_stub.cpp

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
8-
connectivity/cellular/framework/common/util
9-
../connectivity/cellular/framework/common
10-
../connectivity/cellular/framework/AT
8+
../connectivity/cellular/tests/UNITTESTS/framework/common/util
9+
../connectivity/cellular/include/cellular/framework/common
10+
../connectivity/cellular/include/cellular/framework/AT
1111
../features/frameworks/mbed-client-randlib/mbed-client-randlib
1212
../features/netsocket/cellular
1313
)
1414

1515
# Source files
1616
set(unittest-sources
17-
../connectivity/cellular/framework/AT/AT_CellularStack.cpp
17+
../connectivity/cellular/source/framework/AT/AT_CellularStack.cpp
1818
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
1919
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
2020
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
@@ -25,7 +25,7 @@ set(unittest-sources
2525

2626
# Test files
2727
set(unittest-test-sources
28-
connectivity/cellular/framework/AT/at_cellularstack/at_cellularstacktest.cpp
28+
${CMAKE_CURRENT_LIST_DIR}/at_cellularstacktest.cpp
2929
stubs/ATHandler_stub.cpp
3030
stubs/EventQueue_stub.cpp
3131
stubs/FileHandle_stub.cpp

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
8-
connectivity/cellular/framework/common/util
9-
../connectivity/cellular/framework/common
8+
../connectivity/cellular/tests/UNITTESTS/framework/common/util
9+
../connectivity/cellular/include/cellular/framework/common
1010
)
1111

1212
# Source files
@@ -15,5 +15,5 @@ set(unittest-sources
1515

1616
# Test files
1717
set(unittest-test-sources
18-
connectivity/cellular/framework/common/list/listtest.cpp
18+
${CMAKE_CURRENT_LIST_DIR}/listtest.cpp
1919
)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55

66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
8-
connectivity/cellular/framework/common/util
9-
../connectivity/cellular/framework/common
8+
../connectivity/cellular/tests/UNITTESTS/framework/common/util
9+
../connectivity/cellular/include/cellular/framework/common
1010
../features/frameworks/mbed-client-randlib/mbed-client-randlib
1111
)
1212

1313
# Source files
1414
set(unittest-sources
15-
../connectivity/cellular/framework/common/CellularUtil.cpp
15+
../connectivity/cellular/source/framework/common/CellularUtil.cpp
1616
)
1717

1818
# Test files
1919
set(unittest-test-sources
20-
connectivity/cellular/framework/common/util/utiltest.cpp
20+
${CMAKE_CURRENT_LIST_DIR}/utiltest.cpp
2121
stubs/randLIB_stub.cpp
2222
)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
88
../platform
9-
../connectivity/cellular/framework/common/util
10-
../connectivity/cellular/framework/common
11-
../connectivity/cellular/framework/AT
9+
../connectivity/cellular/tests/UNITTESTS/framework/common/util
10+
../connectivity/cellular/include/cellular/framework/common
11+
../connectivity/cellular/include/cellular/framework/AT
1212
../features/frameworks/mbed-client-randlib/mbed-client-randlib
1313

1414
)
1515

1616
# Source files
1717
set(unittest-sources
18-
../connectivity/cellular/framework/device/ATHandler.cpp
18+
../connectivity/cellular/source/framework/device/ATHandler.cpp
1919
)
2020

2121
# Test files
2222
set(unittest-test-sources
23-
connectivity/cellular/framework/device/athandler/athandlertest.cpp
23+
${CMAKE_CURRENT_LIST_DIR}/athandlertest.cpp
2424
stubs/EventQueue_stub.cpp
2525
stubs/FileHandle_stub.cpp
2626
stubs/us_ticker_stub.cpp

0 commit comments

Comments
 (0)