diff --git a/tooling/test/debugger_client_test.cpp b/tooling/test/debugger_client_test.cpp index ba9df5f6657187e69841a98a6045873ed5f273e4..9a7ce955e0fe96af91d3e2fc62053ce579c3c13a 100644 --- a/tooling/test/debugger_client_test.cpp +++ b/tooling/test/debugger_client_test.cpp @@ -21,6 +21,7 @@ #include "tooling/test/client_utils/test_list.h" #include "tooling/test/client_utils/test_util.h" +#define DDD() std::cerr << __FILE__ << ':' << __LINE__ << ':' << __func__ << '\n' << std::flush namespace panda::ecmascript::tooling::test { using panda::test::TestHelper; static int g_port = 9002; // 9002: socket port @@ -42,21 +43,33 @@ public: void SetUp() override { g_port -= 1; + DDD(); SetCurrentTestName(GetParam()); + DDD(); TestHelper::CreateEcmaVMWithScope(instance, thread, scope); + DDD(); TestUtil::ForkSocketClient(g_port, GetParam()); + DDD(); JSNApi::DebugOption debugOption = {DEBUGGER_LIBRARY, true, g_port}; + DDD(); JSNApi::StartDebugger(instance, debugOption); + DDD(); if (instance->GetJsDebuggerManager() != nullptr) { + DDD(); instance->GetJsDebuggerManager()->DisableObjectHashDisplay(); } + DDD(); } void TearDown() override { + DDD(); std::this_thread::sleep_for(std::chrono::microseconds(500000)); // 500000: 500ms + DDD(); JSNApi::StopDebugger(instance); + DDD(); TestHelper::DestroyEcmaVMWithScope(instance, scope); + DDD(); } EcmaVM *instance {nullptr}; @@ -64,15 +77,21 @@ public: JSThread *thread {nullptr}; }; -//NOTE: enable (issue 18042) -HWTEST_P_L0(DebuggerClientTest, DISABLED_DebuggerSuite) +HWTEST_P_L0(DebuggerClientTest, DebuggerSuite) { + DDD(); std::string testName = GetCurrentTestName(); + DDD(); std::cout << "Running " << testName << std::endl; + DDD(); ASSERT_NE(instance, nullptr); + DDD(); auto [pandaFile, entryPoint] = GetTestEntryPoint(testName); + DDD(); auto res = JSNApi::Execute(instance, pandaFile.c_str(), entryPoint.c_str()); + DDD(); ASSERT_TRUE(res); + DDD(); } INSTANTIATE_TEST_SUITE_P(DebugClientAbcTest, DebuggerClientTest, testing::ValuesIn(GetTestList()));