diff --git a/CMakeLists.txt b/CMakeLists.txt index 4309ae2..090c846 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ endif() project(wrp_sdk VERSION 0.1.5) ## Project Options -set(BUILD_TESTS OFF) +option(BUILD_TESTS ON) ## Check if pkg is built with ROS catkin if(CATKIN_DEVEL_PREFIX) @@ -60,6 +60,8 @@ if(BUILD_WITHOUT_ROS) endif() # Build libraries +find_package(Threads REQUIRED) + add_library(${PROJECT_NAME} src/async_serial.cpp src/async_can.cpp @@ -73,7 +75,7 @@ add_library(${PROJECT_NAME} src/platforms/scout_uart_parser.c ) target_compile_definitions(${PROJECT_NAME} PUBLIC "-DASIO_ENABLE_OLD_SERVICES -DASIO_HAS_POSIX_STREAM_DESCRIPTOR") -target_link_libraries(${PROJECT_NAME} pthread) +target_link_libraries(${PROJECT_NAME} Threads::Threads) target_include_directories(${PROJECT_NAME} PUBLIC $ $ @@ -97,10 +99,12 @@ endif() # Build tests if(PROJECT_NAME STREQUAL CMAKE_PROJECT_NAME AND BUILD_TESTS) + message(STATUS "Tests will be built") enable_testing() include(GoogleTest) add_subdirectory(tests) - add_subdirectory(unit_tests) +else() + message(STATUS "Tests will not be built") endif() ## Installation configuration diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6ea0499..cbd664e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,22 +1,17 @@ -# Add executables -add_executable(test_aserial test_aserial.cpp) -target_link_libraries(test_aserial wrp_sdk) +# Google tests +message(STATUS "Build unit tests with Google Test.") +add_subdirectory(googletest) -add_executable(test_aserial_comm test_aserial_comm.cpp) -target_link_libraries(test_aserial_comm wrp_sdk) +# reference: https://cliutils.gitlab.io/modern-cmake/chapters/testing/googletest.html +mark_as_advanced( + BUILD_GMOCK BUILD_GTEST BUILD_SHARED_LIBS + gmock_build_tests gtest_build_samples gtest_build_tests + gtest_disable_pthreads gtest_force_shared_crt gtest_hide_internal_symbols +) -add_executable(test_asio_can test_asio_can.cpp) -target_link_libraries(test_asio_can wrp_sdk) - -add_executable(test_acan test_acan.cpp) -target_link_libraries(test_acan wrp_sdk) - -# hunter -add_executable(test_hunter_base test_hunter_base.cpp) -target_link_libraries(test_hunter_base wrp_sdk) - -# scout -add_executable(test_scout_base test_scout_base.cpp) -target_link_libraries(test_scout_base wrp_sdk) - -# tracer +# add unit tests +set(GRAPH_TESTS + unit_tests/scout_can_protocol_test.cpp +) +add_executable(gtest_all ${GRAPH_TESTS}) +target_link_libraries(gtest_all gtest gmock gtest_main wrp_sdk) diff --git a/tests/devel_tests/CMakeLists.txt b/tests/devel_tests/CMakeLists.txt new file mode 100644 index 0000000..6ea0499 --- /dev/null +++ b/tests/devel_tests/CMakeLists.txt @@ -0,0 +1,22 @@ +# Add executables +add_executable(test_aserial test_aserial.cpp) +target_link_libraries(test_aserial wrp_sdk) + +add_executable(test_aserial_comm test_aserial_comm.cpp) +target_link_libraries(test_aserial_comm wrp_sdk) + +add_executable(test_asio_can test_asio_can.cpp) +target_link_libraries(test_asio_can wrp_sdk) + +add_executable(test_acan test_acan.cpp) +target_link_libraries(test_acan wrp_sdk) + +# hunter +add_executable(test_hunter_base test_hunter_base.cpp) +target_link_libraries(test_hunter_base wrp_sdk) + +# scout +add_executable(test_scout_base test_scout_base.cpp) +target_link_libraries(test_scout_base wrp_sdk) + +# tracer diff --git a/tests/test_acan.cpp b/tests/devel_tests/test_acan.cpp similarity index 100% rename from tests/test_acan.cpp rename to tests/devel_tests/test_acan.cpp diff --git a/tests/test_aserial.cpp b/tests/devel_tests/test_aserial.cpp similarity index 100% rename from tests/test_aserial.cpp rename to tests/devel_tests/test_aserial.cpp diff --git a/tests/test_aserial_comm.cpp b/tests/devel_tests/test_aserial_comm.cpp similarity index 100% rename from tests/test_aserial_comm.cpp rename to tests/devel_tests/test_aserial_comm.cpp diff --git a/tests/test_asio_can.cpp b/tests/devel_tests/test_asio_can.cpp similarity index 100% rename from tests/test_asio_can.cpp rename to tests/devel_tests/test_asio_can.cpp diff --git a/tests/test_can_msg.cpp b/tests/devel_tests/test_can_msg.cpp similarity index 100% rename from tests/test_can_msg.cpp rename to tests/devel_tests/test_can_msg.cpp diff --git a/tests/test_hunter_base.cpp b/tests/devel_tests/test_hunter_base.cpp similarity index 100% rename from tests/test_hunter_base.cpp rename to tests/devel_tests/test_hunter_base.cpp diff --git a/tests/test_scout_base.cpp b/tests/devel_tests/test_scout_base.cpp similarity index 100% rename from tests/test_scout_base.cpp rename to tests/devel_tests/test_scout_base.cpp diff --git a/tests/test_scout_serial.cpp b/tests/devel_tests/test_scout_serial.cpp similarity index 100% rename from tests/test_scout_serial.cpp rename to tests/devel_tests/test_scout_serial.cpp diff --git a/tests/test_serial_parser.cpp b/tests/devel_tests/test_serial_parser.cpp similarity index 100% rename from tests/test_serial_parser.cpp rename to tests/devel_tests/test_serial_parser.cpp diff --git a/tests/test_tracer_base.cpp b/tests/devel_tests/test_tracer_base.cpp similarity index 100% rename from tests/test_tracer_base.cpp rename to tests/devel_tests/test_tracer_base.cpp diff --git a/unit_tests/googletest/.gitignore b/tests/googletest/.gitignore similarity index 100% rename from unit_tests/googletest/.gitignore rename to tests/googletest/.gitignore diff --git a/unit_tests/googletest/.travis.yml b/tests/googletest/.travis.yml similarity index 100% rename from unit_tests/googletest/.travis.yml rename to tests/googletest/.travis.yml diff --git a/unit_tests/googletest/BUILD.bazel b/tests/googletest/BUILD.bazel similarity index 100% rename from unit_tests/googletest/BUILD.bazel rename to tests/googletest/BUILD.bazel diff --git a/unit_tests/googletest/CMakeLists.txt b/tests/googletest/CMakeLists.txt similarity index 100% rename from unit_tests/googletest/CMakeLists.txt rename to tests/googletest/CMakeLists.txt diff --git a/unit_tests/googletest/CONTRIBUTING.md b/tests/googletest/CONTRIBUTING.md similarity index 100% rename from unit_tests/googletest/CONTRIBUTING.md rename to tests/googletest/CONTRIBUTING.md diff --git a/unit_tests/googletest/LICENSE b/tests/googletest/LICENSE similarity index 100% rename from unit_tests/googletest/LICENSE rename to tests/googletest/LICENSE diff --git a/unit_tests/googletest/Makefile.am b/tests/googletest/Makefile.am similarity index 100% rename from unit_tests/googletest/Makefile.am rename to tests/googletest/Makefile.am diff --git a/unit_tests/googletest/README.md b/tests/googletest/README.md similarity index 100% rename from unit_tests/googletest/README.md rename to tests/googletest/README.md diff --git a/unit_tests/googletest/VERSION.md b/tests/googletest/VERSION.md similarity index 100% rename from unit_tests/googletest/VERSION.md rename to tests/googletest/VERSION.md diff --git a/unit_tests/googletest/WORKSPACE b/tests/googletest/WORKSPACE similarity index 100% rename from unit_tests/googletest/WORKSPACE rename to tests/googletest/WORKSPACE diff --git a/unit_tests/googletest/appveyor.yml b/tests/googletest/appveyor.yml similarity index 100% rename from unit_tests/googletest/appveyor.yml rename to tests/googletest/appveyor.yml diff --git a/unit_tests/googletest/ci/build-linux-autotools.sh b/tests/googletest/ci/build-linux-autotools.sh similarity index 100% rename from unit_tests/googletest/ci/build-linux-autotools.sh rename to tests/googletest/ci/build-linux-autotools.sh diff --git a/unit_tests/googletest/ci/build-linux-bazel.sh b/tests/googletest/ci/build-linux-bazel.sh similarity index 100% rename from unit_tests/googletest/ci/build-linux-bazel.sh rename to tests/googletest/ci/build-linux-bazel.sh diff --git a/unit_tests/googletest/ci/env-linux.sh b/tests/googletest/ci/env-linux.sh similarity index 100% rename from unit_tests/googletest/ci/env-linux.sh rename to tests/googletest/ci/env-linux.sh diff --git a/unit_tests/googletest/ci/env-osx.sh b/tests/googletest/ci/env-osx.sh similarity index 100% rename from unit_tests/googletest/ci/env-osx.sh rename to tests/googletest/ci/env-osx.sh diff --git a/unit_tests/googletest/ci/get-nprocessors.sh b/tests/googletest/ci/get-nprocessors.sh similarity index 100% rename from unit_tests/googletest/ci/get-nprocessors.sh rename to tests/googletest/ci/get-nprocessors.sh diff --git a/unit_tests/googletest/ci/install-linux.sh b/tests/googletest/ci/install-linux.sh similarity index 100% rename from unit_tests/googletest/ci/install-linux.sh rename to tests/googletest/ci/install-linux.sh diff --git a/unit_tests/googletest/ci/install-osx.sh b/tests/googletest/ci/install-osx.sh similarity index 100% rename from unit_tests/googletest/ci/install-osx.sh rename to tests/googletest/ci/install-osx.sh diff --git a/unit_tests/googletest/ci/log-config.sh b/tests/googletest/ci/log-config.sh similarity index 100% rename from unit_tests/googletest/ci/log-config.sh rename to tests/googletest/ci/log-config.sh diff --git a/unit_tests/googletest/ci/travis.sh b/tests/googletest/ci/travis.sh similarity index 100% rename from unit_tests/googletest/ci/travis.sh rename to tests/googletest/ci/travis.sh diff --git a/unit_tests/googletest/configure.ac b/tests/googletest/configure.ac similarity index 100% rename from unit_tests/googletest/configure.ac rename to tests/googletest/configure.ac diff --git a/unit_tests/googletest/googlemock/CHANGES b/tests/googletest/googlemock/CHANGES similarity index 100% rename from unit_tests/googletest/googlemock/CHANGES rename to tests/googletest/googlemock/CHANGES diff --git a/unit_tests/googletest/googlemock/CMakeLists.txt b/tests/googletest/googlemock/CMakeLists.txt similarity index 100% rename from unit_tests/googletest/googlemock/CMakeLists.txt rename to tests/googletest/googlemock/CMakeLists.txt diff --git a/unit_tests/googletest/googlemock/CONTRIBUTORS b/tests/googletest/googlemock/CONTRIBUTORS similarity index 100% rename from unit_tests/googletest/googlemock/CONTRIBUTORS rename to tests/googletest/googlemock/CONTRIBUTORS diff --git a/unit_tests/googletest/googlemock/LICENSE b/tests/googletest/googlemock/LICENSE similarity index 100% rename from unit_tests/googletest/googlemock/LICENSE rename to tests/googletest/googlemock/LICENSE diff --git a/unit_tests/googletest/googlemock/Makefile.am b/tests/googletest/googlemock/Makefile.am similarity index 100% rename from unit_tests/googletest/googlemock/Makefile.am rename to tests/googletest/googlemock/Makefile.am diff --git a/unit_tests/googletest/googlemock/README.md b/tests/googletest/googlemock/README.md similarity index 100% rename from unit_tests/googletest/googlemock/README.md rename to tests/googletest/googlemock/README.md diff --git a/unit_tests/googletest/googlemock/cmake/gmock.pc.in b/tests/googletest/googlemock/cmake/gmock.pc.in similarity index 100% rename from unit_tests/googletest/googlemock/cmake/gmock.pc.in rename to tests/googletest/googlemock/cmake/gmock.pc.in diff --git a/unit_tests/googletest/googlemock/cmake/gmock_main.pc.in b/tests/googletest/googlemock/cmake/gmock_main.pc.in similarity index 100% rename from unit_tests/googletest/googlemock/cmake/gmock_main.pc.in rename to tests/googletest/googlemock/cmake/gmock_main.pc.in diff --git a/unit_tests/googletest/googlemock/configure.ac b/tests/googletest/googlemock/configure.ac similarity index 100% rename from unit_tests/googletest/googlemock/configure.ac rename to tests/googletest/googlemock/configure.ac diff --git a/unit_tests/googletest/googlemock/docs/CheatSheet.md b/tests/googletest/googlemock/docs/CheatSheet.md similarity index 100% rename from unit_tests/googletest/googlemock/docs/CheatSheet.md rename to tests/googletest/googlemock/docs/CheatSheet.md diff --git a/unit_tests/googletest/googlemock/docs/CookBook.md b/tests/googletest/googlemock/docs/CookBook.md similarity index 100% rename from unit_tests/googletest/googlemock/docs/CookBook.md rename to tests/googletest/googlemock/docs/CookBook.md diff --git a/unit_tests/googletest/googlemock/docs/DesignDoc.md b/tests/googletest/googlemock/docs/DesignDoc.md similarity index 100% rename from unit_tests/googletest/googlemock/docs/DesignDoc.md rename to tests/googletest/googlemock/docs/DesignDoc.md diff --git a/unit_tests/googletest/googlemock/docs/Documentation.md b/tests/googletest/googlemock/docs/Documentation.md similarity index 100% rename from unit_tests/googletest/googlemock/docs/Documentation.md rename to tests/googletest/googlemock/docs/Documentation.md diff --git a/unit_tests/googletest/googlemock/docs/ForDummies.md b/tests/googletest/googlemock/docs/ForDummies.md similarity index 100% rename from unit_tests/googletest/googlemock/docs/ForDummies.md rename to tests/googletest/googlemock/docs/ForDummies.md diff --git a/unit_tests/googletest/googlemock/docs/FrequentlyAskedQuestions.md b/tests/googletest/googlemock/docs/FrequentlyAskedQuestions.md similarity index 100% rename from unit_tests/googletest/googlemock/docs/FrequentlyAskedQuestions.md rename to tests/googletest/googlemock/docs/FrequentlyAskedQuestions.md diff --git a/unit_tests/googletest/googlemock/docs/KnownIssues.md b/tests/googletest/googlemock/docs/KnownIssues.md similarity index 100% rename from unit_tests/googletest/googlemock/docs/KnownIssues.md rename to tests/googletest/googlemock/docs/KnownIssues.md diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-actions.h b/tests/googletest/googlemock/include/gmock/gmock-actions.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-actions.h rename to tests/googletest/googlemock/include/gmock/gmock-actions.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-cardinalities.h b/tests/googletest/googlemock/include/gmock/gmock-cardinalities.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-cardinalities.h rename to tests/googletest/googlemock/include/gmock/gmock-cardinalities.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-generated-actions.h b/tests/googletest/googlemock/include/gmock/gmock-generated-actions.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-generated-actions.h rename to tests/googletest/googlemock/include/gmock/gmock-generated-actions.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump b/tests/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump rename to tests/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h b/tests/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h rename to tests/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/tests/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump rename to tests/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-generated-matchers.h b/tests/googletest/googlemock/include/gmock/gmock-generated-matchers.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-generated-matchers.h rename to tests/googletest/googlemock/include/gmock/gmock-generated-matchers.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump b/tests/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump rename to tests/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h b/tests/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h rename to tests/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump b/tests/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump rename to tests/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-matchers.h b/tests/googletest/googlemock/include/gmock/gmock-matchers.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-matchers.h rename to tests/googletest/googlemock/include/gmock/gmock-matchers.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-more-actions.h b/tests/googletest/googlemock/include/gmock/gmock-more-actions.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-more-actions.h rename to tests/googletest/googlemock/include/gmock/gmock-more-actions.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-more-matchers.h b/tests/googletest/googlemock/include/gmock/gmock-more-matchers.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-more-matchers.h rename to tests/googletest/googlemock/include/gmock/gmock-more-matchers.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock-spec-builders.h b/tests/googletest/googlemock/include/gmock/gmock-spec-builders.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock-spec-builders.h rename to tests/googletest/googlemock/include/gmock/gmock-spec-builders.h diff --git a/unit_tests/googletest/googlemock/include/gmock/gmock.h b/tests/googletest/googlemock/include/gmock/gmock.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/gmock.h rename to tests/googletest/googlemock/include/gmock/gmock.h diff --git a/unit_tests/googletest/googlemock/include/gmock/internal/custom/README.md b/tests/googletest/googlemock/include/gmock/internal/custom/README.md similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/internal/custom/README.md rename to tests/googletest/googlemock/include/gmock/internal/custom/README.md diff --git a/unit_tests/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/tests/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h rename to tests/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h diff --git a/unit_tests/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/tests/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump rename to tests/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump diff --git a/unit_tests/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h b/tests/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h rename to tests/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h diff --git a/unit_tests/googletest/googlemock/include/gmock/internal/custom/gmock-port.h b/tests/googletest/googlemock/include/gmock/internal/custom/gmock-port.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/internal/custom/gmock-port.h rename to tests/googletest/googlemock/include/gmock/internal/custom/gmock-port.h diff --git a/unit_tests/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h b/tests/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h rename to tests/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h diff --git a/unit_tests/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump b/tests/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump rename to tests/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump diff --git a/unit_tests/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h b/tests/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h rename to tests/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h diff --git a/unit_tests/googletest/googlemock/include/gmock/internal/gmock-port.h b/tests/googletest/googlemock/include/gmock/internal/gmock-port.h similarity index 100% rename from unit_tests/googletest/googlemock/include/gmock/internal/gmock-port.h rename to tests/googletest/googlemock/include/gmock/internal/gmock-port.h diff --git a/unit_tests/googletest/googlemock/msvc/2005/gmock.sln b/tests/googletest/googlemock/msvc/2005/gmock.sln similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2005/gmock.sln rename to tests/googletest/googlemock/msvc/2005/gmock.sln diff --git a/unit_tests/googletest/googlemock/msvc/2005/gmock.vcproj b/tests/googletest/googlemock/msvc/2005/gmock.vcproj similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2005/gmock.vcproj rename to tests/googletest/googlemock/msvc/2005/gmock.vcproj diff --git a/unit_tests/googletest/googlemock/msvc/2005/gmock_config.vsprops b/tests/googletest/googlemock/msvc/2005/gmock_config.vsprops similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2005/gmock_config.vsprops rename to tests/googletest/googlemock/msvc/2005/gmock_config.vsprops diff --git a/unit_tests/googletest/googlemock/msvc/2005/gmock_main.vcproj b/tests/googletest/googlemock/msvc/2005/gmock_main.vcproj similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2005/gmock_main.vcproj rename to tests/googletest/googlemock/msvc/2005/gmock_main.vcproj diff --git a/unit_tests/googletest/googlemock/msvc/2005/gmock_test.vcproj b/tests/googletest/googlemock/msvc/2005/gmock_test.vcproj similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2005/gmock_test.vcproj rename to tests/googletest/googlemock/msvc/2005/gmock_test.vcproj diff --git a/unit_tests/googletest/googlemock/msvc/2010/gmock.sln b/tests/googletest/googlemock/msvc/2010/gmock.sln similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2010/gmock.sln rename to tests/googletest/googlemock/msvc/2010/gmock.sln diff --git a/unit_tests/googletest/googlemock/msvc/2010/gmock.vcxproj b/tests/googletest/googlemock/msvc/2010/gmock.vcxproj similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2010/gmock.vcxproj rename to tests/googletest/googlemock/msvc/2010/gmock.vcxproj diff --git a/unit_tests/googletest/googlemock/msvc/2010/gmock_config.props b/tests/googletest/googlemock/msvc/2010/gmock_config.props similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2010/gmock_config.props rename to tests/googletest/googlemock/msvc/2010/gmock_config.props diff --git a/unit_tests/googletest/googlemock/msvc/2010/gmock_main.vcxproj b/tests/googletest/googlemock/msvc/2010/gmock_main.vcxproj similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2010/gmock_main.vcxproj rename to tests/googletest/googlemock/msvc/2010/gmock_main.vcxproj diff --git a/unit_tests/googletest/googlemock/msvc/2010/gmock_test.vcxproj b/tests/googletest/googlemock/msvc/2010/gmock_test.vcxproj similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2010/gmock_test.vcxproj rename to tests/googletest/googlemock/msvc/2010/gmock_test.vcxproj diff --git a/unit_tests/googletest/googlemock/msvc/2015/gmock.sln b/tests/googletest/googlemock/msvc/2015/gmock.sln similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2015/gmock.sln rename to tests/googletest/googlemock/msvc/2015/gmock.sln diff --git a/unit_tests/googletest/googlemock/msvc/2015/gmock.vcxproj b/tests/googletest/googlemock/msvc/2015/gmock.vcxproj similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2015/gmock.vcxproj rename to tests/googletest/googlemock/msvc/2015/gmock.vcxproj diff --git a/unit_tests/googletest/googlemock/msvc/2015/gmock_config.props b/tests/googletest/googlemock/msvc/2015/gmock_config.props similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2015/gmock_config.props rename to tests/googletest/googlemock/msvc/2015/gmock_config.props diff --git a/unit_tests/googletest/googlemock/msvc/2015/gmock_main.vcxproj b/tests/googletest/googlemock/msvc/2015/gmock_main.vcxproj similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2015/gmock_main.vcxproj rename to tests/googletest/googlemock/msvc/2015/gmock_main.vcxproj diff --git a/unit_tests/googletest/googlemock/msvc/2015/gmock_test.vcxproj b/tests/googletest/googlemock/msvc/2015/gmock_test.vcxproj similarity index 100% rename from unit_tests/googletest/googlemock/msvc/2015/gmock_test.vcxproj rename to tests/googletest/googlemock/msvc/2015/gmock_test.vcxproj diff --git a/unit_tests/googletest/googlemock/scripts/fuse_gmock_files.py b/tests/googletest/googlemock/scripts/fuse_gmock_files.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/fuse_gmock_files.py rename to tests/googletest/googlemock/scripts/fuse_gmock_files.py diff --git a/unit_tests/googletest/googlemock/scripts/generator/LICENSE b/tests/googletest/googlemock/scripts/generator/LICENSE similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/LICENSE rename to tests/googletest/googlemock/scripts/generator/LICENSE diff --git a/unit_tests/googletest/googlemock/scripts/generator/README b/tests/googletest/googlemock/scripts/generator/README similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/README rename to tests/googletest/googlemock/scripts/generator/README diff --git a/unit_tests/googletest/googlemock/scripts/generator/README.cppclean b/tests/googletest/googlemock/scripts/generator/README.cppclean similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/README.cppclean rename to tests/googletest/googlemock/scripts/generator/README.cppclean diff --git a/unit_tests/googletest/googlemock/scripts/generator/cpp/__init__.py b/tests/googletest/googlemock/scripts/generator/cpp/__init__.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/cpp/__init__.py rename to tests/googletest/googlemock/scripts/generator/cpp/__init__.py diff --git a/unit_tests/googletest/googlemock/scripts/generator/cpp/ast.py b/tests/googletest/googlemock/scripts/generator/cpp/ast.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/cpp/ast.py rename to tests/googletest/googlemock/scripts/generator/cpp/ast.py diff --git a/unit_tests/googletest/googlemock/scripts/generator/cpp/gmock_class.py b/tests/googletest/googlemock/scripts/generator/cpp/gmock_class.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/cpp/gmock_class.py rename to tests/googletest/googlemock/scripts/generator/cpp/gmock_class.py diff --git a/unit_tests/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py b/tests/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py rename to tests/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py diff --git a/unit_tests/googletest/googlemock/scripts/generator/cpp/keywords.py b/tests/googletest/googlemock/scripts/generator/cpp/keywords.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/cpp/keywords.py rename to tests/googletest/googlemock/scripts/generator/cpp/keywords.py diff --git a/unit_tests/googletest/googlemock/scripts/generator/cpp/tokenize.py b/tests/googletest/googlemock/scripts/generator/cpp/tokenize.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/cpp/tokenize.py rename to tests/googletest/googlemock/scripts/generator/cpp/tokenize.py diff --git a/unit_tests/googletest/googlemock/scripts/generator/cpp/utils.py b/tests/googletest/googlemock/scripts/generator/cpp/utils.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/cpp/utils.py rename to tests/googletest/googlemock/scripts/generator/cpp/utils.py diff --git a/unit_tests/googletest/googlemock/scripts/generator/gmock_gen.py b/tests/googletest/googlemock/scripts/generator/gmock_gen.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/generator/gmock_gen.py rename to tests/googletest/googlemock/scripts/generator/gmock_gen.py diff --git a/unit_tests/googletest/googlemock/scripts/gmock-config.in b/tests/googletest/googlemock/scripts/gmock-config.in similarity index 100% rename from unit_tests/googletest/googlemock/scripts/gmock-config.in rename to tests/googletest/googlemock/scripts/gmock-config.in diff --git a/unit_tests/googletest/googlemock/scripts/gmock_doctor.py b/tests/googletest/googlemock/scripts/gmock_doctor.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/gmock_doctor.py rename to tests/googletest/googlemock/scripts/gmock_doctor.py diff --git a/unit_tests/googletest/googlemock/scripts/upload.py b/tests/googletest/googlemock/scripts/upload.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/upload.py rename to tests/googletest/googlemock/scripts/upload.py diff --git a/unit_tests/googletest/googlemock/scripts/upload_gmock.py b/tests/googletest/googlemock/scripts/upload_gmock.py similarity index 100% rename from unit_tests/googletest/googlemock/scripts/upload_gmock.py rename to tests/googletest/googlemock/scripts/upload_gmock.py diff --git a/unit_tests/googletest/googlemock/src/gmock-all.cc b/tests/googletest/googlemock/src/gmock-all.cc similarity index 100% rename from unit_tests/googletest/googlemock/src/gmock-all.cc rename to tests/googletest/googlemock/src/gmock-all.cc diff --git a/unit_tests/googletest/googlemock/src/gmock-cardinalities.cc b/tests/googletest/googlemock/src/gmock-cardinalities.cc similarity index 100% rename from unit_tests/googletest/googlemock/src/gmock-cardinalities.cc rename to tests/googletest/googlemock/src/gmock-cardinalities.cc diff --git a/unit_tests/googletest/googlemock/src/gmock-internal-utils.cc b/tests/googletest/googlemock/src/gmock-internal-utils.cc similarity index 100% rename from unit_tests/googletest/googlemock/src/gmock-internal-utils.cc rename to tests/googletest/googlemock/src/gmock-internal-utils.cc diff --git a/unit_tests/googletest/googlemock/src/gmock-matchers.cc b/tests/googletest/googlemock/src/gmock-matchers.cc similarity index 100% rename from unit_tests/googletest/googlemock/src/gmock-matchers.cc rename to tests/googletest/googlemock/src/gmock-matchers.cc diff --git a/unit_tests/googletest/googlemock/src/gmock-spec-builders.cc b/tests/googletest/googlemock/src/gmock-spec-builders.cc similarity index 100% rename from unit_tests/googletest/googlemock/src/gmock-spec-builders.cc rename to tests/googletest/googlemock/src/gmock-spec-builders.cc diff --git a/unit_tests/googletest/googlemock/src/gmock.cc b/tests/googletest/googlemock/src/gmock.cc similarity index 100% rename from unit_tests/googletest/googlemock/src/gmock.cc rename to tests/googletest/googlemock/src/gmock.cc diff --git a/unit_tests/googletest/googlemock/src/gmock_main.cc b/tests/googletest/googlemock/src/gmock_main.cc similarity index 100% rename from unit_tests/googletest/googlemock/src/gmock_main.cc rename to tests/googletest/googlemock/src/gmock_main.cc diff --git a/unit_tests/googletest/googlemock/test/BUILD.bazel b/tests/googletest/googlemock/test/BUILD.bazel similarity index 100% rename from unit_tests/googletest/googlemock/test/BUILD.bazel rename to tests/googletest/googlemock/test/BUILD.bazel diff --git a/unit_tests/googletest/googlemock/test/gmock-actions_test.cc b/tests/googletest/googlemock/test/gmock-actions_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-actions_test.cc rename to tests/googletest/googlemock/test/gmock-actions_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-cardinalities_test.cc b/tests/googletest/googlemock/test/gmock-cardinalities_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-cardinalities_test.cc rename to tests/googletest/googlemock/test/gmock-cardinalities_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-generated-actions_test.cc b/tests/googletest/googlemock/test/gmock-generated-actions_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-generated-actions_test.cc rename to tests/googletest/googlemock/test/gmock-generated-actions_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-generated-function-mockers_test.cc b/tests/googletest/googlemock/test/gmock-generated-function-mockers_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-generated-function-mockers_test.cc rename to tests/googletest/googlemock/test/gmock-generated-function-mockers_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-generated-internal-utils_test.cc b/tests/googletest/googlemock/test/gmock-generated-internal-utils_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-generated-internal-utils_test.cc rename to tests/googletest/googlemock/test/gmock-generated-internal-utils_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-generated-matchers_test.cc b/tests/googletest/googlemock/test/gmock-generated-matchers_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-generated-matchers_test.cc rename to tests/googletest/googlemock/test/gmock-generated-matchers_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-internal-utils_test.cc b/tests/googletest/googlemock/test/gmock-internal-utils_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-internal-utils_test.cc rename to tests/googletest/googlemock/test/gmock-internal-utils_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-matchers_test.cc b/tests/googletest/googlemock/test/gmock-matchers_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-matchers_test.cc rename to tests/googletest/googlemock/test/gmock-matchers_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-more-actions_test.cc b/tests/googletest/googlemock/test/gmock-more-actions_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-more-actions_test.cc rename to tests/googletest/googlemock/test/gmock-more-actions_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-nice-strict_test.cc b/tests/googletest/googlemock/test/gmock-nice-strict_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-nice-strict_test.cc rename to tests/googletest/googlemock/test/gmock-nice-strict_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-port_test.cc b/tests/googletest/googlemock/test/gmock-port_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-port_test.cc rename to tests/googletest/googlemock/test/gmock-port_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock-spec-builders_test.cc b/tests/googletest/googlemock/test/gmock-spec-builders_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock-spec-builders_test.cc rename to tests/googletest/googlemock/test/gmock-spec-builders_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock_all_test.cc b/tests/googletest/googlemock/test/gmock_all_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_all_test.cc rename to tests/googletest/googlemock/test/gmock_all_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock_ex_test.cc b/tests/googletest/googlemock/test/gmock_ex_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_ex_test.cc rename to tests/googletest/googlemock/test/gmock_ex_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock_leak_test.py b/tests/googletest/googlemock/test/gmock_leak_test.py similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_leak_test.py rename to tests/googletest/googlemock/test/gmock_leak_test.py diff --git a/unit_tests/googletest/googlemock/test/gmock_leak_test_.cc b/tests/googletest/googlemock/test/gmock_leak_test_.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_leak_test_.cc rename to tests/googletest/googlemock/test/gmock_leak_test_.cc diff --git a/unit_tests/googletest/googlemock/test/gmock_link2_test.cc b/tests/googletest/googlemock/test/gmock_link2_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_link2_test.cc rename to tests/googletest/googlemock/test/gmock_link2_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock_link_test.cc b/tests/googletest/googlemock/test/gmock_link_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_link_test.cc rename to tests/googletest/googlemock/test/gmock_link_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock_link_test.h b/tests/googletest/googlemock/test/gmock_link_test.h similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_link_test.h rename to tests/googletest/googlemock/test/gmock_link_test.h diff --git a/unit_tests/googletest/googlemock/test/gmock_output_test.py b/tests/googletest/googlemock/test/gmock_output_test.py similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_output_test.py rename to tests/googletest/googlemock/test/gmock_output_test.py diff --git a/unit_tests/googletest/googlemock/test/gmock_output_test_.cc b/tests/googletest/googlemock/test/gmock_output_test_.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_output_test_.cc rename to tests/googletest/googlemock/test/gmock_output_test_.cc diff --git a/unit_tests/googletest/googlemock/test/gmock_output_test_golden.txt b/tests/googletest/googlemock/test/gmock_output_test_golden.txt similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_output_test_golden.txt rename to tests/googletest/googlemock/test/gmock_output_test_golden.txt diff --git a/unit_tests/googletest/googlemock/test/gmock_stress_test.cc b/tests/googletest/googlemock/test/gmock_stress_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_stress_test.cc rename to tests/googletest/googlemock/test/gmock_stress_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock_test.cc b/tests/googletest/googlemock/test/gmock_test.cc similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_test.cc rename to tests/googletest/googlemock/test/gmock_test.cc diff --git a/unit_tests/googletest/googlemock/test/gmock_test_utils.py b/tests/googletest/googlemock/test/gmock_test_utils.py similarity index 100% rename from unit_tests/googletest/googlemock/test/gmock_test_utils.py rename to tests/googletest/googlemock/test/gmock_test_utils.py diff --git a/unit_tests/googletest/googletest/CHANGES b/tests/googletest/googletest/CHANGES similarity index 100% rename from unit_tests/googletest/googletest/CHANGES rename to tests/googletest/googletest/CHANGES diff --git a/unit_tests/googletest/googletest/CMakeLists.txt b/tests/googletest/googletest/CMakeLists.txt similarity index 100% rename from unit_tests/googletest/googletest/CMakeLists.txt rename to tests/googletest/googletest/CMakeLists.txt diff --git a/unit_tests/googletest/googletest/CONTRIBUTORS b/tests/googletest/googletest/CONTRIBUTORS similarity index 100% rename from unit_tests/googletest/googletest/CONTRIBUTORS rename to tests/googletest/googletest/CONTRIBUTORS diff --git a/unit_tests/googletest/googletest/LICENSE b/tests/googletest/googletest/LICENSE similarity index 100% rename from unit_tests/googletest/googletest/LICENSE rename to tests/googletest/googletest/LICENSE diff --git a/unit_tests/googletest/googletest/Makefile.am b/tests/googletest/googletest/Makefile.am similarity index 100% rename from unit_tests/googletest/googletest/Makefile.am rename to tests/googletest/googletest/Makefile.am diff --git a/unit_tests/googletest/googletest/README.md b/tests/googletest/googletest/README.md similarity index 100% rename from unit_tests/googletest/googletest/README.md rename to tests/googletest/googletest/README.md diff --git a/unit_tests/googletest/googletest/cmake/Config.cmake.in b/tests/googletest/googletest/cmake/Config.cmake.in similarity index 100% rename from unit_tests/googletest/googletest/cmake/Config.cmake.in rename to tests/googletest/googletest/cmake/Config.cmake.in diff --git a/unit_tests/googletest/googletest/cmake/gtest.pc.in b/tests/googletest/googletest/cmake/gtest.pc.in similarity index 100% rename from unit_tests/googletest/googletest/cmake/gtest.pc.in rename to tests/googletest/googletest/cmake/gtest.pc.in diff --git a/unit_tests/googletest/googletest/cmake/gtest_main.pc.in b/tests/googletest/googletest/cmake/gtest_main.pc.in similarity index 100% rename from unit_tests/googletest/googletest/cmake/gtest_main.pc.in rename to tests/googletest/googletest/cmake/gtest_main.pc.in diff --git a/unit_tests/googletest/googletest/cmake/internal_utils.cmake b/tests/googletest/googletest/cmake/internal_utils.cmake similarity index 100% rename from unit_tests/googletest/googletest/cmake/internal_utils.cmake rename to tests/googletest/googletest/cmake/internal_utils.cmake diff --git a/unit_tests/googletest/googletest/codegear/gtest.cbproj b/tests/googletest/googletest/codegear/gtest.cbproj similarity index 100% rename from unit_tests/googletest/googletest/codegear/gtest.cbproj rename to tests/googletest/googletest/codegear/gtest.cbproj diff --git a/unit_tests/googletest/googletest/codegear/gtest.groupproj b/tests/googletest/googletest/codegear/gtest.groupproj similarity index 100% rename from unit_tests/googletest/googletest/codegear/gtest.groupproj rename to tests/googletest/googletest/codegear/gtest.groupproj diff --git a/unit_tests/googletest/googletest/codegear/gtest_all.cc b/tests/googletest/googletest/codegear/gtest_all.cc similarity index 100% rename from unit_tests/googletest/googletest/codegear/gtest_all.cc rename to tests/googletest/googletest/codegear/gtest_all.cc diff --git a/unit_tests/googletest/googletest/codegear/gtest_link.cc b/tests/googletest/googletest/codegear/gtest_link.cc similarity index 100% rename from unit_tests/googletest/googletest/codegear/gtest_link.cc rename to tests/googletest/googletest/codegear/gtest_link.cc diff --git a/unit_tests/googletest/googletest/codegear/gtest_main.cbproj b/tests/googletest/googletest/codegear/gtest_main.cbproj similarity index 100% rename from unit_tests/googletest/googletest/codegear/gtest_main.cbproj rename to tests/googletest/googletest/codegear/gtest_main.cbproj diff --git a/unit_tests/googletest/googletest/codegear/gtest_unittest.cbproj b/tests/googletest/googletest/codegear/gtest_unittest.cbproj similarity index 100% rename from unit_tests/googletest/googletest/codegear/gtest_unittest.cbproj rename to tests/googletest/googletest/codegear/gtest_unittest.cbproj diff --git a/unit_tests/googletest/googletest/configure.ac b/tests/googletest/googletest/configure.ac similarity index 100% rename from unit_tests/googletest/googletest/configure.ac rename to tests/googletest/googletest/configure.ac diff --git a/unit_tests/googletest/googletest/docs/Pkgconfig.md b/tests/googletest/googletest/docs/Pkgconfig.md similarity index 100% rename from unit_tests/googletest/googletest/docs/Pkgconfig.md rename to tests/googletest/googletest/docs/Pkgconfig.md diff --git a/unit_tests/googletest/googletest/docs/PumpManual.md b/tests/googletest/googletest/docs/PumpManual.md similarity index 100% rename from unit_tests/googletest/googletest/docs/PumpManual.md rename to tests/googletest/googletest/docs/PumpManual.md diff --git a/unit_tests/googletest/googletest/docs/XcodeGuide.md b/tests/googletest/googletest/docs/XcodeGuide.md similarity index 100% rename from unit_tests/googletest/googletest/docs/XcodeGuide.md rename to tests/googletest/googletest/docs/XcodeGuide.md diff --git a/unit_tests/googletest/googletest/docs/advanced.md b/tests/googletest/googletest/docs/advanced.md similarity index 100% rename from unit_tests/googletest/googletest/docs/advanced.md rename to tests/googletest/googletest/docs/advanced.md diff --git a/unit_tests/googletest/googletest/docs/faq.md b/tests/googletest/googletest/docs/faq.md similarity index 100% rename from unit_tests/googletest/googletest/docs/faq.md rename to tests/googletest/googletest/docs/faq.md diff --git a/unit_tests/googletest/googletest/docs/primer.md b/tests/googletest/googletest/docs/primer.md similarity index 100% rename from unit_tests/googletest/googletest/docs/primer.md rename to tests/googletest/googletest/docs/primer.md diff --git a/unit_tests/googletest/googletest/docs/samples.md b/tests/googletest/googletest/docs/samples.md similarity index 100% rename from unit_tests/googletest/googletest/docs/samples.md rename to tests/googletest/googletest/docs/samples.md diff --git a/unit_tests/googletest/googletest/include/gtest/gtest-death-test.h b/tests/googletest/googletest/include/gtest/gtest-death-test.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest-death-test.h rename to tests/googletest/googletest/include/gtest/gtest-death-test.h diff --git a/unit_tests/googletest/googletest/include/gtest/gtest-message.h b/tests/googletest/googletest/include/gtest/gtest-message.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest-message.h rename to tests/googletest/googletest/include/gtest/gtest-message.h diff --git a/unit_tests/googletest/googletest/include/gtest/gtest-param-test.h b/tests/googletest/googletest/include/gtest/gtest-param-test.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest-param-test.h rename to tests/googletest/googletest/include/gtest/gtest-param-test.h diff --git a/unit_tests/googletest/googletest/include/gtest/gtest-param-test.h.pump b/tests/googletest/googletest/include/gtest/gtest-param-test.h.pump similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest-param-test.h.pump rename to tests/googletest/googletest/include/gtest/gtest-param-test.h.pump diff --git a/unit_tests/googletest/googletest/include/gtest/gtest-printers.h b/tests/googletest/googletest/include/gtest/gtest-printers.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest-printers.h rename to tests/googletest/googletest/include/gtest/gtest-printers.h diff --git a/unit_tests/googletest/googletest/include/gtest/gtest-spi.h b/tests/googletest/googletest/include/gtest/gtest-spi.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest-spi.h rename to tests/googletest/googletest/include/gtest/gtest-spi.h diff --git a/unit_tests/googletest/googletest/include/gtest/gtest-test-part.h b/tests/googletest/googletest/include/gtest/gtest-test-part.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest-test-part.h rename to tests/googletest/googletest/include/gtest/gtest-test-part.h diff --git a/unit_tests/googletest/googletest/include/gtest/gtest-typed-test.h b/tests/googletest/googletest/include/gtest/gtest-typed-test.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest-typed-test.h rename to tests/googletest/googletest/include/gtest/gtest-typed-test.h diff --git a/unit_tests/googletest/googletest/include/gtest/gtest.h b/tests/googletest/googletest/include/gtest/gtest.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest.h rename to tests/googletest/googletest/include/gtest/gtest.h diff --git a/unit_tests/googletest/googletest/include/gtest/gtest_pred_impl.h b/tests/googletest/googletest/include/gtest/gtest_pred_impl.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest_pred_impl.h rename to tests/googletest/googletest/include/gtest/gtest_pred_impl.h diff --git a/unit_tests/googletest/googletest/include/gtest/gtest_prod.h b/tests/googletest/googletest/include/gtest/gtest_prod.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/gtest_prod.h rename to tests/googletest/googletest/include/gtest/gtest_prod.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/custom/README.md b/tests/googletest/googletest/include/gtest/internal/custom/README.md similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/custom/README.md rename to tests/googletest/googletest/include/gtest/internal/custom/README.md diff --git a/unit_tests/googletest/googletest/include/gtest/internal/custom/gtest-port.h b/tests/googletest/googletest/include/gtest/internal/custom/gtest-port.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/custom/gtest-port.h rename to tests/googletest/googletest/include/gtest/internal/custom/gtest-port.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/custom/gtest-printers.h b/tests/googletest/googletest/include/gtest/internal/custom/gtest-printers.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/custom/gtest-printers.h rename to tests/googletest/googletest/include/gtest/internal/custom/gtest-printers.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/custom/gtest.h b/tests/googletest/googletest/include/gtest/internal/custom/gtest.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/custom/gtest.h rename to tests/googletest/googletest/include/gtest/internal/custom/gtest.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h b/tests/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h rename to tests/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-filepath.h b/tests/googletest/googletest/include/gtest/internal/gtest-filepath.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-filepath.h rename to tests/googletest/googletest/include/gtest/internal/gtest-filepath.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-internal.h b/tests/googletest/googletest/include/gtest/internal/gtest-internal.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-internal.h rename to tests/googletest/googletest/include/gtest/internal/gtest-internal.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h b/tests/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h rename to tests/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h b/tests/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h rename to tests/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump b/tests/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump rename to tests/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-param-util.h b/tests/googletest/googletest/include/gtest/internal/gtest-param-util.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-param-util.h rename to tests/googletest/googletest/include/gtest/internal/gtest-param-util.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-port-arch.h b/tests/googletest/googletest/include/gtest/internal/gtest-port-arch.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-port-arch.h rename to tests/googletest/googletest/include/gtest/internal/gtest-port-arch.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-port.h b/tests/googletest/googletest/include/gtest/internal/gtest-port.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-port.h rename to tests/googletest/googletest/include/gtest/internal/gtest-port.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-string.h b/tests/googletest/googletest/include/gtest/internal/gtest-string.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-string.h rename to tests/googletest/googletest/include/gtest/internal/gtest-string.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-tuple.h b/tests/googletest/googletest/include/gtest/internal/gtest-tuple.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-tuple.h rename to tests/googletest/googletest/include/gtest/internal/gtest-tuple.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump b/tests/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump rename to tests/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-type-util.h b/tests/googletest/googletest/include/gtest/internal/gtest-type-util.h similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-type-util.h rename to tests/googletest/googletest/include/gtest/internal/gtest-type-util.h diff --git a/unit_tests/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump b/tests/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump similarity index 100% rename from unit_tests/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump rename to tests/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump diff --git a/unit_tests/googletest/googletest/m4/acx_pthread.m4 b/tests/googletest/googletest/m4/acx_pthread.m4 similarity index 100% rename from unit_tests/googletest/googletest/m4/acx_pthread.m4 rename to tests/googletest/googletest/m4/acx_pthread.m4 diff --git a/unit_tests/googletest/googletest/m4/gtest.m4 b/tests/googletest/googletest/m4/gtest.m4 similarity index 100% rename from unit_tests/googletest/googletest/m4/gtest.m4 rename to tests/googletest/googletest/m4/gtest.m4 diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest-md.sln b/tests/googletest/googletest/msvc/2010/gtest-md.sln similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest-md.sln rename to tests/googletest/googletest/msvc/2010/gtest-md.sln diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest-md.vcxproj b/tests/googletest/googletest/msvc/2010/gtest-md.vcxproj similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest-md.vcxproj rename to tests/googletest/googletest/msvc/2010/gtest-md.vcxproj diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest-md.vcxproj.filters b/tests/googletest/googletest/msvc/2010/gtest-md.vcxproj.filters similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest-md.vcxproj.filters rename to tests/googletest/googletest/msvc/2010/gtest-md.vcxproj.filters diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest.sln b/tests/googletest/googletest/msvc/2010/gtest.sln similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest.sln rename to tests/googletest/googletest/msvc/2010/gtest.sln diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest.vcxproj b/tests/googletest/googletest/msvc/2010/gtest.vcxproj similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest.vcxproj rename to tests/googletest/googletest/msvc/2010/gtest.vcxproj diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest.vcxproj.filters b/tests/googletest/googletest/msvc/2010/gtest.vcxproj.filters similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest.vcxproj.filters rename to tests/googletest/googletest/msvc/2010/gtest.vcxproj.filters diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_main-md.vcxproj b/tests/googletest/googletest/msvc/2010/gtest_main-md.vcxproj similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_main-md.vcxproj rename to tests/googletest/googletest/msvc/2010/gtest_main-md.vcxproj diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_main-md.vcxproj.filters b/tests/googletest/googletest/msvc/2010/gtest_main-md.vcxproj.filters similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_main-md.vcxproj.filters rename to tests/googletest/googletest/msvc/2010/gtest_main-md.vcxproj.filters diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_main.vcxproj b/tests/googletest/googletest/msvc/2010/gtest_main.vcxproj similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_main.vcxproj rename to tests/googletest/googletest/msvc/2010/gtest_main.vcxproj diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_main.vcxproj.filters b/tests/googletest/googletest/msvc/2010/gtest_main.vcxproj.filters similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_main.vcxproj.filters rename to tests/googletest/googletest/msvc/2010/gtest_main.vcxproj.filters diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj b/tests/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj rename to tests/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters b/tests/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters rename to tests/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj b/tests/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj rename to tests/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj.filters b/tests/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj.filters similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj.filters rename to tests/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj.filters diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj b/tests/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj rename to tests/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj.filters b/tests/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj.filters similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj.filters rename to tests/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj.filters diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_unittest.vcxproj b/tests/googletest/googletest/msvc/2010/gtest_unittest.vcxproj similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_unittest.vcxproj rename to tests/googletest/googletest/msvc/2010/gtest_unittest.vcxproj diff --git a/unit_tests/googletest/googletest/msvc/2010/gtest_unittest.vcxproj.filters b/tests/googletest/googletest/msvc/2010/gtest_unittest.vcxproj.filters similarity index 100% rename from unit_tests/googletest/googletest/msvc/2010/gtest_unittest.vcxproj.filters rename to tests/googletest/googletest/msvc/2010/gtest_unittest.vcxproj.filters diff --git a/unit_tests/googletest/googletest/samples/prime_tables.h b/tests/googletest/googletest/samples/prime_tables.h similarity index 100% rename from unit_tests/googletest/googletest/samples/prime_tables.h rename to tests/googletest/googletest/samples/prime_tables.h diff --git a/unit_tests/googletest/googletest/samples/sample1.cc b/tests/googletest/googletest/samples/sample1.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample1.cc rename to tests/googletest/googletest/samples/sample1.cc diff --git a/unit_tests/googletest/googletest/samples/sample1.h b/tests/googletest/googletest/samples/sample1.h similarity index 100% rename from unit_tests/googletest/googletest/samples/sample1.h rename to tests/googletest/googletest/samples/sample1.h diff --git a/unit_tests/googletest/googletest/samples/sample10_unittest.cc b/tests/googletest/googletest/samples/sample10_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample10_unittest.cc rename to tests/googletest/googletest/samples/sample10_unittest.cc diff --git a/unit_tests/googletest/googletest/samples/sample1_unittest.cc b/tests/googletest/googletest/samples/sample1_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample1_unittest.cc rename to tests/googletest/googletest/samples/sample1_unittest.cc diff --git a/unit_tests/googletest/googletest/samples/sample2.cc b/tests/googletest/googletest/samples/sample2.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample2.cc rename to tests/googletest/googletest/samples/sample2.cc diff --git a/unit_tests/googletest/googletest/samples/sample2.h b/tests/googletest/googletest/samples/sample2.h similarity index 100% rename from unit_tests/googletest/googletest/samples/sample2.h rename to tests/googletest/googletest/samples/sample2.h diff --git a/unit_tests/googletest/googletest/samples/sample2_unittest.cc b/tests/googletest/googletest/samples/sample2_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample2_unittest.cc rename to tests/googletest/googletest/samples/sample2_unittest.cc diff --git a/unit_tests/googletest/googletest/samples/sample3-inl.h b/tests/googletest/googletest/samples/sample3-inl.h similarity index 100% rename from unit_tests/googletest/googletest/samples/sample3-inl.h rename to tests/googletest/googletest/samples/sample3-inl.h diff --git a/unit_tests/googletest/googletest/samples/sample3_unittest.cc b/tests/googletest/googletest/samples/sample3_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample3_unittest.cc rename to tests/googletest/googletest/samples/sample3_unittest.cc diff --git a/unit_tests/googletest/googletest/samples/sample4.cc b/tests/googletest/googletest/samples/sample4.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample4.cc rename to tests/googletest/googletest/samples/sample4.cc diff --git a/unit_tests/googletest/googletest/samples/sample4.h b/tests/googletest/googletest/samples/sample4.h similarity index 100% rename from unit_tests/googletest/googletest/samples/sample4.h rename to tests/googletest/googletest/samples/sample4.h diff --git a/unit_tests/googletest/googletest/samples/sample4_unittest.cc b/tests/googletest/googletest/samples/sample4_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample4_unittest.cc rename to tests/googletest/googletest/samples/sample4_unittest.cc diff --git a/unit_tests/googletest/googletest/samples/sample5_unittest.cc b/tests/googletest/googletest/samples/sample5_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample5_unittest.cc rename to tests/googletest/googletest/samples/sample5_unittest.cc diff --git a/unit_tests/googletest/googletest/samples/sample6_unittest.cc b/tests/googletest/googletest/samples/sample6_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample6_unittest.cc rename to tests/googletest/googletest/samples/sample6_unittest.cc diff --git a/unit_tests/googletest/googletest/samples/sample7_unittest.cc b/tests/googletest/googletest/samples/sample7_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample7_unittest.cc rename to tests/googletest/googletest/samples/sample7_unittest.cc diff --git a/unit_tests/googletest/googletest/samples/sample8_unittest.cc b/tests/googletest/googletest/samples/sample8_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample8_unittest.cc rename to tests/googletest/googletest/samples/sample8_unittest.cc diff --git a/unit_tests/googletest/googletest/samples/sample9_unittest.cc b/tests/googletest/googletest/samples/sample9_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/samples/sample9_unittest.cc rename to tests/googletest/googletest/samples/sample9_unittest.cc diff --git a/unit_tests/googletest/googletest/scripts/common.py b/tests/googletest/googletest/scripts/common.py similarity index 100% rename from unit_tests/googletest/googletest/scripts/common.py rename to tests/googletest/googletest/scripts/common.py diff --git a/unit_tests/googletest/googletest/scripts/fuse_gtest_files.py b/tests/googletest/googletest/scripts/fuse_gtest_files.py similarity index 100% rename from unit_tests/googletest/googletest/scripts/fuse_gtest_files.py rename to tests/googletest/googletest/scripts/fuse_gtest_files.py diff --git a/unit_tests/googletest/googletest/scripts/gen_gtest_pred_impl.py b/tests/googletest/googletest/scripts/gen_gtest_pred_impl.py similarity index 100% rename from unit_tests/googletest/googletest/scripts/gen_gtest_pred_impl.py rename to tests/googletest/googletest/scripts/gen_gtest_pred_impl.py diff --git a/unit_tests/googletest/googletest/scripts/gtest-config.in b/tests/googletest/googletest/scripts/gtest-config.in similarity index 100% rename from unit_tests/googletest/googletest/scripts/gtest-config.in rename to tests/googletest/googletest/scripts/gtest-config.in diff --git a/unit_tests/googletest/googletest/scripts/pump.py b/tests/googletest/googletest/scripts/pump.py similarity index 100% rename from unit_tests/googletest/googletest/scripts/pump.py rename to tests/googletest/googletest/scripts/pump.py diff --git a/unit_tests/googletest/googletest/scripts/release_docs.py b/tests/googletest/googletest/scripts/release_docs.py similarity index 100% rename from unit_tests/googletest/googletest/scripts/release_docs.py rename to tests/googletest/googletest/scripts/release_docs.py diff --git a/unit_tests/googletest/googletest/scripts/upload.py b/tests/googletest/googletest/scripts/upload.py similarity index 100% rename from unit_tests/googletest/googletest/scripts/upload.py rename to tests/googletest/googletest/scripts/upload.py diff --git a/unit_tests/googletest/googletest/scripts/upload_gtest.py b/tests/googletest/googletest/scripts/upload_gtest.py similarity index 100% rename from unit_tests/googletest/googletest/scripts/upload_gtest.py rename to tests/googletest/googletest/scripts/upload_gtest.py diff --git a/unit_tests/googletest/googletest/src/gtest-all.cc b/tests/googletest/googletest/src/gtest-all.cc similarity index 100% rename from unit_tests/googletest/googletest/src/gtest-all.cc rename to tests/googletest/googletest/src/gtest-all.cc diff --git a/unit_tests/googletest/googletest/src/gtest-death-test.cc b/tests/googletest/googletest/src/gtest-death-test.cc similarity index 100% rename from unit_tests/googletest/googletest/src/gtest-death-test.cc rename to tests/googletest/googletest/src/gtest-death-test.cc diff --git a/unit_tests/googletest/googletest/src/gtest-filepath.cc b/tests/googletest/googletest/src/gtest-filepath.cc similarity index 100% rename from unit_tests/googletest/googletest/src/gtest-filepath.cc rename to tests/googletest/googletest/src/gtest-filepath.cc diff --git a/unit_tests/googletest/googletest/src/gtest-internal-inl.h b/tests/googletest/googletest/src/gtest-internal-inl.h similarity index 100% rename from unit_tests/googletest/googletest/src/gtest-internal-inl.h rename to tests/googletest/googletest/src/gtest-internal-inl.h diff --git a/unit_tests/googletest/googletest/src/gtest-port.cc b/tests/googletest/googletest/src/gtest-port.cc similarity index 100% rename from unit_tests/googletest/googletest/src/gtest-port.cc rename to tests/googletest/googletest/src/gtest-port.cc diff --git a/unit_tests/googletest/googletest/src/gtest-printers.cc b/tests/googletest/googletest/src/gtest-printers.cc similarity index 100% rename from unit_tests/googletest/googletest/src/gtest-printers.cc rename to tests/googletest/googletest/src/gtest-printers.cc diff --git a/unit_tests/googletest/googletest/src/gtest-test-part.cc b/tests/googletest/googletest/src/gtest-test-part.cc similarity index 100% rename from unit_tests/googletest/googletest/src/gtest-test-part.cc rename to tests/googletest/googletest/src/gtest-test-part.cc diff --git a/unit_tests/googletest/googletest/src/gtest-typed-test.cc b/tests/googletest/googletest/src/gtest-typed-test.cc similarity index 100% rename from unit_tests/googletest/googletest/src/gtest-typed-test.cc rename to tests/googletest/googletest/src/gtest-typed-test.cc diff --git a/unit_tests/googletest/googletest/src/gtest.cc b/tests/googletest/googletest/src/gtest.cc similarity index 100% rename from unit_tests/googletest/googletest/src/gtest.cc rename to tests/googletest/googletest/src/gtest.cc diff --git a/unit_tests/googletest/googletest/src/gtest_main.cc b/tests/googletest/googletest/src/gtest_main.cc similarity index 100% rename from unit_tests/googletest/googletest/src/gtest_main.cc rename to tests/googletest/googletest/src/gtest_main.cc diff --git a/unit_tests/googletest/googletest/test/BUILD.bazel b/tests/googletest/googletest/test/BUILD.bazel similarity index 100% rename from unit_tests/googletest/googletest/test/BUILD.bazel rename to tests/googletest/googletest/test/BUILD.bazel diff --git a/unit_tests/googletest/googletest/test/googletest-break-on-failure-unittest.py b/tests/googletest/googletest/test/googletest-break-on-failure-unittest.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-break-on-failure-unittest.py rename to tests/googletest/googletest/test/googletest-break-on-failure-unittest.py diff --git a/unit_tests/googletest/googletest/test/googletest-break-on-failure-unittest_.cc b/tests/googletest/googletest/test/googletest-break-on-failure-unittest_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-break-on-failure-unittest_.cc rename to tests/googletest/googletest/test/googletest-break-on-failure-unittest_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-catch-exceptions-test.py b/tests/googletest/googletest/test/googletest-catch-exceptions-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-catch-exceptions-test.py rename to tests/googletest/googletest/test/googletest-catch-exceptions-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-catch-exceptions-test_.cc b/tests/googletest/googletest/test/googletest-catch-exceptions-test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-catch-exceptions-test_.cc rename to tests/googletest/googletest/test/googletest-catch-exceptions-test_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-color-test.py b/tests/googletest/googletest/test/googletest-color-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-color-test.py rename to tests/googletest/googletest/test/googletest-color-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-color-test_.cc b/tests/googletest/googletest/test/googletest-color-test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-color-test_.cc rename to tests/googletest/googletest/test/googletest-color-test_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-death-test-test.cc b/tests/googletest/googletest/test/googletest-death-test-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-death-test-test.cc rename to tests/googletest/googletest/test/googletest-death-test-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-death-test_ex_test.cc b/tests/googletest/googletest/test/googletest-death-test_ex_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-death-test_ex_test.cc rename to tests/googletest/googletest/test/googletest-death-test_ex_test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-env-var-test.py b/tests/googletest/googletest/test/googletest-env-var-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-env-var-test.py rename to tests/googletest/googletest/test/googletest-env-var-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-env-var-test_.cc b/tests/googletest/googletest/test/googletest-env-var-test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-env-var-test_.cc rename to tests/googletest/googletest/test/googletest-env-var-test_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-filepath-test.cc b/tests/googletest/googletest/test/googletest-filepath-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-filepath-test.cc rename to tests/googletest/googletest/test/googletest-filepath-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-filter-unittest.py b/tests/googletest/googletest/test/googletest-filter-unittest.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-filter-unittest.py rename to tests/googletest/googletest/test/googletest-filter-unittest.py diff --git a/unit_tests/googletest/googletest/test/googletest-filter-unittest_.cc b/tests/googletest/googletest/test/googletest-filter-unittest_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-filter-unittest_.cc rename to tests/googletest/googletest/test/googletest-filter-unittest_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-json-outfiles-test.py b/tests/googletest/googletest/test/googletest-json-outfiles-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-json-outfiles-test.py rename to tests/googletest/googletest/test/googletest-json-outfiles-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-json-output-unittest.py b/tests/googletest/googletest/test/googletest-json-output-unittest.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-json-output-unittest.py rename to tests/googletest/googletest/test/googletest-json-output-unittest.py diff --git a/unit_tests/googletest/googletest/test/googletest-linked-ptr-test.cc b/tests/googletest/googletest/test/googletest-linked-ptr-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-linked-ptr-test.cc rename to tests/googletest/googletest/test/googletest-linked-ptr-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-list-tests-unittest.py b/tests/googletest/googletest/test/googletest-list-tests-unittest.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-list-tests-unittest.py rename to tests/googletest/googletest/test/googletest-list-tests-unittest.py diff --git a/unit_tests/googletest/googletest/test/googletest-list-tests-unittest_.cc b/tests/googletest/googletest/test/googletest-list-tests-unittest_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-list-tests-unittest_.cc rename to tests/googletest/googletest/test/googletest-list-tests-unittest_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-listener-test.cc b/tests/googletest/googletest/test/googletest-listener-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-listener-test.cc rename to tests/googletest/googletest/test/googletest-listener-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-message-test.cc b/tests/googletest/googletest/test/googletest-message-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-message-test.cc rename to tests/googletest/googletest/test/googletest-message-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-options-test.cc b/tests/googletest/googletest/test/googletest-options-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-options-test.cc rename to tests/googletest/googletest/test/googletest-options-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-output-test-golden-lin.txt b/tests/googletest/googletest/test/googletest-output-test-golden-lin.txt similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-output-test-golden-lin.txt rename to tests/googletest/googletest/test/googletest-output-test-golden-lin.txt diff --git a/unit_tests/googletest/googletest/test/googletest-output-test.py b/tests/googletest/googletest/test/googletest-output-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-output-test.py rename to tests/googletest/googletest/test/googletest-output-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-output-test_.cc b/tests/googletest/googletest/test/googletest-output-test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-output-test_.cc rename to tests/googletest/googletest/test/googletest-output-test_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-param-test-invalid-name1-test.py b/tests/googletest/googletest/test/googletest-param-test-invalid-name1-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-param-test-invalid-name1-test.py rename to tests/googletest/googletest/test/googletest-param-test-invalid-name1-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc b/tests/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc rename to tests/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-param-test-invalid-name2-test.py b/tests/googletest/googletest/test/googletest-param-test-invalid-name2-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-param-test-invalid-name2-test.py rename to tests/googletest/googletest/test/googletest-param-test-invalid-name2-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc b/tests/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc rename to tests/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-param-test-test.cc b/tests/googletest/googletest/test/googletest-param-test-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-param-test-test.cc rename to tests/googletest/googletest/test/googletest-param-test-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-param-test-test.h b/tests/googletest/googletest/test/googletest-param-test-test.h similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-param-test-test.h rename to tests/googletest/googletest/test/googletest-param-test-test.h diff --git a/unit_tests/googletest/googletest/test/googletest-param-test2-test.cc b/tests/googletest/googletest/test/googletest-param-test2-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-param-test2-test.cc rename to tests/googletest/googletest/test/googletest-param-test2-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-port-test.cc b/tests/googletest/googletest/test/googletest-port-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-port-test.cc rename to tests/googletest/googletest/test/googletest-port-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-printers-test.cc b/tests/googletest/googletest/test/googletest-printers-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-printers-test.cc rename to tests/googletest/googletest/test/googletest-printers-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-shuffle-test.py b/tests/googletest/googletest/test/googletest-shuffle-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-shuffle-test.py rename to tests/googletest/googletest/test/googletest-shuffle-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-shuffle-test_.cc b/tests/googletest/googletest/test/googletest-shuffle-test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-shuffle-test_.cc rename to tests/googletest/googletest/test/googletest-shuffle-test_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-test-part-test.cc b/tests/googletest/googletest/test/googletest-test-part-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-test-part-test.cc rename to tests/googletest/googletest/test/googletest-test-part-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-test2_test.cc b/tests/googletest/googletest/test/googletest-test2_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-test2_test.cc rename to tests/googletest/googletest/test/googletest-test2_test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-throw-on-failure-test.py b/tests/googletest/googletest/test/googletest-throw-on-failure-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-throw-on-failure-test.py rename to tests/googletest/googletest/test/googletest-throw-on-failure-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-throw-on-failure-test_.cc b/tests/googletest/googletest/test/googletest-throw-on-failure-test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-throw-on-failure-test_.cc rename to tests/googletest/googletest/test/googletest-throw-on-failure-test_.cc diff --git a/unit_tests/googletest/googletest/test/googletest-tuple-test.cc b/tests/googletest/googletest/test/googletest-tuple-test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-tuple-test.cc rename to tests/googletest/googletest/test/googletest-tuple-test.cc diff --git a/unit_tests/googletest/googletest/test/googletest-uninitialized-test.py b/tests/googletest/googletest/test/googletest-uninitialized-test.py similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-uninitialized-test.py rename to tests/googletest/googletest/test/googletest-uninitialized-test.py diff --git a/unit_tests/googletest/googletest/test/googletest-uninitialized-test_.cc b/tests/googletest/googletest/test/googletest-uninitialized-test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/googletest-uninitialized-test_.cc rename to tests/googletest/googletest/test/googletest-uninitialized-test_.cc diff --git a/unit_tests/googletest/googletest/test/gtest-typed-test2_test.cc b/tests/googletest/googletest/test/gtest-typed-test2_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest-typed-test2_test.cc rename to tests/googletest/googletest/test/gtest-typed-test2_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest-typed-test_test.cc b/tests/googletest/googletest/test/gtest-typed-test_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest-typed-test_test.cc rename to tests/googletest/googletest/test/gtest-typed-test_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest-typed-test_test.h b/tests/googletest/googletest/test/gtest-typed-test_test.h similarity index 100% rename from unit_tests/googletest/googletest/test/gtest-typed-test_test.h rename to tests/googletest/googletest/test/gtest-typed-test_test.h diff --git a/unit_tests/googletest/googletest/test/gtest-unittest-api_test.cc b/tests/googletest/googletest/test/gtest-unittest-api_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest-unittest-api_test.cc rename to tests/googletest/googletest/test/gtest-unittest-api_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_all_test.cc b/tests/googletest/googletest/test/gtest_all_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_all_test.cc rename to tests/googletest/googletest/test/gtest_all_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_assert_by_exception_test.cc b/tests/googletest/googletest/test/gtest_assert_by_exception_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_assert_by_exception_test.cc rename to tests/googletest/googletest/test/gtest_assert_by_exception_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_environment_test.cc b/tests/googletest/googletest/test/gtest_environment_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_environment_test.cc rename to tests/googletest/googletest/test/gtest_environment_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_help_test.py b/tests/googletest/googletest/test/gtest_help_test.py similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_help_test.py rename to tests/googletest/googletest/test/gtest_help_test.py diff --git a/unit_tests/googletest/googletest/test/gtest_help_test_.cc b/tests/googletest/googletest/test/gtest_help_test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_help_test_.cc rename to tests/googletest/googletest/test/gtest_help_test_.cc diff --git a/unit_tests/googletest/googletest/test/gtest_json_test_utils.py b/tests/googletest/googletest/test/gtest_json_test_utils.py similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_json_test_utils.py rename to tests/googletest/googletest/test/gtest_json_test_utils.py diff --git a/unit_tests/googletest/googletest/test/gtest_list_output_unittest.py b/tests/googletest/googletest/test/gtest_list_output_unittest.py similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_list_output_unittest.py rename to tests/googletest/googletest/test/gtest_list_output_unittest.py diff --git a/unit_tests/googletest/googletest/test/gtest_list_output_unittest_.cc b/tests/googletest/googletest/test/gtest_list_output_unittest_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_list_output_unittest_.cc rename to tests/googletest/googletest/test/gtest_list_output_unittest_.cc diff --git a/unit_tests/googletest/googletest/test/gtest_main_unittest.cc b/tests/googletest/googletest/test/gtest_main_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_main_unittest.cc rename to tests/googletest/googletest/test/gtest_main_unittest.cc diff --git a/unit_tests/googletest/googletest/test/gtest_no_test_unittest.cc b/tests/googletest/googletest/test/gtest_no_test_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_no_test_unittest.cc rename to tests/googletest/googletest/test/gtest_no_test_unittest.cc diff --git a/unit_tests/googletest/googletest/test/gtest_pred_impl_unittest.cc b/tests/googletest/googletest/test/gtest_pred_impl_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_pred_impl_unittest.cc rename to tests/googletest/googletest/test/gtest_pred_impl_unittest.cc diff --git a/unit_tests/googletest/googletest/test/gtest_premature_exit_test.cc b/tests/googletest/googletest/test/gtest_premature_exit_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_premature_exit_test.cc rename to tests/googletest/googletest/test/gtest_premature_exit_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_prod_test.cc b/tests/googletest/googletest/test/gtest_prod_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_prod_test.cc rename to tests/googletest/googletest/test/gtest_prod_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_repeat_test.cc b/tests/googletest/googletest/test/gtest_repeat_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_repeat_test.cc rename to tests/googletest/googletest/test/gtest_repeat_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_sole_header_test.cc b/tests/googletest/googletest/test/gtest_sole_header_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_sole_header_test.cc rename to tests/googletest/googletest/test/gtest_sole_header_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_stress_test.cc b/tests/googletest/googletest/test/gtest_stress_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_stress_test.cc rename to tests/googletest/googletest/test/gtest_stress_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc b/tests/googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc rename to tests/googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_test_utils.py b/tests/googletest/googletest/test/gtest_test_utils.py similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_test_utils.py rename to tests/googletest/googletest/test/gtest_test_utils.py diff --git a/unit_tests/googletest/googletest/test/gtest_testbridge_test.py b/tests/googletest/googletest/test/gtest_testbridge_test.py similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_testbridge_test.py rename to tests/googletest/googletest/test/gtest_testbridge_test.py diff --git a/unit_tests/googletest/googletest/test/gtest_testbridge_test_.cc b/tests/googletest/googletest/test/gtest_testbridge_test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_testbridge_test_.cc rename to tests/googletest/googletest/test/gtest_testbridge_test_.cc diff --git a/unit_tests/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc b/tests/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc rename to tests/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc diff --git a/unit_tests/googletest/googletest/test/gtest_unittest.cc b/tests/googletest/googletest/test/gtest_unittest.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_unittest.cc rename to tests/googletest/googletest/test/gtest_unittest.cc diff --git a/unit_tests/googletest/googletest/test/gtest_xml_outfile1_test_.cc b/tests/googletest/googletest/test/gtest_xml_outfile1_test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_xml_outfile1_test_.cc rename to tests/googletest/googletest/test/gtest_xml_outfile1_test_.cc diff --git a/unit_tests/googletest/googletest/test/gtest_xml_outfile2_test_.cc b/tests/googletest/googletest/test/gtest_xml_outfile2_test_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_xml_outfile2_test_.cc rename to tests/googletest/googletest/test/gtest_xml_outfile2_test_.cc diff --git a/unit_tests/googletest/googletest/test/gtest_xml_outfiles_test.py b/tests/googletest/googletest/test/gtest_xml_outfiles_test.py similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_xml_outfiles_test.py rename to tests/googletest/googletest/test/gtest_xml_outfiles_test.py diff --git a/unit_tests/googletest/googletest/test/gtest_xml_output_unittest.py b/tests/googletest/googletest/test/gtest_xml_output_unittest.py similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_xml_output_unittest.py rename to tests/googletest/googletest/test/gtest_xml_output_unittest.py diff --git a/unit_tests/googletest/googletest/test/gtest_xml_output_unittest_.cc b/tests/googletest/googletest/test/gtest_xml_output_unittest_.cc similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_xml_output_unittest_.cc rename to tests/googletest/googletest/test/gtest_xml_output_unittest_.cc diff --git a/unit_tests/googletest/googletest/test/gtest_xml_test_utils.py b/tests/googletest/googletest/test/gtest_xml_test_utils.py similarity index 100% rename from unit_tests/googletest/googletest/test/gtest_xml_test_utils.py rename to tests/googletest/googletest/test/gtest_xml_test_utils.py diff --git a/unit_tests/googletest/googletest/test/production.cc b/tests/googletest/googletest/test/production.cc similarity index 100% rename from unit_tests/googletest/googletest/test/production.cc rename to tests/googletest/googletest/test/production.cc diff --git a/unit_tests/googletest/googletest/test/production.h b/tests/googletest/googletest/test/production.h similarity index 100% rename from unit_tests/googletest/googletest/test/production.h rename to tests/googletest/googletest/test/production.h diff --git a/unit_tests/googletest/googletest/xcode/Config/DebugProject.xcconfig b/tests/googletest/googletest/xcode/Config/DebugProject.xcconfig similarity index 100% rename from unit_tests/googletest/googletest/xcode/Config/DebugProject.xcconfig rename to tests/googletest/googletest/xcode/Config/DebugProject.xcconfig diff --git a/unit_tests/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig b/tests/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig similarity index 100% rename from unit_tests/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig rename to tests/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig diff --git a/unit_tests/googletest/googletest/xcode/Config/General.xcconfig b/tests/googletest/googletest/xcode/Config/General.xcconfig similarity index 100% rename from unit_tests/googletest/googletest/xcode/Config/General.xcconfig rename to tests/googletest/googletest/xcode/Config/General.xcconfig diff --git a/unit_tests/googletest/googletest/xcode/Config/ReleaseProject.xcconfig b/tests/googletest/googletest/xcode/Config/ReleaseProject.xcconfig similarity index 100% rename from unit_tests/googletest/googletest/xcode/Config/ReleaseProject.xcconfig rename to tests/googletest/googletest/xcode/Config/ReleaseProject.xcconfig diff --git a/unit_tests/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig b/tests/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig similarity index 100% rename from unit_tests/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig rename to tests/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig diff --git a/unit_tests/googletest/googletest/xcode/Config/TestTarget.xcconfig b/tests/googletest/googletest/xcode/Config/TestTarget.xcconfig similarity index 100% rename from unit_tests/googletest/googletest/xcode/Config/TestTarget.xcconfig rename to tests/googletest/googletest/xcode/Config/TestTarget.xcconfig diff --git a/unit_tests/googletest/googletest/xcode/Resources/Info.plist b/tests/googletest/googletest/xcode/Resources/Info.plist similarity index 100% rename from unit_tests/googletest/googletest/xcode/Resources/Info.plist rename to tests/googletest/googletest/xcode/Resources/Info.plist diff --git a/unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist b/tests/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist similarity index 100% rename from unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist rename to tests/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist diff --git a/unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/tests/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj similarity index 100% rename from unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj rename to tests/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj diff --git a/unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh b/tests/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh similarity index 100% rename from unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh rename to tests/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh diff --git a/unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc b/tests/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc similarity index 100% rename from unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc rename to tests/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc diff --git a/unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/widget.h b/tests/googletest/googletest/xcode/Samples/FrameworkSample/widget.h similarity index 100% rename from unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/widget.h rename to tests/googletest/googletest/xcode/Samples/FrameworkSample/widget.h diff --git a/unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc b/tests/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc similarity index 100% rename from unit_tests/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc rename to tests/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc diff --git a/unit_tests/googletest/googletest/xcode/Scripts/runtests.sh b/tests/googletest/googletest/xcode/Scripts/runtests.sh similarity index 100% rename from unit_tests/googletest/googletest/xcode/Scripts/runtests.sh rename to tests/googletest/googletest/xcode/Scripts/runtests.sh diff --git a/unit_tests/googletest/googletest/xcode/Scripts/versiongenerate.py b/tests/googletest/googletest/xcode/Scripts/versiongenerate.py similarity index 100% rename from unit_tests/googletest/googletest/xcode/Scripts/versiongenerate.py rename to tests/googletest/googletest/xcode/Scripts/versiongenerate.py diff --git a/unit_tests/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj b/tests/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj similarity index 100% rename from unit_tests/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj rename to tests/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj diff --git a/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt similarity index 100% rename from unit_tests/CMakeLists.txt rename to tests/unit_tests/CMakeLists.txt diff --git a/unit_tests/gtests/scout_can_protocol_test.cpp b/tests/unit_tests/scout_can_protocol_test.cpp similarity index 100% rename from unit_tests/gtests/scout_can_protocol_test.cpp rename to tests/unit_tests/scout_can_protocol_test.cpp