From 53e08c44dd34857ba57581d7c5774d6c96a8d0e1 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Tue, 14 Sep 2010 05:38:21 +0000 Subject: Include gtest and gmock headers as user headers instead of system headers. --- 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 ++-- 16 files changed, 52 insertions(+), 52 deletions(-) (limited to 'test') 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; -- cgit v1.2.3