diff --git a/CMakeLists.txt b/CMakeLists.txt index 685f3481..af5cc810 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for root cmake_minimum_required(VERSION 2.8.11) project(azure_iot_gateway_sdk) diff --git a/bindings/dotnet/tests/CMakeLists.txt b/bindings/dotnet/tests/CMakeLists.txt index a33dd923..cce11969 100644 --- a/bindings/dotnet/tests/CMakeLists.txt +++ b/bindings/dotnet/tests/CMakeLists.txt @@ -3,6 +3,5 @@ cmake_minimum_required(VERSION 2.8.11) -add_subdirectory(dotnet_hl_unittests) - -add_subdirectory(dotnet_unittests) \ No newline at end of file +add_subdirectory(dotnet_hl_ut) +add_subdirectory(dotnet_ut) \ No newline at end of file diff --git a/bindings/dotnet/tests/dotnet_hl_unittests/CMakeLists.txt b/bindings/dotnet/tests/dotnet_hl_ut/CMakeLists.txt similarity index 93% rename from bindings/dotnet/tests/dotnet_hl_unittests/CMakeLists.txt rename to bindings/dotnet/tests/dotnet_hl_ut/CMakeLists.txt index be162f46..ec54b29b 100644 --- a/bindings/dotnet/tests/dotnet_hl_unittests/CMakeLists.txt +++ b/bindings/dotnet/tests/dotnet_hl_ut/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName dotnet_hl_unittests) +set(theseTestsName dotnet_hl_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp diff --git a/bindings/dotnet/tests/dotnet_hl_unittests/dotnet_hl_unittests.cpp b/bindings/dotnet/tests/dotnet_hl_ut/dotnet_hl_ut.cpp similarity index 99% rename from bindings/dotnet/tests/dotnet_hl_unittests/dotnet_hl_unittests.cpp rename to bindings/dotnet/tests/dotnet_hl_ut/dotnet_hl_ut.cpp index 29a45d1e..cee31491 100644 --- a/bindings/dotnet/tests/dotnet_hl_unittests/dotnet_hl_unittests.cpp +++ b/bindings/dotnet/tests/dotnet_hl_ut/dotnet_hl_ut.cpp @@ -430,7 +430,7 @@ DECLARE_GLOBAL_MOCK_METHOD_0(CDOTNETHLMocks, , const MODULE_APIS*, MODULE_STATIC -BEGIN_TEST_SUITE(dotnet_hl_unittests) +BEGIN_TEST_SUITE(dotnet_hl_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -787,4 +787,4 @@ BEGIN_TEST_SUITE(dotnet_hl_unittests) ///cleanup } -END_TEST_SUITE(dotnet_hl_unittests) \ No newline at end of file +END_TEST_SUITE(dotnet_hl_ut) \ No newline at end of file diff --git a/modules/ble/tests/ble_hl_unittests/main.c b/bindings/dotnet/tests/dotnet_hl_ut/main.c similarity index 83% rename from modules/ble/tests/ble_hl_unittests/main.c rename to bindings/dotnet/tests/dotnet_hl_ut/main.c index 0842a2fb..78b1c04f 100644 --- a/modules/ble/tests/ble_hl_unittests/main.c +++ b/bindings/dotnet/tests/dotnet_hl_ut/main.c @@ -6,6 +6,6 @@ int main(void) { size_t failedTestCount = 0; - RUN_TEST_SUITE(ble_hl_unittests, failedTestCount); + RUN_TEST_SUITE(dotnet_hl_ut, failedTestCount); return failedTestCount; } diff --git a/bindings/dotnet/tests/dotnet_unittests/CMakeLists.txt b/bindings/dotnet/tests/dotnet_ut/CMakeLists.txt similarity index 95% rename from bindings/dotnet/tests/dotnet_unittests/CMakeLists.txt rename to bindings/dotnet/tests/dotnet_ut/CMakeLists.txt index a456f1f4..3207c037 100644 --- a/bindings/dotnet/tests/dotnet_unittests/CMakeLists.txt +++ b/bindings/dotnet/tests/dotnet_ut/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName dotnet_unittests) +set(theseTestsName dotnet_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp diff --git a/bindings/dotnet/tests/dotnet_unittests/dotnet_unittests.cpp b/bindings/dotnet/tests/dotnet_ut/dotnet_ut.cpp similarity index 99% rename from bindings/dotnet/tests/dotnet_unittests/dotnet_unittests.cpp rename to bindings/dotnet/tests/dotnet_ut/dotnet_ut.cpp index c73a9728..a6dccbc1 100644 --- a/bindings/dotnet/tests/dotnet_unittests/dotnet_unittests.cpp +++ b/bindings/dotnet/tests/dotnet_ut/dotnet_ut.cpp @@ -1625,7 +1625,7 @@ HRESULT my_Type::InvokeMember_3( return ::InvokeMember_3(name, invokeAttr, Binder, Target, args, pRetVal); }; -BEGIN_TEST_SUITE(dotnet_unittests) +BEGIN_TEST_SUITE(dotnet_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -3803,4 +3803,4 @@ BEGIN_TEST_SUITE(dotnet_unittests) ///cleanup } -END_TEST_SUITE(dotnet_unittests) \ No newline at end of file +END_TEST_SUITE(dotnet_ut) \ No newline at end of file diff --git a/bindings/dotnet/tests/dotnet_unittests/main.c b/bindings/dotnet/tests/dotnet_ut/main.c similarity index 83% rename from bindings/dotnet/tests/dotnet_unittests/main.c rename to bindings/dotnet/tests/dotnet_ut/main.c index 0d886572..c9729d69 100644 --- a/bindings/dotnet/tests/dotnet_unittests/main.c +++ b/bindings/dotnet/tests/dotnet_ut/main.c @@ -6,6 +6,6 @@ int main(void) { size_t failedTestCount = 0; - RUN_TEST_SUITE(dotnet_unittests, failedTestCount); + RUN_TEST_SUITE(dotnet_ut, failedTestCount); return failedTestCount; } diff --git a/bindings/java/tests/CMakeLists.txt b/bindings/java/tests/CMakeLists.txt index 97c82838..3f4f9a20 100644 --- a/bindings/java/tests/CMakeLists.txt +++ b/bindings/java/tests/CMakeLists.txt @@ -6,6 +6,6 @@ cmake_minimum_required(VERSION 2.8.11) add_definitions(-DUNDER_TEST) -add_subdirectory(java_module_host_unittests) -add_subdirectory(java_module_host_hl_unittests) -add_subdirectory(java_module_host_manager_unittests) +add_subdirectory(host_ut) +add_subdirectory(host_hl_ut) +add_subdirectory(host_manager_ut) diff --git a/bindings/java/tests/java_module_host_hl_unittests/CMakeLists.txt b/bindings/java/tests/host_hl_ut/CMakeLists.txt similarity index 81% rename from bindings/java/tests/java_module_host_hl_unittests/CMakeLists.txt rename to bindings/java/tests/host_hl_ut/CMakeLists.txt index 32775781..eeadf7c3 100644 --- a/bindings/java/tests/java_module_host_hl_unittests/CMakeLists.txt +++ b/bindings/java/tests/host_hl_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for java_module_host_hl_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName java_module_host_hl_unittests) +set(theseTestsName host_hl_ut) set(${theseTestsName}_test_files ${theseTestsName}.c diff --git a/bindings/java/tests/java_module_host_hl_unittests/java_module_host_hl_unittests.c b/bindings/java/tests/host_hl_ut/host_hl_ut.c similarity index 100% rename from bindings/java/tests/java_module_host_hl_unittests/java_module_host_hl_unittests.c rename to bindings/java/tests/host_hl_ut/host_hl_ut.c diff --git a/bindings/java/tests/java_module_host_hl_unittests/main.c b/bindings/java/tests/host_hl_ut/main.c similarity index 100% rename from bindings/java/tests/java_module_host_hl_unittests/main.c rename to bindings/java/tests/host_hl_ut/main.c diff --git a/bindings/java/tests/java_module_host_manager_unittests/CMakeLists.txt b/bindings/java/tests/host_manager_ut/CMakeLists.txt similarity index 81% rename from bindings/java/tests/java_module_host_manager_unittests/CMakeLists.txt rename to bindings/java/tests/host_manager_ut/CMakeLists.txt index 30d2239b..5f29053a 100644 --- a/bindings/java/tests/java_module_host_manager_unittests/CMakeLists.txt +++ b/bindings/java/tests/host_manager_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for java_module_host_manager_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName java_module_host_manager_unittests) +set(theseTestsName host_manager_ut) set(${theseTestsName}_test_files ${theseTestsName}.c diff --git a/bindings/java/tests/java_module_host_manager_unittests/java_module_host_manager_unittests.c b/bindings/java/tests/host_manager_ut/host_manager_ut.c similarity index 100% rename from bindings/java/tests/java_module_host_manager_unittests/java_module_host_manager_unittests.c rename to bindings/java/tests/host_manager_ut/host_manager_ut.c diff --git a/bindings/java/tests/java_module_host_manager_unittests/main.c b/bindings/java/tests/host_manager_ut/main.c similarity index 100% rename from bindings/java/tests/java_module_host_manager_unittests/main.c rename to bindings/java/tests/host_manager_ut/main.c diff --git a/bindings/java/tests/java_module_host_unittests/CMakeLists.txt b/bindings/java/tests/host_ut/CMakeLists.txt similarity index 82% rename from bindings/java/tests/java_module_host_unittests/CMakeLists.txt rename to bindings/java/tests/host_ut/CMakeLists.txt index c71f6fd8..2e1a1a2b 100644 --- a/bindings/java/tests/java_module_host_unittests/CMakeLists.txt +++ b/bindings/java/tests/host_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for java_module_host_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName java_module_host_unittests) +set(theseTestsName host_ut) set(${theseTestsName}_test_files ${theseTestsName}.c diff --git a/bindings/java/tests/java_module_host_unittests/java_module_host_unittests.c b/bindings/java/tests/host_ut/host_ut.c similarity index 100% rename from bindings/java/tests/java_module_host_unittests/java_module_host_unittests.c rename to bindings/java/tests/host_ut/host_ut.c diff --git a/bindings/java/tests/java_module_host_unittests/main.c b/bindings/java/tests/host_ut/main.c similarity index 100% rename from bindings/java/tests/java_module_host_unittests/main.c rename to bindings/java/tests/host_ut/main.c diff --git a/bindings/nodejs/tests/CMakeLists.txt b/bindings/nodejs/tests/CMakeLists.txt index d2ed6771..36b246c2 100644 --- a/bindings/nodejs/tests/CMakeLists.txt +++ b/bindings/nodejs/tests/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 2.8.11) # fail when run under "ctest". Also, Valgrind doesn't # pass with a garbage collected system like v8. if(WIN32) - add_subdirectory(nodejs_binding_integrationtests) + add_subdirectory(nodejs_int) endif() -add_subdirectory(nodejs_binding_hl_unittests) +add_subdirectory(nodejs_hl_ut) diff --git a/bindings/nodejs/tests/nodejs_binding_hl_unittests/main.c b/bindings/nodejs/tests/nodejs_binding_hl_unittests/main.c deleted file mode 100644 index 3a1aa175..00000000 --- a/bindings/nodejs/tests/nodejs_binding_hl_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include -#include "testrunnerswitcher.h" -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(nodejs_binding_hl_unittests, failedTestCount); - return failedTestCount; -} diff --git a/bindings/nodejs/tests/nodejs_binding_hl_unittests/CMakeLists.txt b/bindings/nodejs/tests/nodejs_hl_ut/CMakeLists.txt similarity index 86% rename from bindings/nodejs/tests/nodejs_binding_hl_unittests/CMakeLists.txt rename to bindings/nodejs/tests/nodejs_hl_ut/CMakeLists.txt index b02433b2..29e1a1d0 100644 --- a/bindings/nodejs/tests/nodejs_binding_hl_unittests/CMakeLists.txt +++ b/bindings/nodejs/tests/nodejs_hl_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for nodejs_binding_hl_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName nodejs_binding_hl_unittests) +set(theseTestsName nodejs_hl_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp diff --git a/bindings/dotnet/tests/dotnet_hl_unittests/main.c b/bindings/nodejs/tests/nodejs_hl_ut/main.c similarity index 82% rename from bindings/dotnet/tests/dotnet_hl_unittests/main.c rename to bindings/nodejs/tests/nodejs_hl_ut/main.c index 2b8f145f..7f6e96b8 100644 --- a/bindings/dotnet/tests/dotnet_hl_unittests/main.c +++ b/bindings/nodejs/tests/nodejs_hl_ut/main.c @@ -6,6 +6,6 @@ int main(void) { size_t failedTestCount = 0; - RUN_TEST_SUITE(dotnet_hl_unittests, failedTestCount); + RUN_TEST_SUITE(nodejs_hl_ut, failedTestCount); return failedTestCount; } diff --git a/bindings/nodejs/tests/nodejs_binding_hl_unittests/nodejs_binding_hl_unittests.cpp b/bindings/nodejs/tests/nodejs_hl_ut/nodejs_hl_ut.cpp similarity index 99% rename from bindings/nodejs/tests/nodejs_binding_hl_unittests/nodejs_binding_hl_unittests.cpp rename to bindings/nodejs/tests/nodejs_hl_ut/nodejs_hl_ut.cpp index 8a2f594c..48902dbf 100644 --- a/bindings/nodejs/tests/nodejs_binding_hl_unittests/nodejs_binding_hl_unittests.cpp +++ b/bindings/nodejs/tests/nodejs_hl_ut/nodejs_hl_ut.cpp @@ -388,7 +388,7 @@ static MESSAGE_HANDLE VALID_MESSAGE_HANDLE = (MESSAGE_HANDLE)0x02; static MICROMOCK_MUTEX_HANDLE g_testByTest; static MICROMOCK_GLOBAL_SEMAPHORE_HANDLE g_dllByDll; -BEGIN_TEST_SUITE(nodejs_binding_hl_unittests) +BEGIN_TEST_SUITE(nodejs_hl_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -665,4 +665,4 @@ BEGIN_TEST_SUITE(nodejs_binding_hl_unittests) ///cleanup } -END_TEST_SUITE(nodejs_binding_hl_unittests) +END_TEST_SUITE(nodejs_hl_ut) diff --git a/bindings/nodejs/tests/nodejs_binding_integrationtests/CMakeLists.txt b/bindings/nodejs/tests/nodejs_int/CMakeLists.txt similarity index 92% rename from bindings/nodejs/tests/nodejs_binding_integrationtests/CMakeLists.txt rename to bindings/nodejs/tests/nodejs_int/CMakeLists.txt index 1bf59198..84760a1b 100644 --- a/bindings/nodejs/tests/nodejs_binding_integrationtests/CMakeLists.txt +++ b/bindings/nodejs/tests/nodejs_int/CMakeLists.txt @@ -1,10 +1,9 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for logger_unittests cmake_minimum_required(VERSION 2.8.11) -set(theseTestsName nodejs_binding_integrationtests) +set(theseTestsName nodejs_int) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp diff --git a/bindings/nodejs/tests/nodejs_binding_integrationtests/main.c b/bindings/nodejs/tests/nodejs_int/main.c similarity index 81% rename from bindings/nodejs/tests/nodejs_binding_integrationtests/main.c rename to bindings/nodejs/tests/nodejs_int/main.c index 2aed8206..c3f9e89b 100644 --- a/bindings/nodejs/tests/nodejs_binding_integrationtests/main.c +++ b/bindings/nodejs/tests/nodejs_int/main.c @@ -7,6 +7,6 @@ int main(void) { size_t failedTestCount = 0; - RUN_TEST_SUITE(nodejs_binding_unittests, failedTestCount); + RUN_TEST_SUITE(nodejs_int, failedTestCount); return failedTestCount; } diff --git a/bindings/nodejs/tests/nodejs_binding_integrationtests/nodejs_binding_integrationtests.cpp b/bindings/nodejs/tests/nodejs_int/nodejs_int.cpp similarity index 99% rename from bindings/nodejs/tests/nodejs_binding_integrationtests/nodejs_binding_integrationtests.cpp rename to bindings/nodejs/tests/nodejs_int/nodejs_int.cpp index 37c4330e..ad488cd8 100644 --- a/bindings/nodejs/tests/nodejs_binding_integrationtests/nodejs_binding_integrationtests.cpp +++ b/bindings/nodejs/tests/nodejs_int/nodejs_int.cpp @@ -286,7 +286,7 @@ static void publish_mock_message(const v8::FunctionCallbackInfo& info g_mock_module.publish_mock_message(); } -BEGIN_TEST_SUITE(nodejs_binding_unittests) +BEGIN_TEST_SUITE(nodejs_int) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -1058,4 +1058,4 @@ BEGIN_TEST_SUITE(nodejs_binding_unittests) ///cleanup } -END_TEST_SUITE(nodejs_binding_unittests) +END_TEST_SUITE(nodejs_int) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index a42bb9d4..b8f2957f 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,4 +1,6 @@ -#this is CMakeLists.txt for the gateway core +#Copyright (c) Microsoft. All rights reserved. +#Licensed under the MIT license. See LICENSE file in the project root for full license information. + cmake_minimum_required(VERSION 2.8.11) add_subdirectory(deps) diff --git a/core/deps/CMakeLists.txt b/core/deps/CMakeLists.txt index 3cd022f5..6c3aa138 100644 --- a/core/deps/CMakeLists.txt +++ b/core/deps/CMakeLists.txt @@ -1,4 +1,6 @@ -#this is CMakeLists.txt to build parson only as a lib +#Copyright (c) Microsoft. All rights reserved. +#Licensed under the MIT license. See LICENSE file in the project root for full license information. + cmake_minimum_required(VERSION 2.8.11) remove_definitions(-D_CRT_SECURE_NO_WARNINGS) diff --git a/core/tests/CMakeLists.txt b/core/tests/CMakeLists.txt index 43819840..b321783a 100644 --- a/core/tests/CMakeLists.txt +++ b/core/tests/CMakeLists.txt @@ -4,21 +4,21 @@ cmake_minimum_required(VERSION 2.8.11) #this is CMakeLists for the core tests folder -add_subdirectory(gwmessage_unittests) -add_subdirectory(module_loader_unittests) -add_subdirectory(dynamic_library_unittests) -add_subdirectory(broadcast_bus_unittests) -add_subdirectory(pubsub_bus_unittests) -add_subdirectory(gateway_ll_unittests) -add_subdirectory(event_system_unittests) -add_subdirectory(gateway_unittests) +add_subdirectory(broadcast_bus_ut) +add_subdirectory(broker_ut) +add_subdirectory(dynamic_library_ut) +add_subdirectory(event_system_ut) +add_subdirectory(gateway_ll_ut) +add_subdirectory(gateway_ut) +add_subdirectory(gwmessage_ut) +add_subdirectory(module_loader_ut) if(WIN32) -add_subdirectory(broker_uwp_unittests) -add_subdirectory(gateway_ll_uwp_unittests) + add_subdirectory(broker_uwp_ut) + add_subdirectory(gateway_ll_uwp_ut) endif() if(${run_e2e_tests}) - add_subdirectory(gw_e2etests) + add_subdirectory(gateway_e2e) endif() diff --git a/core/tests/broadcast_bus_unittests/main.c b/core/tests/broadcast_bus_unittests/main.c deleted file mode 100644 index 5f89625f..00000000 --- a/core/tests/broadcast_bus_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(broadcast_broker_unittests, failedTestCount); - return failedTestCount; -} diff --git a/core/tests/broadcast_bus_unittests/CMakeLists.txt b/core/tests/broadcast_bus_ut/CMakeLists.txt similarity index 81% rename from core/tests/broadcast_bus_unittests/CMakeLists.txt rename to core/tests/broadcast_bus_ut/CMakeLists.txt index eee8de91..84563e33 100644 --- a/core/tests/broadcast_bus_unittests/CMakeLists.txt +++ b/core/tests/broadcast_bus_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for broadcast_bus_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName broadcast_bus_unittests) +set(theseTestsName broadcast_bus_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/core/tests/broadcast_bus_unittests/broadcast_bus_unittests.cpp b/core/tests/broadcast_bus_ut/broadcast_bus_ut.cpp similarity index 99% rename from core/tests/broadcast_bus_unittests/broadcast_bus_unittests.cpp rename to core/tests/broadcast_bus_ut/broadcast_bus_ut.cpp index e7521944..1f806fe8 100644 --- a/core/tests/broadcast_bus_unittests/broadcast_bus_unittests.cpp +++ b/core/tests/broadcast_bus_ut/broadcast_bus_ut.cpp @@ -547,7 +547,7 @@ DECLARE_GLOBAL_MOCK_METHOD_3(CBrokerMocks, , LIST_ITEM_HANDLE, list_find, LIST_H DECLARE_GLOBAL_MOCK_METHOD_1(CBrokerMocks, , const void*, list_item_get_value, LIST_ITEM_HANDLE, item_handle); -BEGIN_TEST_SUITE(broadcast_broker_unittests) +BEGIN_TEST_SUITE(broadcast_bus_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -2240,4 +2240,4 @@ TEST_FUNCTION(Broker_Publish_succeeds_skips_self) Broker_Destroy(broker); } -END_TEST_SUITE(broadcast_broker_unittests) +END_TEST_SUITE(broadcast_bus_ut) diff --git a/modules/logger/tests/logger_unittests/main.c b/core/tests/broadcast_bus_ut/main.c similarity index 82% rename from modules/logger/tests/logger_unittests/main.c rename to core/tests/broadcast_bus_ut/main.c index 094c3e11..7188d643 100644 --- a/modules/logger/tests/logger_unittests/main.c +++ b/core/tests/broadcast_bus_ut/main.c @@ -6,6 +6,6 @@ int main(void) { size_t failedTestCount = 0; - RUN_TEST_SUITE(logger_unittests, failedTestCount); + RUN_TEST_SUITE(broadcast_bus_ut, failedTestCount); return failedTestCount; } diff --git a/core/tests/pubsub_bus_unittests/CMakeLists.txt b/core/tests/broker_ut/CMakeLists.txt similarity index 85% rename from core/tests/pubsub_bus_unittests/CMakeLists.txt rename to core/tests/broker_ut/CMakeLists.txt index 7bd5fcf3..1504e078 100644 --- a/core/tests/pubsub_bus_unittests/CMakeLists.txt +++ b/core/tests/broker_ut/CMakeLists.txt @@ -1,14 +1,13 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for pubsub_bus_unittests cmake_minimum_required(VERSION 2.8.11) # unit tests should always pretend nanomsg is statically linked. add_definitions (-DNN_STATIC_LIB) compileAsC99() -set(theseTestsName pubsub_bus_unittests) +set(theseTestsName broker_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/core/tests/pubsub_bus_unittests/pubsub_bus_unittests.cpp b/core/tests/broker_ut/broker_ut.cpp similarity index 99% rename from core/tests/pubsub_bus_unittests/pubsub_bus_unittests.cpp rename to core/tests/broker_ut/broker_ut.cpp index 4b5a02f1..62e54caa 100644 --- a/core/tests/pubsub_bus_unittests/pubsub_bus_unittests.cpp +++ b/core/tests/broker_ut/broker_ut.cpp @@ -646,7 +646,7 @@ DECLARE_GLOBAL_MOCK_METHOD_2(CBrokerMocks, , int, nn_connect, int, s, const char DECLARE_GLOBAL_MOCK_METHOD_4(CBrokerMocks, , int, nn_send, int, s, const void*, buf, size_t, len, int, flags) DECLARE_GLOBAL_MOCK_METHOD_4(CBrokerMocks, , int, nn_recv, int, s, void*, buf, size_t, len, int, flags) -BEGIN_TEST_SUITE(pubsub_broker_unittests) +BEGIN_TEST_SUITE(broker_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -2728,4 +2728,4 @@ TEST_FUNCTION(Broker_Publish_succeeds) } -END_TEST_SUITE(pubsub_broker_unittests) +END_TEST_SUITE(broker_ut) diff --git a/core/tests/gw_e2etests/main.c b/core/tests/broker_ut/main.c similarity index 84% rename from core/tests/gw_e2etests/main.c rename to core/tests/broker_ut/main.c index 4c90a10f..67107501 100644 --- a/core/tests/gw_e2etests/main.c +++ b/core/tests/broker_ut/main.c @@ -6,6 +6,6 @@ int main(void) { size_t failedTestCount = 0; - RUN_TEST_SUITE(gw_e2etests, failedTestCount); + RUN_TEST_SUITE(broker_ut, failedTestCount); return failedTestCount; } diff --git a/core/tests/broker_uwp_unittests/main.c b/core/tests/broker_uwp_unittests/main.c deleted file mode 100644 index 2b3e0272..00000000 --- a/core/tests/broker_uwp_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(broker_uwp_unittests, failedTestCount); - return failedTestCount; -} diff --git a/core/tests/broker_uwp_unittests/CMakeLists.txt b/core/tests/broker_uwp_ut/CMakeLists.txt similarity index 93% rename from core/tests/broker_uwp_unittests/CMakeLists.txt rename to core/tests/broker_uwp_ut/CMakeLists.txt index c880248e..8ddeb4ac 100644 --- a/core/tests/broker_uwp_unittests/CMakeLists.txt +++ b/core/tests/broker_uwp_ut/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.8.11) add_definitions(-DUWP_BINDING) compileAsC99() -set(theseTestsName broker_uwp_unittests) +set(theseTestsName broker_uwp_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/core/tests/broker_uwp_unittests/broker_uwp_unittests.cpp b/core/tests/broker_uwp_ut/broker_uwp_ut.cpp similarity index 99% rename from core/tests/broker_uwp_unittests/broker_uwp_unittests.cpp rename to core/tests/broker_uwp_ut/broker_uwp_ut.cpp index fb22c839..abad9fb5 100644 --- a/core/tests/broker_uwp_unittests/broker_uwp_unittests.cpp +++ b/core/tests/broker_uwp_ut/broker_uwp_ut.cpp @@ -534,7 +534,7 @@ DECLARE_GLOBAL_MOCK_METHOD_3(CBrokerMocks, , LIST_ITEM_HANDLE, list_find, LIST_H DECLARE_GLOBAL_MOCK_METHOD_1(CBrokerMocks, , const void*, list_item_get_value, LIST_ITEM_HANDLE, item_handle); -BEGIN_TEST_SUITE(broker_uwp_unittests) +BEGIN_TEST_SUITE(broker_uwp_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -847,4 +847,4 @@ TEST_FUNCTION(module_publish_worker_calls_module_receive) Broker_Destroy(broker); } -END_TEST_SUITE(broker_uwp_unittests) +END_TEST_SUITE(broker_uwp_ut) diff --git a/modules/ble/tests/ble_unittests/main.c b/core/tests/broker_uwp_ut/main.c similarity index 83% rename from modules/ble/tests/ble_unittests/main.c rename to core/tests/broker_uwp_ut/main.c index 00e9c769..039eec16 100644 --- a/modules/ble/tests/ble_unittests/main.c +++ b/core/tests/broker_uwp_ut/main.c @@ -6,6 +6,6 @@ int main(void) { size_t failedTestCount = 0; - RUN_TEST_SUITE(ble_unittests, failedTestCount); + RUN_TEST_SUITE(broker_uwp_ut, failedTestCount); return failedTestCount; } diff --git a/core/tests/dynamic_library_unittests/main.c b/core/tests/dynamic_library_unittests/main.c deleted file mode 100644 index 9521eba3..00000000 --- a/core/tests/dynamic_library_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(dynamic_library_unittests, failedTestCount); - return failedTestCount; -} diff --git a/core/tests/dynamic_library_unittests/CMakeLists.txt b/core/tests/dynamic_library_ut/CMakeLists.txt similarity index 88% rename from core/tests/dynamic_library_unittests/CMakeLists.txt rename to core/tests/dynamic_library_ut/CMakeLists.txt index aae1bf1c..419c84ac 100644 --- a/core/tests/dynamic_library_unittests/CMakeLists.txt +++ b/core/tests/dynamic_library_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for dynamic_library_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(testSuiteName dynamic_library_unittests) +set(testSuiteName dynamic_library_ut) #setting the dynamic_loader file based on OS that it is used if(WIN32) diff --git a/core/tests/dynamic_library_unittests/dynamic_library_unittests_linux.cpp b/core/tests/dynamic_library_ut/dynamic_library_ut_linux.cpp similarity index 97% rename from core/tests/dynamic_library_unittests/dynamic_library_unittests_linux.cpp rename to core/tests/dynamic_library_ut/dynamic_library_ut_linux.cpp index e80376d6..407ff3f7 100644 --- a/core/tests/dynamic_library_unittests/dynamic_library_unittests_linux.cpp +++ b/core/tests/dynamic_library_ut/dynamic_library_ut_linux.cpp @@ -55,7 +55,7 @@ DECLARE_GLOBAL_MOCK_METHOD_2(CDynamicLibraryMocks, , void*, gb_dlsym, void*, lib static MICROMOCK_GLOBAL_SEMAPHORE_HANDLE g_dllByDll; static MICROMOCK_MUTEX_HANDLE g_testByTest; -BEGIN_TEST_SUITE(dynamic_library_unittests) +BEGIN_TEST_SUITE(dynamic_library_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -146,8 +146,4 @@ TEST_FUNCTION(DynamicLibrary_FindSymbol_returns_correct_value) ///cleanup } -END_TEST_SUITE(dynamic_library_unittests) - - - - +END_TEST_SUITE(dynamic_library_ut) diff --git a/core/tests/dynamic_library_unittests/dynamic_library_unittests_windows.cpp b/core/tests/dynamic_library_ut/dynamic_library_ut_windows.cpp similarity index 98% rename from core/tests/dynamic_library_unittests/dynamic_library_unittests_windows.cpp rename to core/tests/dynamic_library_ut/dynamic_library_ut_windows.cpp index a0d60131..71f6596b 100644 --- a/core/tests/dynamic_library_unittests/dynamic_library_unittests_windows.cpp +++ b/core/tests/dynamic_library_ut/dynamic_library_ut_windows.cpp @@ -65,7 +65,7 @@ DECLARE_GLOBAL_MOCK_METHOD_2(CDynamicLibraryMocks, , DWORD, gb_GetCurrentDirecto static MICROMOCK_GLOBAL_SEMAPHORE_HANDLE g_dllByDll; static MICROMOCK_MUTEX_HANDLE g_testByTest; -BEGIN_TEST_SUITE(dynamic_library_unittests) +BEGIN_TEST_SUITE(dynamic_library_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -155,8 +155,4 @@ TEST_FUNCTION(DynamicLibrary_FindSymbol_returns_correct_value) ///cleanup } -END_TEST_SUITE(dynamic_library_unittests) - - - - +END_TEST_SUITE(dynamic_library_ut) diff --git a/core/tests/dynamic_library_ut/main.c b/core/tests/dynamic_library_ut/main.c new file mode 100644 index 00000000..9aa24213 --- /dev/null +++ b/core/tests/dynamic_library_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(dynamic_library_ut, failedTestCount); + return failedTestCount; +} diff --git a/core/tests/event_system_unittests/main.c b/core/tests/event_system_unittests/main.c deleted file mode 100644 index 12855b94..00000000 --- a/core/tests/event_system_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(event_system_unittests, failedTestCount); - return failedTestCount; -} diff --git a/core/tests/event_system_unittests/CMakeLists.txt b/core/tests/event_system_ut/CMakeLists.txt similarity index 83% rename from core/tests/event_system_unittests/CMakeLists.txt rename to core/tests/event_system_ut/CMakeLists.txt index 80a43f7e..a7b30ab7 100644 --- a/core/tests/event_system_unittests/CMakeLists.txt +++ b/core/tests/event_system_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#This is the CMakeLists.txt for event_system_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(testSuite event_system_unittests) +set(testSuite event_system_ut) set(${testSuite}_cpp_files ${testSuite}.cpp ) diff --git a/core/tests/event_system_unittests/event_system_unittests.cpp b/core/tests/event_system_ut/event_system_ut.cpp similarity index 99% rename from core/tests/event_system_unittests/event_system_unittests.cpp rename to core/tests/event_system_ut/event_system_ut.cpp index bea1e0d1..8f48274e 100644 --- a/core/tests/event_system_unittests/event_system_unittests.cpp +++ b/core/tests/event_system_ut/event_system_ut.cpp @@ -275,7 +275,7 @@ static void catch_context_callback(GATEWAY_HANDLE gw, GATEWAY_EVENT event_type, last_context = ctx; } -BEGIN_TEST_SUITE(event_system_unittests) +BEGIN_TEST_SUITE(event_system_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -1087,4 +1087,4 @@ TEST_FUNCTION(EventSystem_ReportEvent_Modules_Pushback_Fails) EventSystem_Destroy(handle); } -END_TEST_SUITE(event_system_unittests) +END_TEST_SUITE(event_system_ut) diff --git a/core/tests/gateway_unittests/main.c b/core/tests/event_system_ut/main.c similarity index 82% rename from core/tests/gateway_unittests/main.c rename to core/tests/event_system_ut/main.c index 11b716b2..09d7c78e 100644 --- a/core/tests/gateway_unittests/main.c +++ b/core/tests/event_system_ut/main.c @@ -6,6 +6,6 @@ int main(void) { size_t failedTestCount = 0; - RUN_TEST_SUITE(gateway_unittests, failedTestCount); + RUN_TEST_SUITE(event_system_ut, failedTestCount); return failedTestCount; } diff --git a/core/tests/gw_e2etests/CMakeLists.txt b/core/tests/gateway_e2e/CMakeLists.txt similarity index 95% rename from core/tests/gw_e2etests/CMakeLists.txt rename to core/tests/gateway_e2e/CMakeLists.txt index d35f7a32..3333dd02 100644 --- a/core/tests/gw_e2etests/CMakeLists.txt +++ b/core/tests/gateway_e2e/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for the gw e2e tests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName gw_e2etests) +set(theseTestsName gateway_e2e) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/core/tests/gw_e2etests/doc/E2ETestDiagram.vsdx b/core/tests/gateway_e2e/doc/E2ETestDiagram.vsdx similarity index 100% rename from core/tests/gw_e2etests/doc/E2ETestDiagram.vsdx rename to core/tests/gateway_e2e/doc/E2ETestDiagram.vsdx diff --git a/core/tests/gw_e2etests/e2e_module/CMakeLists.txt b/core/tests/gateway_e2e/e2e_module/CMakeLists.txt similarity index 91% rename from core/tests/gw_e2etests/e2e_module/CMakeLists.txt rename to core/tests/gateway_e2e/e2e_module/CMakeLists.txt index 8a0862cc..6877701e 100644 --- a/core/tests/gw_e2etests/e2e_module/CMakeLists.txt +++ b/core/tests/gateway_e2e/e2e_module/CMakeLists.txt @@ -1,7 +1,6 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for the e2e module cmake_minimum_required(VERSION 2.8.11) set(e2e_module_sources diff --git a/core/tests/gw_e2etests/e2e_module/inc/e2e_module.h b/core/tests/gateway_e2e/e2e_module/inc/e2e_module.h similarity index 100% rename from core/tests/gw_e2etests/e2e_module/inc/e2e_module.h rename to core/tests/gateway_e2e/e2e_module/inc/e2e_module.h diff --git a/core/tests/gw_e2etests/e2e_module/src/e2e_module.c b/core/tests/gateway_e2e/e2e_module/src/e2e_module.c similarity index 100% rename from core/tests/gw_e2etests/e2e_module/src/e2e_module.c rename to core/tests/gateway_e2e/e2e_module/src/e2e_module.c diff --git a/core/tests/gw_e2etests/gw_e2etests.cpp b/core/tests/gateway_e2e/gateway_e2e.cpp similarity index 99% rename from core/tests/gw_e2etests/gw_e2etests.cpp rename to core/tests/gateway_e2e/gateway_e2e.cpp index 1d72e7f5..45fc8502 100644 --- a/core/tests/gw_e2etests/gw_e2etests.cpp +++ b/core/tests/gateway_e2e/gateway_e2e.cpp @@ -102,7 +102,7 @@ static int IoTHubCallback(void* context, const char* data, size_t size) return result; } -BEGIN_TEST_SUITE(gw_e2etests) +BEGIN_TEST_SUITE(gateway_e2e) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -233,4 +233,4 @@ BEGIN_TEST_SUITE(gw_e2etests) EventData_Destroy(sendData); } -END_TEST_SUITE(gw_e2etests) +END_TEST_SUITE(gateway_e2e) diff --git a/core/tests/gateway_e2e/main.c b/core/tests/gateway_e2e/main.c new file mode 100644 index 00000000..d9215ebf --- /dev/null +++ b/core/tests/gateway_e2e/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(gateway_e2e, failedTestCount); + return failedTestCount; +} diff --git a/core/tests/gw_e2etests/module_config_linux.c b/core/tests/gateway_e2e/module_config_linux.c similarity index 100% rename from core/tests/gw_e2etests/module_config_linux.c rename to core/tests/gateway_e2e/module_config_linux.c diff --git a/core/tests/gw_e2etests/module_config_windows.c b/core/tests/gateway_e2e/module_config_windows.c similarity index 100% rename from core/tests/gw_e2etests/module_config_windows.c rename to core/tests/gateway_e2e/module_config_windows.c diff --git a/core/tests/gateway_ll_unittests/main.c b/core/tests/gateway_ll_unittests/main.c deleted file mode 100644 index 387c40b3..00000000 --- a/core/tests/gateway_ll_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(gateway_ll_unittests, failedTestCount); - return failedTestCount; -} diff --git a/core/tests/gateway_ll_unittests/CMakeLists.txt b/core/tests/gateway_ll_ut/CMakeLists.txt similarity index 82% rename from core/tests/gateway_ll_unittests/CMakeLists.txt rename to core/tests/gateway_ll_ut/CMakeLists.txt index 856b9099..837696ea 100644 --- a/core/tests/gateway_ll_unittests/CMakeLists.txt +++ b/core/tests/gateway_ll_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#This is the CMakeLists.txt for gateway_ll_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(testSuite gateway_ll_unittests) +set(testSuite gateway_ll_ut) set(${testSuite}_cpp_files ${testSuite}.cpp ) diff --git a/core/tests/gateway_ll_unittests/gateway_ll_unittests.cpp b/core/tests/gateway_ll_ut/gateway_ll_ut.cpp similarity index 99% rename from core/tests/gateway_ll_unittests/gateway_ll_unittests.cpp rename to core/tests/gateway_ll_ut/gateway_ll_ut.cpp index cba3eefd..b6043592 100644 --- a/core/tests/gateway_ll_unittests/gateway_ll_unittests.cpp +++ b/core/tests/gateway_ll_ut/gateway_ll_ut.cpp @@ -334,7 +334,7 @@ static void sampleCallbackFunc(GATEWAY_HANDLE gw, GATEWAY_EVENT event_type, GATE sampleCallbackFuncCallCount++; } -BEGIN_TEST_SUITE(gateway_ll_unittests) +BEGIN_TEST_SUITE(gateway_ll_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -2465,4 +2465,4 @@ TEST_FUNCTION(Gateway_LL_AddLink_Succeeds) Gateway_LL_Destroy(gateway); } -END_TEST_SUITE(gateway_ll_unittests) +END_TEST_SUITE(gateway_ll_ut) diff --git a/core/tests/gateway_ll_ut/main.c b/core/tests/gateway_ll_ut/main.c new file mode 100644 index 00000000..abe5ff41 --- /dev/null +++ b/core/tests/gateway_ll_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(gateway_ll_ut, failedTestCount); + return failedTestCount; +} diff --git a/core/tests/gateway_ll_uwp_unittests/main.c b/core/tests/gateway_ll_uwp_unittests/main.c deleted file mode 100644 index c69c6076..00000000 --- a/core/tests/gateway_ll_uwp_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(gateway_ll_uwp_unittests, failedTestCount); - return failedTestCount; -} diff --git a/core/tests/gateway_ll_uwp_unittests/CMakeLists.txt b/core/tests/gateway_ll_uwp_ut/CMakeLists.txt similarity index 84% rename from core/tests/gateway_ll_uwp_unittests/CMakeLists.txt rename to core/tests/gateway_ll_uwp_ut/CMakeLists.txt index 7ce92601..462c06b5 100644 --- a/core/tests/gateway_ll_uwp_unittests/CMakeLists.txt +++ b/core/tests/gateway_ll_uwp_ut/CMakeLists.txt @@ -1,13 +1,12 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#This is the CMakeLists.txt for gateway_ll_uwp_unittests cmake_minimum_required(VERSION 2.8.11) add_definitions(-DUWP_BINDING) compileAsC99() -set(testSuite gateway_ll_uwp_unittests) +set(testSuite gateway_ll_uwp_ut) set(${testSuite}_cpp_files ${testSuite}.cpp ) diff --git a/core/tests/gateway_ll_uwp_unittests/gateway_ll_uwp_unittests.cpp b/core/tests/gateway_ll_uwp_ut/gateway_ll_uwp_ut.cpp similarity index 99% rename from core/tests/gateway_ll_uwp_unittests/gateway_ll_uwp_unittests.cpp rename to core/tests/gateway_ll_uwp_ut/gateway_ll_uwp_ut.cpp index fe97b16f..1c1dee23 100644 --- a/core/tests/gateway_ll_uwp_unittests/gateway_ll_uwp_unittests.cpp +++ b/core/tests/gateway_ll_uwp_ut/gateway_ll_uwp_ut.cpp @@ -304,7 +304,7 @@ DECLARE_GLOBAL_MOCK_METHOD_1(CGatewayUwpLLMocks, , void, gballoc_free, void*, pt static MICROMOCK_GLOBAL_SEMAPHORE_HANDLE g_dllByDll; static MICROMOCK_MUTEX_HANDLE g_testByTest; -BEGIN_TEST_SUITE(gateway_ll_uwp_unittests) +BEGIN_TEST_SUITE(gateway_ll_uwp_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -555,4 +555,4 @@ TEST_FUNCTION(Gateway_LL_UwpDestroy_Continues_Unloading_If_Broker_RemoveModule_F mocks.AssertActualAndExpectedCalls(); } -END_TEST_SUITE(gateway_ll_uwp_unittests) +END_TEST_SUITE(gateway_ll_uwp_ut) diff --git a/core/tests/gateway_ll_uwp_ut/main.c b/core/tests/gateway_ll_uwp_ut/main.c new file mode 100644 index 00000000..c877699d --- /dev/null +++ b/core/tests/gateway_ll_uwp_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(gateway_ll_uwp_ut, failedTestCount); + return failedTestCount; +} diff --git a/core/tests/gateway_unittests/CMakeLists.txt b/core/tests/gateway_ut/CMakeLists.txt similarity index 84% rename from core/tests/gateway_unittests/CMakeLists.txt rename to core/tests/gateway_ut/CMakeLists.txt index 18ce040d..be0bdc3f 100644 --- a/core/tests/gateway_unittests/CMakeLists.txt +++ b/core/tests/gateway_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#This is the CMakeLists.txt for gateway_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(testSuite gateway_unittests) +set(testSuite gateway_ut) set(${testSuite}_cpp_files ${testSuite}.cpp ) diff --git a/core/tests/gateway_unittests/gateway_unittests.cpp b/core/tests/gateway_ut/gateway_ut.cpp similarity index 99% rename from core/tests/gateway_unittests/gateway_unittests.cpp rename to core/tests/gateway_ut/gateway_ut.cpp index 61fe4a3d..f1d8cc58 100644 --- a/core/tests/gateway_unittests/gateway_unittests.cpp +++ b/core/tests/gateway_ut/gateway_ut.cpp @@ -406,7 +406,7 @@ static MICROMOCK_GLOBAL_SEMAPHORE_HANDLE g_dllByDll; static MICROMOCK_MUTEX_HANDLE g_testByTest; -BEGIN_TEST_SUITE(gateway_unittests) +BEGIN_TEST_SUITE(gateway_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -986,4 +986,4 @@ TEST_FUNCTION(Gateway_Create_Fails_For_Missing_Info_In_JSON_Configuration) mocks.AssertActualAndExpectedCalls(); } -END_TEST_SUITE(gateway_unittests) +END_TEST_SUITE(gateway_ut) diff --git a/core/tests/gateway_ut/main.c b/core/tests/gateway_ut/main.c new file mode 100644 index 00000000..f8af379d --- /dev/null +++ b/core/tests/gateway_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(gateway_ut, failedTestCount); + return failedTestCount; +} diff --git a/core/tests/gwmessage_unittests/main.c b/core/tests/gwmessage_unittests/main.c deleted file mode 100644 index ece1450b..00000000 --- a/core/tests/gwmessage_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(gwmessage_unittests, failedTestCount); - return failedTestCount; -} diff --git a/core/tests/gwmessage_unittests/CMakeLists.txt b/core/tests/gwmessage_ut/CMakeLists.txt similarity index 83% rename from core/tests/gwmessage_unittests/CMakeLists.txt rename to core/tests/gwmessage_ut/CMakeLists.txt index ab877f56..6559d2a8 100644 --- a/core/tests/gwmessage_unittests/CMakeLists.txt +++ b/core/tests/gwmessage_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for gwmessage_unittests cmake_minimum_required(VERSION 2.8.12) compileAsC99() -set(theseTestsName gwmessage_unittests) +set(theseTestsName gwmessage_ut) set(${theseTestsName}_test_files ${theseTestsName}.c diff --git a/core/tests/gwmessage_unittests/gwmessage_unittests.c b/core/tests/gwmessage_ut/gwmessage_ut.c similarity index 99% rename from core/tests/gwmessage_unittests/gwmessage_unittests.c rename to core/tests/gwmessage_ut/gwmessage_ut.c index 13845061..cc142fd2 100644 --- a/core/tests/gwmessage_unittests/gwmessage_unittests.c +++ b/core/tests/gwmessage_ut/gwmessage_ut.c @@ -341,7 +341,7 @@ static const unsigned char fail_whenThereIsOnly1ByteOfcontentSize[] = IMPLEMENT_UMOCK_C_ENUM_TYPE(MAP_RESULT, MAP_RESULT_VALUES); IMPLEMENT_UMOCK_C_ENUM_TYPE(CONSTMAP_RESULT, CONSTMAP_RESULT_VALUES); -BEGIN_TEST_SUITE(gwmessage_unittests) +BEGIN_TEST_SUITE(gwmessage_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -2152,4 +2152,4 @@ BEGIN_TEST_SUITE(gwmessage_unittests) Message_Destroy(messageHandle); } -END_TEST_SUITE(gwmessage_unittests) +END_TEST_SUITE(gwmessage_ut) diff --git a/core/tests/gwmessage_ut/main.c b/core/tests/gwmessage_ut/main.c new file mode 100644 index 00000000..d93406cf --- /dev/null +++ b/core/tests/gwmessage_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(gwmessage_ut, failedTestCount); + return failedTestCount; +} diff --git a/core/tests/module_loader_unittests/main.c b/core/tests/module_loader_unittests/main.c deleted file mode 100644 index 10d8e294..00000000 --- a/core/tests/module_loader_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(module_loader_unittests, failedTestCount); - return failedTestCount; -} diff --git a/core/tests/module_loader_unittests/CMakeLists.txt b/core/tests/module_loader_ut/CMakeLists.txt similarity index 83% rename from core/tests/module_loader_unittests/CMakeLists.txt rename to core/tests/module_loader_ut/CMakeLists.txt index 1aac0ec7..d106f528 100644 --- a/core/tests/module_loader_unittests/CMakeLists.txt +++ b/core/tests/module_loader_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for module_loader_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(testSuiteName module_loader_unittests) +set(testSuiteName module_loader_ut) set(${testSuiteName}_cpp_files ${testSuiteName}.cpp ) diff --git a/core/tests/module_loader_ut/main.c b/core/tests/module_loader_ut/main.c new file mode 100644 index 00000000..534318e7 --- /dev/null +++ b/core/tests/module_loader_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(module_loader_ut, failedTestCount); + return failedTestCount; +} diff --git a/core/tests/module_loader_unittests/module_loader_unittests.cpp b/core/tests/module_loader_ut/module_loader_ut.cpp similarity index 99% rename from core/tests/module_loader_unittests/module_loader_unittests.cpp rename to core/tests/module_loader_ut/module_loader_ut.cpp index 5ce451b0..9fdf7006 100644 --- a/core/tests/module_loader_unittests/module_loader_unittests.cpp +++ b/core/tests/module_loader_ut/module_loader_ut.cpp @@ -159,7 +159,7 @@ DECLARE_GLOBAL_MOCK_METHOD_1(CModuleLoaderMocks, , void, gballoc_free, void*, pt static MICROMOCK_GLOBAL_SEMAPHORE_HANDLE g_dllByDll; static MICROMOCK_MUTEX_HANDLE g_testByTest; -BEGIN_TEST_SUITE(module_loader_unittests) +BEGIN_TEST_SUITE(module_loader_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -425,4 +425,4 @@ BEGIN_TEST_SUITE(module_loader_unittests) ///cleanup } -END_TEST_SUITE(module_loader_unittests) +END_TEST_SUITE(module_loader_ut) diff --git a/core/tests/pubsub_bus_unittests/main.c b/core/tests/pubsub_bus_unittests/main.c deleted file mode 100644 index eee54f23..00000000 --- a/core/tests/pubsub_bus_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(pubsub_broker_unittests, failedTestCount); - return failedTestCount; -} diff --git a/modules/ble/tests/CMakeLists.txt b/modules/ble/tests/CMakeLists.txt index 4d287854..b9dc8fd2 100644 --- a/modules/ble/tests/CMakeLists.txt +++ b/modules/ble/tests/CMakeLists.txt @@ -2,14 +2,13 @@ #Licensed under the MIT license. See LICENSE file in the project root for full license information. cmake_minimum_required(VERSION 2.8.11) -#this is CMakeLists for ble tests folder -add_subdirectory(ble_gatt_io_unittests) -add_subdirectory(bleio_seq_unittests) -add_subdirectory(ble_unittests) -add_subdirectory(ble_hl_unittests) +add_subdirectory(ble_hl_ut) +add_subdirectory(ble_ut) +add_subdirectory(bleio_seq_ut) +add_subdirectory(gatt_io_ut) # add the gio_async_seq unit tests only for Linux if(LINUX) - add_subdirectory(gio_async_seq_unittests) + add_subdirectory(gio_async_seq_ut) endif() \ No newline at end of file diff --git a/modules/ble/tests/ble_gatt_io_unittests/main.c b/modules/ble/tests/ble_gatt_io_unittests/main.c deleted file mode 100644 index 103f6558..00000000 --- a/modules/ble/tests/ble_gatt_io_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(ble_gatt_io_unittests, failedTestCount); - return failedTestCount; -} diff --git a/modules/ble/tests/ble_hl_unittests/CMakeLists.txt b/modules/ble/tests/ble_hl_ut/CMakeLists.txt similarity index 90% rename from modules/ble/tests/ble_hl_unittests/CMakeLists.txt rename to modules/ble/tests/ble_hl_ut/CMakeLists.txt index 78274f2e..6504193a 100644 --- a/modules/ble/tests/ble_hl_unittests/CMakeLists.txt +++ b/modules/ble/tests/ble_hl_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for ble_hl_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName ble_hl_unittests) +set(theseTestsName ble_hl_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp diff --git a/modules/ble/tests/ble_hl_unittests/ble_hl_unittests.cpp b/modules/ble/tests/ble_hl_ut/ble_hl_ut.cpp similarity index 99% rename from modules/ble/tests/ble_hl_unittests/ble_hl_unittests.cpp rename to modules/ble/tests/ble_hl_ut/ble_hl_ut.cpp index 13257c35..21fee0b5 100644 --- a/modules/ble/tests/ble_hl_unittests/ble_hl_unittests.cpp +++ b/modules/ble/tests/ble_hl_ut/ble_hl_ut.cpp @@ -594,7 +594,7 @@ DECLARE_GLOBAL_MOCK_METHOD_1(CBLEHLMocks, , void, ConstMap_Destroy, CONSTMAP_HAN DECLARE_GLOBAL_MOCK_METHOD_3(CBLEHLMocks, , MAP_RESULT, Map_AddOrUpdate, MAP_HANDLE, handle, const char*, key, const char*, value); DECLARE_GLOBAL_MOCK_METHOD_1(CBLEHLMocks, , void, Map_Destroy, MAP_HANDLE, handle); -BEGIN_TEST_SUITE(ble_hl_unittests) +BEGIN_TEST_SUITE(ble_hl_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -2801,4 +2801,4 @@ BEGIN_TEST_SUITE(ble_hl_unittests) ///cleanup } -END_TEST_SUITE(ble_hl_unittests) \ No newline at end of file +END_TEST_SUITE(ble_hl_ut) \ No newline at end of file diff --git a/modules/logger/tests/logger_hl_unittests/main.c b/modules/ble/tests/ble_hl_ut/main.c similarity index 82% rename from modules/logger/tests/logger_hl_unittests/main.c rename to modules/ble/tests/ble_hl_ut/main.c index 895dae73..d3de609c 100644 --- a/modules/logger/tests/logger_hl_unittests/main.c +++ b/modules/ble/tests/ble_hl_ut/main.c @@ -6,6 +6,6 @@ int main(void) { size_t failedTestCount = 0; - RUN_TEST_SUITE(logger_hl_unittests, failedTestCount); + RUN_TEST_SUITE(ble_hl_ut, failedTestCount); return failedTestCount; } diff --git a/modules/ble/tests/ble_unittests/CMakeLists.txt b/modules/ble/tests/ble_ut/CMakeLists.txt similarity index 95% rename from modules/ble/tests/ble_unittests/CMakeLists.txt rename to modules/ble/tests/ble_ut/CMakeLists.txt index 14070dd3..a63ff489 100644 --- a/modules/ble/tests/ble_unittests/CMakeLists.txt +++ b/modules/ble/tests/ble_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for ble_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName ble_unittests) +set(theseTestsName ble_ut) if(LINUX) set(${theseTestsName}_cpp_files diff --git a/modules/ble/tests/ble_unittests/ble_unittests_linux.cpp b/modules/ble/tests/ble_ut/ble_ut_linux.cpp similarity index 99% rename from modules/ble/tests/ble_unittests/ble_unittests_linux.cpp rename to modules/ble/tests/ble_ut/ble_ut_linux.cpp index 9539146f..fe26ed56 100644 --- a/modules/ble/tests/ble_unittests/ble_unittests_linux.cpp +++ b/modules/ble/tests/ble_ut/ble_ut_linux.cpp @@ -571,7 +571,7 @@ DECLARE_GLOBAL_MOCK_METHOD_1(CBLEMocks, , void, g_main_loop_run, GMainLoop*, loo DECLARE_GLOBAL_MOCK_METHOD_1(CBLEMocks, , gboolean, g_main_loop_is_running, GMainLoop*, loop); DECLARE_GLOBAL_MOCK_METHOD_1(CBLEMocks, , void, g_main_loop_quit, GMainLoop*, loop); -BEGIN_TEST_SUITE(ble_unittests) +BEGIN_TEST_SUITE(ble_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -3016,4 +3016,4 @@ BEGIN_TEST_SUITE(ble_unittests) STRING_delete(instruction.characteristic_uuid); } -END_TEST_SUITE(ble_unittests) +END_TEST_SUITE(ble_ut) diff --git a/modules/ble/tests/ble_unittests/ble_unittests_windows.cpp b/modules/ble/tests/ble_ut/ble_ut_windows.cpp similarity index 99% rename from modules/ble/tests/ble_unittests/ble_unittests_windows.cpp rename to modules/ble/tests/ble_ut/ble_ut_windows.cpp index f9ff8ee4..317fe3e9 100644 --- a/modules/ble/tests/ble_unittests/ble_unittests_windows.cpp +++ b/modules/ble/tests/ble_ut/ble_ut_windows.cpp @@ -228,7 +228,7 @@ DECLARE_GLOBAL_MOCK_METHOD_3(CBLEMocks, , void, BLEIO_Seq_Destroy, BLEIO_SEQ_HAN DECLARE_GLOBAL_MOCK_METHOD_1(CBLEMocks, , BLEIO_SEQ_RESULT, BLEIO_Seq_Run, BLEIO_SEQ_HANDLE, bleio_seq_handle); DECLARE_GLOBAL_MOCK_METHOD_2(CBLEMocks, , BLEIO_SEQ_RESULT, BLEIO_Seq_AddInstruction, BLEIO_SEQ_HANDLE, bleio_seq_handle, BLEIO_SEQ_INSTRUCTION*, instruction); -BEGIN_TEST_SUITE(ble_unittests) +BEGIN_TEST_SUITE(ble_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -258,4 +258,4 @@ TEST_FUNCTION_CLEANUP(TestMethodCleanup) } } -END_TEST_SUITE(ble_unittests) \ No newline at end of file +END_TEST_SUITE(ble_ut) \ No newline at end of file diff --git a/modules/ble/tests/ble_ut/main.c b/modules/ble/tests/ble_ut/main.c new file mode 100644 index 00000000..012ad979 --- /dev/null +++ b/modules/ble/tests/ble_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(ble_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/ble/tests/bleio_seq_unittests/main.c b/modules/ble/tests/bleio_seq_unittests/main.c deleted file mode 100644 index b7e28d6e..00000000 --- a/modules/ble/tests/bleio_seq_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(bleio_seq_unittests, failedTestCount); - return failedTestCount; -} diff --git a/modules/ble/tests/bleio_seq_unittests/CMakeLists.txt b/modules/ble/tests/bleio_seq_ut/CMakeLists.txt similarity index 94% rename from modules/ble/tests/bleio_seq_unittests/CMakeLists.txt rename to modules/ble/tests/bleio_seq_ut/CMakeLists.txt index 35be9c26..527f46eb 100644 --- a/modules/ble/tests/bleio_seq_unittests/CMakeLists.txt +++ b/modules/ble/tests/bleio_seq_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for bleio_seq_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName bleio_seq_unittests) +set(theseTestsName bleio_seq_ut) if(LINUX) set(${theseTestsName}_cpp_files diff --git a/modules/ble/tests/bleio_seq_unittests/bleio_seq_unittests_linux.cpp b/modules/ble/tests/bleio_seq_ut/bleio_seq_ut_linux.cpp similarity index 99% rename from modules/ble/tests/bleio_seq_unittests/bleio_seq_unittests_linux.cpp rename to modules/ble/tests/bleio_seq_ut/bleio_seq_ut_linux.cpp index 85edf71f..f5242328 100644 --- a/modules/ble/tests/bleio_seq_unittests/bleio_seq_unittests_linux.cpp +++ b/modules/ble/tests/bleio_seq_ut/bleio_seq_ut_linux.cpp @@ -207,7 +207,7 @@ DECLARE_GLOBAL_MOCK_METHOD_1(CBLEIOSeqMocks, , void, BLEIO_gatt_destroy, BLEIO_G DECLARE_GLOBAL_MOCK_METHOD_3(CBLEIOSeqMocks, , guint, g_timeout_add, guint, interval, GSourceFunc, function, gpointer, data); -BEGIN_TEST_SUITE(bleio_seq_unittests) +BEGIN_TEST_SUITE(bleio_seq_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -3290,4 +3290,4 @@ BEGIN_TEST_SUITE(bleio_seq_unittests) BUFFER_delete(instruction2.data.buffer); } -END_TEST_SUITE(bleio_seq_unittests) +END_TEST_SUITE(bleio_seq_ut) diff --git a/modules/ble/tests/bleio_seq_unittests/bleio_seq_unittests_windows.cpp b/modules/ble/tests/bleio_seq_ut/bleio_seq_ut_windows.cpp similarity index 98% rename from modules/ble/tests/bleio_seq_unittests/bleio_seq_unittests_windows.cpp rename to modules/ble/tests/bleio_seq_ut/bleio_seq_ut_windows.cpp index 764cf838..132fe9ff 100644 --- a/modules/ble/tests/bleio_seq_unittests/bleio_seq_unittests_windows.cpp +++ b/modules/ble/tests/bleio_seq_ut/bleio_seq_ut_windows.cpp @@ -67,7 +67,7 @@ DECLARE_GLOBAL_MOCK_METHOD_1(CBLEIOSeqMocks, , void, gballoc_free, void*, ptr); DECLARE_GLOBAL_MOCK_METHOD_5(CBLEIOSeqMocks, , void, on_write_complete, BLEIO_SEQ_HANDLE, bleio_seq_handle, void*, context, const char*, characteristic_uuid, BLEIO_SEQ_INSTRUCTION_TYPE, type, BLEIO_SEQ_RESULT, result); DECLARE_GLOBAL_MOCK_METHOD_6(CBLEIOSeqMocks, , void, on_read_complete, BLEIO_SEQ_HANDLE, bleio_seq_handle, void*, context, const char*, characteristic_uuid, BLEIO_SEQ_INSTRUCTION_TYPE, type, BLEIO_SEQ_RESULT, result, BUFFER_HANDLE, data); -BEGIN_TEST_SUITE(bleio_seq_unittests) +BEGIN_TEST_SUITE(bleio_seq_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -160,4 +160,4 @@ BEGIN_TEST_SUITE(bleio_seq_unittests) ///cleanup } -END_TEST_SUITE(bleio_seq_unittests) +END_TEST_SUITE(bleio_seq_ut) diff --git a/modules/ble/tests/bleio_seq_ut/main.c b/modules/ble/tests/bleio_seq_ut/main.c new file mode 100644 index 00000000..fa31090b --- /dev/null +++ b/modules/ble/tests/bleio_seq_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(bleio_seq_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/ble/tests/ble_gatt_io_unittests/CMakeLists.txt b/modules/ble/tests/gatt_io_ut/CMakeLists.txt similarity index 95% rename from modules/ble/tests/ble_gatt_io_unittests/CMakeLists.txt rename to modules/ble/tests/gatt_io_ut/CMakeLists.txt index 4c7b2b19..3b0bee09 100644 --- a/modules/ble/tests/ble_gatt_io_unittests/CMakeLists.txt +++ b/modules/ble/tests/gatt_io_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for ble_gatt_io_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName ble_gatt_io_unittests) +set(theseTestsName gatt_io_ut) if(LINUX) set(${theseTestsName}_cpp_files diff --git a/modules/ble/tests/ble_gatt_io_unittests/ble_gatt_io_unittests_linux.cpp b/modules/ble/tests/gatt_io_ut/gatt_io_ut_linux.cpp similarity index 99% rename from modules/ble/tests/ble_gatt_io_unittests/ble_gatt_io_unittests_linux.cpp rename to modules/ble/tests/gatt_io_ut/gatt_io_ut_linux.cpp index 1a4f6fae..5027e508 100644 --- a/modules/ble/tests/ble_gatt_io_unittests/ble_gatt_io_unittests_linux.cpp +++ b/modules/ble/tests/gatt_io_ut/gatt_io_ut_linux.cpp @@ -1446,7 +1446,7 @@ GIO_ASYNCSEQ_RESULT GIO_Async_Seq_Add( return result; } -BEGIN_TEST_SUITE(ble_gatt_io_unittests) +BEGIN_TEST_SUITE(gatt_io_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -3953,4 +3953,4 @@ BEGIN_TEST_SUITE(ble_gatt_io_unittests) BLEIO_gatt_destroy(handle); } -END_TEST_SUITE(ble_gatt_io_unittests) +END_TEST_SUITE(gatt_io_ut) diff --git a/modules/ble/tests/ble_gatt_io_unittests/ble_gatt_io_unittests_windows.cpp b/modules/ble/tests/gatt_io_ut/gatt_io_ut_windows.cpp similarity index 97% rename from modules/ble/tests/ble_gatt_io_unittests/ble_gatt_io_unittests_windows.cpp rename to modules/ble/tests/gatt_io_ut/gatt_io_ut_windows.cpp index 7defc2be..6a7c3821 100644 --- a/modules/ble/tests/ble_gatt_io_unittests/ble_gatt_io_unittests_windows.cpp +++ b/modules/ble/tests/gatt_io_ut/gatt_io_ut_windows.cpp @@ -72,7 +72,7 @@ static void mocks_ResetAllCounters(void) FOR_EACH_1(RESET_API_COUNTERS, LIST_OF_COUNTED_APIS); } -BEGIN_TEST_SUITE(ble_gatt_io_unittests) +BEGIN_TEST_SUITE(gatt_io_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -116,4 +116,4 @@ BEGIN_TEST_SUITE(ble_gatt_io_unittests) ///cleanup } -END_TEST_SUITE(ble_gatt_io_unittests) +END_TEST_SUITE(gatt_io_ut) diff --git a/modules/ble/tests/gatt_io_ut/main.c b/modules/ble/tests/gatt_io_ut/main.c new file mode 100644 index 00000000..f9c233c3 --- /dev/null +++ b/modules/ble/tests/gatt_io_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(gatt_io_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/ble/tests/gio_async_seq_unittests/main.c b/modules/ble/tests/gio_async_seq_unittests/main.c deleted file mode 100644 index ad680491..00000000 --- a/modules/ble/tests/gio_async_seq_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(gio_async_seq_unittests, failedTestCount); - return failedTestCount; -} diff --git a/modules/ble/tests/gio_async_seq_unittests/CMakeLists.txt b/modules/ble/tests/gio_async_seq_ut/CMakeLists.txt similarity index 87% rename from modules/ble/tests/gio_async_seq_unittests/CMakeLists.txt rename to modules/ble/tests/gio_async_seq_ut/CMakeLists.txt index e2a36339..598b7aea 100644 --- a/modules/ble/tests/gio_async_seq_unittests/CMakeLists.txt +++ b/modules/ble/tests/gio_async_seq_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -# this is CMakeLists for the gio_async_seq_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName gio_async_seq_unittests) +set(theseTestsName gio_async_seq_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp diff --git a/modules/ble/tests/gio_async_seq_unittests/gio_async_seq_unittests.cpp b/modules/ble/tests/gio_async_seq_ut/gio_async_seq_ut.cpp similarity index 99% rename from modules/ble/tests/gio_async_seq_unittests/gio_async_seq_unittests.cpp rename to modules/ble/tests/gio_async_seq_ut/gio_async_seq_ut.cpp index 43e05fb5..07c1e1a9 100644 --- a/modules/ble/tests/gio_async_seq_unittests/gio_async_seq_unittests.cpp +++ b/modules/ble/tests/gio_async_seq_ut/gio_async_seq_ut.cpp @@ -268,7 +268,7 @@ static GIO_ASYNCSEQ_RESULT call_GIO_Async_Seq_Adv( return result; } -BEGIN_TEST_SUITE(gio_async_seq_unittests) +BEGIN_TEST_SUITE(gio_async_seq_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll); @@ -1430,4 +1430,4 @@ BEGIN_TEST_SUITE(gio_async_seq_unittests) GIO_Async_Seq_Destroy(handle); } -END_TEST_SUITE(gio_async_seq_unittests) +END_TEST_SUITE(gio_async_seq_ut) diff --git a/modules/ble/tests/gio_async_seq_ut/main.c b/modules/ble/tests/gio_async_seq_ut/main.c new file mode 100644 index 00000000..82c43589 --- /dev/null +++ b/modules/ble/tests/gio_async_seq_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(gio_async_seq_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/hello_world/CMakeLists.txt b/modules/hello_world/CMakeLists.txt index b3c6f12b..92f2b81d 100644 --- a/modules/hello_world/CMakeLists.txt +++ b/modules/hello_world/CMakeLists.txt @@ -1,7 +1,6 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for the hello_world module cmake_minimum_required(VERSION 2.8.11) set(hello_world_sources diff --git a/modules/identitymap/tests/CMakeLists.txt b/modules/identitymap/tests/CMakeLists.txt index d845e829..4a546684 100644 --- a/modules/identitymap/tests/CMakeLists.txt +++ b/modules/identitymap/tests/CMakeLists.txt @@ -2,8 +2,6 @@ #Licensed under the MIT license. See LICENSE file in the project root for full license information. cmake_minimum_required(VERSION 2.8.11) -#this is CMakeLists for identity map tests - -add_subdirectory(idmap_unittests) -add_subdirectory(idmap_hl_unittests) +add_subdirectory(idmap_hl_ut) +add_subdirectory(idmap_ut) diff --git a/modules/identitymap/tests/idmap_hl_unittests/main.c b/modules/identitymap/tests/idmap_hl_unittests/main.c deleted file mode 100644 index 36b74eda..00000000 --- a/modules/identitymap/tests/idmap_hl_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(identitymap_hl_unittests, failedTestCount); - return failedTestCount; -} diff --git a/modules/identitymap/tests/idmap_hl_unittests/CMakeLists.txt b/modules/identitymap/tests/idmap_hl_ut/CMakeLists.txt similarity index 82% rename from modules/identitymap/tests/idmap_hl_unittests/CMakeLists.txt rename to modules/identitymap/tests/idmap_hl_ut/CMakeLists.txt index 15b15db2..880f2a3e 100644 --- a/modules/identitymap/tests/idmap_hl_unittests/CMakeLists.txt +++ b/modules/identitymap/tests/idmap_hl_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for idmap_hl_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName identitymap_hl_unittests) +set(theseTestsName idmap_hl_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/modules/identitymap/tests/idmap_hl_unittests/identitymap_hl_unittests.cpp b/modules/identitymap/tests/idmap_hl_ut/idmap_hl_ut.cpp similarity index 99% rename from modules/identitymap/tests/idmap_hl_unittests/identitymap_hl_unittests.cpp rename to modules/identitymap/tests/idmap_hl_ut/idmap_hl_ut.cpp index c31656e3..c2c9513b 100644 --- a/modules/identitymap/tests/idmap_hl_unittests/identitymap_hl_unittests.cpp +++ b/modules/identitymap/tests/idmap_hl_ut/idmap_hl_ut.cpp @@ -225,7 +225,7 @@ DECLARE_GLOBAL_MOCK_METHOD_1(CIdentitymapHlMocks, , size_t, VECTOR_size, const V -BEGIN_TEST_SUITE(identitymap_hl_unittests) +BEGIN_TEST_SUITE(idmap_hl_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -800,4 +800,4 @@ BEGIN_TEST_SUITE(identitymap_hl_unittests) Module_Destroy(result); } -END_TEST_SUITE(identitymap_hl_unittests) +END_TEST_SUITE(idmap_hl_ut) diff --git a/modules/identitymap/tests/idmap_hl_ut/main.c b/modules/identitymap/tests/idmap_hl_ut/main.c new file mode 100644 index 00000000..5e50a865 --- /dev/null +++ b/modules/identitymap/tests/idmap_hl_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(idmap_hl_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/identitymap/tests/idmap_unittests/main.c b/modules/identitymap/tests/idmap_unittests/main.c deleted file mode 100644 index 49943fee..00000000 --- a/modules/identitymap/tests/idmap_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(identitymap_unittests, failedTestCount); - return failedTestCount; -} diff --git a/modules/identitymap/tests/idmap_unittests/CMakeLists.txt b/modules/identitymap/tests/idmap_ut/CMakeLists.txt similarity index 83% rename from modules/identitymap/tests/idmap_unittests/CMakeLists.txt rename to modules/identitymap/tests/idmap_ut/CMakeLists.txt index 22b68aa8..8782068c 100644 --- a/modules/identitymap/tests/idmap_unittests/CMakeLists.txt +++ b/modules/identitymap/tests/idmap_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for idmap_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName identitymap_unittests) +set(theseTestsName idmap_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/modules/identitymap/tests/idmap_unittests/identitymap_unittests.cpp b/modules/identitymap/tests/idmap_ut/idmap_ut.cpp similarity index 99% rename from modules/identitymap/tests/idmap_unittests/identitymap_unittests.cpp rename to modules/identitymap/tests/idmap_ut/idmap_ut.cpp index d379e4bf..bfb9f335 100644 --- a/modules/identitymap/tests/idmap_unittests/identitymap_unittests.cpp +++ b/modules/identitymap/tests/idmap_ut/idmap_ut.cpp @@ -479,7 +479,7 @@ DECLARE_GLOBAL_MOCK_METHOD_2(CIdentitymapMocks, , int, mallocAndStrcpy_s, char** DECLARE_GLOBAL_MOCK_METHOD_3(CIdentitymapMocks, , int, unsignedIntToString, char*, destination, size_t, destinationSize, unsigned int, value); DECLARE_GLOBAL_MOCK_METHOD_3(CIdentitymapMocks, , int, size_tToString, char*, destination, size_t, destinationSize, size_t, value); -BEGIN_TEST_SUITE(identitymap_unittests) +BEGIN_TEST_SUITE(idmap_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -3273,4 +3273,4 @@ BEGIN_TEST_SUITE(identitymap_unittests) } // -END_TEST_SUITE(identitymap_unittests) +END_TEST_SUITE(idmap_ut) diff --git a/modules/identitymap/tests/idmap_ut/main.c b/modules/identitymap/tests/idmap_ut/main.c new file mode 100644 index 00000000..52b06466 --- /dev/null +++ b/modules/identitymap/tests/idmap_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(idmap_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/iothubhttp/tests/CMakeLists.txt b/modules/iothubhttp/tests/CMakeLists.txt index e1192433..cb15177c 100644 --- a/modules/iothubhttp/tests/CMakeLists.txt +++ b/modules/iothubhttp/tests/CMakeLists.txt @@ -2,7 +2,6 @@ #Licensed under the MIT license. See LICENSE file in the project root for full license information. cmake_minimum_required(VERSION 2.8.11) -#this is CMakeLists for iothubhttp module tests -add_subdirectory(iothubhttp_unittests) -add_subdirectory(iothubhttp_hl_unittests) +add_subdirectory(iothubhttp_hl_ut) +add_subdirectory(iothubhttp_ut) diff --git a/modules/iothubhttp/tests/iothubhttp_hl_unittests/main.c b/modules/iothubhttp/tests/iothubhttp_hl_unittests/main.c deleted file mode 100644 index 7623bafb..00000000 --- a/modules/iothubhttp/tests/iothubhttp_hl_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(iothubhttp_hl_unittests, failedTestCount); - return failedTestCount; -} diff --git a/modules/iothubhttp/tests/iothubhttp_hl_unittests/CMakeLists.txt b/modules/iothubhttp/tests/iothubhttp_hl_ut/CMakeLists.txt similarity index 81% rename from modules/iothubhttp/tests/iothubhttp_hl_unittests/CMakeLists.txt rename to modules/iothubhttp/tests/iothubhttp_hl_ut/CMakeLists.txt index 3b744c45..fa623b13 100644 --- a/modules/iothubhttp/tests/iothubhttp_hl_unittests/CMakeLists.txt +++ b/modules/iothubhttp/tests/iothubhttp_hl_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for the iothubhttp_hl_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName iothubhttp_hl_unittests) +set(theseTestsName iothubhttp_hl_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/modules/iothubhttp/tests/iothubhttp_hl_unittests/iothubhttp_hl_unittests.cpp b/modules/iothubhttp/tests/iothubhttp_hl_ut/iothubhttp_hl_ut.cpp similarity index 99% rename from modules/iothubhttp/tests/iothubhttp_hl_unittests/iothubhttp_hl_unittests.cpp rename to modules/iothubhttp/tests/iothubhttp_hl_ut/iothubhttp_hl_ut.cpp index 9d82b573..e1c72314 100644 --- a/modules/iothubhttp/tests/iothubhttp_hl_unittests/iothubhttp_hl_unittests.cpp +++ b/modules/iothubhttp/tests/iothubhttp_hl_ut/iothubhttp_hl_ut.cpp @@ -155,7 +155,7 @@ DECLARE_GLOBAL_MOCK_METHOD_1(CIoTHubHTTPHLMocks, , void*, gballoc_malloc, size_t DECLARE_GLOBAL_MOCK_METHOD_1(CIoTHubHTTPHLMocks, , void, gballoc_free, void*, ptr); -BEGIN_TEST_SUITE(iothubhttp_hl_unittests) +BEGIN_TEST_SUITE(iothubhttp_hl_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -459,4 +459,4 @@ TEST_FUNCTION(IoTHubHttp_HL_Receive_does_everything) Module_Destroy(result); } -END_TEST_SUITE(iothubhttp_hl_unittests) +END_TEST_SUITE(iothubhttp_hl_ut) diff --git a/modules/iothubhttp/tests/iothubhttp_hl_ut/main.c b/modules/iothubhttp/tests/iothubhttp_hl_ut/main.c new file mode 100644 index 00000000..30ef26a9 --- /dev/null +++ b/modules/iothubhttp/tests/iothubhttp_hl_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(iothubhttp_hl_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/iothubhttp/tests/iothubhttp_unittests/main.c b/modules/iothubhttp/tests/iothubhttp_unittests/main.c deleted file mode 100644 index b04de411..00000000 --- a/modules/iothubhttp/tests/iothubhttp_unittests/main.c +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "testrunnerswitcher.h" - -int main(void) -{ - size_t failedTestCount = 0; - RUN_TEST_SUITE(iothubhttp_unittests, failedTestCount); - return failedTestCount; -} diff --git a/modules/iothubhttp/tests/iothubhttp_unittests/CMakeLists.txt b/modules/iothubhttp/tests/iothubhttp_ut/CMakeLists.txt similarity index 82% rename from modules/iothubhttp/tests/iothubhttp_unittests/CMakeLists.txt rename to modules/iothubhttp/tests/iothubhttp_ut/CMakeLists.txt index a41df717..49776f02 100644 --- a/modules/iothubhttp/tests/iothubhttp_unittests/CMakeLists.txt +++ b/modules/iothubhttp/tests/iothubhttp_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for iothubhttp_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName iothubhttp_unittests) +set(theseTestsName iothubhttp_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/modules/iothubhttp/tests/iothubhttp_unittests/iothubhttp_unittests.cpp b/modules/iothubhttp/tests/iothubhttp_ut/iothubhttp_ut.cpp similarity index 99% rename from modules/iothubhttp/tests/iothubhttp_unittests/iothubhttp_unittests.cpp rename to modules/iothubhttp/tests/iothubhttp_ut/iothubhttp_ut.cpp index 00bb5fa2..6c7bab7d 100644 --- a/modules/iothubhttp/tests/iothubhttp_unittests/iothubhttp_unittests.cpp +++ b/modules/iothubhttp/tests/iothubhttp_ut/iothubhttp_ut.cpp @@ -622,7 +622,7 @@ DECLARE_GLOBAL_MOCK_METHOD_3(CIoTHubHTTPMocks, , TRANSPORT_HANDLE, IoTHubTranspo DECLARE_GLOBAL_MOCK_METHOD_1(CIoTHubHTTPMocks, , void, IoTHubTransport_Destroy, TRANSPORT_HANDLE, transportHlHandle) DECLARE_GLOBAL_MOCK_METHOD_3(CIoTHubHTTPMocks, , BROKER_RESULT, Broker_Publish, BROKER_HANDLE, broker, MODULE_HANDLE, source, MESSAGE_HANDLE, message) -BEGIN_TEST_SUITE(iothubhttp_unittests) +BEGIN_TEST_SUITE(iothubhttp_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -2899,4 +2899,4 @@ BEGIN_TEST_SUITE(iothubhttp_unittests) Module_Destroy(module); } -END_TEST_SUITE(iothubhttp_unittests) +END_TEST_SUITE(iothubhttp_ut) diff --git a/modules/iothubhttp/tests/iothubhttp_ut/main.c b/modules/iothubhttp/tests/iothubhttp_ut/main.c new file mode 100644 index 00000000..799e8595 --- /dev/null +++ b/modules/iothubhttp/tests/iothubhttp_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(iothubhttp_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/logger/CMakeLists.txt b/modules/logger/CMakeLists.txt index c7370bff..f318b2ea 100644 --- a/modules/logger/CMakeLists.txt +++ b/modules/logger/CMakeLists.txt @@ -1,7 +1,6 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for the logger module cmake_minimum_required(VERSION 2.8.11) set(logger_sources diff --git a/modules/logger/tests/CMakeLists.txt b/modules/logger/tests/CMakeLists.txt index eaa84d94..fc2a408b 100644 --- a/modules/logger/tests/CMakeLists.txt +++ b/modules/logger/tests/CMakeLists.txt @@ -4,5 +4,5 @@ cmake_minimum_required(VERSION 2.8.11) #this is CMakeLists for logger tests folder -add_subdirectory(logger_unittests) -add_subdirectory(logger_hl_unittests) +add_subdirectory(logger_hl_ut) +add_subdirectory(logger_ut) diff --git a/modules/logger/tests/logger_hl_unittests/CMakeLists.txt b/modules/logger/tests/logger_hl_ut/CMakeLists.txt similarity index 83% rename from modules/logger/tests/logger_hl_unittests/CMakeLists.txt rename to modules/logger/tests/logger_hl_ut/CMakeLists.txt index a5082fa6..d4b8525d 100644 --- a/modules/logger/tests/logger_hl_unittests/CMakeLists.txt +++ b/modules/logger/tests/logger_hl_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for logger_hl_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName logger_hl_unittests) +set(theseTestsName logger_hl_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/modules/logger/tests/logger_hl_unittests/logger_hl_unittests.cpp b/modules/logger/tests/logger_hl_ut/logger_hl_ut.cpp similarity index 99% rename from modules/logger/tests/logger_hl_unittests/logger_hl_unittests.cpp rename to modules/logger/tests/logger_hl_ut/logger_hl_ut.cpp index 1a11b36e..fb987df3 100644 --- a/modules/logger/tests/logger_hl_unittests/logger_hl_unittests.cpp +++ b/modules/logger/tests/logger_hl_ut/logger_hl_ut.cpp @@ -475,7 +475,7 @@ static MESSAGE_HANDLE VALID_MESSAGE_HANDLE = (MESSAGE_HANDLE)0x02; static MICROMOCK_MUTEX_HANDLE g_testByTest; static MICROMOCK_GLOBAL_SEMAPHORE_HANDLE g_dllByDll; -BEGIN_TEST_SUITE(logger_hl_unittests) +BEGIN_TEST_SUITE(logger_hl_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -735,4 +735,4 @@ BEGIN_TEST_SUITE(logger_hl_unittests) ///cleanup } -END_TEST_SUITE(logger_hl_unittests) +END_TEST_SUITE(logger_hl_ut) diff --git a/modules/logger/tests/logger_hl_ut/main.c b/modules/logger/tests/logger_hl_ut/main.c new file mode 100644 index 00000000..5b2974a0 --- /dev/null +++ b/modules/logger/tests/logger_hl_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include +#include "testrunnerswitcher.h" +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(logger_hl_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/logger/tests/logger_unittests/CMakeLists.txt b/modules/logger/tests/logger_ut/CMakeLists.txt similarity index 85% rename from modules/logger/tests/logger_unittests/CMakeLists.txt rename to modules/logger/tests/logger_ut/CMakeLists.txt index 915ee5f2..2ac38db1 100644 --- a/modules/logger/tests/logger_unittests/CMakeLists.txt +++ b/modules/logger/tests/logger_ut/CMakeLists.txt @@ -1,11 +1,10 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for logger_unittests cmake_minimum_required(VERSION 2.8.11) compileAsC99() -set(theseTestsName logger_unittests) +set(theseTestsName logger_ut) set(${theseTestsName}_cpp_files ${theseTestsName}.cpp ) diff --git a/modules/logger/tests/logger_unittests/logger_unittests.cpp b/modules/logger/tests/logger_ut/logger_ut.cpp similarity index 99% rename from modules/logger/tests/logger_unittests/logger_unittests.cpp rename to modules/logger/tests/logger_ut/logger_ut.cpp index 1a7296d4..83d33bb4 100644 --- a/modules/logger/tests/logger_unittests/logger_unittests.cpp +++ b/modules/logger/tests/logger_ut/logger_ut.cpp @@ -257,7 +257,7 @@ static void mocks_ResetAllCounters(void) FOR_EACH_1(RESET_API_COUNTERS, LIST_OF_COUNTED_APIS); } -BEGIN_TEST_SUITE(logger_unittests) +BEGIN_TEST_SUITE(logger_ut) TEST_SUITE_INITIALIZE(TestClassInitialize) { @@ -1936,4 +1936,4 @@ BEGIN_TEST_SUITE(logger_unittests) ASSERT_IS_NOT_NULL(result->Module_Destroy); ASSERT_IS_NOT_NULL(result->Module_Receive); } -END_TEST_SUITE(logger_unittests) +END_TEST_SUITE(logger_ut) diff --git a/modules/logger/tests/logger_ut/main.c b/modules/logger/tests/logger_ut/main.c new file mode 100644 index 00000000..7ac159a8 --- /dev/null +++ b/modules/logger/tests/logger_ut/main.c @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "testrunnerswitcher.h" + +int main(void) +{ + size_t failedTestCount = 0; + RUN_TEST_SUITE(logger_ut, failedTestCount); + return failedTestCount; +} diff --git a/modules/simulated_device/CMakeLists.txt b/modules/simulated_device/CMakeLists.txt index 506d7993..500db2bb 100644 --- a/modules/simulated_device/CMakeLists.txt +++ b/modules/simulated_device/CMakeLists.txt @@ -1,7 +1,6 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. -#this is CMakeLists.txt for the simulated_device module cmake_minimum_required(VERSION 2.8.11) set(simulated_device_sources