From b06a1ef85dcb3fd31bf8289f50c0cd51122160ed Mon Sep 17 00:00:00 2001 From: Ruslan Lesiutin Date: Fri, 14 Jun 2024 07:13:47 -0700 Subject: [PATCH] FuseboxTracer: fix internal and oss tests Summary: # Changelog: [Internal] Differential Revision: D58586169 --- .../jsinspector-modern/CMakeLists.txt | 1 + .../reactperflogger/CMakeLists.txt | 4 ++- .../fusebox/tests/FuseboxTracerTest.cpp | 26 ++++++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt b/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt index cbbc44f6dd0162..73994bd2ecacfd 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt +++ b/packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt @@ -23,4 +23,5 @@ target_link_libraries(jsinspector glog react_featureflags runtimeexecutor + reactperflogger ) diff --git a/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt b/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt index 1f19cda575dfda..5d0da3f9e37833 100644 --- a/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt +++ b/packages/react-native/ReactCommon/reactperflogger/CMakeLists.txt @@ -13,7 +13,9 @@ add_compile_options( -Wall -Wpedantic) -file(GLOB reactperflogger_SRC CONFIGURE_DEPENDS reactperflogger/*.cpp) +file(GLOB reactperflogger_SRC CONFIGURE_DEPENDS + reactperflogger/*.cpp + reactperflogger/fusebox/*.cpp) add_library(reactperflogger STATIC ${reactperflogger_SRC}) target_include_directories(reactperflogger PUBLIC .) diff --git a/packages/react-native/ReactCommon/reactperflogger/fusebox/tests/FuseboxTracerTest.cpp b/packages/react-native/ReactCommon/reactperflogger/fusebox/tests/FuseboxTracerTest.cpp index 67d6874a554868..4655cdc9eab525 100644 --- a/packages/react-native/ReactCommon/reactperflogger/fusebox/tests/FuseboxTracerTest.cpp +++ b/packages/react-native/ReactCommon/reactperflogger/fusebox/tests/FuseboxTracerTest.cpp @@ -9,15 +9,9 @@ #include "reactperflogger/FuseboxTracer.h" -folly::dynamic stopTracingAndCollect() { - folly::dynamic trace = folly::dynamic::array; - FuseboxTracer::stopTracing([&trace](const folly::dynamic& eventsChunk) { - for (const auto& event : eventsChunk) { - trace.push_back(event); - } - }); - return trace; -} +namespace facebook::react { + +namespace { class FuseboxTracerTest : public ::testing::Test { protected: @@ -32,8 +26,20 @@ class FuseboxTracerTest : public ::testing::Test { void TearDown() override { stopTracingAndCollect(); } + + folly::dynamic stopTracingAndCollect() { + folly::dynamic trace = folly::dynamic::array; + FuseboxTracer::stopTracing([&trace](const folly::dynamic& eventsChunk) { + for (const auto& event : eventsChunk) { + trace.push_back(event); + } + }); + return trace; + } }; +} // namespace + TEST_F(FuseboxTracerTest, TracingOffByDefault) { EXPECT_FALSE(FuseboxTracer::isTracing()); } @@ -70,3 +76,5 @@ TEST_F(FuseboxTracerTest, MultiEvents) { EXPECT_GE(stopTracingAndCollect().size(), 10); EXPECT_EQ(stopTracingAndCollect().size(), 0); } + +} // namespace facebook::react