[Lldb-commits] [lldb] [LLDB][NFC]Refactor common test setup into SetUp method (PR #131203)

[Vy Nguyen via lldb-commits]

https://github.com/oontvoo updated https://github.com/llvm/llvm-project/pull/131203

>From cff4bbc4ff68e77e3093a880f55d2e17116e6f37 Mon Sep 17 00:00:00 2001
From: Vy Nguyen <vyng at google.com>
Date: Thu, 13 Mar 2025 15:57:48 -0400
Subject: [PATCH 1/2] [LLDB][NFC]Refactor common test setup into SetUp method

---
 lldb/unittests/Core/TelemetryTest.cpp | 35 ++++++++++++---------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/lldb/unittests/Core/TelemetryTest.cpp b/lldb/unittests/Core/TelemetryTest.cpp
index 72db8c17f09ea..f7dab948faba1 100644
--- a/lldb/unittests/Core/TelemetryTest.cpp
+++ b/lldb/unittests/Core/TelemetryTest.cpp
@@ -81,6 +81,20 @@ using namespace lldb_private::telemetry;
 class TelemetryTest : public testing::Test {
 public:
   lldb_private::SubsystemRAII<lldb_private::FakePlugin> subsystems;
+  std::vector<std::unique_ptr<::llvm::telemetry::TelemetryInfo>>
+      received_entries;
+
+  void SetUp() override {
+    // This would have been called by the plugin reg in a "real" pluging
+    // For tests, we just call it directly.
+    lldb_private::FakePlugin::Initialize();
+
+    auto *ins = lldb_private::telemetry::TelemetryManager::GetInstance();
+    ASSERT_NE(ins, nullptr);
+
+    ins->addDestination(
+        std::make_unique<lldb_private::TestDestination>(&received_entries));
+  }
 };
 
 #if LLVM_ENABLE_TELEMETRY
@@ -90,17 +104,8 @@ class TelemetryTest : public testing::Test {
 #endif
 
 TELEMETRY_TEST(TelemetryTest, PluginTest) {
-  // This would have been called by the plugin reg in a "real" plugin
-  // For tests, we just call it directly.
-  lldb_private::FakePlugin::Initialize();
-
-  auto *ins = lldb_private::telemetry::TelemetryManager::GetInstance();
-  ASSERT_NE(ins, nullptr);
-
-  std::vector<std::unique_ptr<::llvm::telemetry::TelemetryInfo>>
-      received_entries;
-  ins->addDestination(
-      std::make_unique<lldb_private::TestDestination>(&received_entries));
+  lldb_private::telemetry::TelemetryManager *ins =
+      lldb_private::telemetry::TelemetryManager::GetInstance();
 
   lldb_private::FakeTelemetryInfo entry;
   entry.msg = "";
@@ -115,14 +120,6 @@ TELEMETRY_TEST(TelemetryTest, PluginTest) {
 }
 
 TELEMETRY_TEST(TelemetryTest, ScopedDispatcherTest) {
-  lldb_private::FakePlugin::Initialize();
-  auto *ins = TelemetryManager::GetInstance();
-  ASSERT_NE(ins, nullptr);
-  std::vector<std::unique_ptr<::llvm::telemetry::TelemetryInfo>>
-      received_entries;
-  ins->addDestination(
-      std::make_unique<lldb_private::TestDestination>(&received_entries));
-
   {
     ScopedDispatcher<lldb_private::FakeTelemetryInfo> helper(
         [](lldb_private::FakeTelemetryInfo *info) { info->num = 0; });

>From 8106df8a72759b4ecc11d3d01edab4555fa6660a Mon Sep 17 00:00:00 2001
From: Vy Nguyen <vyng at google.com>
Date: Mon, 17 Mar 2025 09:41:20 -0400
Subject: [PATCH 2/2] remove call to Init

---
 lldb/unittests/Core/TelemetryTest.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lldb/unittests/Core/TelemetryTest.cpp b/lldb/unittests/Core/TelemetryTest.cpp
index f7dab948faba1..1e41424bac3ce 100644
--- a/lldb/unittests/Core/TelemetryTest.cpp
+++ b/lldb/unittests/Core/TelemetryTest.cpp
@@ -85,10 +85,6 @@ class TelemetryTest : public testing::Test {
       received_entries;
 
   void SetUp() override {
-    // This would have been called by the plugin reg in a "real" pluging
-    // For tests, we just call it directly.
-    lldb_private::FakePlugin::Initialize();
-
     auto *ins = lldb_private::telemetry::TelemetryManager::GetInstance();
     ASSERT_NE(ins, nullptr);