diff options
author | Copybara-Service <copybara-worker@google.com> | 2024-03-18 13:34:04 -0700 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2024-03-18 13:34:04 -0700 |
commit | eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7 (patch) | |
tree | eeb8565433e049e7cc9d037348a9e0379e4fcdb1 /googletest | |
parent | c231e6f5b152029dbd5fa4a9e0c04095035aec3f (diff) | |
parent | a1a608348ee09747d27a1501debf9c975142d06a (diff) | |
download | googletest-eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7.zip googletest-eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7.tar.gz googletest-eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7.tar.bz2 |
Merge pull request #4490 from memdo:main
PiperOrigin-RevId: 616931521
Change-Id: Iffbb24e3f9add4e7acf8f1988a03afc8628b0733
Diffstat (limited to 'googletest')
-rw-r--r-- | googletest/src/gtest.cc | 13 | ||||
-rwxr-xr-x | googletest/test/googletest-color-test.py | 1 | ||||
-rw-r--r-- | googletest/test/gtest_unittest.cc | 9 |
3 files changed, 13 insertions, 10 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index d4292ae..36f4a2d 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3270,6 +3270,7 @@ bool ShouldUseColor(bool stdout_is_tty) { term != nullptr && (String::CStringEquals(term, "xterm") || String::CStringEquals(term, "xterm-color") || String::CStringEquals(term, "xterm-kitty") || + String::CStringEquals(term, "alacritty") || String::CStringEquals(term, "screen") || String::CStringEquals(term, "tmux") || String::CStringEquals(term, "rxvt-unicode") || @@ -4437,8 +4438,8 @@ std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes( Message attributes; for (int i = 0; i < result.test_property_count(); ++i) { const TestProperty& property = result.GetTestProperty(i); - attributes << " " << property.key() << "=" - << "\"" << EscapeXmlAttribute(property.value()) << "\""; + attributes << " " << property.key() << "=" << "\"" + << EscapeXmlAttribute(property.value()) << "\""; } return attributes.GetString(); } @@ -4748,9 +4749,7 @@ void JsonUnitTestResultPrinter::OutputJsonTestResult(::std::ostream* stream, if (part.failed()) { *stream << ",\n"; if (++failures == 1) { - *stream << kIndent << "\"" - << "failures" - << "\": [\n"; + *stream << kIndent << "\"" << "failures" << "\": [\n"; } const std::string location = internal::FormatCompilerIndependentFileLocation(part.file_name(), @@ -4900,8 +4899,8 @@ std::string JsonUnitTestResultPrinter::TestPropertiesAsJson( for (int i = 0; i < result.test_property_count(); ++i) { const TestProperty& property = result.GetTestProperty(i); attributes << ",\n" - << indent << "\"" << property.key() << "\": " - << "\"" << EscapeJson(property.value()) << "\""; + << indent << "\"" << property.key() << "\": " << "\"" + << EscapeJson(property.value()) << "\""; } return attributes.GetString(); } diff --git a/googletest/test/googletest-color-test.py b/googletest/test/googletest-color-test.py index 8926a48..8968cf1 100755 --- a/googletest/test/googletest-color-test.py +++ b/googletest/test/googletest-color-test.py @@ -80,6 +80,7 @@ class GTestColorTest(gtest_test_utils.TestCase): self.assertTrue(UsesColor('xterm', None, None)) self.assertTrue(UsesColor('xterm-color', None, None)) self.assertTrue(UsesColor('xterm-kitty', None, None)) + self.assertTrue(UsesColor('alacritty', None, None)) self.assertTrue(UsesColor('xterm-256color', None, None)) def testFlagOnly(self): diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 0b383ea..5d7cfb0 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -4172,8 +4172,8 @@ TEST(AssertionSyntaxTest, ExceptionAssertionsBehavesLikeSingleStatement) { #endif TEST(AssertionSyntaxTest, NoFatalFailureAssertionsBehavesLikeSingleStatement) { if (AlwaysFalse()) - EXPECT_NO_FATAL_FAILURE(FAIL()) << "This should never be executed. " - << "It's a compilation test only."; + EXPECT_NO_FATAL_FAILURE(FAIL()) + << "This should never be executed. " << "It's a compilation test only."; else ; // NOLINT @@ -6671,6 +6671,9 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) { SetEnv("TERM", "xterm-kitty"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. + SetEnv("TERM", "alacritty"); // TERM supports colors. + EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. + SetEnv("TERM", "xterm-256color"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. @@ -6695,7 +6698,7 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) { SetEnv("TERM", "linux"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - SetEnv("TERM", "cygwin"); // TERM supports colors. + SetEnv("TERM", "cygwin"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. #endif // GTEST_OS_WINDOWS } |