Skip to content

Commit

Permalink
Include gtest headers as user headers instead of system headers.
Browse files Browse the repository at this point in the history
git-svn-id: http://googletest.googlecode.com/svn/trunk@482 861a406c-534a-0410-8894-cb66d6ee9925
  • Loading branch information
zhanyong.wan committed Sep 14, 2010
1 parent b15c733 commit 2620c79
Show file tree
Hide file tree
Showing 87 changed files with 165 additions and 165 deletions.
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gtest/gtest.h>, 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.).

Expand Down
2 changes: 1 addition & 1 deletion include/gtest/gtest-death-test.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_

#include <gtest/internal/gtest-death-test-internal.h>
#include "gtest/internal/gtest-death-test-internal.h"

namespace testing {

Expand Down
4 changes: 2 additions & 2 deletions include/gtest/gtest-message.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@

#include <limits>

#include <gtest/internal/gtest-string.h>
#include <gtest/internal/gtest-internal.h>
#include "gtest/internal/gtest-string.h"
#include "gtest/internal/gtest-internal.h"

namespace testing {

Expand Down
8 changes: 4 additions & 4 deletions include/gtest/gtest-param-test.h
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));

#endif // 0

#include <gtest/internal/gtest-port.h>
#include "gtest/internal/gtest-port.h"

#if !GTEST_OS_SYMBIAN
#include <utility>
Expand All @@ -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 <gtest/internal/gtest-internal.h>
#include <gtest/internal/gtest-param-util.h>
#include <gtest/internal/gtest-param-util-generated.h>
#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

Expand Down
8 changes: 4 additions & 4 deletions include/gtest/gtest-param-test.h.pump
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));

#endif // 0

#include <gtest/internal/gtest-port.h>
#include "gtest/internal/gtest-port.h"

#if !GTEST_OS_SYMBIAN
#include <utility>
Expand All @@ -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 <gtest/internal/gtest-internal.h>
#include <gtest/internal/gtest-param-util.h>
#include <gtest/internal/gtest-param-util-generated.h>
#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

Expand Down
4 changes: 2 additions & 2 deletions include/gtest/gtest-printers.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
#include <string>
#include <utility>
#include <vector>
#include <gtest/internal/gtest-port.h>
#include <gtest/internal/gtest-internal.h>
#include "gtest/internal/gtest-port.h"
#include "gtest/internal/gtest-internal.h"

namespace testing {

Expand Down
2 changes: 1 addition & 1 deletion include/gtest/gtest-spi.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_

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

namespace testing {

Expand Down
4 changes: 2 additions & 2 deletions include/gtest/gtest-test-part.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@

#include <iosfwd>
#include <vector>
#include <gtest/internal/gtest-internal.h>
#include <gtest/internal/gtest-string.h>
#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-string.h"

namespace testing {

Expand Down
4 changes: 2 additions & 2 deletions include/gtest/gtest-typed-test.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);

#endif // 0

#include <gtest/internal/gtest-port.h>
#include <gtest/internal/gtest-type-util.h>
#include "gtest/internal/gtest-port.h"
#include "gtest/internal/gtest-type-util.h"

// Implements typed tests.

Expand Down
20 changes: 10 additions & 10 deletions include/gtest/gtest.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
#include <limits>
#include <vector>

#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>
#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
Expand Down Expand Up @@ -1736,7 +1736,7 @@ const T* TestWithParam<T>::parameter_ = NULL;

// Includes the auto-generated header that implements a family of
// generic predicate assertion macros.
#include <gtest/gtest_pred_impl.h>
#include "gtest/gtest_pred_impl.h"

// Macros for testing equalities and inequalities.
//
Expand Down
2 changes: 1 addition & 1 deletion include/gtest/internal/gtest-death-test-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gtest/internal/gtest-internal.h>
#include "gtest/internal/gtest-internal.h"

namespace testing {
namespace internal {
Expand Down
2 changes: 1 addition & 1 deletion include/gtest/internal/gtest-filepath.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_

#include <gtest/internal/gtest-string.h>
#include "gtest/internal/gtest-string.h"

namespace testing {
namespace internal {
Expand Down
8 changes: 4 additions & 4 deletions include/gtest/internal/gtest-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_

#include <gtest/internal/gtest-port.h>
#include "gtest/internal/gtest-port.h"

#if GTEST_OS_LINUX
#include <stdlib.h>
Expand All @@ -52,9 +52,9 @@
#include <limits>
#include <set>

#include <gtest/internal/gtest-string.h>
#include <gtest/internal/gtest-filepath.h>
#include <gtest/internal/gtest-type-util.h>
#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
Expand Down
2 changes: 1 addition & 1 deletion include/gtest/internal/gtest-linked_ptr.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
#include <stdlib.h>
#include <assert.h>

#include <gtest/internal/gtest-port.h>
#include "gtest/internal/gtest-port.h"

namespace testing {
namespace internal {
Expand Down
4 changes: 2 additions & 2 deletions include/gtest/internal/gtest-param-util-generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gtest/internal/gtest-param-util.h>
#include <gtest/internal/gtest-port.h>
#include "gtest/internal/gtest-param-util.h"
#include "gtest/internal/gtest-port.h"

#if GTEST_HAS_PARAM_TEST

Expand Down
4 changes: 2 additions & 2 deletions include/gtest/internal/gtest-param-util-generated.h.pump
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gtest/internal/gtest-param-util.h>
#include <gtest/internal/gtest-port.h>
#include "gtest/internal/gtest-param-util.h"
#include "gtest/internal/gtest-port.h"

#if GTEST_HAS_PARAM_TEST

Expand Down
8 changes: 4 additions & 4 deletions include/gtest/internal/gtest-param-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gtest/internal/gtest-internal.h>
#include <gtest/internal/gtest-linked_ptr.h>
#include <gtest/internal/gtest-port.h>
#include <gtest/gtest-printers.h>
#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

Expand Down
2 changes: 1 addition & 1 deletion include/gtest/internal/gtest-port.h
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
#if GTEST_HAS_TR1_TUPLE

#if GTEST_USE_OWN_TR1_TUPLE
#include <gtest/internal/gtest-tuple.h>
#include "gtest/internal/gtest-tuple.h"
#elif GTEST_OS_SYMBIAN

// On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to
Expand Down
2 changes: 1 addition & 1 deletion include/gtest/internal/gtest-string.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#endif

#include <string.h>
#include <gtest/internal/gtest-port.h>
#include "gtest/internal/gtest-port.h"

#include <string>

Expand Down
4 changes: 2 additions & 2 deletions include/gtest/internal/gtest-type-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_

#include <gtest/internal/gtest-port.h>
#include <gtest/internal/gtest-string.h>
#include "gtest/internal/gtest-port.h"
#include "gtest/internal/gtest-string.h"

#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P

Expand Down
4 changes: 2 additions & 2 deletions include/gtest/internal/gtest-type-util.h.pump
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gtest/internal/gtest-port.h>
#include <gtest/internal/gtest-string.h>
#include "gtest/internal/gtest-port.h"
#include "gtest/internal/gtest-string.h"

#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P

Expand Down
2 changes: 1 addition & 1 deletion samples/sample10_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <stdio.h>
#include <stdlib.h>

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

using ::testing::EmptyTestEventListener;
using ::testing::InitGoogleTest;
Expand Down
2 changes: 1 addition & 1 deletion samples/sample1_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

#include <limits.h>
#include "sample1.h"
#include <gtest/gtest.h>
#include "gtest/gtest.h"


// Step 2. Use the TEST macro to define your tests.
Expand Down
2 changes: 1 addition & 1 deletion samples/sample2_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
// needed.

#include "sample2.h"
#include <gtest/gtest.h>
#include "gtest/gtest.h"

// In this example, we test the MyString class (a simple string).

Expand Down
2 changes: 1 addition & 1 deletion samples/sample3_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
// </TechnicalDetails>

#include "sample3-inl.h"
#include <gtest/gtest.h>
#include "gtest/gtest.h"

// To use a test fixture, derive a class from testing::Test.
class QueueTest : public testing::Test {
Expand Down
2 changes: 1 addition & 1 deletion samples/sample4_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
//
// Author: [email protected] (Zhanyong Wan)

#include <gtest/gtest.h>
#include "gtest/gtest.h"
#include "sample4.h"

// Tests the Increment() method.
Expand Down
2 changes: 1 addition & 1 deletion samples/sample5_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include <limits.h>
#include <time.h>
#include "sample3-inl.h"
#include <gtest/gtest.h>
#include "gtest/gtest.h"
#include "sample1.h"

// In this sample, we want to ensure that every test finishes within
Expand Down
2 changes: 1 addition & 1 deletion samples/sample6_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// The interface and its implementations are in this header.
#include "prime_tables.h"

#include <gtest/gtest.h>
#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
Expand Down
2 changes: 1 addition & 1 deletion samples/sample7_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
// The interface and its implementations are in this header.
#include "prime_tables.h"

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

#if GTEST_HAS_PARAM_TEST

Expand Down
2 changes: 1 addition & 1 deletion samples/sample8_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
// Use class definitions to test from this header.
#include "prime_tables.h"

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

#if GTEST_HAS_COMBINE

Expand Down
2 changes: 1 addition & 1 deletion samples/sample9_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include <stdio.h>

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

using ::testing::EmptyTestEventListener;
using ::testing::InitGoogleTest;
Expand Down
Loading

0 comments on commit 2620c79

Please sign in to comment.