Skip to content

Add enableHermesCDPAgent case to ReactInstanceIntegrationTest #43436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
huntie wants to merge 1 commit into from
Closed

Add enableHermesCDPAgent case to ReactInstanceIntegrationTest #43436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions packages/react-native/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
#include <react/featureflags/ReactNativeFeatureFlagsDefaults.h>
#include <react/runtime/hermes/HermesInstance.h>

using namespace ::testing;

namespace facebook::react::jsinspector_modern {

using namespace ::testing;
#pragma region ReactInstanceIntegrationTest

ReactInstanceIntegrationTest::ReactInstanceIntegrationTest()
: runtime(nullptr),
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
10 changes: 7 additions & 3 deletions ...s/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 5 additions & 3 deletions ...ges/react-native/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

#include <react/featureflags/ReactNativeFeatureFlagsDefaults.h>

#include <optional>

namespace facebook::react::jsinspector_modern {

/**
Expand All @@ -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<bool> enableCxxInspectorPackagerConnection;
std::optional<bool> enableHermesCDPAgent;
std::optional<bool> enableModernCDPRegistry;
};

/**
Expand Down