move gmock files, update gmock usages

* all gmock/gtest files moved to `gmock` directory (like a library name) * CMake `gmock` target updated to export includes as "gtest/gtest.h" or "gmock/gtest.h" only * includes in tests updated: "gtest.h" -> "gtest/gtest.h", "gmock.h" -> "gmock/gmock.h" * removed duplications of `target_include_directories` for gmock directories (CMake manages them) * `.clang-format` file added to `gmock` directory to prevent formatting there
fmtlib · Apr 26, 2021 · 7f14bfb · 7f14bfb
1 parent 69bdc20
commit 7f14bfb
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 22 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -6,9 +6,10 @@
 # pre-compiled copy of Google Test (for example, into /usr/local)?"
 # at http://code.google.com/p/googletest/wiki/FAQ for more details.
 add_library(gmock STATIC
-  gmock-gtest-all.cc gmock/gmock.h gtest/gtest.h gtest/gtest-spi.h)
+  gmock/gmock-gtest-all.cc gmock/include/gmock/gmock.h
+  gmock/include/gtest/gtest.h gmock/include/gtest/gtest-spi.h)
 target_compile_definitions(gmock PUBLIC GTEST_HAS_STD_WSTRING=1)
-target_include_directories(gmock SYSTEM PUBLIC . gmock gtest)
+target_include_directories(gmock SYSTEM PUBLIC gmock/include)
 
 find_package(Threads)
 if (Threads_FOUND)
@@ -37,7 +38,6 @@ target_compile_definitions(gmock
 
 set(TEST_MAIN_SRC test-main.cc gtest-extra.cc gtest-extra.h util.cc)
 add_library(test-main STATIC ${TEST_MAIN_SRC})
-target_include_directories(test-main SYSTEM PUBLIC gtest gmock)
 target_link_libraries(test-main gmock fmt)
 
 include(CheckCXXCompilerFlag)
@@ -75,7 +75,6 @@ function(add_fmt_test name)
   if (FMT_WERROR)
     target_compile_options(${name} PRIVATE ${WERROR_FLAG})
   endif ()
-  target_include_directories(${name} SYSTEM PUBLIC gtest gmock)
   add_test(NAME ${name} COMMAND ${name})
 endfunction()
 
@@ -123,7 +122,6 @@ if (NOT MSVC_STATIC_RUNTIME)
   target_include_directories(
     posix-mock-test PRIVATE ${PROJECT_SOURCE_DIR}/include)
   target_link_libraries(posix-mock-test gmock)
-  target_include_directories(posix-mock-test SYSTEM PUBLIC gtest gmock)
   if (FMT_PEDANTIC)
     target_compile_options(posix-mock-test PRIVATE ${PEDANTIC_COMPILE_FLAGS})
   endif ()
@@ -137,7 +135,6 @@ endif ()
 add_fmt_executable(header-only-test
   header-only-test.cc header-only-test2.cc test-main.cc)
 target_link_libraries(header-only-test gmock)
-target_include_directories(header-only-test SYSTEM PUBLIC gtest gmock)
 if (TARGET fmt-header-only)
   target_link_libraries(header-only-test fmt-header-only)
 else ()

diff --git a/test/args-test.cc b/test/args-test.cc
@@ -7,7 +7,7 @@
 
 #include "fmt/args.h"
 
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 TEST(args_test, basic) {
   auto store = fmt::dynamic_format_arg_store<fmt::format_context>();

diff --git a/test/assert-test.cc b/test/assert-test.cc
@@ -10,7 +10,7 @@
 // For the license information refer to format.h.
 
 #include "fmt/core.h"
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 TEST(assert_test, fail) {
 #if GTEST_HAS_DEATH_TEST

diff --git a/test/compile-test.cc b/test/compile-test.cc
@@ -15,7 +15,7 @@
 
 #include "fmt/chrono.h"
 #include "fmt/compile.h"
-#include "gmock.h"
+#include "gmock/gmock.h"
 #include "gtest-extra.h"
 #include "util.h"
 

diff --git a/test/core-test.cc b/test/core-test.cc
@@ -20,7 +20,7 @@
 #include <string>       // std::string
 #include <type_traits>  // std::is_same
 
-#include "gmock.h"
+#include "gmock/gmock.h"
 
 #if defined(FMT_COMPILE_TIME_CHECKS) && FMT_COMPILE_TIME_CHECKS
 #  include "fmt/format.h"

diff --git a/test/format-impl-test.cc b/test/format-impl-test.cc
@@ -15,7 +15,7 @@
 
 #include "../src/format.cc"
 #include "fmt/printf.h"
-#include "gmock.h"
+#include "gmock/gmock.h"
 #include "gtest-extra.h"
 #include "util.h"
 

diff --git a/test/format-test.cc b/test/format-test.cc
@@ -30,7 +30,7 @@
 
 #undef index
 
-#include "gmock.h"
+#include "gmock/gmock.h"
 #include "gtest-extra.h"
 #include "mock-allocator.h"
 #include "util.h"

diff --git a/test/gmock/.clang-format b/test/gmock/.clang-format
@@ -0,0 +1,3 @@
+# Disable clang-format here
+DisableFormat: true
+SortIncludes: Never
diff --git a/test/gmock-gtest-all.cc → test/gmock/gmock-gtest-all.cc b/test/gmock-gtest-all.cc → test/gmock/gmock-gtest-all.cc
diff --git a/test/gmock/gmock.h → test/gmock/include/gmock/gmock.h b/test/gmock/gmock.h → test/gmock/include/gmock/gmock.h
diff --git a/test/gtest/gtest-spi.h → test/gmock/include/gtest/gtest-spi.h b/test/gtest/gtest-spi.h → test/gmock/include/gtest/gtest-spi.h
diff --git a/test/gtest/gtest.h → test/gmock/include/gtest/gtest.h b/test/gtest/gtest.h → test/gmock/include/gtest/gtest.h
diff --git a/test/gtest-extra.h b/test/gtest-extra.h
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "fmt/os.h"
-#include "gmock.h"
+#include "gmock/gmock.h"
 
 #define FMT_TEST_THROW_(statement, expected_exception, expected_message, fail) \
   GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                \

diff --git a/test/locale-test.cc b/test/locale-test.cc
@@ -9,7 +9,7 @@
 
 #include <complex>
 
-#include "gmock.h"
+#include "gmock/gmock.h"
 
 using fmt::detail::max_value;
 

diff --git a/test/mock-allocator.h b/test/mock-allocator.h
@@ -9,7 +9,7 @@
 #define FMT_MOCK_ALLOCATOR_H_
 
 #include "fmt/format.h"
-#include "gmock.h"
+#include "gmock/gmock.h"
 
 template <typename T> class mock_allocator {
  public:

diff --git a/test/ostream-test.cc b/test/ostream-test.cc
@@ -24,7 +24,7 @@ template <> struct formatter<test> : formatter<int> {
 
 #include "fmt/ostream.h"
 #include "fmt/ranges.h"
-#include "gmock.h"
+#include "gmock/gmock.h"
 #include "gtest-extra.h"
 #include "util.h"
 

diff --git a/test/posix-mock-test.cc b/test/posix-mock-test.cc
@@ -26,7 +26,7 @@
 #  undef ERROR
 #endif
 
-#include "gmock.h"
+#include "gmock/gmock.h"
 #include "gtest-extra.h"
 #include "util.h"
 

diff --git a/test/ranges-test.cc b/test/ranges-test.cc
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 #if !FMT_GCC_VERSION || FMT_GCC_VERSION >= 601
 #  define FMT_RANGES_TEST_ENABLE_C_STYLE_ARRAY

diff --git a/test/scan-test.cc b/test/scan-test.cc
@@ -11,7 +11,7 @@
 
 #include <climits>
 
-#include "gmock.h"
+#include "gmock/gmock.h"
 #include "gtest-extra.h"
 
 TEST(ScanTest, ReadText) {

diff --git a/test/std-format-test.cc b/test/std-format-test.cc
@@ -1,6 +1,6 @@
 #include <format>
 
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 TEST(StdFormatTest, Escaping) {
   using namespace std;

diff --git a/test/test-assert.h b/test/test-assert.h
@@ -10,7 +10,7 @@
 
 #include <stdexcept>
 
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 class assertion_failure : public std::logic_error {
  public:

diff --git a/test/test-main.cc b/test/test-main.cc
@@ -7,7 +7,7 @@
 
 #include <cstdlib>
 
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 #ifdef _WIN32
 #  include <windows.h>