Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
98ca4206
Commit
98ca4206
authored
Mar 10, 2021
by
Abseil Team
Committed by
Andy Soffer
Mar 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Googletest export
Internal change PiperOrigin-RevId: 362040448
parent
e8512bc3
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
45 additions
and
45 deletions
+45
-45
gmock-actions.h
googlemock/include/gmock/gmock-actions.h
+3
-3
gmock-cardinalities.h
googlemock/include/gmock/gmock-cardinalities.h
+3
-3
gmock-function-mocker.h
googlemock/include/gmock/gmock-function-mocker.h
+3
-3
gmock-matchers.h
googlemock/include/gmock/gmock-matchers.h
+3
-3
gmock-more-actions.h
googlemock/include/gmock/gmock-more-actions.h
+3
-3
gmock-more-matchers.h
googlemock/include/gmock/gmock-more-matchers.h
+3
-3
gmock-nice-strict.h
googlemock/include/gmock/gmock-nice-strict.h
+3
-3
gmock-spec-builders.h
googlemock/include/gmock/gmock-spec-builders.h
+3
-3
gmock.h
googlemock/include/gmock/gmock.h
+3
-3
gmock-generated-actions.h
...k/include/gmock/internal/custom/gmock-generated-actions.h
+3
-3
gmock-matchers.h
googlemock/include/gmock/internal/custom/gmock-matchers.h
+3
-3
gmock-port.h
googlemock/include/gmock/internal/custom/gmock-port.h
+3
-3
gmock-internal-utils.h
googlemock/include/gmock/internal/gmock-internal-utils.h
+3
-3
gmock-port.h
googlemock/include/gmock/internal/gmock-port.h
+3
-3
gmock-pp.h
googlemock/include/gmock/internal/gmock-pp.h
+3
-3
No files found.
googlemock/include/gmock/gmock-actions.h
View file @
98ca4206
...
@@ -127,8 +127,8 @@
...
@@ -127,8 +127,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
#ifndef _WIN32_WCE
#ifndef _WIN32_WCE
# include <errno.h>
# include <errno.h>
...
@@ -1684,4 +1684,4 @@ template <typename F, typename Impl>
...
@@ -1684,4 +1684,4 @@ template <typename F, typename Impl>
# pragma warning(pop)
# pragma warning(pop)
#endif
#endif
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
googlemock/include/gmock/gmock-cardinalities.h
View file @
98ca4206
...
@@ -36,8 +36,8 @@
...
@@ -36,8 +36,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
#include <limits.h>
#include <limits.h>
#include <memory>
#include <memory>
...
@@ -154,4 +154,4 @@ inline Cardinality MakeCardinality(const CardinalityInterface* c) {
...
@@ -154,4 +154,4 @@ inline Cardinality MakeCardinality(const CardinalityInterface* c) {
GTEST_DISABLE_MSC_WARNINGS_POP_
()
// 4251
GTEST_DISABLE_MSC_WARNINGS_POP_
()
// 4251
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
googlemock/include/gmock/gmock-function-mocker.h
View file @
98ca4206
...
@@ -33,8 +33,8 @@
...
@@ -33,8 +33,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_ // NOLINT
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_ // NOLINT
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_ // NOLINT
#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_ // NOLINT
#include <type_traits> // IWYU pragma: keep
#include <type_traits> // IWYU pragma: keep
#include <utility> // IWYU pragma: keep
#include <utility> // IWYU pragma: keep
...
@@ -476,4 +476,4 @@ using internal::FunctionMocker;
...
@@ -476,4 +476,4 @@ using internal::FunctionMocker;
#define GMOCK_MOCKER_(arity, constness, Method) \
#define GMOCK_MOCKER_(arity, constness, Method) \
GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_
googlemock/include/gmock/gmock-matchers.h
View file @
98ca4206
...
@@ -252,8 +252,8 @@
...
@@ -252,8 +252,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
#include <algorithm>
#include <algorithm>
#include <cmath>
#include <cmath>
...
@@ -5389,4 +5389,4 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 5046
...
@@ -5389,4 +5389,4 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 5046
// declarations from this file.
// declarations from this file.
#include "gmock/internal/custom/gmock-matchers.h"
#include "gmock/internal/custom/gmock-matchers.h"
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
googlemock/include/gmock/gmock-more-actions.h
View file @
98ca4206
...
@@ -34,8 +34,8 @@
...
@@ -34,8 +34,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
#include <memory>
#include <memory>
#include <utility>
#include <utility>
...
@@ -570,4 +570,4 @@ InvokeArgument(Params&&... params) {
...
@@ -570,4 +570,4 @@ InvokeArgument(Params&&... params) {
}
// namespace testing
}
// namespace testing
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
googlemock/include/gmock/gmock-more-matchers.h
View file @
98ca4206
...
@@ -37,8 +37,8 @@
...
@@ -37,8 +37,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
#include "gmock/gmock-matchers.h"
#include "gmock/gmock-matchers.h"
...
@@ -89,4 +89,4 @@ MATCHER(IsFalse, negation ? "is true" : "is false") {
...
@@ -89,4 +89,4 @@ MATCHER(IsFalse, negation ? "is true" : "is false") {
}
// namespace testing
}
// namespace testing
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
googlemock/include/gmock/gmock-nice-strict.h
View file @
98ca4206
...
@@ -60,8 +60,8 @@
...
@@ -60,8 +60,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
#include <type_traits>
#include <type_traits>
...
@@ -260,4 +260,4 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS StrictMock
...
@@ -260,4 +260,4 @@ class GTEST_INTERNAL_EMPTY_BASE_CLASS StrictMock
}
// namespace testing
}
// namespace testing
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
googlemock/include/gmock/gmock-spec-builders.h
View file @
98ca4206
...
@@ -58,8 +58,8 @@
...
@@ -58,8 +58,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
#include <functional>
#include <functional>
#include <map>
#include <map>
...
@@ -2033,4 +2033,4 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
...
@@ -2033,4 +2033,4 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
#define EXPECT_CALL(obj, call) \
#define EXPECT_CALL(obj, call) \
GMOCK_ON_CALL_IMPL_(obj, InternalExpectedAt, call)
GMOCK_ON_CALL_IMPL_(obj, InternalExpectedAt, call)
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
googlemock/include/gmock/gmock.h
View file @
98ca4206
...
@@ -34,8 +34,8 @@
...
@@ -34,8 +34,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
// This file implements the following syntax:
// This file implements the following syntax:
//
//
...
@@ -95,4 +95,4 @@ GTEST_API_ void InitGoogleMock();
...
@@ -95,4 +95,4 @@ GTEST_API_ void InitGoogleMock();
}
// namespace testing
}
// namespace testing
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_GMOCK_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
googlemock/include/gmock/internal/custom/gmock-generated-actions.h
View file @
98ca4206
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
googlemock/include/gmock/internal/custom/gmock-matchers.h
View file @
98ca4206
...
@@ -31,6 +31,6 @@
...
@@ -31,6 +31,6 @@
//
//
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
googlemock/include/gmock/internal/custom/gmock-port.h
View file @
98ca4206
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
googlemock/include/gmock/internal/gmock-internal-utils.h
View file @
98ca4206
...
@@ -36,8 +36,8 @@
...
@@ -36,8 +36,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
#include <stdio.h>
#include <stdio.h>
#include <ostream> // NOLINT
#include <ostream> // NOLINT
...
@@ -456,4 +456,4 @@ constexpr size_t Function<R(Args...)>::ArgumentCount;
...
@@ -456,4 +456,4 @@ constexpr size_t Function<R(Args...)>::ArgumentCount;
}
// namespace internal
}
// namespace internal
}
// namespace testing
}
// namespace testing
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
googlemock/include/gmock/internal/gmock-port.h
View file @
98ca4206
...
@@ -37,8 +37,8 @@
...
@@ -37,8 +37,8 @@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
#include <assert.h>
#include <assert.h>
#include <stdlib.h>
#include <stdlib.h>
...
@@ -84,4 +84,4 @@
...
@@ -84,4 +84,4 @@
#endif // !defined(GMOCK_DECLARE_bool_)
#endif // !defined(GMOCK_DECLARE_bool_)
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
googlemock/include/gmock/internal/gmock-pp.h
View file @
98ca4206
#ifndef GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
#define GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
// Expands and concatenates the arguments. Constructed macros reevaluate.
// Expands and concatenates the arguments. Constructed macros reevaluate.
#define GMOCK_PP_CAT(_1, _2) GMOCK_PP_INTERNAL_CAT(_1, _2)
#define GMOCK_PP_CAT(_1, _2) GMOCK_PP_INTERNAL_CAT(_1, _2)
...
@@ -276,4 +276,4 @@
...
@@ -276,4 +276,4 @@
GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(GMOCK_PP_INC(_i), _Macro, _Data, \
GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(GMOCK_PP_INC(_i), _Macro, _Data, \
(GMOCK_PP_TAIL _Tuple))
(GMOCK_PP_TAIL _Tuple))
#endif // GOOGLE
TEST_GOOGLE
MOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
#endif // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment