diff --git a/build/core/gn/BUILD.gn b/build/core/gn/BUILD.gn index 8281cdfa44e2361ed14744c02514e8b6c79c7ecf..2ea0cfb5471a0364b42d0c325486e52d3d94e89b 100644 --- a/build/core/gn/BUILD.gn +++ b/build/core/gn/BUILD.gn @@ -37,7 +37,10 @@ group("default") { group("unittest_packages") { testonly = true - deps = [ "$toolchain_root:ark_js_host_unittest" ] + deps = [ + "$js_root:ark_js_unittest", + "$toolchain_root:ark_toolchain_unittest", + ] } group("runtime_core_unittest_packages") { diff --git a/inspector/connect_inspector.cpp b/inspector/connect_inspector.cpp index e89b5ef13217a896b9b054dba32ca4d7ad8cc801..e20c1b296def02f998aa95cf63a5a8c29dc0610f 100644 --- a/inspector/connect_inspector.cpp +++ b/inspector/connect_inspector.cpp @@ -26,8 +26,6 @@ using panda::ecmascript::tooling::Result; std::mutex g_connectMutex; std::unique_ptr g_inspector = nullptr; static constexpr char CONNECTED_MESSAGE[] = "connected"; -static constexpr char OPEN_MESSAGE[] = "layoutOpen"; -static constexpr char CLOSE_MESSAGE[] = "layoutClose"; static constexpr char REQUEST_MESSAGE[] = "tree"; static constexpr char STOPDEBUGGER_MESSAGE[] = "stopDebugger"; static constexpr char OPEN_ARKUI_STATE_PROFILER[] = "ArkUIStateProfilerOpen"; @@ -65,16 +63,6 @@ void OnConnectedMessage(const std::string& message) } } -void OnOpenMessage(const std::string& message) -{ - if (message.find(OPEN_MESSAGE, 0) != std::string::npos) { - if (g_inspector->setSwitchStatus_ != nullptr) { - LOGI("layoutOpen start"); - g_inspector->setSwitchStatus_(true); - } - } -} - void OnInspectorRecordMessage(const std::string& message) { if (message.find(START_RECORD_MESSAGE, 0) != std::string::npos) { @@ -134,19 +122,7 @@ void OnMessage(const std::string &message) LOGI("ConnectServer OnMessage: %{public}s", message.c_str()); if (g_inspector != nullptr && g_inspector->connectServer_ != nullptr) { OnConnectedMessage(message); - if (OnArkUIInspectorMessage(message)) { - return; - } - OnOpenMessage(message); - if (message.find(CLOSE_MESSAGE, 0) != std::string::npos) { - if (g_setConnectCallBack != nullptr) { - g_setConnectCallBack(false); - } - if (g_inspector->setSwitchStatus_ != nullptr) { - LOGI("layoutClose start"); - g_inspector->setSwitchStatus_(false); - } - } + if (message.find(OPEN_ARKUI_STATE_PROFILER, 0) != std::string::npos) { if (g_inspector->setArkUIStateProfilerStatus_ != nullptr) { LOGI("state profiler open"); diff --git a/inspector/test/connect_server_test.cpp b/inspector/test/connect_server_test.cpp index cf75fbc84743262403592f0b87451098587f792b..f0beaeaa865317930cb056bf19bea985a3a5bae2 100644 --- a/inspector/test/connect_server_test.cpp +++ b/inspector/test/connect_server_test.cpp @@ -40,8 +40,6 @@ public: #if defined(OHOS_PLATFORM) static constexpr char CONNECTED_MESSAGE_TEST[] = "connected"; - static constexpr char OPEN_MESSAGE_TEST[] = "layoutOpen"; - static constexpr char CLOSE_MESSAGE_TEST[] = "layoutClose"; static constexpr char REQUEST_MESSAGE_TEST[] = "tree"; static constexpr char STOPDEBUGGER_MESSAGE_TEST[] = "stopDebugger"; static constexpr char OPEN_ARKUI_STATE_PROFILER_TEST[] = "ArkUIStateProfilerOpen"; @@ -133,7 +131,6 @@ HWTEST_F(ConnectServerTest, InspectorConnectTest, testing::ext::TestSize.Level0) EXPECT_TRUE(clientSocket.SendReply(CONNECTED_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(OPEN_ARKUI_STATE_PROFILER_TEST)); EXPECT_TRUE(clientSocket.SendReply(REQUEST_MESSAGE_TEST)); - EXPECT_TRUE(clientSocket.SendReply(OPEN_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(START_RECORD_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(STOP_RECORD_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(ARKUI_MESSAGE)); @@ -143,7 +140,6 @@ HWTEST_F(ConnectServerTest, InspectorConnectTest, testing::ext::TestSize.Level0) std::string recv = clientSocket.Decode(); EXPECT_STREQ(recv.c_str(), INSPECTOR_SERVER_OK); if (strcmp(recv.c_str(), INSPECTOR_SERVER_OK) == 0) { - EXPECT_TRUE(clientSocket.SendReply(CLOSE_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(STOPDEBUGGER_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(CLOSE_ARKUI_STATE_PROFILER_TEST)); }