Include gtest headers as user headers instead of system headers.

2010-09-14 05:35:59 +00:00
parent 88e0df6247
commit dac3e879c5
87 changed files with 165 additions and 165 deletions
--- a/test/gtest-death-test_test.cc
+++ b/test/gtest-death-test_test.cc
@@ -31,9 +31,9 @@
 //
 // Tests for death tests.

-#include <gtest/gtest-death-test.h>
-#include <gtest/gtest.h>
-#include <gtest/internal/gtest-filepath.h>
+#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 <signal.h>
 #include <stdio.h>

-#include <gtest/gtest-spi.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
--- 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 <gtest/internal/gtest-filepath.h>
-#include <gtest/gtest.h>
+#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
--- 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 <gtest/internal/gtest-linked_ptr.h>
+#include "gtest/internal/gtest-linked_ptr.h"

 #include <stdlib.h>
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 namespace {

--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"
 #include <vector>

 using ::testing::AddGlobalTestEnvironment;
--- a/test/gtest-message_test.cc
+++ b/test/gtest-message_test.cc
@@ -31,9 +31,9 @@
 //
 // Tests for the Message class.

-#include <gtest/gtest-message.h>
+#include "gtest/gtest-message.h"

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 namespace {

--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #if GTEST_OS_WINDOWS_MOBILE
 #include <windows.h>
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #include "test/gtest-param-test_test.h"

--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #if GTEST_HAS_PARAM_TEST

--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #if GTEST_HAS_PARAM_TEST

--- 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 <gtest/internal/gtest-port.h>
+#include "gtest/internal/gtest-port.h"

 #include <stdio.h>

@@ -41,8 +41,8 @@

 #include <utility>  // For std::pair and std::make_pair.

-#include <gtest/gtest.h>
-#include <gtest/gtest-spi.h>
+#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
--- a/test/gtest-printers_test.cc
+++ b/test/gtest-printers_test.cc
@@ -33,7 +33,7 @@
 //
 // This file tests the universal value printer.

-#include <gtest/gtest-printers.h>
+#include "gtest/gtest-printers.h"

 #include <ctype.h>
 #include <limits.h>
@@ -48,7 +48,7 @@
 #include <utility>
 #include <vector>

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 // hash_map and hash_set are available on Windows.
 #if GTEST_OS_WINDOWS
--- 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 <gtest/gtest-test-part.h>
+#include "gtest/gtest-test-part.h"

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 using testing::Message;
 using testing::Test;
--- a/test/gtest-tuple_test.cc
+++ b/test/gtest-tuple_test.cc
@@ -29,9 +29,9 @@
 //
 // Author: wan@google.com (Zhanyong Wan)

-#include <gtest/internal/gtest-tuple.h>
+#include "gtest/internal/gtest-tuple.h"
 #include <utility>
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 namespace {

--- a/test/gtest-typed-test2_test.cc
+++ b/test/gtest-typed-test2_test.cc
@@ -32,7 +32,7 @@
 #include <vector>

 #include "test/gtest-typed-test_test.h"
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 #if GTEST_HAS_TYPED_TEST_P

--- a/test/gtest-typed-test_test.cc
+++ b/test/gtest-typed-test_test.cc
@@ -33,7 +33,7 @@
 #include <vector>

 #include "test/gtest-typed-test_test.h"
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 using testing::Test;

--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #if GTEST_HAS_TYPED_TEST_P

--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #include <string.h>  // For strcmp.
 #include <algorithm>
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #if GTEST_OS_WINDOWS
 #include <windows.h>
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // For exit().
--- a/test/gtest_color_test_.cc
+++ b/test/gtest_color_test_.cc
@@ -35,7 +35,7 @@

 #include <stdio.h>

-#include <gtest/gtest.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
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #include <iostream>

--- a/test/gtest_environment_test.cc
+++ b/test/gtest_environment_test.cc
@@ -33,7 +33,7 @@

 #include <stdlib.h>
 #include <stdio.h>
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 #define GTEST_IMPLEMENTATION_ 1  // Required for the next #include.
 #include "src/gtest-internal-inl.h"
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 namespace {

--- 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 <gtest/gtest.h>
+#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,
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 namespace {

--- a/test/gtest_main_unittest.cc
+++ b/test/gtest_main_unittest.cc
@@ -29,7 +29,7 @@
 //
 // Author: wan@google.com (Zhanyong Wan)

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 // Tests that we don't have to define main() when we link to
 // gtest_main instead of gtest.
--- 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 <gtest/gtest.h>
+#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 <gtest/gtest.h>
+#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 <gtest/gtest.h>
+#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 <gtest/gtest.h>
+#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 <gtest/gtest.h>
+#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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 template <typename T>
 class FooTest : public testing::Test {
@@ -126,7 +126,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types<int>);
 // Tests that the compiler catches using the wrong test case name in
 // REGISTER_TYPED_TEST_CASE_P.

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 template <typename T>
 class FooTest : public testing::Test {
@@ -145,7 +145,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types<int>);
 // Tests that the compiler catches using the wrong test case name in
 // INSTANTIATE_TYPED_TEST_CASE_P.

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 template <typename T>
 class FooTest : public testing::Test {
@@ -166,7 +166,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, BarTest, testing::Types<int>);
 // Tests that the compiler catches instantiating TYPED_TEST_CASE_P
 // twice with the same name prefix.

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 template <typename T>
 class FooTest : public testing::Test {
@@ -183,21 +183,21 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types<double>);

 #elif defined(TEST_STATIC_ASSERT_TYPE_EQ_IS_NOT_A_TYPE)

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 // Tests that StaticAssertTypeEq<T1, T2> cannot be used as a type.
 testing::StaticAssertTypeEq<int, int> dummy;

 #elif defined(TEST_STATIC_ASSERT_TYPE_EQ_WORKS_IN_NAMESPACE)

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 // Tests that StaticAssertTypeEq<T1, T2> works in a namespace scope.
 static bool dummy = testing::StaticAssertTypeEq<int, const int>();

 #elif defined(TEST_STATIC_ASSERT_TYPE_EQ_WORKS_IN_CLASS)

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 template <typename T>
 class Helper {
@@ -215,7 +215,7 @@ void Test() {

 #elif defined(TEST_STATIC_ASSERT_TYPE_EQ_WORKS_IN_FUNCTION)

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 void Test() {
  // Tests that StaticAssertTypeEq<T1, T2> works inside a function.
@@ -225,7 +225,7 @@ void Test() {
 #else
 // A sanity test.  This should compile.

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 int main() {
  return RUN_ALL_TESTS();
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"


 int main(int argc, char **argv) {
--- a/test/gtest_output_test_.cc
+++ b/test/gtest_output_test_.cc
@@ -32,8 +32,8 @@
 //
 // Author: wan@google.com (Zhanyong Wan)

-#include <gtest/gtest-spi.h>
-#include <gtest/gtest.h>
+#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
--- a/test/gtest_pred_impl_unittest.cc
+++ b/test/gtest_pred_impl_unittest.cc
@@ -49,8 +49,8 @@

 #include <iostream>

-#include <gtest/gtest.h>
-#include <gtest/gtest-spi.h>
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"

 // A user-defined data type.
 struct Bool {
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"
 #include "test/production.h"

 // Tests that private members can be accessed from a TEST declared as
--- a/test/gtest_repeat_test.cc
+++ b/test/gtest_repeat_test.cc
@@ -33,7 +33,7 @@

 #include <stdlib.h>
 #include <iostream>
-#include <gtest/gtest.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
--- a/test/gtest_shuffle_test_.cc
+++ b/test/gtest_shuffle_test_.cc
@@ -31,7 +31,7 @@

 // Verifies that test shuffling works.

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 namespace {

--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 namespace {

--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #include <iostream>
 #include <vector>
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 #include <stdlib.h>
 #include <stdio.h>
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 int main(int argc, char** argv) {
  testing::InitGoogleTest(&argc, argv);
--- a/test/gtest_uninitialized_test_.cc
+++ b/test/gtest_uninitialized_test_.cc
@@ -29,7 +29,7 @@
 //
 // Author: wan@google.com (Zhanyong Wan)

-#include <gtest/gtest.h>
+#include "gtest/gtest.h"

 TEST(DummyTest, Dummy) {
  // This test doesn't verify anything.  We just need it to create a
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"
 #include <vector>

 // 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 <gtest/gtest-spi.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
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 class PropertyOne : public testing::Test {
 protected:
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 class PropertyTwo : public testing::Test {
 protected:
--- 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 <gtest/gtest.h>
+#include "gtest/gtest.h"

 using ::testing::InitGoogleTest;
 using ::testing::TestEventListeners;
--- a/test/production.h
+++ b/test/production.h
@@ -34,7 +34,7 @@
 #ifndef GTEST_TEST_PRODUCTION_H_
 #define GTEST_TEST_PRODUCTION_H_

-#include <gtest/gtest_prod.h>
+#include "gtest/gtest_prod.h"

 class PrivateCode {
 public: