summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCopybara-Service <copybara-worker@google.com>2022-03-22 21:59:23 (GMT)
committerCopybara-Service <copybara-worker@google.com>2022-03-22 21:59:23 (GMT)
commit0affd45b62371c1de44064a5a5f8817242208442 (patch)
tree9dd9a00241931e155b511d4101f8b0a205416fc0
parent5d6f38c1e2bc5e462e7bbb743903479ee2c54f7e (diff)
parent9e712372214d75bb30ec2847a44bf124d48096f3 (diff)
downloadgoogletest-0affd45b62371c1de44064a5a5f8817242208442.zip
googletest-0affd45b62371c1de44064a5a5f8817242208442.tar.gz
googletest-0affd45b62371c1de44064a5a5f8817242208442.tar.bz2
Merge pull request #3779 from messerb5467:promote-inclusive-behavior
PiperOrigin-RevId: 436579789 Change-Id: I19faae341027efba83f1c2b3839636fc95780fc7
-rw-r--r--googlemock/test/gmock-matchers_test.cc2
-rw-r--r--googletest/test/googletest-output-test_.cc2
-rw-r--r--googletest/test/googletest-printers-test.cc2
-rw-r--r--googletest/test/gtest_unittest.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index 06a5634..45d5241 100644
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@ -7606,7 +7606,7 @@ TEST(ElementsAreArrayTest, CanBeCreatedWithIteratorRange) {
}
// Since ElementsAre() and ElementsAreArray() share much of the
-// implementation, we only do a sanity test for native arrays here.
+// implementation, we only do a test for native arrays here.
TEST(ElementsAreArrayTest, WorksWithNativeArray) {
::std::string a[] = {"hi", "ho"};
::std::string b[] = {"hi", "ho"};
diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc
index 1de2828..c2f96d9 100644
--- a/googletest/test/googletest-output-test_.cc
+++ b/googletest/test/googletest-output-test_.cc
@@ -1019,7 +1019,7 @@ int main(int argc, char** argv) {
// this program with the golden file.
// It's hard to test InitGoogleTest() directly, as it has many
- // global side effects. The following line serves as a sanity test
+ // global side effects. The following line serves as a test
// for it.
testing::InitGoogleTest(&argc, argv);
bool internal_skip_environment_and_ad_hoc_tests =
diff --git a/googletest/test/googletest-printers-test.cc b/googletest/test/googletest-printers-test.cc
index 142c980..acfecf9 100644
--- a/googletest/test/googletest-printers-test.cc
+++ b/googletest/test/googletest-printers-test.cc
@@ -1593,7 +1593,7 @@ TEST(PrintToStringTest, WorksForCharArrayWithEmbeddedNul) {
}
TEST(PrintToStringTest, ContainsNonLatin) {
- // Sanity test with valid UTF-8. Prints both in hex and as text.
+ // Test with valid UTF-8. Prints both in hex and as text.
std::string non_ascii_str = ::std::string("오전 4:30");
EXPECT_PRINT_TO_STRING_(non_ascii_str,
"\"\\xEC\\x98\\xA4\\xEC\\xA0\\x84 4:30\"\n"
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index 34ec751..9b26899 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -7059,7 +7059,7 @@ TEST(EventListenerTest, RemovingDefaultXmlGeneratorWorks) {
delete listener;
}
-// Sanity tests to ensure that the alternative, verbose spellings of
+// Tests to ensure that the alternative, verbose spellings of
// some of the macros work. We don't test them thoroughly as that
// would be quite involved. Since their implementations are
// straightforward, and they are rarely used, we'll just rely on the