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
9311242d
Commit
9311242d
authored
Jul 30, 2019
by
Gennadiy Civil
Browse files
Merge pull request #2356 from kuzkry:typos
PiperOrigin-RevId: 260786935
parents
0647b90e
bf6df7ea
Changes
42
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
114 additions
and
114 deletions
+114
-114
googletest/include/gtest/internal/gtest-internal.h
googletest/include/gtest/internal/gtest-internal.h
+5
-5
googletest/include/gtest/internal/gtest-port.h
googletest/include/gtest/internal/gtest-port.h
+12
-12
googletest/include/gtest/internal/gtest-string.h
googletest/include/gtest/internal/gtest-string.h
+5
-5
googletest/include/gtest/internal/gtest-type-util.h
googletest/include/gtest/internal/gtest-type-util.h
+1
-1
googletest/include/gtest/internal/gtest-type-util.h.pump
googletest/include/gtest/internal/gtest-type-util.h.pump
+1
-1
googletest/samples/prime_tables.h
googletest/samples/prime_tables.h
+1
-1
googletest/samples/sample1.cc
googletest/samples/sample1.cc
+1
-1
googletest/samples/sample1.h
googletest/samples/sample1.h
+1
-1
googletest/scripts/gen_gtest_pred_impl.py
googletest/scripts/gen_gtest_pred_impl.py
+7
-7
googletest/scripts/pump.py
googletest/scripts/pump.py
+1
-1
googletest/scripts/upload.py
googletest/scripts/upload.py
+1
-1
googletest/src/gtest-death-test.cc
googletest/src/gtest-death-test.cc
+1
-1
googletest/src/gtest-internal-inl.h
googletest/src/gtest-internal-inl.h
+9
-9
googletest/src/gtest-port.cc
googletest/src/gtest-port.cc
+12
-12
googletest/src/gtest.cc
googletest/src/gtest.cc
+39
-39
googletest/test/googletest-death-test-test.cc
googletest/test/googletest-death-test-test.cc
+3
-3
googletest/test/googletest-throw-on-failure-test.py
googletest/test/googletest-throw-on-failure-test.py
+1
-1
googletest/test/gtest_environment_test.cc
googletest/test/gtest_environment_test.cc
+1
-1
googletest/test/gtest_pred_impl_unittest.cc
googletest/test/gtest_pred_impl_unittest.cc
+10
-10
googletest/test/gtest_premature_exit_test.cc
googletest/test/gtest_premature_exit_test.cc
+2
-2
No files found.
googletest/include/gtest/internal/gtest-internal.h
View file @
9311242d
...
...
@@ -189,7 +189,7 @@ GTEST_API_ std::string DiffStrings(const std::string& left,
// expected_value: "5"
// actual_value: "6"
//
// The ignoring_case parameter is true if
f
the assertion is a
// The ignoring_case parameter is true if the assertion is a
// *_STRCASEEQ*. When it's true, the string " (ignoring case)" will
// be inserted into the message.
GTEST_API_
AssertionResult
EqFailure
(
const
char
*
expected_expression
,
...
...
@@ -318,14 +318,14 @@ class FloatingPoint {
// Returns the sign bit of this number.
Bits
sign_bit
()
const
{
return
kSignBitMask
&
u_
.
bits_
;
}
// Returns true if
f
this is NAN (not a number).
// Returns true if this is NAN (not a number).
bool
is_nan
()
const
{
// It's a NAN if the exponent bits are all ones and the fraction
// bits are not entirely zeros.
return
(
exponent_bits
()
==
kExponentBitMask
)
&&
(
fraction_bits
()
!=
0
);
}
// Returns true if
f
this number is at most kMaxUlps ULP's away from
// Returns true if this number is at most kMaxUlps ULP's away from
// rhs. In particular, this function:
//
// - returns false if either number is (or both are) NAN.
...
...
@@ -848,7 +848,7 @@ class GTEST_API_ Random {
};
// Defining a variable of type CompileAssertTypesEqual<T1, T2> will cause a
// compiler error if
f
T1 and T2 are different types.
// compiler error if T1 and T2 are different types.
template
<
typename
T1
,
typename
T2
>
struct
CompileAssertTypesEqual
;
...
...
@@ -895,7 +895,7 @@ struct RemoveConst<const T[N]> {
GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T))
// IsAProtocolMessage<T>::value is a compile-time bool constant that's
// true if
f
T is type proto2::Message or a subclass of it.
// true if T is type proto2::Message or a subclass of it.
template
<
typename
T
>
struct
IsAProtocolMessage
:
public
bool_constant
<
...
...
googletest/include/gtest/internal/gtest-port.h
View file @
9311242d
...
...
@@ -362,7 +362,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
# include <android/api-level.h> // NOLINT
#endif
// Defines this to true if
f
Google Test can use POSIX regular expressions.
// Defines this to true if Google Test can use POSIX regular expressions.
#ifndef GTEST_HAS_POSIX_RE
# if GTEST_OS_LINUX_ANDROID
// On Android, <regex.h> is only available starting with Gingerbread.
...
...
@@ -403,7 +403,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
// The user didn't tell us whether exceptions are enabled, so we need
// to figure it out.
# if defined(_MSC_VER) && defined(_CPPUNWIND)
// MSVC defines _CPPUNWIND to 1 if
f
exceptions are enabled.
// MSVC defines _CPPUNWIND to 1 if exceptions are enabled.
# define GTEST_HAS_EXCEPTIONS 1
# elif defined(__BORLANDC__)
// C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS
...
...
@@ -414,8 +414,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
# endif // _HAS_EXCEPTIONS
# define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
# elif defined(__clang__)
// clang defines __EXCEPTIONS if
f
exceptions are enabled before clang 220714,
// but if
f
cleanups are enabled after that. In Obj-C++ files, there can be
// clang defines __EXCEPTIONS if exceptions are enabled before clang 220714,
// but if cleanups are enabled after that. In Obj-C++ files, there can be
// cleanups for ObjC exceptions which also need cleanups, even if C++ exceptions
// are disabled. clang has __has_feature(cxx_exceptions) which checks for C++
// exceptions starting at clang r206352, but which checked for cleanups prior to
...
...
@@ -423,7 +423,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
// __EXCEPTIONS && __has_feature(cxx_exceptions).
# define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions))
# elif defined(__GNUC__) && __EXCEPTIONS
// gcc defines __EXCEPTIONS to 1 if
f
exceptions are enabled.
// gcc defines __EXCEPTIONS to 1 if exceptions are enabled.
# define GTEST_HAS_EXCEPTIONS 1
# elif defined(__SUNPRO_CC)
// Sun Pro CC supports exceptions. However, there is no compile-time way of
...
...
@@ -431,7 +431,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
// they are enabled unless the user tells us otherwise.
# define GTEST_HAS_EXCEPTIONS 1
# elif defined(__IBMCPP__) && __EXCEPTIONS
// xlC defines __EXCEPTIONS to 1 if
f
exceptions are enabled.
// xlC defines __EXCEPTIONS to 1 if exceptions are enabled.
# define GTEST_HAS_EXCEPTIONS 1
# elif defined(__HP_aCC)
// Exception handling is in effect by default in HP aCC compiler. It has to
...
...
@@ -472,13 +472,13 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
# ifdef _MSC_VER
# ifdef _CPPRTTI // MSVC defines this macro if
f
RTTI is enabled.
# ifdef _CPPRTTI // MSVC defines this macro if RTTI is enabled.
# define GTEST_HAS_RTTI 1
# else
# define GTEST_HAS_RTTI 0
# endif
// Starting with version 4.3.2, gcc defines __GXX_RTTI if
f
RTTI is enabled.
// Starting with version 4.3.2, gcc defines __GXX_RTTI if RTTI is enabled.
# elif defined(__GNUC__)
# ifdef __GXX_RTTI
...
...
@@ -909,9 +909,9 @@ class GTEST_API_ RE {
// Returns the string representation of the regex.
const
char
*
pattern
()
const
{
return
pattern_
;
}
// FullMatch(str, re) returns true if
f
regular expression re matches
// FullMatch(str, re) returns true if regular expression re matches
// the entire str.
// PartialMatch(str, re) returns true if
f
regular expression re
// PartialMatch(str, re) returns true if regular expression re
// matches a substring of str (including str itself).
static
bool
FullMatch
(
const
::
std
::
string
&
str
,
const
RE
&
re
)
{
return
FullMatch
(
str
.
c_str
(),
re
);
...
...
@@ -1266,7 +1266,7 @@ class GTEST_API_ AutoHandle {
void
Reset
(
Handle
handle
);
private:
// Returns true if
f
the handle is a valid handle object that can be closed.
// Returns true if the handle is a valid handle object that can be closed.
bool
IsCloseable
()
const
;
Handle
handle_
;
...
...
@@ -1368,7 +1368,7 @@ class ThreadWithParam : public ThreadWithParamBase {
// When non-NULL, used to block execution until the controller thread
// notifies.
Notification
*
const
thread_can_start_
;
bool
finished_
;
// true if
f
we know that the thread function has finished.
bool
finished_
;
// true if we know that the thread function has finished.
pthread_t
thread_
;
// The native thread object.
GTEST_DISALLOW_COPY_AND_ASSIGN_
(
ThreadWithParam
);
...
...
googletest/include/gtest/internal/gtest-string.h
View file @
9311242d
...
...
@@ -94,7 +94,7 @@ class GTEST_API_ String {
static
const
char
*
Utf16ToAnsi
(
LPCWSTR
utf16_str
);
#endif
// Compares two C strings. Returns true if
f
they have the same content.
// Compares two C strings. Returns true if they have the same content.
//
// Unlike strcmp(), this function can handle NULL argument(s). A
// NULL C string is considered different to any non-NULL C string,
...
...
@@ -107,7 +107,7 @@ class GTEST_API_ String {
// returned.
static
std
::
string
ShowWideCString
(
const
wchar_t
*
wide_c_str
);
// Compares two wide C strings. Returns true if
f
they have the same
// Compares two wide C strings. Returns true if they have the same
// content.
//
// Unlike wcscmp(), this function can handle NULL argument(s). A
...
...
@@ -115,7 +115,7 @@ class GTEST_API_ String {
// including the empty string.
static
bool
WideCStringEquals
(
const
wchar_t
*
lhs
,
const
wchar_t
*
rhs
);
// Compares two C strings, ignoring case. Returns true if
f
they
// Compares two C strings, ignoring case. Returns true if they
// have the same content.
//
// Unlike strcasecmp(), this function can handle NULL argument(s).
...
...
@@ -124,7 +124,7 @@ class GTEST_API_ String {
static
bool
CaseInsensitiveCStringEquals
(
const
char
*
lhs
,
const
char
*
rhs
);
// Compares two wide C strings, ignoring case. Returns true if
f
they
// Compares two wide C strings, ignoring case. Returns true if they
// have the same content.
//
// Unlike wcscasecmp(), this function can handle NULL argument(s).
...
...
@@ -139,7 +139,7 @@ class GTEST_API_ String {
static
bool
CaseInsensitiveWideCStringEquals
(
const
wchar_t
*
lhs
,
const
wchar_t
*
rhs
);
// Returns true if
f
the given string ends with the given suffix, ignoring
// Returns true if the given string ends with the given suffix, ignoring
// case. Any string is considered to end with an empty suffix.
static
bool
EndsWithCaseInsensitive
(
const
std
::
string
&
str
,
const
std
::
string
&
suffix
);
...
...
googletest/include/gtest/internal/gtest-type-util.h
View file @
9311242d
...
...
@@ -105,7 +105,7 @@ std::string GetTypeName() {
#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
// AssertyTypeEq<T1, T2>::type is defined if
f
T1 and T2 are the same
// AssertyTypeEq<T1, T2>::type is defined if T1 and T2 are the same
// type. This can be used as a compile-time assertion to ensure that
// two types are equal.
...
...
googletest/include/gtest/internal/gtest-type-util.h.pump
View file @
9311242d
...
...
@@ -104,7 +104,7 @@ std::string GetTypeName() {
#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
// AssertyTypeEq<T1, T2>::type is defined if
f
T1 and T2 are the same
// AssertyTypeEq<T1, T2>::type is defined if T1 and T2 are the same
// type. This can be used as a compile-time assertion to ensure that
// two types are equal.
...
...
googletest/samples/prime_tables.h
View file @
9311242d
...
...
@@ -43,7 +43,7 @@ class PrimeTable {
public:
virtual
~
PrimeTable
()
{}
// Returns true if
f
n is a prime number.
// Returns true if n is a prime number.
virtual
bool
IsPrime
(
int
n
)
const
=
0
;
// Returns the smallest prime number greater than p; or returns -1
...
...
googletest/samples/sample1.cc
View file @
9311242d
...
...
@@ -41,7 +41,7 @@ int Factorial(int n) {
return
result
;
}
// Returns true if
f
n is a prime number.
// Returns true if n is a prime number.
bool
IsPrime
(
int
n
)
{
// Trivial case 1: small numbers
if
(
n
<=
1
)
return
false
;
...
...
googletest/samples/sample1.h
View file @
9311242d
...
...
@@ -35,7 +35,7 @@
// Returns n! (the factorial of n). For negative n, n! is defined to be 1.
int
Factorial
(
int
n
);
// Returns true if
f
n is a prime number.
// Returns true if n is a prime number.
bool
IsPrime
(
int
n
);
#endif // GTEST_SAMPLES_SAMPLE1_H_
googletest/scripts/gen_gtest_pred_impl.py
View file @
9311242d
...
...
@@ -540,10 +540,10 @@ class Predicate%(n)sTest : public testing::Test {
}
}
// true if
f
the test function is expected to run to finish.
// true if the test function is expected to run to finish.
static bool expected_to_finish_;
// true if
f
the test function did run to finish.
// true if the test function did run to finish.
static bool finished_;
"""
%
DEFS
...
...
@@ -572,12 +572,12 @@ typedef Predicate%(n)sTest ASSERT_PRED%(n)sTest;
"""Returns the test for a predicate assertion macro.
Args:
use_format: true if
f
the assertion is a *_PRED_FORMAT*.
use_assert: true if
f
the assertion is a ASSERT_*.
expect_failure: true if
f
the assertion is expected to fail.
use_functor: true if
f
the first argument of the assertion is
use_format: true if the assertion is a *_PRED_FORMAT*.
use_assert: true if the assertion is a ASSERT_*.
expect_failure: true if the assertion is expected to fail.
use_functor: true if the first argument of the assertion is
a functor (as opposed to a function)
use_user_type: true if
f
the predicate functor/function takes
use_user_type: true if the predicate functor/function takes
argument(s) of a user-defined type.
Example:
...
...
googletest/scripts/pump.py
View file @
9311242d
...
...
@@ -161,7 +161,7 @@ class Token:
def
StartsWith
(
lines
,
pos
,
string
):
"""Returns True if
f
the given position in lines starts with 'string'."""
"""Returns True if the given position in lines starts with 'string'."""
return
lines
[
pos
.
line
][
pos
.
column
:].
startswith
(
string
)
...
...
googletest/scripts/upload.py
View file @
9311242d
...
...
@@ -631,7 +631,7 @@ class VersionControlSystem(object):
new_content: For text files, this is empty. For binary files, this is
the contents of the new file, since the diff output won't contain
information to reconstruct the current file.
is_binary: True if
f
the file is binary.
is_binary: True if the file is binary.
status: The status of the file.
"""
...
...
googletest/src/gtest-death-test.cc
View file @
9311242d
...
...
@@ -563,7 +563,7 @@ static ::std::string FormatDeathTestOutput(const ::std::string& output) {
// status_ok: true if exit_status is acceptable in the context of
// this particular death test, which fails if it is false
//
// Returns true if
f
all of the above conditions are met. Otherwise, the
// Returns true if all of the above conditions are met. Otherwise, the
// first failing condition, in the order given above, is the one that is
// reported. Also sets the last death test message string.
bool
DeathTestImpl
::
Passed
(
bool
status_ok
)
{
...
...
googletest/src/gtest-internal-inl.h
View file @
9311242d
...
...
@@ -99,14 +99,14 @@ const char kFlagfileFlag[] = "flagfile";
// A valid random seed must be in [1, kMaxRandomSeed].
const
int
kMaxRandomSeed
=
99999
;
// g_help_flag is true if
f
the --help flag or an equivalent form is
// g_help_flag is true if the --help flag or an equivalent form is
// specified on the command line.
GTEST_API_
extern
bool
g_help_flag
;
// Returns the current time in milliseconds.
GTEST_API_
TimeInMillis
GetTimeInMillis
();
// Returns true if
f
Google Test should use colors in the output.
// Returns true if Google Test should use colors in the output.
GTEST_API_
bool
ShouldUseColor
(
bool
stdout_is_tty
);
// Formats the given time in milliseconds as seconds.
...
...
@@ -266,7 +266,7 @@ GTEST_API_ bool ShouldShard(const char* total_shards_str,
GTEST_API_
Int32
Int32FromEnvOrDie
(
const
char
*
env_var
,
Int32
default_val
);
// Given the total number of shards, the shard index, and the test id,
// returns true if
f
the test should be run on this shard. The test id is
// returns true if the test should be run on this shard. The test id is
// some arbitrary but unique non-negative integer assigned to each test
// method. Assumes that 0 <= shard_index < total_shards.
GTEST_API_
bool
ShouldRunTestOnShard
(
...
...
@@ -352,7 +352,7 @@ class TestPropertyKeyIs {
// TestPropertyKeyIs has NO default constructor.
explicit
TestPropertyKeyIs
(
const
std
::
string
&
key
)
:
key_
(
key
)
{}
// Returns true if
f
the test name of test property matches on key_.
// Returns true if the test name of test property matches on key_.
bool
operator
()(
const
TestProperty
&
test_property
)
const
{
return
test_property
.
key
()
==
key_
;
}
...
...
@@ -385,14 +385,14 @@ class GTEST_API_ UnitTestOptions {
// Functions for processing the gtest_filter flag.
// Returns true if
f
the wildcard pattern matches the string. The
// Returns true if the wildcard pattern matches the string. The
// first ':' or '\0' character in pattern marks the end of it.
//
// This recursive algorithm isn't very efficient, but is clear and
// works well enough for matching test names, which are short.
static
bool
PatternMatchesString
(
const
char
*
pattern
,
const
char
*
str
);
// Returns true if
f
the user-specified filter matches the test suite
// Returns true if the user-specified filter matches the test suite
// name and the test name.
static
bool
FilterMatchesTest
(
const
std
::
string
&
test_suite_name
,
const
std
::
string
&
test_name
);
...
...
@@ -577,10 +577,10 @@ class GTEST_API_ UnitTestImpl {
// Gets the elapsed time, in milliseconds.
TimeInMillis
elapsed_time
()
const
{
return
elapsed_time_
;
}
// Returns true if
f
the unit test passed (i.e. all test suites passed).
// Returns true if the unit test passed (i.e. all test suites passed).
bool
Passed
()
const
{
return
!
Failed
();
}
// Returns true if
f
the unit test failed (i.e. some test suite failed
// Returns true if the unit test failed (i.e. some test suite failed
// or something outside of all tests failed).
bool
Failed
()
const
{
return
failed_test_suite_count
()
>
0
||
ad_hoc_test_result
()
->
Failed
();
...
...
@@ -911,7 +911,7 @@ class GTEST_API_ UnitTestImpl {
// desired.
OsStackTraceGetterInterface
*
os_stack_trace_getter_
;
// True if
f
PostFlagParsingInit() has been called.
// True if PostFlagParsingInit() has been called.
bool
post_flag_parse_init_performed_
;
// The random number seed used at the beginning of the test run.
...
...
googletest/src/gtest-port.cc
View file @
9311242d
...
...
@@ -715,7 +715,7 @@ RE::~RE() {
free
(
const_cast
<
char
*>
(
pattern_
));
}
// Returns true if
f
regular expression re matches the entire str.
// Returns true if regular expression re matches the entire str.
bool
RE
::
FullMatch
(
const
char
*
str
,
const
RE
&
re
)
{
if
(
!
re
.
is_valid_
)
return
false
;
...
...
@@ -723,7 +723,7 @@ bool RE::FullMatch(const char* str, const RE& re) {
return
regexec
(
&
re
.
full_regex_
,
str
,
1
,
&
match
,
0
)
==
0
;
}
// Returns true if
f
regular expression re matches a substring of str
// Returns true if regular expression re matches a substring of str
// (including str itself).
bool
RE
::
PartialMatch
(
const
char
*
str
,
const
RE
&
re
)
{
if
(
!
re
.
is_valid_
)
return
false
;
...
...
@@ -764,13 +764,13 @@ void RE::Init(const char* regex) {
#elif GTEST_USES_SIMPLE_RE
// Returns true if
f
ch appears anywhere in str (excluding the
// Returns true if ch appears anywhere in str (excluding the
// terminating '\0' character).
bool
IsInSet
(
char
ch
,
const
char
*
str
)
{
return
ch
!=
'\0'
&&
strchr
(
str
,
ch
)
!=
nullptr
;
}
// Returns true if
f
ch belongs to the given classification. Unlike
// Returns true if ch belongs to the given classification. Unlike
// similar functions in <ctype.h>, these aren't affected by the
// current locale.
bool
IsAsciiDigit
(
char
ch
)
{
return
'0'
<=
ch
&&
ch
<=
'9'
;
}
...
...
@@ -784,12 +784,12 @@ bool IsAsciiWordChar(char ch) {
(
'0'
<=
ch
&&
ch
<=
'9'
)
||
ch
==
'_'
;
}
// Returns true if
f
"\\c" is a supported escape sequence.
// Returns true if "\\c" is a supported escape sequence.
bool
IsValidEscape
(
char
c
)
{
return
(
IsAsciiPunct
(
c
)
||
IsInSet
(
c
,
"dDfnrsStvwW"
));
}
// Returns true if
f
the given atom (specified by escaped and pattern)
// Returns true if the given atom (specified by escaped and pattern)
// matches ch. The result is undefined if the atom is invalid.
bool
AtomMatchesChar
(
bool
escaped
,
char
pattern_char
,
char
ch
)
{
if
(
escaped
)
{
// "\\p" where p is pattern_char.
...
...
@@ -828,7 +828,7 @@ bool ValidateRegex(const char* regex) {
bool
is_valid
=
true
;
// True if
f
?, *, or + can follow the previous atom.
// True if ?, *, or + can follow the previous atom.
bool
prev_repeatable
=
false
;
for
(
int
i
=
0
;
regex
[
i
];
i
++
)
{
if
(
regex
[
i
]
==
'\\'
)
{
// An escape sequence
...
...
@@ -904,7 +904,7 @@ bool MatchRepetitionAndRegexAtHead(
return
false
;
}
// Returns true if
f
regex matches a prefix of str. regex must be a
// Returns true if regex matches a prefix of str. regex must be a
// valid simple regular expression and not start with "^", or the
// result is undefined.
bool
MatchRegexAtHead
(
const
char
*
regex
,
const
char
*
str
)
{
...
...
@@ -935,7 +935,7 @@ bool MatchRegexAtHead(const char* regex, const char* str) {
}
}
// Returns true if
f
regex matches any substring of str. regex must be
// Returns true if regex matches any substring of str. regex must be
// a valid simple regular expression, or the result is undefined.
//
// The algorithm is recursive, but the recursion depth doesn't exceed
...
...
@@ -964,12 +964,12 @@ RE::~RE() {
free
(
const_cast
<
char
*>
(
full_pattern_
));
}
// Returns true if
f
regular expression re matches the entire str.
// Returns true if regular expression re matches the entire str.
bool
RE
::
FullMatch
(
const
char
*
str
,
const
RE
&
re
)
{
return
re
.
is_valid_
&&
MatchRegexAnywhere
(
re
.
full_pattern_
,
str
);
}
// Returns true if
f
regular expression re matches a substring of str
// Returns true if regular expression re matches a substring of str
// (including str itself).
bool
RE
::
PartialMatch
(
const
char
*
str
,
const
RE
&
re
)
{
return
re
.
is_valid_
&&
MatchRegexAnywhere
(
re
.
pattern_
,
str
);
...
...
@@ -1330,7 +1330,7 @@ bool ParseInt32(const Message& src_text, const char* str, Int32* value) {
// Reads and returns the Boolean environment variable corresponding to
// the given flag; if it's not set, returns default_value.
//
// The value is considered true if
f
it's not "0".
// The value is considered true if it's not "0".
bool
BoolFromGTestEnv
(
const
char
*
flag
,
bool
default_value
)
{
#if defined(GTEST_GET_BOOL_FROM_ENV_)
return
GTEST_GET_BOOL_FROM_ENV_
(
flag
,
default_value
);
...
...
googletest/src/gtest.cc
View file @
9311242d
...
...
@@ -177,7 +177,7 @@ namespace internal {
// stack trace.
const
char
kStackTraceMarker
[]
=
"
\n
Stack trace:
\n
"
;
// g_help_flag is true if
f
the --help flag or an equivalent form is
// g_help_flag is true if the --help flag or an equivalent form is
// specified on the command line.
bool
g_help_flag
=
false
;
...
...
@@ -217,12 +217,12 @@ GTEST_DEFINE_bool_(
GTEST_DEFINE_bool_
(
break_on_failure
,
internal
::
BoolFromGTestEnv
(
"break_on_failure"
,
false
),
"True if
f
a failed assertion should be a debugger break-point."
);
"True if a failed assertion should be a debugger break-point."
);
GTEST_DEFINE_bool_
(
catch_exceptions
,
internal
::
BoolFromGTestEnv
(
"catch_exceptions"
,
true
),
"True if
f
"
GTEST_NAME_
"True if "
GTEST_NAME_
" should catch exceptions and treat them as test failures."
);
GTEST_DEFINE_string_
(
...
...
@@ -273,13 +273,13 @@ GTEST_DEFINE_string_(
GTEST_DEFINE_bool_
(
print_time
,
internal
::
BoolFromGTestEnv
(
"print_time"
,
true
),
"True if
f
"
GTEST_NAME_
"True if "
GTEST_NAME_
" should display elapsed time in text output."
);
GTEST_DEFINE_bool_
(
print_utf8
,
internal
::
BoolFromGTestEnv
(
"print_utf8"
,
true
),
"True if
f
"
GTEST_NAME_
"True if "
GTEST_NAME_
" prints UTF8 characters as text."
);
GTEST_DEFINE_int32_
(
...
...
@@ -296,13 +296,13 @@ GTEST_DEFINE_int32_(
GTEST_DEFINE_bool_
(
show_internal_stack_frames
,
false
,
"True if
f
"
GTEST_NAME_
" should include internal stack frames when "
"True if "
GTEST_NAME_
" should include internal stack frames when "
"printing test failure stack traces."
);
GTEST_DEFINE_bool_
(
shuffle
,
internal
::
BoolFromGTestEnv
(
"shuffle"
,
false
),
"True if
f
"
GTEST_NAME_
"True if "
GTEST_NAME_
" should randomize tests' order on every run."
);
GTEST_DEFINE_int32_
(
...
...
@@ -354,7 +354,7 @@ UInt32 Random::Generate(UInt32 range) {
return
state_
%
range
;
}
// GTestIsInitialized() returns true if
f
the user has initialized
// GTestIsInitialized() returns true if the user has initialized
// Google Test. Useful for catching the user mistake of not initializing
// Google Test before calling RUN_ALL_TESTS().
static
bool
GTestIsInitialized
()
{
return
GetArgvs
().
size
()
>
0
;
}
...
...
@@ -371,17 +371,17 @@ static int SumOverTestSuiteList(const std::vector<TestSuite*>& case_list,
return
sum
;
}
// Returns true if
f
the test suite passed.
// Returns true if the test suite passed.
static
bool
TestSuitePassed
(
const
TestSuite
*
test_suite
)
{
return
test_suite
->
should_run
()
&&
test_suite
->
Passed
();
}
// Returns true if
f
the test suite failed.
// Returns true if the test suite failed.
static
bool
TestSuiteFailed
(
const
TestSuite
*
test_suite
)
{
return
test_suite
->
should_run
()
&&
test_suite
->
Failed
();
}
// Returns true if
f
test_suite contains at least one test that should
// Returns true if test_suite contains at least one test that should
// run.
static
bool
ShouldRunTestSuite
(
const
TestSuite
*
test_suite
)
{
return
test_suite
->
should_run
();
...
...
@@ -482,7 +482,7 @@ std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
return
result
.
string
();
}
// Returns true if
f
the wildcard pattern matches the string. The
// Returns true if the wildcard pattern matches the string. The
// first ':' or '\0' character in pattern marks the end of it.
//
// This recursive algorithm isn't very efficient, but is clear and
...
...
@@ -525,7 +525,7 @@ bool UnitTestOptions::MatchesFilter(
}
}
// Returns true if
f
the user-specified filter matches the test suite
// Returns true if the user-specified filter matches the test suite
// name and the test name.
bool
UnitTestOptions
::
FilterMatchesTest
(
const
std
::
string
&
test_suite_name
,
const
std
::
string
&
test_name
)
{
...
...
@@ -910,7 +910,7 @@ const char* String::Utf16ToAnsi(LPCWSTR utf16_str) {
#endif // GTEST_OS_WINDOWS_MOBILE
// Compares two C strings. Returns true if
f
they have the same content.
// Compares two C strings. Returns true if they have the same content.
//
// Unlike strcmp(), this function can handle NULL argument(s). A NULL
// C string is considered different to any non-NULL C string,
...
...
@@ -1320,7 +1320,7 @@ std::vector<std::string> SplitEscapedString(const std::string& str) {
// lhs_value: "5"
// rhs_value: "6"
//
// The ignoring_case parameter is true if
f
the assertion is a
// The ignoring_case parameter is true if the assertion is a
// *_STRCASEEQ*. When it's true, the string "Ignoring case" will
// be inserted into the message.
AssertionResult
EqFailure
(
const
char
*
lhs_expression
,
...
...
@@ -1563,7 +1563,7 @@ namespace {
// Helper functions for implementing IsSubString() and IsNotSubstring().
// This group of overloaded functions return true if
f
needle is a
// This group of overloaded functions return true if needle is a
// substring of haystack. NULL is considered a substring of itself
// only.
...
...
@@ -1865,7 +1865,7 @@ std::string String::ShowWideCString(const wchar_t * wide_c_str) {
return
internal
::
WideStringToUtf8
(
wide_c_str
,
-
1
);
}
// Compares two wide C strings. Returns true if
f
they have the same
// Compares two wide C strings. Returns true if they have the same
// content.
//
// Unlike wcscmp(), this function can handle NULL argument(s). A NULL
...
...
@@ -1910,7 +1910,7 @@ AssertionResult CmpHelperSTRNE(const char* s1_expression,
<<
" vs "
<<
PrintToString
(
s2
);
}
// Compares two C strings, ignoring case. Returns true if
f
they have
// Compares two C strings, ignoring case. Returns true if they have
// the same content.
//
// Unlike strcasecmp(), this function can handle NULL argument(s). A
...
...
@@ -1922,7 +1922,7 @@ bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
return
posix
::
StrCaseCmp
(
lhs
,
rhs
)
==
0
;
}
// Compares two wide C strings, ignoring case. Returns true if
f
they
// Compares two wide C strings, ignoring case. Returns true if they
// have the same content.
//
// Unlike wcscasecmp(), this function can handle NULL argument(s).
...
...
@@ -1956,7 +1956,7 @@ bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
#endif // OS selector
}
// Returns true if
f
str ends with the given suffix, ignoring case.
// Returns true if str ends with the given suffix, ignoring case.
// Any string is considered to end with an empty suffix.
bool
String
::
EndsWithCaseInsensitive
(
const
std
::
string
&
str
,
const
std
::
string
&
suffix
)
{
...
...
@@ -2198,12 +2198,12 @@ static bool TestPartSkipped(const TestPartResult& result) {
return
result
.
skipped
();
}
// Returns true if
f
the test was skipped.
// Returns true if the test was skipped.
bool
TestResult
::
Skipped
()
const
{
return
!
Failed
()
&&
CountIf
(
test_part_results_
,
TestPartSkipped
)
>
0
;
}
// Returns true if
f
the test failed.
// Returns true if the test failed.
bool
TestResult
::
Failed
()
const
{
for
(
int
i
=
0
;
i
<
total_part_count
();
++
i
)
{
if
(
GetTestPartResult
(
i
).
failed
())
...
...
@@ -2212,22 +2212,22 @@ bool TestResult::Failed() const {
return
false
;
}
// Returns true if
f
the test part fatally failed.
// Returns true if the test part fatally failed.
static
bool
TestPartFatallyFailed
(
const
TestPartResult
&
result
)
{
return
result
.
fatally_failed
();
}
// Returns true if
f
the test fatally failed.
// Returns true if the test fatally failed.
bool
TestResult
::
HasFatalFailure
()
const
{
return
CountIf
(
test_part_results_
,
TestPartFatallyFailed
)
>
0
;
}
// Returns true if
f
the test part non-fatally failed.
// Returns true if the test part non-fatally failed.
static
bool
TestPartNonfatallyFailed
(
const
TestPartResult
&
result
)
{
return
result
.
nonfatally_failed
();
}
// Returns true if
f
the test has a non-fatal failure.
// Returns true if the test has a non-fatal failure.
bool
TestResult
::
HasNonfatalFailure
()
const
{
return
CountIf
(
test_part_results_
,
TestPartNonfatallyFailed
)
>
0
;
}
...
...
@@ -2523,18 +2523,18 @@ void Test::Run() {
this
,
&
Test
::
TearDown
,
"TearDown()"
);
}
// Returns true if
f
the current test has a fatal failure.
// Returns true if the current test has a fatal failure.
bool
Test
::
HasFatalFailure
()
{
return
internal
::
GetUnitTestImpl
()
->
current_test_result
()
->
HasFatalFailure
();
}
// Returns true if
f
the current test has a non-fatal failure.
// Returns true if the current test has a non-fatal failure.
bool
Test
::
HasNonfatalFailure
()
{
return
internal
::
GetUnitTestImpl
()
->
current_test_result
()
->
HasNonfatalFailure
();
}
// Returns true if
f
the current test was skipped.
// Returns true if the current test was skipped.
bool
Test
::
IsSkipped
()
{
return
internal
::
GetUnitTestImpl
()
->
current_test_result
()
->
Skipped
();
}
...
...
@@ -2633,7 +2633,7 @@ class TestNameIs {
explicit
TestNameIs
(
const
char
*
name
)
:
name_
(
name
)
{}
// Returns true if
f
the test name of test_info matches name_.
// Returns true if the test name of test_info matches name_.
bool
operator
()(
const
TestInfo
*
test_info
)
const
{
return
test_info
&&
test_info
->
name
()
==
name_
;
}
...
...
@@ -2992,7 +2992,7 @@ static const char* GetAnsiColorCode(GTestColor color) {
#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
// Returns true if
f
Google Test should use colors in the output.
// Returns true if Google Test should use colors in the output.
bool
ShouldUseColor
(
bool
stdout_is_tty
)
{
const
char
*
const
gtest_color
=
GTEST_FLAG
(
color
).
c_str
();
...
...
@@ -4669,10 +4669,10 @@ internal::TimeInMillis UnitTest::elapsed_time() const {
return
impl
()
->
elapsed_time
();
}
// Returns true if
f
the unit test passed (i.e. all test suites passed).
// Returns true if the unit test passed (i.e. all test suites passed).
bool
UnitTest
::
Passed
()
const
{
return
impl
()
->
Passed
();
}
// Returns true if
f
the unit test failed (i.e. some test suite failed
// Returns true if the unit test failed (i.e. some test suite failed
// or something outside of all tests failed).
bool
UnitTest
::
Failed
()
const
{
return
impl
()
->
Failed
();
}
...
...
@@ -5111,7 +5111,7 @@ class TestSuiteNameIs {
// Constructor.
explicit
TestSuiteNameIs
(
const
std
::
string
&
name
)
:
name_
(
name
)
{}
// Returns true if
f
the name of test_suite matches name_.
// Returns true if the name of test_suite matches name_.
bool
operator
()(
const
TestSuite
*
test_suite
)
const
{
return
test_suite
!=
nullptr
&&
strcmp
(
test_suite
->
name
(),
name_
.
c_str
())
==
0
;
...
...
@@ -5182,7 +5182,7 @@ static void TearDownEnvironment(Environment* env) { env->TearDown(); }
// All other functions called from RunAllTests() may safely assume that
// parameterized tests are ready to be counted and run.
bool
UnitTestImpl
::
RunAllTests
()
{
// True if
f
Google Test is initialized before RUN_ALL_TESTS() is called.
// True if Google Test is initialized before RUN_ALL_TESTS() is called.
const
bool
gtest_is_initialized_before_run_all_tests
=
GTestIsInitialized
();
// Do not run any test if the --help flag was specified.
...
...
@@ -5198,7 +5198,7 @@ bool UnitTestImpl::RunAllTests() {
// protocol.
internal
::
WriteToShardStatusFileIfNeeded
();
// True if
f
we are in a subprocess for running a thread-safe-style
// True if we are in a subprocess for running a thread-safe-style
// death test.
bool
in_subprocess_for_death_test
=
false
;
...
...
@@ -5231,7 +5231,7 @@ bool UnitTestImpl::RunAllTests() {
random_seed_
=
GTEST_FLAG
(
shuffle
)
?
GetRandomSeedFromFlag
(
GTEST_FLAG
(
random_seed
))
:
0
;
// True if
f
at least one test has failed.
// True if at least one test has failed.
bool
failed
=
false
;
TestEventListener
*
repeater
=
listeners
()
->
repeater
();
...
...
@@ -5429,7 +5429,7 @@ Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) {
}
// Given the total number of shards, the shard index, and the test id,
// returns true if
f
the test should be run on this shard. The test id is
// returns true if the test should be run on this shard. The test id is
// some arbitrary but unique non-negative integer assigned to each test
// method. Assumes that 0 <= shard_index < total_shards.
bool
ShouldRunTestOnShard
(
int
total_shards
,
int
shard_index
,
int
test_id
)
{
...
...
@@ -6003,7 +6003,7 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
void
ParseGoogleTestFlagsOnly
(
int
*
argc
,
char
**
argv
)
{
ParseGoogleTestFlagsOnlyImpl
(
argc
,
argv
);
// Fix the value of *_NSGetArgc() on macOS, but if
f
// Fix the value of *_NSGetArgc() on macOS, but if
// *_NSGetArgv() == argv
// Only applicable to char** version of argv
#if GTEST_OS_MAC
...
...
googletest/test/googletest-death-test-test.cc
View file @
9311242d
...
...
@@ -139,7 +139,7 @@ class TestForDeathTest : public testing::Test {
DieInside
(
"MemberFunction"
);
}
// True if
f
MemberFunction() should die.
// True if MemberFunction() should die.
bool
should_die_
;
const
FilePath
original_dir_
;
};
...
...
@@ -156,7 +156,7 @@ class MayDie {
}
private:
// True if
f
MemberFunction() should die.
// True if MemberFunction() should die.
bool
should_die_
;
};
...
...
@@ -551,7 +551,7 @@ TEST_F(TestForDeathTest, ErrorMessageMismatch) {
},
"died but not with expected error"
);
}
// On exit, *aborted will be true if
f
the EXPECT_DEATH() statement
// On exit, *aborted will be true if the EXPECT_DEATH() statement
// aborted the function.
void
ExpectDeathTestHelper
(
bool
*
aborted
)
{
*
aborted
=
true
;
...
...
googletest/test/googletest-throw-on-failure-test.py
View file @
9311242d
...
...
@@ -86,7 +86,7 @@ class ThrowOnFailureTest(gtest_test_utils.TestCase):
variable; None if the variable should be unset.
flag_value: value of the --gtest_break_on_failure flag;
None if the flag should not be present.
should_fail: True if
f
the program is expected to fail.
should_fail: True if the program is expected to fail.
"""
SetEnvVar
(
THROW_ON_FAILURE
,
env_var_value
)
...
...
googletest/test/gtest_environment_test.cc
View file @
9311242d
...
...
@@ -116,7 +116,7 @@ void Check(bool condition, const char* msg) {
}
}
// Runs the tests. Return true if
f
successful.
// Runs the tests. Return true if successful.
//
// The 'failure' parameter specifies the type of failure that should
// be generated by the global set-up.
...
...
googletest/test/gtest_pred_impl_unittest.cc
View file @
9311242d
...
...
@@ -144,10 +144,10 @@ class Predicate1Test : public testing::Test {
}
}
// true if
f
the test function is expected to run to finish.
// true if the test function is expected to run to finish.
static
bool
expected_to_finish_
;
// true if
f
the test function did run to finish.
// true if the test function did run to finish.
static
bool
finished_
;
static
int
n1_
;
...
...
@@ -539,10 +539,10 @@ class Predicate2Test : public testing::Test {
}
}
// true if
f
the test function is expected to run to finish.
// true if the test function is expected to run to finish.
static
bool
expected_to_finish_
;
// true if
f
the test function did run to finish.
// true if the test function did run to finish.
static
bool
finished_
;
static
int
n1_
;
...
...
@@ -976,10 +976,10 @@ class Predicate3Test : public testing::Test {
}
}
// true if
f
the test function is expected to run to finish.
// true if the test function is expected to run to finish.
static
bool
expected_to_finish_
;
// true if
f
the test function did run to finish.
// true if the test function did run to finish.
static
bool
finished_
;
static
int
n1_
;
...
...
@@ -1455,10 +1455,10 @@ class Predicate4Test : public testing::Test {
}
}
// true if
f
the test function is expected to run to finish.
// true if the test function is expected to run to finish.
static
bool
expected_to_finish_
;
// true if
f
the test function did run to finish.
// true if the test function did run to finish.
static
bool
finished_
;
static
int
n1_
;
...
...
@@ -1976,10 +1976,10 @@ class Predicate5Test : public testing::Test {
}
}
// true if
f
the test function is expected to run to finish.
// true if the test function is expected to run to finish.
static
bool
expected_to_finish_
;
// true if
f
the test function did run to finish.
// true if the test function did run to finish.
static
bool
finished_
;
static
int
n1_
;
...
...
googletest/test/gtest_premature_exit_test.cc
View file @
9311242d
...
...
@@ -45,7 +45,7 @@ namespace {
class
PrematureExitTest
:
public
Test
{
public:
// Returns true if
f
the given file exists.
// Returns true if the given file exists.
static
bool
FileExists
(
const
char
*
filepath
)
{
StatStruct
stat
;
return
Stat
(
filepath
,
&
stat
)
==
0
;
...
...
@@ -61,7 +61,7 @@ class PrematureExitTest : public Test {
}
}
// Returns true if
f
the premature-exit file exists.
// Returns true if the premature-exit file exists.
bool
PrematureExitFileExists
()
const
{
return
FileExists
(
premature_exit_file_path_
);
}
...
...
Prev
1
2
3
Next
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