Shorten paths to gateway tests

embdur · Aug 10, 2016 · bd8509e · bd8509e
1 parent 14c1b38
commit bd8509e
Show file tree

Hide file tree

Showing 128 changed files with 320 additions and 360 deletions.
diff --git 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
@@ -3,6 +3,5 @@
 
 cmake_minimum_required(VERSION 2.8.11)
 
-add_subdirectory(dotnet_hl_unittests)
-
-add_subdirectory(dotnet_unittests)
+add_subdirectory(dotnet_hl_ut)
+add_subdirectory(dotnet_ut)
diff --git a/.../tests/dotnet_hl_unittests/CMakeLists.txt → .../dotnet/tests/dotnet_hl_ut/CMakeLists.txt b/.../tests/dotnet_hl_unittests/CMakeLists.txt → .../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/...tnet_hl_unittests/dotnet_hl_unittests.cpp → ...otnet/tests/dotnet_hl_ut/dotnet_hl_ut.cpp b/...tnet_hl_unittests/dotnet_hl_unittests.cpp → ...otnet/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)
+END_TEST_SUITE(dotnet_hl_ut)
diff --git a/modules/ble/tests/ble_hl_unittests/main.c → bindings/dotnet/tests/dotnet_hl_ut/main.c b/modules/ble/tests/ble_hl_unittests/main.c → 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/...net/tests/dotnet_unittests/CMakeLists.txt → ...ngs/dotnet/tests/dotnet_ut/CMakeLists.txt b/...net/tests/dotnet_unittests/CMakeLists.txt → ...ngs/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/...sts/dotnet_unittests/dotnet_unittests.cpp → ...ings/dotnet/tests/dotnet_ut/dotnet_ut.cpp b/...sts/dotnet_unittests/dotnet_unittests.cpp → ...ings/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)
+END_TEST_SUITE(dotnet_ut)
diff --git a/...ings/dotnet/tests/dotnet_unittests/main.c → bindings/dotnet/tests/dotnet_ut/main.c b/...ings/dotnet/tests/dotnet_unittests/main.c → 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
@@ -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/...a_module_host_hl_unittests/CMakeLists.txt → ...ings/java/tests/host_hl_ut/CMakeLists.txt b/...a_module_host_hl_unittests/CMakeLists.txt → ...ings/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/...unittests/java_module_host_hl_unittests.c → bindings/java/tests/host_hl_ut/host_hl_ut.c b/...unittests/java_module_host_hl_unittests.c → bindings/java/tests/host_hl_ut/host_hl_ut.c
diff --git a/...ests/java_module_host_hl_unittests/main.c → bindings/java/tests/host_hl_ut/main.c b/...ests/java_module_host_hl_unittests/main.c → bindings/java/tests/host_hl_ut/main.c
diff --git a/...ule_host_manager_unittests/CMakeLists.txt → ...java/tests/host_manager_ut/CMakeLists.txt b/...ule_host_manager_unittests/CMakeLists.txt → ...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/...ests/java_module_host_manager_unittests.c → ...a/tests/host_manager_ut/host_manager_ut.c b/...ests/java_module_host_manager_unittests.c → ...a/tests/host_manager_ut/host_manager_ut.c
diff --git a/...java_module_host_manager_unittests/main.c → bindings/java/tests/host_manager_ut/main.c b/...java_module_host_manager_unittests/main.c → bindings/java/tests/host_manager_ut/main.c
diff --git a/...java_module_host_unittests/CMakeLists.txt → bindings/java/tests/host_ut/CMakeLists.txt b/...java_module_host_unittests/CMakeLists.txt → 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/...st_unittests/java_module_host_unittests.c → bindings/java/tests/host_ut/host_ut.c b/...st_unittests/java_module_host_unittests.c → bindings/java/tests/host_ut/host_ut.c
diff --git a/...a/tests/java_module_host_unittests/main.c → bindings/java/tests/host_ut/main.c b/...a/tests/java_module_host_unittests/main.c → bindings/java/tests/host_ut/main.c
diff --git 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
diff --git a/...odejs_binding_hl_unittests/CMakeLists.txt → .../nodejs/tests/nodejs_hl_ut/CMakeLists.txt b/...odejs_binding_hl_unittests/CMakeLists.txt → .../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/...s/dotnet/tests/dotnet_hl_unittests/main.c → bindings/nodejs/tests/nodejs_hl_ut/main.c b/...s/dotnet/tests/dotnet_hl_unittests/main.c → 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/...unittests/nodejs_binding_hl_unittests.cpp → ...odejs/tests/nodejs_hl_ut/nodejs_hl_ut.cpp b/...unittests/nodejs_binding_hl_unittests.cpp → ...odejs/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/...s_binding_integrationtests/CMakeLists.txt → ...gs/nodejs/tests/nodejs_int/CMakeLists.txt b/...s_binding_integrationtests/CMakeLists.txt → ...gs/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/...ts/nodejs_binding_integrationtests/main.c → bindings/nodejs/tests/nodejs_int/main.c b/...ts/nodejs_binding_integrationtests/main.c → 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/...tests/nodejs_binding_integrationtests.cpp → ...gs/nodejs/tests/nodejs_int/nodejs_int.cpp b/...tests/nodejs_binding_integrationtests.cpp → ...gs/nodejs/tests/nodejs_int/nodejs_int.cpp
@@ -286,7 +286,7 @@ static void publish_mock_message(const v8::FunctionCallbackInfo<v8::Value>& 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
@@ -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
@@ -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
@@ -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
diff --git a/...ts/broadcast_bus_unittests/CMakeLists.txt → core/tests/broadcast_bus_ut/CMakeLists.txt b/...ts/broadcast_bus_unittests/CMakeLists.txt → 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/...bus_unittests/broadcast_bus_unittests.cpp → ...sts/broadcast_bus_ut/broadcast_bus_ut.cpp b/...bus_unittests/broadcast_bus_unittests.cpp → ...sts/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 → core/tests/broadcast_bus_ut/main.c b/modules/logger/tests/logger_unittests/main.c → 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/...tests/pubsub_bus_unittests/CMakeLists.txt → core/tests/broker_ut/CMakeLists.txt b/...tests/pubsub_bus_unittests/CMakeLists.txt → 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/...ub_bus_unittests/pubsub_bus_unittests.cpp → core/tests/broker_ut/broker_ut.cpp b/...ub_bus_unittests/pubsub_bus_unittests.cpp → 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 → core/tests/broker_ut/main.c b/core/tests/gw_e2etests/main.c → 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
diff --git a/...tests/broker_uwp_unittests/CMakeLists.txt → core/tests/broker_uwp_ut/CMakeLists.txt b/...tests/broker_uwp_unittests/CMakeLists.txt → 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
 )