From dac3e879c56a50696a36f53e1e5e353e48fa665f Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Tue, 14 Sep 2010 05:35:59 +0000 Subject: Include gtest headers as user headers instead of system headers. --- README | 2 +- include/gtest/gtest-death-test.h | 2 +- include/gtest/gtest-message.h | 4 ++-- include/gtest/gtest-param-test.h | 8 +++---- include/gtest/gtest-param-test.h.pump | 8 +++---- include/gtest/gtest-printers.h | 4 ++-- include/gtest/gtest-spi.h | 2 +- include/gtest/gtest-test-part.h | 4 ++-- include/gtest/gtest-typed-test.h | 4 ++-- include/gtest/gtest.h | 20 ++++++++-------- include/gtest/internal/gtest-death-test-internal.h | 2 +- include/gtest/internal/gtest-filepath.h | 2 +- include/gtest/internal/gtest-internal.h | 8 +++---- include/gtest/internal/gtest-linked_ptr.h | 2 +- .../gtest/internal/gtest-param-util-generated.h | 4 ++-- .../internal/gtest-param-util-generated.h.pump | 4 ++-- include/gtest/internal/gtest-param-util.h | 8 +++---- include/gtest/internal/gtest-port.h | 2 +- include/gtest/internal/gtest-string.h | 2 +- include/gtest/internal/gtest-type-util.h | 4 ++-- include/gtest/internal/gtest-type-util.h.pump | 4 ++-- samples/sample10_unittest.cc | 2 +- samples/sample1_unittest.cc | 2 +- samples/sample2_unittest.cc | 2 +- samples/sample3_unittest.cc | 2 +- samples/sample4_unittest.cc | 2 +- samples/sample5_unittest.cc | 2 +- samples/sample6_unittest.cc | 2 +- samples/sample7_unittest.cc | 2 +- samples/sample8_unittest.cc | 2 +- samples/sample9_unittest.cc | 2 +- scripts/fuse_gtest_files.py | 18 +++++++------- scripts/gen_gtest_pred_impl.py | 4 ++-- src/gtest-all.cc | 2 +- src/gtest-death-test.cc | 8 +++---- src/gtest-filepath.cc | 6 ++--- src/gtest-internal-inl.h | 6 ++--- src/gtest-port.cc | 8 +++---- src/gtest-printers.cc | 4 ++-- src/gtest-test-part.cc | 2 +- src/gtest-typed-test.cc | 4 ++-- src/gtest.cc | 4 ++-- src/gtest_main.cc | 2 +- test/gtest-death-test_test.cc | 8 +++---- test/gtest-filepath_test.cc | 4 ++-- test/gtest-linked_ptr_test.cc | 4 ++-- test/gtest-listener_test.cc | 2 +- test/gtest-message_test.cc | 4 ++-- test/gtest-options_test.cc | 2 +- test/gtest-param-test2_test.cc | 2 +- test/gtest-param-test_test.cc | 2 +- test/gtest-param-test_test.h | 2 +- test/gtest-port_test.cc | 6 ++--- test/gtest-printers_test.cc | 4 ++-- test/gtest-test-part_test.cc | 4 ++-- test/gtest-tuple_test.cc | 4 ++-- test/gtest-typed-test2_test.cc | 2 +- test/gtest-typed-test_test.cc | 2 +- test/gtest-typed-test_test.h | 2 +- test/gtest-unittest-api_test.cc | 2 +- test/gtest_break_on_failure_unittest_.cc | 2 +- test/gtest_catch_exceptions_test_.cc | 2 +- test/gtest_color_test_.cc | 2 +- test/gtest_env_var_test_.cc | 2 +- test/gtest_environment_test.cc | 2 +- test/gtest_filter_unittest_.cc | 2 +- test/gtest_help_test_.cc | 2 +- test/gtest_list_tests_unittest_.cc | 2 +- test/gtest_main_unittest.cc | 2 +- test/gtest_nc.cc | 28 +++++++++++----------- test/gtest_no_test_unittest.cc | 2 +- test/gtest_output_test_.cc | 4 ++-- test/gtest_pred_impl_unittest.cc | 4 ++-- test/gtest_prod_test.cc | 2 +- test/gtest_repeat_test.cc | 2 +- test/gtest_shuffle_test_.cc | 2 +- test/gtest_sole_header_test.cc | 2 +- test/gtest_stress_test.cc | 2 +- test/gtest_throw_on_failure_ex_test.cc | 2 +- test/gtest_throw_on_failure_test_.cc | 2 +- test/gtest_uninitialized_test_.cc | 2 +- test/gtest_unittest.cc | 4 ++-- test/gtest_xml_outfile1_test_.cc | 2 +- test/gtest_xml_outfile2_test_.cc | 2 +- test/gtest_xml_output_unittest_.cc | 2 +- test/production.h | 2 +- xcode/Samples/FrameworkSample/widget_test.cc | 2 +- 87 files changed, 165 insertions(+), 165 deletions(-) diff --git a/README b/README index 792abf3..b82c5b5 100644 --- a/README +++ b/README @@ -262,7 +262,7 @@ and all features using tuple will be disabled. ### Multi-threaded Tests ### Google Test is thread-safe where the pthread library is available. -After #include , you can check the GTEST_IS_THREADSAFE +After #include "gtest/gtest.h", you can check the GTEST_IS_THREADSAFE macro to see whether this is the case (yes if the macro is #defined to 1, no if it's undefined.). diff --git a/include/gtest/gtest-death-test.h b/include/gtest/gtest-death-test.h index 121dc1f..0d1cb36 100644 --- a/include/gtest/gtest-death-test.h +++ b/include/gtest/gtest-death-test.h @@ -38,7 +38,7 @@ #ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_ #define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_ -#include +#include "gtest/internal/gtest-death-test-internal.h" namespace testing { diff --git a/include/gtest/gtest-message.h b/include/gtest/gtest-message.h index e7a1188..ecc04e7 100644 --- a/include/gtest/gtest-message.h +++ b/include/gtest/gtest-message.h @@ -48,8 +48,8 @@ #include -#include -#include +#include "gtest/internal/gtest-string.h" +#include "gtest/internal/gtest-internal.h" namespace testing { diff --git a/include/gtest/gtest-param-test.h b/include/gtest/gtest-param-test.h index 8100696..fb6ec8f 100644 --- a/include/gtest/gtest-param-test.h +++ b/include/gtest/gtest-param-test.h @@ -149,7 +149,7 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); #endif // 0 -#include +#include "gtest/internal/gtest-port.h" #if !GTEST_OS_SYMBIAN #include @@ -158,9 +158,9 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); // scripts/fuse_gtest.py depends on gtest's own header being #included // *unconditionally*. Therefore these #includes cannot be moved // inside #if GTEST_HAS_PARAM_TEST. -#include -#include -#include +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-param-util.h" +#include "gtest/internal/gtest-param-util-generated.h" #if GTEST_HAS_PARAM_TEST diff --git a/include/gtest/gtest-param-test.h.pump b/include/gtest/gtest-param-test.h.pump index a231188..cff9972 100644 --- a/include/gtest/gtest-param-test.h.pump +++ b/include/gtest/gtest-param-test.h.pump @@ -147,7 +147,7 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); #endif // 0 -#include +#include "gtest/internal/gtest-port.h" #if !GTEST_OS_SYMBIAN #include @@ -156,9 +156,9 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); // scripts/fuse_gtest.py depends on gtest's own header being #included // *unconditionally*. Therefore these #includes cannot be moved // inside #if GTEST_HAS_PARAM_TEST. -#include -#include -#include +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-param-util.h" +#include "gtest/internal/gtest-param-util-generated.h" #if GTEST_HAS_PARAM_TEST diff --git a/include/gtest/gtest-printers.h b/include/gtest/gtest-printers.h index 68e7eb1..7d90f00 100644 --- a/include/gtest/gtest-printers.h +++ b/include/gtest/gtest-printers.h @@ -100,8 +100,8 @@ #include #include #include -#include -#include +#include "gtest/internal/gtest-port.h" +#include "gtest/internal/gtest-internal.h" namespace testing { diff --git a/include/gtest/gtest-spi.h b/include/gtest/gtest-spi.h index c41da48..e338e36 100644 --- a/include/gtest/gtest-spi.h +++ b/include/gtest/gtest-spi.h @@ -35,7 +35,7 @@ #ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_ #define GTEST_INCLUDE_GTEST_GTEST_SPI_H_ -#include +#include "gtest/gtest.h" namespace testing { diff --git a/include/gtest/gtest-test-part.h b/include/gtest/gtest-test-part.h index f714759..8aeea14 100644 --- a/include/gtest/gtest-test-part.h +++ b/include/gtest/gtest-test-part.h @@ -35,8 +35,8 @@ #include #include -#include -#include +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-string.h" namespace testing { diff --git a/include/gtest/gtest-typed-test.h b/include/gtest/gtest-typed-test.h index 1ec8eb8..eb6b0b8 100644 --- a/include/gtest/gtest-typed-test.h +++ b/include/gtest/gtest-typed-test.h @@ -146,8 +146,8 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes); #endif // 0 -#include -#include +#include "gtest/internal/gtest-port.h" +#include "gtest/internal/gtest-type-util.h" // Implements typed tests. diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 41d2796..334a52d 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -54,15 +54,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-string.h" +#include "gtest/gtest-death-test.h" +#include "gtest/gtest-message.h" +#include "gtest/gtest-param-test.h" +#include "gtest/gtest-printers.h" +#include "gtest/gtest_prod.h" +#include "gtest/gtest-test-part.h" +#include "gtest/gtest-typed-test.h" // Depending on the platform, different string classes are available. // On Linux, in addition to ::std::string, Google also makes use of @@ -1736,7 +1736,7 @@ const T* TestWithParam::parameter_ = NULL; // Includes the auto-generated header that implements a family of // generic predicate assertion macros. -#include +#include "gtest/gtest_pred_impl.h" // Macros for testing equalities and inequalities. // diff --git a/include/gtest/internal/gtest-death-test-internal.h b/include/gtest/internal/gtest-death-test-internal.h index 9bd2aa3..9242bd3 100644 --- a/include/gtest/internal/gtest-death-test-internal.h +++ b/include/gtest/internal/gtest-death-test-internal.h @@ -37,7 +37,7 @@ #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_ -#include +#include "gtest/internal/gtest-internal.h" namespace testing { namespace internal { diff --git a/include/gtest/internal/gtest-filepath.h b/include/gtest/internal/gtest-filepath.h index 4b76d79..b36b3cf 100644 --- a/include/gtest/internal/gtest-filepath.h +++ b/include/gtest/internal/gtest-filepath.h @@ -40,7 +40,7 @@ #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ -#include +#include "gtest/internal/gtest-string.h" namespace testing { namespace internal { diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h index 9cf9dd8..3307855 100644 --- a/include/gtest/internal/gtest-internal.h +++ b/include/gtest/internal/gtest-internal.h @@ -37,7 +37,7 @@ #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ -#include +#include "gtest/internal/gtest-port.h" #if GTEST_OS_LINUX #include @@ -52,9 +52,9 @@ #include #include -#include -#include -#include +#include "gtest/internal/gtest-string.h" +#include "gtest/internal/gtest-filepath.h" +#include "gtest/internal/gtest-type-util.h" // Due to C++ preprocessor weirdness, we need double indirection to // concatenate two tokens when one of them is __LINE__. Writing diff --git a/include/gtest/internal/gtest-linked_ptr.h b/include/gtest/internal/gtest-linked_ptr.h index 540ef4c..78750b1 100644 --- a/include/gtest/internal/gtest-linked_ptr.h +++ b/include/gtest/internal/gtest-linked_ptr.h @@ -71,7 +71,7 @@ #include #include -#include +#include "gtest/internal/gtest-port.h" namespace testing { namespace internal { diff --git a/include/gtest/internal/gtest-param-util-generated.h b/include/gtest/internal/gtest-param-util-generated.h index ab4ab56..306a5e5 100644 --- a/include/gtest/internal/gtest-param-util-generated.h +++ b/include/gtest/internal/gtest-param-util-generated.h @@ -47,8 +47,8 @@ // scripts/fuse_gtest.py depends on gtest's own header being #included // *unconditionally*. Therefore these #includes cannot be moved // inside #if GTEST_HAS_PARAM_TEST. -#include -#include +#include "gtest/internal/gtest-param-util.h" +#include "gtest/internal/gtest-port.h" #if GTEST_HAS_PARAM_TEST diff --git a/include/gtest/internal/gtest-param-util-generated.h.pump b/include/gtest/internal/gtest-param-util-generated.h.pump index baedfbc..f261eb7 100644 --- a/include/gtest/internal/gtest-param-util-generated.h.pump +++ b/include/gtest/internal/gtest-param-util-generated.h.pump @@ -48,8 +48,8 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support. // scripts/fuse_gtest.py depends on gtest's own header being #included // *unconditionally*. Therefore these #includes cannot be moved // inside #if GTEST_HAS_PARAM_TEST. -#include -#include +#include "gtest/internal/gtest-param-util.h" +#include "gtest/internal/gtest-port.h" #if GTEST_HAS_PARAM_TEST diff --git a/include/gtest/internal/gtest-param-util.h b/include/gtest/internal/gtest-param-util.h index 98bcca7..d923b7d 100644 --- a/include/gtest/internal/gtest-param-util.h +++ b/include/gtest/internal/gtest-param-util.h @@ -41,10 +41,10 @@ // scripts/fuse_gtest.py depends on gtest's own header being #included // *unconditionally*. Therefore these #includes cannot be moved // inside #if GTEST_HAS_PARAM_TEST. -#include -#include -#include -#include +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-linked_ptr.h" +#include "gtest/internal/gtest-port.h" +#include "gtest/gtest-printers.h" #if GTEST_HAS_PARAM_TEST diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index bf9cc8d..a9c7cae 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -441,7 +441,7 @@ #if GTEST_HAS_TR1_TUPLE #if GTEST_USE_OWN_TR1_TUPLE -#include +#include "gtest/internal/gtest-tuple.h" #elif GTEST_OS_SYMBIAN // On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to diff --git a/include/gtest/internal/gtest-string.h b/include/gtest/internal/gtest-string.h index 05a1f89..8cbb797 100644 --- a/include/gtest/internal/gtest-string.h +++ b/include/gtest/internal/gtest-string.h @@ -47,7 +47,7 @@ #endif #include -#include +#include "gtest/internal/gtest-port.h" #include diff --git a/include/gtest/internal/gtest-type-util.h b/include/gtest/internal/gtest-type-util.h index 093eee6..7a98646 100644 --- a/include/gtest/internal/gtest-type-util.h +++ b/include/gtest/internal/gtest-type-util.h @@ -44,8 +44,8 @@ #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ -#include -#include +#include "gtest/internal/gtest-port.h" +#include "gtest/internal/gtest-string.h" #if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P diff --git a/include/gtest/internal/gtest-type-util.h.pump b/include/gtest/internal/gtest-type-util.h.pump index 5aed1e5..04906b7 100644 --- a/include/gtest/internal/gtest-type-util.h.pump +++ b/include/gtest/internal/gtest-type-util.h.pump @@ -42,8 +42,8 @@ $var n = 50 $$ Maximum length of type lists we want to support. #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ -#include -#include +#include "gtest/internal/gtest-port.h" +#include "gtest/internal/gtest-string.h" #if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P diff --git a/samples/sample10_unittest.cc b/samples/sample10_unittest.cc index 3ad6fd6..2813d04 100644 --- a/samples/sample10_unittest.cc +++ b/samples/sample10_unittest.cc @@ -34,7 +34,7 @@ #include #include -#include +#include "gtest/gtest.h" using ::testing::EmptyTestEventListener; using ::testing::InitGoogleTest; diff --git a/samples/sample1_unittest.cc b/samples/sample1_unittest.cc index 01eb546..a8a7c79 100644 --- a/samples/sample1_unittest.cc +++ b/samples/sample1_unittest.cc @@ -45,7 +45,7 @@ #include #include "sample1.h" -#include +#include "gtest/gtest.h" // Step 2. Use the TEST macro to define your tests. diff --git a/samples/sample2_unittest.cc b/samples/sample2_unittest.cc index 32232d9..3792fa5 100644 --- a/samples/sample2_unittest.cc +++ b/samples/sample2_unittest.cc @@ -41,7 +41,7 @@ // needed. #include "sample2.h" -#include +#include "gtest/gtest.h" // In this example, we test the MyString class (a simple string). diff --git a/samples/sample3_unittest.cc b/samples/sample3_unittest.cc index 34c1ca8..bf3877d 100644 --- a/samples/sample3_unittest.cc +++ b/samples/sample3_unittest.cc @@ -64,7 +64,7 @@ // #include "sample3-inl.h" -#include +#include "gtest/gtest.h" // To use a test fixture, derive a class from testing::Test. class QueueTest : public testing::Test { diff --git a/samples/sample4_unittest.cc b/samples/sample4_unittest.cc index b4fb373..fa5afc7 100644 --- a/samples/sample4_unittest.cc +++ b/samples/sample4_unittest.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -#include +#include "gtest/gtest.h" #include "sample4.h" // Tests the Increment() method. diff --git a/samples/sample5_unittest.cc b/samples/sample5_unittest.cc index 49dae7c..e7cab01 100644 --- a/samples/sample5_unittest.cc +++ b/samples/sample5_unittest.cc @@ -47,7 +47,7 @@ #include #include #include "sample3-inl.h" -#include +#include "gtest/gtest.h" #include "sample1.h" // In this sample, we want to ensure that every test finishes within diff --git a/samples/sample6_unittest.cc b/samples/sample6_unittest.cc index dd0df31..8f2036a 100644 --- a/samples/sample6_unittest.cc +++ b/samples/sample6_unittest.cc @@ -35,7 +35,7 @@ // The interface and its implementations are in this header. #include "prime_tables.h" -#include +#include "gtest/gtest.h" // First, we define some factory functions for creating instances of // the implementations. You may be able to skip this step if all your diff --git a/samples/sample7_unittest.cc b/samples/sample7_unittest.cc index f455282..441acf9 100644 --- a/samples/sample7_unittest.cc +++ b/samples/sample7_unittest.cc @@ -38,7 +38,7 @@ // The interface and its implementations are in this header. #include "prime_tables.h" -#include +#include "gtest/gtest.h" #if GTEST_HAS_PARAM_TEST diff --git a/samples/sample8_unittest.cc b/samples/sample8_unittest.cc index ccf61d9..5ad2e2c 100644 --- a/samples/sample8_unittest.cc +++ b/samples/sample8_unittest.cc @@ -36,7 +36,7 @@ // Use class definitions to test from this header. #include "prime_tables.h" -#include +#include "gtest/gtest.h" #if GTEST_HAS_COMBINE diff --git a/samples/sample9_unittest.cc b/samples/sample9_unittest.cc index 3772630..b2e2079 100644 --- a/samples/sample9_unittest.cc +++ b/samples/sample9_unittest.cc @@ -34,7 +34,7 @@ #include -#include +#include "gtest/gtest.h" using ::testing::EmptyTestEventListener; using ::testing::InitGoogleTest; diff --git a/scripts/fuse_gtest_files.py b/scripts/fuse_gtest_files.py index 148444c..57ef72f 100755 --- a/scripts/fuse_gtest_files.py +++ b/scripts/fuse_gtest_files.py @@ -67,8 +67,8 @@ import sys # Test root directory. DEFAULT_GTEST_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..') -# Regex for matching '#include '. -INCLUDE_GTEST_FILE_REGEX = re.compile(r'^\s*#\s*include\s*<(gtest/.+)>') +# Regex for matching '#include "gtest/..."'. +INCLUDE_GTEST_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(gtest/.+)"') # Regex for matching '#include "src/..."'. INCLUDE_SRC_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(src/.+)"') @@ -162,7 +162,7 @@ def FuseGTestH(gtest_root, output_dir): for line in file(os.path.join(gtest_root, gtest_header_path), 'r'): m = INCLUDE_GTEST_FILE_REGEX.match(line) if m: - # It's '#include ' - let's process it recursively. + # It's '#include "gtest/..."' - let's process it recursively. ProcessFile('include/' + m.group(1)) else: # Otherwise we copy the line unchanged to the output file. @@ -191,19 +191,19 @@ def FuseGTestAllCcToFile(gtest_root, output_file): m = INCLUDE_GTEST_FILE_REGEX.match(line) if m: if 'include/' + m.group(1) == GTEST_SPI_H_SEED: - # It's '#include '. This file is not - # #included by , so we need to process it. + # It's '#include "gtest/gtest-spi.h"'. This file is not + # #included by "gtest/gtest.h", so we need to process it. ProcessFile(GTEST_SPI_H_SEED) else: - # It's '#include ' where foo is not gtest-spi. - # We treat it as '#include ', as all other + # It's '#include "gtest/foo.h"' where foo is not gtest-spi. + # We treat it as '#include "gtest/gtest.h"', as all other # gtest headers are being fused into gtest.h and cannot be # #included directly. - # There is no need to #include more than once. + # There is no need to #include "gtest/gtest.h" more than once. if not GTEST_H_SEED in processed_files: processed_files.add(GTEST_H_SEED) - output_file.write('#include <%s>\n' % (GTEST_H_OUTPUT,)) + output_file.write('#include "%s"\n' % (GTEST_H_OUTPUT,)) else: m = INCLUDE_SRC_FILE_REGEX.match(line) if m: diff --git a/scripts/gen_gtest_pred_impl.py b/scripts/gen_gtest_pred_impl.py index 8307134..39bb6cf 100755 --- a/scripts/gen_gtest_pred_impl.py +++ b/scripts/gen_gtest_pred_impl.py @@ -386,8 +386,8 @@ def UnitTestPreamble(): #include -#include -#include +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" // A user-defined data type. struct Bool { diff --git a/src/gtest-all.cc b/src/gtest-all.cc index f3e22dd..0a9cee5 100644 --- a/src/gtest-all.cc +++ b/src/gtest-all.cc @@ -36,7 +36,7 @@ // This line ensures that gtest.h can be compiled on its own, even // when it's fused. -#include +#include "gtest/gtest.h" // The following lines pull in the real gtest *.cc files. #include "src/gtest.cc" diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc index 66bf189..ffd9f3a 100644 --- a/src/gtest-death-test.cc +++ b/src/gtest-death-test.cc @@ -31,8 +31,8 @@ // // This file implements death tests. -#include -#include +#include "gtest/gtest-death-test.h" +#include "gtest/internal/gtest-port.h" #if GTEST_HAS_DEATH_TEST @@ -54,8 +54,8 @@ #endif // GTEST_HAS_DEATH_TEST -#include -#include +#include "gtest/gtest-message.h" +#include "gtest/internal/gtest-string.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/src/gtest-filepath.cc b/src/gtest-filepath.cc index c1ef918..96557f3 100644 --- a/src/gtest-filepath.cc +++ b/src/gtest-filepath.cc @@ -29,8 +29,8 @@ // // Authors: keith.ray@gmail.com (Keith Ray) -#include -#include +#include "gtest/internal/gtest-filepath.h" +#include "gtest/internal/gtest-port.h" #include @@ -57,7 +57,7 @@ #define GTEST_PATH_MAX_ _POSIX_PATH_MAX #endif // GTEST_OS_WINDOWS -#include +#include "gtest/internal/gtest-string.h" namespace testing { namespace internal { diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h index fe53c21..e0f4af5 100644 --- a/src/gtest-internal-inl.h +++ b/src/gtest-internal-inl.h @@ -56,14 +56,14 @@ #include #include -#include +#include "gtest/internal/gtest-port.h" #if GTEST_OS_WINDOWS #include // For DWORD. #endif // GTEST_OS_WINDOWS -#include // NOLINT -#include +#include "gtest/gtest.h" // NOLINT +#include "gtest/gtest-spi.h" namespace testing { diff --git a/src/gtest-port.cc b/src/gtest-port.cc index 8a7005f..ae0c663 100644 --- a/src/gtest-port.cc +++ b/src/gtest-port.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -#include +#include "gtest/internal/gtest-port.h" #include #include @@ -51,9 +51,9 @@ #include #endif // GTEST_OS_MAC -#include -#include -#include +#include "gtest/gtest-spi.h" +#include "gtest/gtest-message.h" +#include "gtest/internal/gtest-string.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/src/gtest-printers.cc b/src/gtest-printers.cc index 07a0d85..147f8b2 100644 --- a/src/gtest-printers.cc +++ b/src/gtest-printers.cc @@ -42,12 +42,12 @@ // or void PrintTo(const Foo&, ::std::ostream*) in the namespace that // defines Foo. -#include +#include "gtest/gtest-printers.h" #include #include #include // NOLINT #include -#include +#include "gtest/internal/gtest-port.h" namespace testing { diff --git a/src/gtest-test-part.cc b/src/gtest-test-part.cc index 5d183a4..5ddc67c 100644 --- a/src/gtest-test-part.cc +++ b/src/gtest-test-part.cc @@ -31,7 +31,7 @@ // // The Google C++ Testing Framework (Google Test) -#include +#include "gtest/gtest-test-part.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/src/gtest-typed-test.cc b/src/gtest-typed-test.cc index f70043e..a5cc88f 100644 --- a/src/gtest-typed-test.cc +++ b/src/gtest-typed-test.cc @@ -29,8 +29,8 @@ // // Author: wan@google.com (Zhanyong Wan) -#include -#include +#include "gtest/gtest-typed-test.h" +#include "gtest/gtest.h" namespace testing { namespace internal { diff --git a/src/gtest.cc b/src/gtest.cc index 4f0446d..34e56d7 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -31,8 +31,8 @@ // // The Google C++ Testing Framework (Google Test) -#include -#include +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" #include #include diff --git a/src/gtest_main.cc b/src/gtest_main.cc index 6d4d22d..a09bbe0 100644 --- a/src/gtest_main.cc +++ b/src/gtest_main.cc @@ -29,7 +29,7 @@ #include -#include +#include "gtest/gtest.h" GTEST_API_ int main(int argc, char **argv) { std::cout << "Running main() from gtest_main.cc\n"; diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc index d33cfeb..6144f2d 100644 --- a/test/gtest-death-test_test.cc +++ b/test/gtest-death-test_test.cc @@ -31,9 +31,9 @@ // // Tests for death tests. -#include -#include -#include +#include "gtest/gtest-death-test.h" +#include "gtest/gtest.h" +#include "gtest/internal/gtest-filepath.h" using testing::internal::AlwaysFalse; using testing::internal::AlwaysTrue; @@ -52,7 +52,7 @@ using testing::internal::AlwaysTrue; #include #include -#include +#include "gtest/gtest-spi.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/test/gtest-filepath_test.cc b/test/gtest-filepath_test.cc index 6250282..549dcef 100644 --- a/test/gtest-filepath_test.cc +++ b/test/gtest-filepath_test.cc @@ -38,8 +38,8 @@ // build or make-files for some existing Google Test clients. Do not // #include this file anywhere else! -#include -#include +#include "gtest/internal/gtest-filepath.h" +#include "gtest/gtest.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/test/gtest-linked_ptr_test.cc b/test/gtest-linked_ptr_test.cc index eae8229..efd6b1e 100644 --- a/test/gtest-linked_ptr_test.cc +++ b/test/gtest-linked_ptr_test.cc @@ -30,10 +30,10 @@ // Authors: Dan Egnor (egnor@google.com) // Ported to Windows: Vadim Berman (vadimb@google.com) -#include +#include "gtest/internal/gtest-linked_ptr.h" #include -#include +#include "gtest/gtest.h" namespace { diff --git a/test/gtest-listener_test.cc b/test/gtest-listener_test.cc index c9be39a..2aa08ef 100644 --- a/test/gtest-listener_test.cc +++ b/test/gtest-listener_test.cc @@ -33,7 +33,7 @@ // This file verifies Google Test event listeners receive events at the // right times. -#include +#include "gtest/gtest.h" #include using ::testing::AddGlobalTestEnvironment; diff --git a/test/gtest-message_test.cc b/test/gtest-message_test.cc index efb6ff0..c09c6a8 100644 --- a/test/gtest-message_test.cc +++ b/test/gtest-message_test.cc @@ -31,9 +31,9 @@ // // Tests for the Message class. -#include +#include "gtest/gtest-message.h" -#include +#include "gtest/gtest.h" namespace { diff --git a/test/gtest-options_test.cc b/test/gtest-options_test.cc index 2e2cbc9..30b82f3 100644 --- a/test/gtest-options_test.cc +++ b/test/gtest-options_test.cc @@ -38,7 +38,7 @@ // make-files on Windows and other platforms. Do not #include this file // anywhere else! -#include +#include "gtest/gtest.h" #if GTEST_OS_WINDOWS_MOBILE #include diff --git a/test/gtest-param-test2_test.cc b/test/gtest-param-test2_test.cc index ccb6cfa..4a782fe 100644 --- a/test/gtest-param-test2_test.cc +++ b/test/gtest-param-test2_test.cc @@ -32,7 +32,7 @@ // Tests for Google Test itself. This verifies that the basic constructs of // Google Test work. -#include +#include "gtest/gtest.h" #include "test/gtest-param-test_test.h" diff --git a/test/gtest-param-test_test.cc b/test/gtest-param-test_test.cc index 26acce4..c920f4f 100644 --- a/test/gtest-param-test_test.cc +++ b/test/gtest-param-test_test.cc @@ -33,7 +33,7 @@ // generators objects produce correct parameter sequences and that // Google Test runtime instantiates correct tests from those sequences. -#include +#include "gtest/gtest.h" #if GTEST_HAS_PARAM_TEST diff --git a/test/gtest-param-test_test.h b/test/gtest-param-test_test.h index b7f9493..d0f6556 100644 --- a/test/gtest-param-test_test.h +++ b/test/gtest-param-test_test.h @@ -37,7 +37,7 @@ #ifndef GTEST_TEST_GTEST_PARAM_TEST_TEST_H_ #define GTEST_TEST_GTEST_PARAM_TEST_TEST_H_ -#include +#include "gtest/gtest.h" #if GTEST_HAS_PARAM_TEST diff --git a/test/gtest-port_test.cc b/test/gtest-port_test.cc index e08afe8..bf42d8b 100644 --- a/test/gtest-port_test.cc +++ b/test/gtest-port_test.cc @@ -31,7 +31,7 @@ // // This file tests the internal cross-platform support utilities. -#include +#include "gtest/internal/gtest-port.h" #include @@ -41,8 +41,8 @@ #include // For std::pair and std::make_pair. -#include -#include +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/test/gtest-printers_test.cc b/test/gtest-printers_test.cc index ce72421..16fe924 100644 --- a/test/gtest-printers_test.cc +++ b/test/gtest-printers_test.cc @@ -33,7 +33,7 @@ // // This file tests the universal value printer. -#include +#include "gtest/gtest-printers.h" #include #include @@ -48,7 +48,7 @@ #include #include -#include +#include "gtest/gtest.h" // hash_map and hash_set are available on Windows. #if GTEST_OS_WINDOWS diff --git a/test/gtest-test-part_test.cc b/test/gtest-test-part_test.cc index 5a3e919..ca8ba93 100644 --- a/test/gtest-test-part_test.cc +++ b/test/gtest-test-part_test.cc @@ -30,9 +30,9 @@ // Author: mheule@google.com (Markus Heule) // -#include +#include "gtest/gtest-test-part.h" -#include +#include "gtest/gtest.h" using testing::Message; using testing::Test; diff --git a/test/gtest-tuple_test.cc b/test/gtest-tuple_test.cc index 532f70b..bfaa3e0 100644 --- a/test/gtest-tuple_test.cc +++ b/test/gtest-tuple_test.cc @@ -29,9 +29,9 @@ // // Author: wan@google.com (Zhanyong Wan) -#include +#include "gtest/internal/gtest-tuple.h" #include -#include +#include "gtest/gtest.h" namespace { diff --git a/test/gtest-typed-test2_test.cc b/test/gtest-typed-test2_test.cc index 79a8a87..c284700 100644 --- a/test/gtest-typed-test2_test.cc +++ b/test/gtest-typed-test2_test.cc @@ -32,7 +32,7 @@ #include #include "test/gtest-typed-test_test.h" -#include +#include "gtest/gtest.h" #if GTEST_HAS_TYPED_TEST_P diff --git a/test/gtest-typed-test_test.cc b/test/gtest-typed-test_test.cc index f2c3972..dd4ba43 100644 --- a/test/gtest-typed-test_test.cc +++ b/test/gtest-typed-test_test.cc @@ -33,7 +33,7 @@ #include #include "test/gtest-typed-test_test.h" -#include +#include "gtest/gtest.h" using testing::Test; diff --git a/test/gtest-typed-test_test.h b/test/gtest-typed-test_test.h index 40dfeac..41d7570 100644 --- a/test/gtest-typed-test_test.h +++ b/test/gtest-typed-test_test.h @@ -32,7 +32,7 @@ #ifndef GTEST_TEST_GTEST_TYPED_TEST_TEST_H_ #define GTEST_TEST_GTEST_TYPED_TEST_TEST_H_ -#include +#include "gtest/gtest.h" #if GTEST_HAS_TYPED_TEST_P diff --git a/test/gtest-unittest-api_test.cc b/test/gtest-unittest-api_test.cc index 7e0f8f8..ed5dea8 100644 --- a/test/gtest-unittest-api_test.cc +++ b/test/gtest-unittest-api_test.cc @@ -33,7 +33,7 @@ // This file contains tests verifying correctness of data provided via // UnitTest's public methods. -#include +#include "gtest/gtest.h" #include // For strcmp. #include diff --git a/test/gtest_break_on_failure_unittest_.cc b/test/gtest_break_on_failure_unittest_.cc index 6779c90..3075509 100644 --- a/test/gtest_break_on_failure_unittest_.cc +++ b/test/gtest_break_on_failure_unittest_.cc @@ -39,7 +39,7 @@ // This program will be invoked from a Python unit test. It is // expected to fail. Don't run it directly. -#include +#include "gtest/gtest.h" #if GTEST_OS_WINDOWS #include diff --git a/test/gtest_catch_exceptions_test_.cc b/test/gtest_catch_exceptions_test_.cc index 2ba6eb4..3cf7532 100644 --- a/test/gtest_catch_exceptions_test_.cc +++ b/test/gtest_catch_exceptions_test_.cc @@ -32,7 +32,7 @@ // Tests for Google Test itself. Tests in this file throw C++ or SEH // exceptions, and the output is verified by gtest_catch_exceptions_test.py. -#include +#include "gtest/gtest.h" #include // NOLINT #include // For exit(). diff --git a/test/gtest_color_test_.cc b/test/gtest_color_test_.cc index 58d377c..f61ebb8 100644 --- a/test/gtest_color_test_.cc +++ b/test/gtest_color_test_.cc @@ -35,7 +35,7 @@ #include -#include +#include "gtest/gtest.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/test/gtest_env_var_test_.cc b/test/gtest_env_var_test_.cc index f7c78fc..539afc9 100644 --- a/test/gtest_env_var_test_.cc +++ b/test/gtest_env_var_test_.cc @@ -32,7 +32,7 @@ // A helper program for testing that Google Test parses the environment // variables correctly. -#include +#include "gtest/gtest.h" #include diff --git a/test/gtest_environment_test.cc b/test/gtest_environment_test.cc index 94ea318..744b405 100644 --- a/test/gtest_environment_test.cc +++ b/test/gtest_environment_test.cc @@ -33,7 +33,7 @@ #include #include -#include +#include "gtest/gtest.h" #define GTEST_IMPLEMENTATION_ 1 // Required for the next #include. #include "src/gtest-internal-inl.h" diff --git a/test/gtest_filter_unittest_.cc b/test/gtest_filter_unittest_.cc index 325504f..77deffc 100644 --- a/test/gtest_filter_unittest_.cc +++ b/test/gtest_filter_unittest_.cc @@ -38,7 +38,7 @@ // The program will be invoked from a Python unit test. Don't run it // directly. -#include +#include "gtest/gtest.h" namespace { diff --git a/test/gtest_help_test_.cc b/test/gtest_help_test_.cc index aad0d72..31f78c2 100644 --- a/test/gtest_help_test_.cc +++ b/test/gtest_help_test_.cc @@ -32,7 +32,7 @@ // This program is meant to be run by gtest_help_test.py. Do not run // it directly. -#include +#include "gtest/gtest.h" // When a help flag is specified, this program should skip the tests // and exit with 0; otherwise the following test will be executed, diff --git a/test/gtest_list_tests_unittest_.cc b/test/gtest_list_tests_unittest_.cc index a0ed082..2b1d078 100644 --- a/test/gtest_list_tests_unittest_.cc +++ b/test/gtest_list_tests_unittest_.cc @@ -38,7 +38,7 @@ // This program will be invoked from a Python unit test. // Don't run it directly. -#include +#include "gtest/gtest.h" namespace { diff --git a/test/gtest_main_unittest.cc b/test/gtest_main_unittest.cc index 7a3f0ad..ecd9bb8 100644 --- a/test/gtest_main_unittest.cc +++ b/test/gtest_main_unittest.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -#include +#include "gtest/gtest.h" // Tests that we don't have to define main() when we link to // gtest_main instead of gtest. diff --git a/test/gtest_nc.cc b/test/gtest_nc.cc index 73b5db6..71acf2b 100644 --- a/test/gtest_nc.cc +++ b/test/gtest_nc.cc @@ -42,7 +42,7 @@ #ifdef TEST_CANNOT_IGNORE_RUN_ALL_TESTS_RESULT // Tests that the result of RUN_ALL_TESTS() cannot be ignored. -#include +#include "gtest/gtest.h" int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); @@ -58,7 +58,7 @@ int main(int argc, char** argv) { // Tests that the compiler catches the typo when a user declares a // Setup() method in a test fixture. -#include +#include "gtest/gtest.h" class MyTest : public testing::Test { protected: @@ -69,7 +69,7 @@ class MyTest : public testing::Test { // Tests that the compiler catches the typo when a user calls Setup() // from a test fixture. -#include +#include "gtest/gtest.h" class MyTest : public testing::Test { protected: @@ -82,7 +82,7 @@ class MyTest : public testing::Test { // Tests that the compiler catches the typo when a user declares a // Setup() method in a subclass of Environment. -#include +#include "gtest/gtest.h" class MyEnvironment : public testing::Environment { public: @@ -93,7 +93,7 @@ class MyEnvironment : public testing::Environment { // Tests that the compiler catches the typo when a user calls Setup() // in an Environment. -#include +#include "gtest/gtest.h" class MyEnvironment : public testing::Environment { protected: @@ -107,7 +107,7 @@ class MyEnvironment : public testing::Environment { // Tests that the compiler catches using the wrong test case name in // TYPED_TEST_P. -#include +#include "gtest/gtest.h" template class FooTest : public testing::Test { @@ -126,7 +126,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types); // Tests that the compiler catches using the wrong test case name in // REGISTER_TYPED_TEST_CASE_P. -#include +#include "gtest/gtest.h" template class FooTest : public testing::Test { @@ -145,7 +145,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types); // Tests that the compiler catches using the wrong test case name in // INSTANTIATE_TYPED_TEST_CASE_P. -#include +#include "gtest/gtest.h" template class FooTest : public testing::Test { @@ -166,7 +166,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, BarTest, testing::Types); // Tests that the compiler catches instantiating TYPED_TEST_CASE_P // twice with the same name prefix. -#include +#include "gtest/gtest.h" template class FooTest : public testing::Test { @@ -183,21 +183,21 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types); #elif defined(TEST_STATIC_ASSERT_TYPE_EQ_IS_NOT_A_TYPE) -#include +#include "gtest/gtest.h" // Tests that StaticAssertTypeEq cannot be used as a type. testing::StaticAssertTypeEq dummy; #elif defined(TEST_STATIC_ASSERT_TYPE_EQ_WORKS_IN_NAMESPACE) -#include +#include "gtest/gtest.h" // Tests that StaticAssertTypeEq works in a namespace scope. static bool dummy = testing::StaticAssertTypeEq(); #elif defined(TEST_STATIC_ASSERT_TYPE_EQ_WORKS_IN_CLASS) -#include +#include "gtest/gtest.h" template class Helper { @@ -215,7 +215,7 @@ void Test() { #elif defined(TEST_STATIC_ASSERT_TYPE_EQ_WORKS_IN_FUNCTION) -#include +#include "gtest/gtest.h" void Test() { // Tests that StaticAssertTypeEq works inside a function. @@ -225,7 +225,7 @@ void Test() { #else // A sanity test. This should compile. -#include +#include "gtest/gtest.h" int main() { return RUN_ALL_TESTS(); diff --git a/test/gtest_no_test_unittest.cc b/test/gtest_no_test_unittest.cc index e09ca73..e3a85f1 100644 --- a/test/gtest_no_test_unittest.cc +++ b/test/gtest_no_test_unittest.cc @@ -32,7 +32,7 @@ // // Author: wan@google.com (Zhanyong Wan) -#include +#include "gtest/gtest.h" int main(int argc, char **argv) { diff --git a/test/gtest_output_test_.cc b/test/gtest_output_test_.cc index fc80fac..47343e5 100644 --- a/test/gtest_output_test_.cc +++ b/test/gtest_output_test_.cc @@ -32,8 +32,8 @@ // // Author: wan@google.com (Zhanyong Wan) -#include -#include +#include "gtest/gtest-spi.h" +#include "gtest/gtest.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/test/gtest_pred_impl_unittest.cc b/test/gtest_pred_impl_unittest.cc index e7ee54b..66c75d1 100644 --- a/test/gtest_pred_impl_unittest.cc +++ b/test/gtest_pred_impl_unittest.cc @@ -49,8 +49,8 @@ #include -#include -#include +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" // A user-defined data type. struct Bool { diff --git a/test/gtest_prod_test.cc b/test/gtest_prod_test.cc index bc3201d..060abce 100644 --- a/test/gtest_prod_test.cc +++ b/test/gtest_prod_test.cc @@ -31,7 +31,7 @@ // // Unit test for include/gtest/gtest_prod.h. -#include +#include "gtest/gtest.h" #include "test/production.h" // Tests that private members can be accessed from a TEST declared as diff --git a/test/gtest_repeat_test.cc b/test/gtest_repeat_test.cc index df6868b..ff9063a 100644 --- a/test/gtest_repeat_test.cc +++ b/test/gtest_repeat_test.cc @@ -33,7 +33,7 @@ #include #include -#include +#include "gtest/gtest.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/test/gtest_shuffle_test_.cc b/test/gtest_shuffle_test_.cc index 53ecf77..0752789 100644 --- a/test/gtest_shuffle_test_.cc +++ b/test/gtest_shuffle_test_.cc @@ -31,7 +31,7 @@ // Verifies that test shuffling works. -#include +#include "gtest/gtest.h" namespace { diff --git a/test/gtest_sole_header_test.cc b/test/gtest_sole_header_test.cc index de91e80..ccd091a 100644 --- a/test/gtest_sole_header_test.cc +++ b/test/gtest_sole_header_test.cc @@ -32,7 +32,7 @@ // This test verifies that it's possible to use Google Test by including // the gtest.h header file alone. -#include +#include "gtest/gtest.h" namespace { diff --git a/test/gtest_stress_test.cc b/test/gtest_stress_test.cc index f5af78c..4e7d9bf 100644 --- a/test/gtest_stress_test.cc +++ b/test/gtest_stress_test.cc @@ -32,7 +32,7 @@ // Tests that SCOPED_TRACE() and various Google Test assertions can be // used in a large number of threads concurrently. -#include +#include "gtest/gtest.h" #include #include diff --git a/test/gtest_throw_on_failure_ex_test.cc b/test/gtest_throw_on_failure_ex_test.cc index 8bf9dc9..8d46c76 100644 --- a/test/gtest_throw_on_failure_ex_test.cc +++ b/test/gtest_throw_on_failure_ex_test.cc @@ -31,7 +31,7 @@ // Tests Google Test's throw-on-failure mode with exceptions enabled. -#include +#include "gtest/gtest.h" #include #include diff --git a/test/gtest_throw_on_failure_test_.cc b/test/gtest_throw_on_failure_test_.cc index 88fbd5a..03776ec 100644 --- a/test/gtest_throw_on_failure_test_.cc +++ b/test/gtest_throw_on_failure_test_.cc @@ -35,7 +35,7 @@ // invoked by gtest_throw_on_failure_test.py, and is expected to exit // with non-zero in the throw-on-failure mode or 0 otherwise. -#include +#include "gtest/gtest.h" int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); diff --git a/test/gtest_uninitialized_test_.cc b/test/gtest_uninitialized_test_.cc index e8b2aa8..4431698 100644 --- a/test/gtest_uninitialized_test_.cc +++ b/test/gtest_uninitialized_test_.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -#include +#include "gtest/gtest.h" TEST(DummyTest, Dummy) { // This test doesn't verify anything. We just need it to create a diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc index d709249..5eaa2af 100644 --- a/test/gtest_unittest.cc +++ b/test/gtest_unittest.cc @@ -32,7 +32,7 @@ // Tests for Google Test itself. This verifies that the basic constructs of // Google Test work. -#include +#include "gtest/gtest.h" #include // Verifies that the command line flag variables can be accessed @@ -57,7 +57,7 @@ TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) { EXPECT_TRUE(dummy || !dummy); // Suppresses warning that dummy is unused. } -#include +#include "gtest/gtest-spi.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/test/gtest_xml_outfile1_test_.cc b/test/gtest_xml_outfile1_test_.cc index 664baad..531ced4 100644 --- a/test/gtest_xml_outfile1_test_.cc +++ b/test/gtest_xml_outfile1_test_.cc @@ -32,7 +32,7 @@ // gtest_xml_outfile1_test_ writes some xml via TestProperty used by // gtest_xml_outfiles_test.py -#include +#include "gtest/gtest.h" class PropertyOne : public testing::Test { protected: diff --git a/test/gtest_xml_outfile2_test_.cc b/test/gtest_xml_outfile2_test_.cc index 3411a3d..7b400b2 100644 --- a/test/gtest_xml_outfile2_test_.cc +++ b/test/gtest_xml_outfile2_test_.cc @@ -32,7 +32,7 @@ // gtest_xml_outfile2_test_ writes some xml via TestProperty used by // gtest_xml_outfiles_test.py -#include +#include "gtest/gtest.h" class PropertyTwo : public testing::Test { protected: diff --git a/test/gtest_xml_output_unittest_.cc b/test/gtest_xml_output_unittest_.cc index fc07ef4..693ffb9 100644 --- a/test/gtest_xml_output_unittest_.cc +++ b/test/gtest_xml_output_unittest_.cc @@ -38,7 +38,7 @@ // This program will be invoked from a Python unit test. Don't run it // directly. -#include +#include "gtest/gtest.h" using ::testing::InitGoogleTest; using ::testing::TestEventListeners; diff --git a/test/production.h b/test/production.h index 8f16fff..98fd5e4 100644 --- a/test/production.h +++ b/test/production.h @@ -34,7 +34,7 @@ #ifndef GTEST_TEST_PRODUCTION_H_ #define GTEST_TEST_PRODUCTION_H_ -#include +#include "gtest/gtest_prod.h" class PrivateCode { public: diff --git a/xcode/Samples/FrameworkSample/widget_test.cc b/xcode/Samples/FrameworkSample/widget_test.cc index 61c0d2f..8725994 100644 --- a/xcode/Samples/FrameworkSample/widget_test.cc +++ b/xcode/Samples/FrameworkSample/widget_test.cc @@ -36,7 +36,7 @@ // This is a simple test file for the Widget class in the Widget.framework #include -#include +#include "gtest/gtest.h" #include -- cgit v0.12