Include gtest and gmock headers as user headers instead of system headers.

This commit is contained in:
zhanyong.wan
2010-09-14 05:38:21 +00:00
parent ad7c462be7
commit 53e08c44dd
42 changed files with 124 additions and 124 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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.

View File

@@ -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

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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>

View File

@@ -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;

View File

@@ -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;