Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
0cb2eeb5
Commit
0cb2eeb5
authored
Aug 02, 2017
by
Gennadiy Civil
Committed by
GitHub
Aug 02, 2017
Browse files
Merge pull request #764 from flyd1005/wip-fix-typo
remove duplicated words
parents
73f32159
266a185a
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
12 additions
and
12 deletions
+12
-12
googlemock/CHANGES
googlemock/CHANGES
+1
-1
googlemock/src/gmock-matchers.cc
googlemock/src/gmock-matchers.cc
+1
-1
googlemock/test/gmock-generated-actions_test.cc
googlemock/test/gmock-generated-actions_test.cc
+1
-1
googletest/docs/AdvancedGuide.md
googletest/docs/AdvancedGuide.md
+1
-1
googletest/docs/V1_5_AdvancedGuide.md
googletest/docs/V1_5_AdvancedGuide.md
+1
-1
googletest/docs/V1_6_AdvancedGuide.md
googletest/docs/V1_6_AdvancedGuide.md
+1
-1
googletest/docs/V1_7_AdvancedGuide.md
googletest/docs/V1_7_AdvancedGuide.md
+1
-1
googletest/src/gtest-death-test.cc
googletest/src/gtest-death-test.cc
+1
-1
googletest/src/gtest-port.cc
googletest/src/gtest-port.cc
+1
-1
googletest/src/gtest.cc
googletest/src/gtest.cc
+1
-1
googletest/test/gtest_unittest.cc
googletest/test/gtest_unittest.cc
+1
-1
googletest/xcode/Scripts/versiongenerate.py
googletest/xcode/Scripts/versiongenerate.py
+1
-1
No files found.
googlemock/CHANGES
View file @
0cb2eeb5
...
...
@@ -94,7 +94,7 @@ Google Test):
* New feature: --gmock_catch_leaked_mocks for detecting leaked mocks.
* New feature: ACTION_TEMPLATE for defining templatized actions.
* New feature: the .After() clause for specifying expectation order.
* New feature: the .With() clause for
for
specifying inter-argument
* New feature: the .With() clause for specifying inter-argument
constraints.
* New feature: actions ReturnArg<k>(), ReturnNew<T>(...), and
DeleteArg<k>().
...
...
googlemock/src/gmock-matchers.cc
View file @
0cb2eeb5
...
...
@@ -288,7 +288,7 @@ class MaxBipartiteMatchState {
// Each element of the left_ vector represents a left hand side node
// (i.e. an element) and each element of right_ is a right hand side
// node (i.e. a matcher). The values in the left_ vector indicate
// outflow from that node to a node on the
the
right_ side. The values
// outflow from that node to a node on the right_ side. The values
// in the right_ indicate inflow, and specify which left_ node is
// feeding that right_ node, if any. For example, left_[3] == 1 means
// there's a flow from element #3 to matcher #1. Such a flow would also
...
...
googlemock/test/gmock-generated-actions_test.cc
View file @
0cb2eeb5
...
...
@@ -1120,7 +1120,7 @@ TEST(ActionTemplateTest, WorksForIntegralTemplateParams) {
EXPECT_FALSE
(
b
);
// Verifies that resetter is deleted.
}
// Tests that ACTION_TEMPLATES works for template
template
parameters.
// Tests that ACTION_TEMPLATES works for template parameters.
ACTION_TEMPLATE
(
ReturnSmartPointer
,
HAS_1_TEMPLATE_PARAMS
(
template
<
typename
Pointee
>
class
,
Pointer
),
...
...
googletest/docs/AdvancedGuide.md
View file @
0cb2eeb5
...
...
@@ -675,7 +675,7 @@ syntax only.
## How It Works ##
Under the hood,
`ASSERT_EXIT()`
spawns a new process and executes the
death test statement in that process. The details of
of
how precisely
death test statement in that process. The details of how precisely
that happens depend on the platform and the variable
`::testing::GTEST_FLAG(death_test_style)`
(which is initialized from the
command-line flag
`--gtest_death_test_style`
).
...
...
googletest/docs/V1_5_AdvancedGuide.md
View file @
0cb2eeb5
...
...
@@ -599,7 +599,7 @@ syntax only.
## How It Works ##
Under the hood, `
ASSERT_EXIT()
` spawns a new process and executes the
death test statement in that process. The details of
of
how precisely
death test statement in that process. The details of how precisely
that happens depend on the platform and the variable
`
::testing::GTEST_FLAG(death_test_style)
` (which is initialized from the
command-line flag `
--gtest_death_test_style
`).
...
...
googletest/docs/V1_6_AdvancedGuide.md
View file @
0cb2eeb5
...
...
@@ -672,7 +672,7 @@ syntax only.
## How It Works ##
Under the hood, `
ASSERT_EXIT()
` spawns a new process and executes the
death test statement in that process. The details of
of
how precisely
death test statement in that process. The details of how precisely
that happens depend on the platform and the variable
`
::testing::GTEST_FLAG(death_test_style)
` (which is initialized from the
command-line flag `
--gtest_death_test_style
`).
...
...
googletest/docs/V1_7_AdvancedGuide.md
View file @
0cb2eeb5
...
...
@@ -673,7 +673,7 @@ syntax only.
## How It Works ##
Under the hood, `
ASSERT_EXIT()
` spawns a new process and executes the
death test statement in that process. The details of
of
how precisely
death test statement in that process. The details of how precisely
that happens depend on the platform and the variable
`
::testing::GTEST_FLAG(death_test_style)
` (which is initialized from the
command-line flag `
--gtest_death_test_style
`).
...
...
googletest/src/gtest-death-test.cc
View file @
0cb2eeb5
...
...
@@ -1242,7 +1242,7 @@ int GetStatusFileDescriptor(unsigned int parent_process_id,
reinterpret_cast
<
HANDLE
>
(
write_handle_as_size_t
);
HANDLE
dup_write_handle
;
// The newly initialized handle is accessible only in
in
the parent
// The newly initialized handle is accessible only in the parent
// process. To obtain one accessible within the child, we need to use
// DuplicateHandle.
if
(
!::
DuplicateHandle
(
parent_process_handle
.
Get
(),
write_handle
,
...
...
googletest/src/gtest-port.cc
View file @
0cb2eeb5
...
...
@@ -496,7 +496,7 @@ class ThreadLocalRegistryImpl {
FALSE
,
thread_id
);
GTEST_CHECK_
(
thread
!=
NULL
);
// We need to
to
pass a valid thread ID pointer into CreateThread for it
// We need to pass a valid thread ID pointer into CreateThread for it
// to work correctly under Win98.
DWORD
watcher_thread_id
;
HANDLE
watcher_thread
=
::
CreateThread
(
...
...
googletest/src/gtest.cc
View file @
0cb2eeb5
...
...
@@ -1781,7 +1781,7 @@ std::string CodePointToUtf8(UInt32 code_point) {
return
str
;
}
// The following two functions only make sense if the
the
system
// The following two functions only make sense if the system
// uses UTF-16 for wide string encoding. All supported systems
// with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16.
...
...
googletest/test/gtest_unittest.cc
View file @
0cb2eeb5
...
...
@@ -1388,7 +1388,7 @@ class TestResultTest : public Test {
delete
r2
;
}
// Helper that compares two
two
TestPartResults.
// Helper that compares two TestPartResults.
static
void
CompareTestPartResult
(
const
TestPartResult
&
expected
,
const
TestPartResult
&
actual
)
{
EXPECT_EQ
(
expected
.
type
(),
actual
.
type
());
...
...
googletest/xcode/Scripts/versiongenerate.py
View file @
0cb2eeb5
...
...
@@ -88,7 +88,7 @@ file_data = """//
// is executed in a "Run Script" build phase when creating gtest.framework. This
// header file is not used during compilation of C-source. Rather, it simply
// defines some version strings for substitution in the Info.plist. Because of
// this, we are not
not
restricted to C-syntax nor are we using include guards.
// this, we are not restricted to C-syntax nor are we using include guards.
//
#define GTEST_VERSIONINFO_SHORT %s.%s
...
...
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