Merge aaebbb24f65fe9ba33c679b4c1ea4311948b168e into 3ff51c3e80f2c2eb105d43ecb9acab9a62e01600

Merge pull request #5041 from alvinjaison:fix/get-test-suite-shuffle-index
PiperOrigin-RevId: 955317170 Change-Id: I40e01cdafe58768ccdb743dcf38717e48edcde41
2026-07-30 16:26:24 +08:00 · 2026-07-28 21:05:59 -07:00 · 2026-07-28 09:58:12 -07:00 · 2026-07-24 16:11:55 +01:00 · 2025-01-17 15:26:35 -08:00
2 changed files with 4 additions and 3 deletions
--- a/googletest/src/gtest-internal-inl.h
+++ b/googletest/src/gtest-internal-inl.h
@ -587,7 +587,7 @@ class GTEST_API_ UnitTestImpl {
  // total_test_suite_count() - 1. If i is not in that range, returns NULL.
  const TestSuite* GetTestSuite(int i) const {
    const int index = GetElementOr(test_suite_indices_, i, -1);
-    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(i)];
+    return index < 0 ? nullptr : test_suites_[static_cast<size_t>(index)];
  }

  //  Legacy API is deprecated but still available
@ -1193,7 +1193,8 @@ class StreamingListener : public EmptyTestEventListener {

  void OnTestEnd(const TestInfo& test_info) override {
    SendLn("event=TestEnd&passed=" +
-           FormatBool((test_info.result())->Passed()) + "&elapsed_time=" +
+           FormatBool((test_info.result())->Passed()) + "&skipped=" +
+           FormatBool((test_info.result())->Skipped()) + "&elapsed_time=" +
           StreamableToString((test_info.result())->elapsed_time()) + "ms");
  }

--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@ -167,7 +167,7 @@ TEST_F(StreamingListenerTest, OnTestStart) {
 TEST_F(StreamingListenerTest, OnTestEnd) {
  *output() = "";
  streamer_.OnTestEnd(test_info_obj_);
-  EXPECT_EQ("event=TestEnd&passed=1&elapsed_time=0ms\n", *output());
+  EXPECT_EQ("event=TestEnd&passed=1&skipped=0&elapsed_time=0ms\n", *output());
 }

 TEST_F(StreamingListenerTest, OnTestPartResult) {
Author	SHA1	Message	Date
David Matson	aa9cfd1b60	Merge aaebbb24f65fe9ba33c679b4c1ea4311948b168e into 3ff51c3e80f2c2eb105d43ecb9acab9a62e01600	2026-07-28 21:05:59 -07:00
Copybara-Service	3ff51c3e80	Merge pull request #5041 from alvinjaison:fix/get-test-suite-shuffle-index PiperOrigin-RevId: 955317170 Change-Id: I40e01cdafe58768ccdb743dcf38717e48edcde41	2026-07-28 09:58:12 -07:00
Alvin Jaison	1269db9643	Fix GetTestSuite(i) ignoring shuffle order UnitTestImpl::GetTestSuite(int i) computes the shuffled index from test_suite_indices_ but then accesses test_suites_ using the raw parameter 'i' instead of the computed 'index'. This causes the public API UnitTest::GetTestSuite(i) to return test suites in original registration order rather than the active shuffle order. The mutable variant GetMutableSuiteCase(i) correctly uses 'index', and the equivalent function TestSuite::GetTestInfo(i) also uses 'index'. This was a copy-paste typo introduced in commit bd851333 (Sep 2009) when the shuffle feature was first added. The bug is observable from within TestEventListener callbacks during test execution when --gtest_shuffle is active.	2026-07-24 16:11:55 +01:00
David Matson	aaebbb24f6	Add skipped= to streaming results TestEnd event (fixes #3411 ).	2025-01-17 15:26:35 -08:00