Merge a7890fc76b45a46183c575329819c7f92d6a4fa5 into add971c7cb497d40985b48641891bf9b51423730

InitGoogleMockTest.ParsesMultipleFlags was using wchar_t
This seems like an inadvertent copy&paste error duplicating WideInitGoogleMockTest.ParsesMultipleFlags
2026-06-15 08:26:11 +08:00 · 2026-05-22 02:21:04 +10:00 · 2024-04-18 10:44:49 -05:00 · 2024-04-07 17:13:55 +00:00
2 changed files with 4 additions and 4 deletions
--- a/googlemock/test/gmock_test.cc
+++ b/googlemock/test/gmock_test.cc
@ -87,10 +87,10 @@ TEST(InitGoogleMockTest, ParsesSingleFlag) {

 TEST(InitGoogleMockTest, ParsesMultipleFlags) {
  int old_default_behavior = GMOCK_FLAG_GET(default_mock_behavior);
-  const wchar_t* argv[] = {L"foo.exe", L"--gmock_verbose=info",
-                           L"--gmock_default_mock_behavior=2", nullptr};
+  const char* argv[] = {"foo.exe", "--gmock_verbose=info",
+                        "--gmock_default_mock_behavior=2", nullptr};

-  const wchar_t* new_argv[] = {L"foo.exe", nullptr};
+  const char* new_argv[] = {"foo.exe", nullptr};

  TestInitGoogleMock(argv, new_argv, "info");
  EXPECT_EQ(2, GMOCK_FLAG_GET(default_mock_behavior));
--- a/googletest/test/googletest-output-test.py
+++ b/googletest/test/googletest-output-test.py
@ -175,7 +175,7 @@ def RemoveTestCounts(output):
  output = re.sub(r'\d+ tests?, listed below', '? tests, listed below', output)
  output = re.sub(r'\d+ FAILED TESTS', '? FAILED TESTS', output)
  output = re.sub(
-      r'\d+ tests? from \d+ test cases?', '? tests from ? test cases', output
+      r'\d+ tests? from \d+ test suites?', '? tests from ? test suites', output
  )
  output = re.sub(r'\d+ tests? from ([a-zA-Z_])', r'? tests from \1', output)
  return re.sub(r'\d+ tests?\.', '? tests.', output)
Author	SHA1	Message	Date
Kevin Puetz	2f2dd95d9c	Merge a7890fc76b45a46183c575329819c7f92d6a4fa5 into add971c7cb497d40985b48641891bf9b51423730	2026-05-22 02:21:04 +10:00
Kevin Puetz	a7890fc76b	InitGoogleMockTest.ParsesMultipleFlags was using wchar_t This seems like an inadvertent copy&paste error duplicating WideInitGoogleMockTest.ParsesMultipleFlags	2024-04-18 10:44:49 -05:00
Kevin Puetz	01f9c536ce	googletest-output-test: fix RemoveTestCounts for non-golden platforms This seems to have been missed when renaming "test cases" -> "test suites" in 3a460a26b7a91abf87af7f31b93d29f930e25c82. Presumably no such platform is regularly tested...	2024-04-07 17:13:55 +00:00