From 53e08c44dd34857ba57581d7c5774d6c96a8d0e1 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Tue, 14 Sep 2010 05:38:21 +0000 Subject: [PATCH] Include gtest and gmock headers as user headers instead of system headers. --- include/gmock/gmock-actions.h | 4 ++-- include/gmock/gmock-cardinalities.h | 4 ++-- include/gmock/gmock-generated-actions.h | 4 ++-- include/gmock/gmock-generated-actions.h.pump | 4 ++-- .../gmock/gmock-generated-function-mockers.h | 4 ++-- .../gmock-generated-function-mockers.h.pump | 4 ++-- include/gmock/gmock-generated-matchers.h | 2 +- include/gmock/gmock-generated-matchers.h.pump | 2 +- include/gmock/gmock-generated-nice-strict.h | 4 ++-- .../gmock/gmock-generated-nice-strict.h.pump | 4 ++-- include/gmock/gmock-matchers.h | 6 ++--- include/gmock/gmock-more-actions.h | 2 +- include/gmock/gmock-spec-builders.h | 12 +++++----- include/gmock/gmock.h | 18 +++++++-------- .../internal/gmock-generated-internal-utils.h | 2 +- .../gmock-generated-internal-utils.h.pump | 2 +- include/gmock/internal/gmock-internal-utils.h | 6 ++--- include/gmock/internal/gmock-port.h | 4 ++-- scripts/fuse_gmock_files.py | 22 +++++++++---------- src/gmock-all.cc | 2 +- src/gmock-cardinalities.cc | 6 ++--- src/gmock-internal-utils.cc | 8 +++---- src/gmock-matchers.cc | 4 ++-- src/gmock-spec-builders.cc | 6 ++--- src/gmock.cc | 4 ++-- src/gmock_main.cc | 4 ++-- test/gmock-actions_test.cc | 10 ++++----- test/gmock-cardinalities_test.cc | 6 ++--- test/gmock-generated-actions_test.cc | 6 ++--- test/gmock-generated-function-mockers_test.cc | 6 ++--- test/gmock-generated-internal-utils_test.cc | 6 ++--- test/gmock-generated-matchers_test.cc | 8 +++---- test/gmock-internal-utils_test.cc | 10 ++++----- test/gmock-matchers_test.cc | 8 +++---- test/gmock-more-actions_test.cc | 6 ++--- test/gmock-nice-strict_test.cc | 8 +++---- test/gmock-port_test.cc | 4 ++-- test/gmock-spec-builders_test.cc | 10 ++++----- test/gmock_leak_test_.cc | 2 +- test/gmock_link_test.h | 6 ++--- test/gmock_output_test_.cc | 4 ++-- test/gmock_test.cc | 4 ++-- 42 files changed, 124 insertions(+), 124 deletions(-) diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h index ddaaef24..6eb3f445 100644 --- a/include/gmock/gmock-actions.h +++ b/include/gmock/gmock-actions.h @@ -43,8 +43,8 @@ #include #endif -#include -#include +#include "gmock/internal/gmock-internal-utils.h" +#include "gmock/internal/gmock-port.h" namespace testing { diff --git a/include/gmock/gmock-cardinalities.h b/include/gmock/gmock-cardinalities.h index ae4cb641..954a86ea 100644 --- a/include/gmock/gmock-cardinalities.h +++ b/include/gmock/gmock-cardinalities.h @@ -40,8 +40,8 @@ #include #include // NOLINT -#include -#include +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" namespace testing { diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h index 65652f8e..6ab014dd 100644 --- a/include/gmock/gmock-generated-actions.h +++ b/include/gmock/gmock-generated-actions.h @@ -38,8 +38,8 @@ #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ -#include -#include +#include "gmock/gmock-actions.h" +#include "gmock/internal/gmock-port.h" namespace testing { namespace internal { diff --git a/include/gmock/gmock-generated-actions.h.pump b/include/gmock/gmock-generated-actions.h.pump index b1deb798..4d7c5cee 100644 --- a/include/gmock/gmock-generated-actions.h.pump +++ b/include/gmock/gmock-generated-actions.h.pump @@ -42,8 +42,8 @@ $$}} This meta comment fixes auto-indentation in editors. #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ -#include -#include +#include "gmock/gmock-actions.h" +#include "gmock/internal/gmock-port.h" namespace testing { namespace internal { diff --git a/include/gmock/gmock-generated-function-mockers.h b/include/gmock/gmock-generated-function-mockers.h index 65090861..7b334e42 100644 --- a/include/gmock/gmock-generated-function-mockers.h +++ b/include/gmock/gmock-generated-function-mockers.h @@ -38,8 +38,8 @@ #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ -#include -#include +#include "gmock/gmock-spec-builders.h" +#include "gmock/internal/gmock-internal-utils.h" namespace testing { namespace internal { diff --git a/include/gmock/gmock-generated-function-mockers.h.pump b/include/gmock/gmock-generated-function-mockers.h.pump index e0a0cd10..50b369bb 100644 --- a/include/gmock/gmock-generated-function-mockers.h.pump +++ b/include/gmock/gmock-generated-function-mockers.h.pump @@ -41,8 +41,8 @@ $var n = 10 $$ The maximum arity we support. #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ -#include -#include +#include "gmock/gmock-spec-builders.h" +#include "gmock/internal/gmock-internal-utils.h" namespace testing { namespace internal { diff --git a/include/gmock/gmock-generated-matchers.h b/include/gmock/gmock-generated-matchers.h index cb610543..68af306b 100644 --- a/include/gmock/gmock-generated-matchers.h +++ b/include/gmock/gmock-generated-matchers.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include "gmock/gmock-matchers.h" namespace testing { namespace internal { diff --git a/include/gmock/gmock-generated-matchers.h.pump b/include/gmock/gmock-generated-matchers.h.pump index 02e3c980..cebdd0e6 100644 --- a/include/gmock/gmock-generated-matchers.h.pump +++ b/include/gmock/gmock-generated-matchers.h.pump @@ -43,7 +43,7 @@ $$ }} This line fixes auto-indentation of the following code in Emacs. #include #include #include -#include +#include "gmock/gmock-matchers.h" namespace testing { namespace internal { diff --git a/include/gmock/gmock-generated-nice-strict.h b/include/gmock/gmock-generated-nice-strict.h index 435467fa..4fb69fdc 100644 --- a/include/gmock/gmock-generated-nice-strict.h +++ b/include/gmock/gmock-generated-nice-strict.h @@ -59,8 +59,8 @@ #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_ -#include -#include +#include "gmock/gmock-spec-builders.h" +#include "gmock/internal/gmock-port.h" namespace testing { diff --git a/include/gmock/gmock-generated-nice-strict.h.pump b/include/gmock/gmock-generated-nice-strict.h.pump index 96371f57..784635bd 100644 --- a/include/gmock/gmock-generated-nice-strict.h.pump +++ b/include/gmock/gmock-generated-nice-strict.h.pump @@ -62,8 +62,8 @@ $var n = 10 $$ The maximum arity we support. #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_ -#include -#include +#include "gmock/gmock-spec-builders.h" +#include "gmock/internal/gmock-port.h" namespace testing { diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h index 9f268d64..1938be90 100644 --- a/include/gmock/gmock-matchers.h +++ b/include/gmock/gmock-matchers.h @@ -46,9 +46,9 @@ #include #include -#include -#include -#include +#include "gmock/internal/gmock-internal-utils.h" +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" namespace testing { diff --git a/include/gmock/gmock-more-actions.h b/include/gmock/gmock-more-actions.h index c60557e6..e418505a 100644 --- a/include/gmock/gmock-more-actions.h +++ b/include/gmock/gmock-more-actions.h @@ -36,7 +36,7 @@ #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_ -#include +#include "gmock/gmock-generated-actions.h" namespace testing { namespace internal { diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index 27d2b747..1676056c 100644 --- a/include/gmock/gmock-spec-builders.h +++ b/include/gmock/gmock-spec-builders.h @@ -66,12 +66,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "gmock/gmock-actions.h" +#include "gmock/gmock-cardinalities.h" +#include "gmock/gmock-matchers.h" +#include "gmock/internal/gmock-internal-utils.h" +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" namespace testing { diff --git a/include/gmock/gmock.h b/include/gmock/gmock.h index e3d5fd8e..ba9fa286 100644 --- a/include/gmock/gmock.h +++ b/include/gmock/gmock.h @@ -55,15 +55,15 @@ // // where all clauses are optional and WillOnce() can be repeated. -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "gmock/gmock-actions.h" +#include "gmock/gmock-cardinalities.h" +#include "gmock/gmock-generated-actions.h" +#include "gmock/gmock-generated-function-mockers.h" +#include "gmock/gmock-generated-matchers.h" +#include "gmock/gmock-more-actions.h" +#include "gmock/gmock-generated-nice-strict.h" +#include "gmock/gmock-matchers.h" +#include "gmock/internal/gmock-internal-utils.h" namespace testing { diff --git a/include/gmock/internal/gmock-generated-internal-utils.h b/include/gmock/internal/gmock-generated-internal-utils.h index 6386b05a..1b52dceb 100644 --- a/include/gmock/internal/gmock-generated-internal-utils.h +++ b/include/gmock/internal/gmock-generated-internal-utils.h @@ -39,7 +39,7 @@ #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_ #define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_ -#include +#include "gmock/internal/gmock-port.h" namespace testing { diff --git a/include/gmock/internal/gmock-generated-internal-utils.h.pump b/include/gmock/internal/gmock-generated-internal-utils.h.pump index f3128b04..821e474e 100644 --- a/include/gmock/internal/gmock-generated-internal-utils.h.pump +++ b/include/gmock/internal/gmock-generated-internal-utils.h.pump @@ -42,7 +42,7 @@ $var n = 10 $$ The maximum arity we support. #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_ #define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_ -#include +#include "gmock/internal/gmock-port.h" namespace testing { diff --git a/include/gmock/internal/gmock-internal-utils.h b/include/gmock/internal/gmock-internal-utils.h index 19ea89eb..7aaf6de5 100644 --- a/include/gmock/internal/gmock-internal-utils.h +++ b/include/gmock/internal/gmock-internal-utils.h @@ -42,9 +42,9 @@ #include // NOLINT #include -#include -#include -#include +#include "gmock/internal/gmock-generated-internal-utils.h" +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" namespace testing { namespace internal { diff --git a/include/gmock/internal/gmock-port.h b/include/gmock/internal/gmock-port.h index b644eb4f..bb3f5838 100644 --- a/include/gmock/internal/gmock-port.h +++ b/include/gmock/internal/gmock-port.h @@ -42,8 +42,8 @@ // Most of the types needed for porting Google Mock are also required // for Google Test and are defined in gtest-port.h. -#include -#include +#include "gtest/internal/gtest-linked_ptr.h" +#include "gtest/internal/gtest-port.h" // To avoid conditional compilation everywhere, we make it // gmock-port.h's responsibility to #include the header implementing diff --git a/scripts/fuse_gmock_files.py b/scripts/fuse_gmock_files.py index 4e892e9a..fc0baf79 100755 --- a/scripts/fuse_gmock_files.py +++ b/scripts/fuse_gmock_files.py @@ -75,8 +75,8 @@ sys.path.append(os.path.join(DEFAULT_GMOCK_ROOT_DIR, 'gtest/scripts')) import fuse_gtest_files gtest = fuse_gtest_files -# Regex for matching '#include '. -INCLUDE_GMOCK_FILE_REGEX = re.compile(r'^\s*#\s*include\s*<(gmock/.+)>') +# Regex for matching '#include "gmock/..."'. +INCLUDE_GMOCK_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(gmock/.+)"') # Where to find the source seed files. GMOCK_H_SEED = 'include/gmock/gmock.h' @@ -135,19 +135,19 @@ def FuseGMockH(gmock_root, output_dir): for line in file(os.path.join(gmock_root, gmock_header_path), 'r'): m = INCLUDE_GMOCK_FILE_REGEX.match(line) if m: - # It's '#include ' - let's process it recursively. + # It's '#include "gmock/..."' - let's process it recursively. ProcessFile('include/' + m.group(1)) else: m = gtest.INCLUDE_GTEST_FILE_REGEX.match(line) if m: - # It's '#include '. We translate it to - # , regardless of what foo is, since all + # It's '#include "gtest/foo.h"'. We translate it to + # "gtest/gtest.h", regardless of what foo is, since all # gtest headers are fused into gtest/gtest.h. # There is no need to #include gtest.h twice. if not gtest.GTEST_H_SEED in processed_files: processed_files.add(gtest.GTEST_H_SEED) - output_file.write('#include <%s>\n' % (gtest.GTEST_H_OUTPUT,)) + output_file.write('#include "%s"\n' % (gtest.GTEST_H_OUTPUT,)) else: # Otherwise we copy the line unchanged to the output file. output_file.write(line) @@ -174,18 +174,18 @@ def FuseGMockAllCcToFile(gmock_root, output_file): for line in file(os.path.join(gmock_root, gmock_source_file), 'r'): m = INCLUDE_GMOCK_FILE_REGEX.match(line) if m: - # It's '#include '. We treat it as '#include - # ', as all other gmock headers are being fused + # It's '#include "gmock/foo.h"'. We treat it as '#include + # "gmock/gmock.h"', as all other gmock headers are being fused # into gmock.h and cannot be #included directly. - # There is no need to #include more than once. + # There is no need to #include "gmock/gmock.h" more than once. if not GMOCK_H_SEED in processed_files: processed_files.add(GMOCK_H_SEED) - output_file.write('#include <%s>\n' % (GMOCK_H_OUTPUT,)) + output_file.write('#include "%s"\n' % (GMOCK_H_OUTPUT,)) else: m = gtest.INCLUDE_GTEST_FILE_REGEX.match(line) if m: - # It's '#include '. + # It's '#include "gtest/..."'. # There is no need to #include gtest.h as it has been # #included by gtest-all.cc. pass diff --git a/src/gmock-all.cc b/src/gmock-all.cc index 76118d88..7aebce7a 100644 --- a/src/gmock-all.cc +++ b/src/gmock-all.cc @@ -37,7 +37,7 @@ // This line ensures that gmock.h can be compiled on its own, even // when it's fused. -#include +#include "gmock/gmock.h" // The following lines pull in the real gmock *.cc files. #include "src/gmock-cardinalities.cc" diff --git a/src/gmock-cardinalities.cc b/src/gmock-cardinalities.cc index 07eed469..1a7902b4 100644 --- a/src/gmock-cardinalities.cc +++ b/src/gmock-cardinalities.cc @@ -33,14 +33,14 @@ // // This file implements cardinalities. -#include +#include "gmock/gmock-cardinalities.h" #include #include // NOLINT #include #include -#include -#include +#include "gmock/internal/gmock-internal-utils.h" +#include "gtest/gtest.h" namespace testing { diff --git a/src/gmock-internal-utils.cc b/src/gmock-internal-utils.cc index 9debe187..dd38132a 100644 --- a/src/gmock-internal-utils.cc +++ b/src/gmock-internal-utils.cc @@ -35,14 +35,14 @@ // Mock. They are subject to change without notice, so please DO NOT // USE THEM IN USER CODE. -#include +#include "gmock/internal/gmock-internal-utils.h" #include #include // NOLINT #include -#include -#include -#include +#include "gmock/gmock.h" +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" namespace testing { namespace internal { diff --git a/src/gmock-matchers.cc b/src/gmock-matchers.cc index 89007d9f..a5e6824d 100644 --- a/src/gmock-matchers.cc +++ b/src/gmock-matchers.cc @@ -34,8 +34,8 @@ // This file implements Matcher, Matcher, and // utilities for defining matchers. -#include -#include +#include "gmock/gmock-matchers.h" +#include "gmock/gmock-generated-matchers.h" #include #include diff --git a/src/gmock-spec-builders.cc b/src/gmock-spec-builders.cc index dab1a2c9..0d40d9cd 100644 --- a/src/gmock-spec-builders.cc +++ b/src/gmock-spec-builders.cc @@ -34,15 +34,15 @@ // This file implements the spec builder syntax (ON_CALL and // EXPECT_CALL). -#include +#include "gmock/gmock-spec-builders.h" #include #include // NOLINT #include #include #include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" #if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC #include // NOLINT diff --git a/src/gmock.cc b/src/gmock.cc index f487265d..700bcb2e 100644 --- a/src/gmock.cc +++ b/src/gmock.cc @@ -29,8 +29,8 @@ // // Author: wan@google.com (Zhanyong Wan) -#include -#include +#include "gmock/gmock.h" +#include "gmock/internal/gmock-port.h" namespace testing { diff --git a/src/gmock_main.cc b/src/gmock_main.cc index 0a3071bf..3725ae72 100644 --- a/src/gmock_main.cc +++ b/src/gmock_main.cc @@ -30,8 +30,8 @@ // Author: wan@google.com (Zhanyong Wan) #include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" // MS C++ compiler/linker has a bug on Windows (not on Windows CE), which // causes a link error when _tmain is defined in a static library and UNICODE diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc index 50cc6f98..fd52ce21 100644 --- a/test/gmock-actions_test.cc +++ b/test/gmock-actions_test.cc @@ -33,14 +33,14 @@ // // This file tests the built-in actions. -#include +#include "gmock/gmock-actions.h" #include #include #include -#include -#include -#include -#include +#include "gmock/gmock.h" +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" namespace { diff --git a/test/gmock-cardinalities_test.cc b/test/gmock-cardinalities_test.cc index f6a94916..64815e57 100644 --- a/test/gmock-cardinalities_test.cc +++ b/test/gmock-cardinalities_test.cc @@ -33,9 +33,9 @@ // // This file tests the built-in cardinalities. -#include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" namespace { diff --git a/test/gmock-generated-actions_test.cc b/test/gmock-generated-actions_test.cc index 3c076d7c..f4d42a38 100644 --- a/test/gmock-generated-actions_test.cc +++ b/test/gmock-generated-actions_test.cc @@ -33,13 +33,13 @@ // // This file tests the built-in actions generated by a script. -#include +#include "gmock/gmock-generated-actions.h" #include #include #include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" namespace testing { namespace gmock_generated_actions_test { diff --git a/test/gmock-generated-function-mockers_test.cc b/test/gmock-generated-function-mockers_test.cc index 5d839c41..d000386d 100644 --- a/test/gmock-generated-function-mockers_test.cc +++ b/test/gmock-generated-function-mockers_test.cc @@ -33,12 +33,12 @@ // // This file tests the function mocker classes. -#include +#include "gmock/gmock-generated-function-mockers.h" #include #include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" #if GTEST_OS_WINDOWS // MSDN says the header file to be included for STDMETHOD is BaseTyps.h but diff --git a/test/gmock-generated-internal-utils_test.cc b/test/gmock-generated-internal-utils_test.cc index 13b4c5cf..1156c7db 100644 --- a/test/gmock-generated-internal-utils_test.cc +++ b/test/gmock-generated-internal-utils_test.cc @@ -33,9 +33,9 @@ // // This file tests the internal utilities. -#include -#include -#include +#include "gmock/internal/gmock-generated-internal-utils.h" +#include "gmock/internal/gmock-internal-utils.h" +#include "gtest/gtest.h" namespace { diff --git a/test/gmock-generated-matchers_test.cc b/test/gmock-generated-matchers_test.cc index 600783c7..2a7f498a 100644 --- a/test/gmock-generated-matchers_test.cc +++ b/test/gmock-generated-matchers_test.cc @@ -31,7 +31,7 @@ // // This file tests the built-in matchers generated by a script. -#include +#include "gmock/gmock-generated-matchers.h" #include #include @@ -41,9 +41,9 @@ #include #include -#include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" namespace { diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc index 720d6c72..5b0e8043 100644 --- a/test/gmock-internal-utils_test.cc +++ b/test/gmock-internal-utils_test.cc @@ -33,16 +33,16 @@ // // This file tests the internal utilities. -#include +#include "gmock/internal/gmock-internal-utils.h" #include #include #include #include #include -#include -#include -#include -#include +#include "gmock/gmock.h" +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" #if GTEST_OS_CYGWIN #include // For ssize_t. NOLINT diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index c2db86ca..dfa34a42 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -33,7 +33,7 @@ // // This file tests some commonly used argument matchers. -#include +#include "gmock/gmock-matchers.h" #include #include @@ -45,9 +45,9 @@ #include #include #include -#include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" namespace testing { diff --git a/test/gmock-more-actions_test.cc b/test/gmock-more-actions_test.cc index be7b1273..c09cccf4 100644 --- a/test/gmock-more-actions_test.cc +++ b/test/gmock-more-actions_test.cc @@ -33,13 +33,13 @@ // // This file tests the built-in actions in gmock-more-actions.h. -#include +#include "gmock/gmock-more-actions.h" #include #include #include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" namespace testing { namespace gmock_more_actions_test { diff --git a/test/gmock-nice-strict_test.cc b/test/gmock-nice-strict_test.cc index f340cecb..e3344180 100644 --- a/test/gmock-nice-strict_test.cc +++ b/test/gmock-nice-strict_test.cc @@ -29,12 +29,12 @@ // // Author: wan@google.com (Zhanyong Wan) -#include +#include "gmock/gmock-generated-nice-strict.h" #include -#include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" // This must not be defined inside the ::testing namespace, or it will // clash with ::testing::Mock. diff --git a/test/gmock-port_test.cc b/test/gmock-port_test.cc index a84eb9ea..d6a8d444 100644 --- a/test/gmock-port_test.cc +++ b/test/gmock-port_test.cc @@ -33,8 +33,8 @@ // // This file tests the internal cross-platform support utilities. -#include -#include +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" // NOTE: if this file is left without tests for some reason, put a dummy // test here to make references to symbols in the gtest library and avoid diff --git a/test/gmock-spec-builders_test.cc b/test/gmock-spec-builders_test.cc index 50af1fef..6c844e22 100644 --- a/test/gmock-spec-builders_test.cc +++ b/test/gmock-spec-builders_test.cc @@ -33,16 +33,16 @@ // // This file tests the spec builder syntax. -#include +#include "gmock/gmock-spec-builders.h" #include // NOLINT #include #include -#include -#include -#include -#include +#include "gmock/gmock.h" +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" namespace testing { namespace internal { diff --git a/test/gmock_leak_test_.cc b/test/gmock_leak_test_.cc index 24dfc1ff..1d27d22f 100644 --- a/test/gmock_leak_test_.cc +++ b/test/gmock_leak_test_.cc @@ -34,7 +34,7 @@ // This program is for verifying that a leaked mock object can be // caught by Google Mock's leak detector. -#include +#include "gmock/gmock.h" namespace { diff --git a/test/gmock_link_test.h b/test/gmock_link_test.h index aa9aab3a..00b2110d 100644 --- a/test/gmock_link_test.h +++ b/test/gmock_link_test.h @@ -114,14 +114,14 @@ #ifndef GMOCK_TEST_GMOCK_LINK_TEST_H_ #define GMOCK_TEST_GMOCK_LINK_TEST_H_ -#include +#include "gmock/gmock.h" #if !GTEST_OS_WINDOWS_MOBILE #include #endif -#include -#include +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" #include #include diff --git a/test/gmock_output_test_.cc b/test/gmock_output_test_.cc index 24c9b383..c8e6b831 100644 --- a/test/gmock_output_test_.cc +++ b/test/gmock_output_test_.cc @@ -32,12 +32,12 @@ // Tests Google Mock's output in various scenarios. This ensures that // Google Mock's messages are readable and useful. -#include +#include "gmock/gmock.h" #include #include -#include +#include "gtest/gtest.h" using testing::_; using testing::AnyNumber; diff --git a/test/gmock_test.cc b/test/gmock_test.cc index 0c832607..ba137dd3 100644 --- a/test/gmock_test.cc +++ b/test/gmock_test.cc @@ -33,10 +33,10 @@ // // This file tests code in gmock.cc. -#include +#include "gmock/gmock.h" #include -#include +#include "gtest/gtest.h" using testing::GMOCK_FLAG(verbose); using testing::InitGoogleMock;