diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp b/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp index a945d692b9f8..2e0f5c209b12 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp @@ -17,9 +17,11 @@ #include #include +using namespace ::testing; + namespace facebook::react::jsinspector_modern { -using namespace ::testing; +#pragma region ReactInstanceIntegrationTest ReactInstanceIntegrationTest::ReactInstanceIntegrationTest() : runtime(nullptr), @@ -179,6 +181,8 @@ bool ReactInstanceIntegrationTest::verbose(bool isVerbose) { return previous; } +#pragma endregion + TEST_F(ReactInstanceIntegrationTest, RuntimeEvalTest) { auto val = run("1 + 2"); EXPECT_EQ(val.asNumber(), 3); @@ -217,14 +221,21 @@ INSTANTIATE_TEST_SUITE_P( ReactInstanceVaryingInspectorFlags, ReactInstanceIntegrationTestWithFlags, ::testing::Values( - InspectorFlagOverrides{ - .enableCxxInspectorPackagerConnection = true, - .enableModernCDPRegistry = true}, InspectorFlagOverrides{ .enableCxxInspectorPackagerConnection = false, + .enableHermesCDPAgent = false, .enableModernCDPRegistry = false}, InspectorFlagOverrides{ .enableCxxInspectorPackagerConnection = true, - .enableModernCDPRegistry = false})); + .enableHermesCDPAgent = false, + .enableModernCDPRegistry = false}, + InspectorFlagOverrides{ + .enableCxxInspectorPackagerConnection = true, + .enableHermesCDPAgent = false, + .enableModernCDPRegistry = true}, + InspectorFlagOverrides{ + .enableCxxInspectorPackagerConnection = false, + .enableHermesCDPAgent = true, + .enableModernCDPRegistry = true})); } // namespace facebook::react::jsinspector_modern diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp b/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp index ea6e640a59da..816ec4a1b981 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp @@ -27,15 +27,19 @@ class ReactNativeFeatureFlagsOverrides : overrides_(overrides) {} bool inspectorEnableCxxInspectorPackagerConnection() override { - return overrides_.enableCxxInspectorPackagerConnection; + return overrides_.enableCxxInspectorPackagerConnection.value_or( + ReactNativeFeatureFlagsDefaults:: + inspectorEnableCxxInspectorPackagerConnection()); } bool inspectorEnableHermesCDPAgent() override { - return overrides_.enableHermesCDPAgent; + return overrides_.enableHermesCDPAgent.value_or( + ReactNativeFeatureFlagsDefaults::inspectorEnableHermesCDPAgent()); } bool inspectorEnableModernCDPRegistry() override { - return overrides_.enableModernCDPRegistry; + return overrides_.enableModernCDPRegistry.value_or( + ReactNativeFeatureFlagsDefaults::inspectorEnableModernCDPRegistry()); } private: diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h b/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h index 5e91bb4cb8ab..c998cbb2391a 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h @@ -9,6 +9,8 @@ #include +#include + namespace facebook::react::jsinspector_modern { /** @@ -17,9 +19,9 @@ namespace facebook::react::jsinspector_modern { struct InspectorFlagOverrides { // NOTE: Keep these entries in sync with ReactNativeFeatureFlagsOverrides in // the implementation file. - bool enableCxxInspectorPackagerConnection = false; - bool enableHermesCDPAgent = false; - bool enableModernCDPRegistry = false; + std::optional enableCxxInspectorPackagerConnection; + std::optional enableHermesCDPAgent; + std::optional enableModernCDPRegistry; }; /**