ARMmbed · Patater · Jul 28, 2021 · Jul 21, 2021 · Jul 21, 2021 · Jul 21, 2021
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-common-list-unittest)
 
 add_executable(${TEST_NAME})
@@ -16,6 +18,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-common-util-unittest)
 
 add_executable(${TEST_NAME})
@@ -19,6 +21,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-device-athandler-unittest)
 
 add_executable(${TEST_NAME})
@@ -39,6 +41,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/athandlertest.cpp b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/athandlertest.cpp
@@ -906,6 +906,7 @@ TEST_F(TestATHandler, test_ATHandler_resp_start)
 
     filehandle_stub_table = NULL;
     filehandle_stub_table_pos = 0;
+    mbed_poll_stub::revents_value = POLLIN;
 
     ATHandler at(&fh1, que, 0, ",");
     at.resp_start();
@@ -914,6 +915,7 @@ TEST_F(TestATHandler, test_ATHandler_resp_start)
     char table2[] = "\"2,\"OK\r\n\0";
     filehandle_stub_table = table2;
     filehandle_stub_table_pos = 0;
+    mbed_poll_stub::int_value = strlen(table2);
 
     at.flush();
     at.clear_error();
@@ -1052,12 +1054,14 @@ TEST_F(TestATHandler, test_ATHandler_resp_stop)
 {
     EventQueue que;
     FileHandle_stub fh1;
+    mbed_poll_stub::revents_value = POLLIN;
 
     ATHandler at(&fh1, que, 0, ",");
 
     char table[] = "21 OK\r\n\0";
     filehandle_stub_table = table;
     filehandle_stub_table_pos = 0;
+    mbed_poll_stub::int_value = strlen(table);
 
     at.info_elem('2');
     at.set_stop_tag("OK\r\n");
@@ -1266,6 +1270,7 @@ TEST_F(TestATHandler, test_ATHandler_at_cmd_str)
 {
     EventQueue que;
     FileHandle_stub fh1;
+    mbed_poll_stub::revents_value = POLLIN;
 
     ATHandler at(&fh1, que, 0, ",");
     uint8_t byte[] = {1, 2, 3, 4};

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-device-cellular-context-unittest)
 
 add_executable(${TEST_NAME})
@@ -45,6 +47,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-device-cellular-device-unittest)
 
 add_executable(${TEST_NAME})
@@ -41,6 +43,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME cellular-framework-device-cellular-state-machine-unittest)
 
 add_executable(${TEST_NAME})
@@ -43,6 +45,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loramac-unittest)
 
 add_executable(${TEST_NAME})
@@ -45,6 +47,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/Test_LoRaMac.cpp b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/Test_LoRaMac.cpp
@@ -432,7 +432,7 @@ TEST_F(Test_LoRaMac, post_process_mcps_req)
     LoRaMacCrypto_stub::int_table_idx_value = 0;
     LoRaMacCrypto_stub::int_table[0] = 4;
     LoRaMacCrypto_stub::int_table[1] = 4;
-//    LoRaPHY_stub::uint16_value = 0;
+    LoRaPHY_stub::uint16_value = 0;
     object->on_radio_rx_done(payload, 16, 0, 0);
     object->post_process_mcps_req();
 

diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loramac-channel-plan-unittest)
 
 add_executable(${TEST_NAME})
@@ -29,6 +31,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loramac-command-unittest)
 
 add_executable(${TEST_NAME})
@@ -30,6 +32,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loramac-crypto-unittest)
 
 add_executable(${TEST_NAME})
@@ -28,6 +30,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-unittest)
 
 add_executable(${TEST_NAME})
@@ -33,6 +35,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/CMakeLists.txt
@@ -1,13 +1,15 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-as923-unittest)
 
 add_executable(${TEST_NAME})
 
 target_compile_definitions(${TEST_NAME}
     PRIVATE
-        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5        
+        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
         MBED_CONF_LORA_TX_MAX_SIZE=255
         MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
 )
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/CMakeLists.txt
@@ -1,13 +1,15 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-au915-unittest)
 
 add_executable(${TEST_NAME})
 
 target_compile_definitions(${TEST_NAME}
     PRIVATE
-        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5        
+        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
         MBED_CONF_LORA_TX_MAX_SIZE=255
         MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
 )
@@ -37,6 +39,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/CMakeLists.txt
@@ -1,13 +1,15 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-cn470-unittest)
 
 add_executable(${TEST_NAME})
 
 target_compile_definitions(${TEST_NAME}
     PRIVATE
-        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5        
+        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
         MBED_CONF_LORA_TX_MAX_SIZE=255
         MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
 )
@@ -37,6 +39,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/CMakeLists.txt
@@ -1,13 +1,15 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-cn779-unittest)
 
 add_executable(${TEST_NAME})
 
 target_compile_definitions(${TEST_NAME}
     PRIVATE
-        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5        
+        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
         MBED_CONF_LORA_TX_MAX_SIZE=255
         MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
 )
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt
@@ -1,13 +1,15 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-eu433-unittest)
 
 add_executable(${TEST_NAME})
 
 target_compile_definitions(${TEST_NAME}
     PRIVATE
-        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5        
+        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
         MBED_CONF_LORA_TX_MAX_SIZE=255
         MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
 )
@@ -32,6 +34,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/CMakeLists.txt
@@ -1,13 +1,15 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+include(GoogleTest)
+
 set(TEST_NAME lorawan-loraphy-eu868-unittest)
 
 add_executable(${TEST_NAME})
 
 target_compile_definitions(${TEST_NAME}
     PRIVATE
-        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5        
+        MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
         MBED_CONF_LORA_TX_MAX_SIZE=255
         MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
 )
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
         gmock_main
 )
 
-add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
-
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
+gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")