aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2010-09-14 05:38:21 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2010-09-14 05:38:21 +0000
commit53e08c44dd34857ba57581d7c5774d6c96a8d0e1 (patch)
tree8aee751ab6c88f64cbc2ea4de63e80a6f955fc9e /test
parentad7c462be7ea6041419426f98b5653bd98ad14dc (diff)
downloadgoogletest-53e08c44dd34857ba57581d7c5774d6c96a8d0e1.tar.gz
googletest-53e08c44dd34857ba57581d7c5774d6c96a8d0e1.tar.bz2
googletest-53e08c44dd34857ba57581d7c5774d6c96a8d0e1.zip
Include gtest and gmock headers as user headers instead of system headers.
Diffstat (limited to 'test')
-rw-r--r--test/gmock-actions_test.cc10
-rw-r--r--test/gmock-cardinalities_test.cc6
-rw-r--r--test/gmock-generated-actions_test.cc6
-rw-r--r--test/gmock-generated-function-mockers_test.cc6
-rw-r--r--test/gmock-generated-internal-utils_test.cc6
-rw-r--r--test/gmock-generated-matchers_test.cc8
-rw-r--r--test/gmock-internal-utils_test.cc10
-rw-r--r--test/gmock-matchers_test.cc8
-rw-r--r--test/gmock-more-actions_test.cc6
-rw-r--r--test/gmock-nice-strict_test.cc8
-rw-r--r--test/gmock-port_test.cc4
-rw-r--r--test/gmock-spec-builders_test.cc10
-rw-r--r--test/gmock_leak_test_.cc2
-rw-r--r--test/gmock_link_test.h6
-rw-r--r--test/gmock_output_test_.cc4
-rw-r--r--test/gmock_test.cc4
16 files changed, 52 insertions, 52 deletions
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 <gmock/gmock-actions.h>
+#include "gmock/gmock-actions.h"
#include <algorithm>
#include <iterator>
#include <string>
-#include <gmock/gmock.h>
-#include <gmock/internal/gmock-port.h>
-#include <gtest/gtest.h>
-#include <gtest/gtest-spi.h>
+#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 <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <gtest/gtest-spi.h>
+#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 <gmock/gmock-generated-actions.h>
+#include "gmock/gmock-generated-actions.h"
#include <functional>
#include <sstream>
#include <string>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#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 <gmock/gmock-generated-function-mockers.h>
+#include "gmock/gmock-generated-function-mockers.h"
#include <map>
#include <string>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#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 <gmock/internal/gmock-generated-internal-utils.h>
-#include <gmock/internal/gmock-internal-utils.h>
-#include <gtest/gtest.h>
+#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 <gmock/gmock-generated-matchers.h>
+#include "gmock/gmock-generated-matchers.h"
#include <list>
#include <map>
@@ -41,9 +41,9 @@
#include <utility>
#include <vector>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <gtest/gtest-spi.h>
+#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 <gmock/internal/gmock-internal-utils.h>
+#include "gmock/internal/gmock-internal-utils.h"
#include <stdlib.h>
#include <map>
#include <string>
#include <sstream>
#include <vector>
-#include <gmock/gmock.h>
-#include <gmock/internal/gmock-port.h>
-#include <gtest/gtest.h>
-#include <gtest/gtest-spi.h>
+#include "gmock/gmock.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
#if GTEST_OS_CYGWIN
#include <sys/types.h> // 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 <gmock/gmock-matchers.h>
+#include "gmock/gmock-matchers.h"
#include <string.h>
#include <functional>
@@ -45,9 +45,9 @@
#include <string>
#include <utility>
#include <vector>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <gtest/gtest-spi.h>
+#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 <gmock/gmock-more-actions.h>
+#include "gmock/gmock-more-actions.h"
#include <functional>
#include <sstream>
#include <string>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#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 <gmock/gmock-generated-nice-strict.h>
+#include "gmock/gmock-generated-nice-strict.h"
#include <string>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <gtest/gtest-spi.h>
+#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 <gmock/internal/gmock-port.h>
-#include <gtest/gtest.h>
+#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 <gmock/gmock-spec-builders.h>
+#include "gmock/gmock-spec-builders.h"
#include <ostream> // NOLINT
#include <sstream>
#include <string>
-#include <gmock/gmock.h>
-#include <gmock/internal/gmock-port.h>
-#include <gtest/gtest.h>
-#include <gtest/gtest-spi.h>
+#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 <gmock/gmock.h>
+#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 <gmock/gmock.h>
+#include "gmock/gmock.h"
#if !GTEST_OS_WINDOWS_MOBILE
#include <errno.h>
#endif
-#include <gmock/internal/gmock-port.h>
-#include <gtest/gtest.h>
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
#include <iostream>
#include <vector>
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 <gmock/gmock.h>
+#include "gmock/gmock.h"
#include <stdio.h>
#include <string>
-#include <gtest/gtest.h>
+#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 <gmock/gmock.h>
+#include "gmock/gmock.h"
#include <string>
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
using testing::GMOCK_FLAG(verbose);
using testing::InitGoogleMock;