Update GoogleTest to latest version (#269)

* Remove old gtest version * Add new vendored Googletest version * Move test_config H to HH * CMake updates for new googletest version * Test updates for new googletest version Signed-off-by: Michael Carroll <michael@openrobotics.org>
gazebosim · Jun 28, 2022 · 6231f53 · 6231f53
1 parent a877872
commit 6231f53
Show file tree

Hide file tree

Showing 65 changed files with 11,431 additions and 20,776 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,6 +22,8 @@ gz_configure_project(
 #============================================================================
 # Set project-specific options
 #============================================================================
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 #============================================================================
 # Search for project-specific dependencies
@@ -54,7 +56,7 @@ set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-common
-gz_find_package(gz-common5 REQUIRED PRIVATE)
+gz_find_package(gz-common5 REQUIRED PRIVATE COMPONENTS testing)
 set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
 
 #--------------------------------------

diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc
@@ -22,7 +22,7 @@
 #include <gz/common/Filesystem.hh>
 #include <gz/common/Util.hh>
 #include "gz/fuel_tools/ClientConfig.hh"
-#include "test_config.h"
+#include "test_config.hh"
 
 using namespace gz;
 using namespace fuel_tools;

diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc
@@ -26,7 +26,7 @@
 #include "gz/fuel_tools/Result.hh"
 #include "gz/fuel_tools/WorldIdentifier.hh"
 
-#include "test_config.h"
+#include "test_config.hh"
 
 #ifdef _WIN32
 #include <direct.h>

diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc
@@ -23,7 +23,7 @@
 #include "gz/fuel_tools/FuelClient.hh"
 #include "gz/fuel_tools/Interface.hh"
 
-#include "test_config.h"
+#include "test_config.hh"
 
 #ifdef _WIN32
 #include <direct.h>

diff --git a/src/LocalCache_TEST.cc b/src/LocalCache_TEST.cc
@@ -28,7 +28,7 @@
 #include "gz/fuel_tools/WorldIdentifier.hh"
 
 #include "LocalCache.hh"
-#include "test_config.h"
+#include "test_config.hh"
 
 #ifdef _WIN32
 #include <direct.h>

diff --git a/src/RestClient_TEST.cc b/src/RestClient_TEST.cc
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 #include <string>
 #include "gz/fuel_tools/RestClient.hh"
-#include "test_config.h"
+#include "test_config.hh"
 
 /////////////////////////////////////////////////
 TEST(RestClient, UserAgent)

diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc
@@ -23,7 +23,7 @@
 #include <gz/utils/ExtraTestMacros.hh>
 
 #include "gz/fuel_tools/config.hh"
-#include "test_config.h"
+#include "test_config.hh"
 
 /////////////////////////////////////////////////
 std::string custom_exec_str(std::string _cmd)

diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc
@@ -24,7 +24,7 @@
 #include <gz/utils/ExtraTestMacros.hh>
 
 #include "gz.hh"
-#include "test_config.h"
+#include "test_config.hh"
 
 using namespace gz;
 
@@ -371,8 +371,8 @@ class DownloadCollectionTest
       public ::testing::WithParamInterface<int>
 {};
 
-INSTANTIATE_TEST_CASE_P(CollectionTest, DownloadCollectionTest,
-                        ::testing::Values(1, 2, 16),); // NOLINT
+INSTANTIATE_TEST_SUITE_P(CollectionTest, DownloadCollectionTest,
+                        ::testing::Values(1, 2, 16));
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,24 +1,9 @@
-configure_file(test_config.h.in ${PROJECT_BINARY_DIR}/test_config.h)
-
-# Build gtest
-add_library(gtest STATIC gtest/src/gtest-all.cc)
-add_library(gtest_main STATIC gtest/src/gtest_main.cc)
-target_include_directories(gtest
-  SYSTEM PUBLIC
-  ${PROJECT_SOURCE_DIR}/test/gtest/include
-  PRIVATE
-  ${PROJECT_SOURCE_DIR}/test/gtest
+configure_file (test_config.hh.in ${PROJECT_BINARY_DIR}/include/test_config.hh)
+include_directories (
+  ${PROJECT_BINARY_DIR}/include
 )
 
-target_link_libraries(gtest_main gtest)
-set_property(TARGET gtest_main PROPERTY CXX_STANDARD ${c++standard})
-set_property(TARGET gtest PROPERTY CXX_STANDARD ${c++standard})
-set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
-set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")
-
-execute_process(COMMAND cmake -E remove_directory ${CMAKE_BINARY_DIR}/test_results)
-execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results)
-
+add_subdirectory(gtest_vendor)
 add_subdirectory(integration)
 add_subdirectory(performance)
 add_subdirectory(regression)