From 2728a96a7c8bdd91d06bf9d2696ce148b2c5e463 Mon Sep 17 00:00:00 2001 From: s30030188 Date: Sat, 5 Jul 2025 19:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0trace=E5=8F=8A=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E8=8E=B7=E5=8F=96=E6=8F=92=E4=BB=B6context=E7=9A=84td?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: s30030188 --- .../native/runtime/js_module_reader.cpp | 3 +- .../context_impl_second_test.cpp | 50 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/frameworks/native/runtime/js_module_reader.cpp b/frameworks/native/runtime/js_module_reader.cpp index ecb8023f739..f2dea171f05 100755 --- a/frameworks/native/runtime/js_module_reader.cpp +++ b/frameworks/native/runtime/js_module_reader.cpp @@ -48,7 +48,8 @@ bool JsModuleReader::operator()(const std::string& inputPath, uint8_t **buff, size_t *buffSize, std::string& errorMsg) const { TAG_LOGD(AAFwkTag::JSRUNTIME, "called start: %{private}s", inputPath.c_str()); - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); + std::string traceTag = __PRETTY_FUNCTION__ + inputPath; + HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, traceTag); if (inputPath.empty() || buff == nullptr || buffSize == nullptr) { TAG_LOGE(AAFwkTag::JSRUNTIME, "Invalid param"); return false; diff --git a/test/unittest/frameworks_kits_appkit_native_test/context_impl_second_test.cpp b/test/unittest/frameworks_kits_appkit_native_test/context_impl_second_test.cpp index c4dcfe92992..dcbd57708e4 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/context_impl_second_test.cpp +++ b/test/unittest/frameworks_kits_appkit_native_test/context_impl_second_test.cpp @@ -476,5 +476,55 @@ HWTEST_F(ContextImplSecondTest, AppExecFwk_AppContext_CreateTargetPluginContext_ GTEST_LOG_(INFO) << "AppExecFwk_AppContext_CreateTargetPluginContext_001 end"; } + +/** + * @tc.number: AppExecFwk_AppContext_WrapContext_001 + * @tc.name: WrapContext + * @tc.desc: Test WrapContext. + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(ContextImplSecondTest, AppExecFwk_AppContext_WrapContext_001, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AppExecFwk_AppContext_CreateTargetPluginContext_001 start"; + + auto contextImpl = std::make_shared(); + + std::string hostBundName = "com.example.hostBundleName"; + std::string pluginBundleName = "com.example.pluginBundleName"; + std::string moduleName = "moduleName"; + std::shared_ptr inputContext = std::make_shared(); + std::shared_ptr applicationInfo = std::make_shared(); + inputContext->applicationInfo_ = applicationInfo; + applicationInfo->bundleName = "testname"; + + AppExecFwk::PluginBundleInfo pluginBundleInfo; + std::vector pluginModuleInfos; + PluginModuleInfo p1; + p1.hapPath = ""; + pluginModuleInfos.emplace_back(p1); + PluginModuleInfo p2; + p2.hapPath = "abc"; + p2.moduleName = "abc"; + pluginModuleInfos.emplace_back(p2); + PluginModuleInfo p3; + p3.moduleName = "moduleName"; + p3.hapPath = "file://"; + pluginModuleInfos.emplace_back(p3); + + pluginBundleInfo.pluginModuleInfos = pluginModuleInfos; + + auto ret0 = contextImpl->WrapContext(pluginBundleName, moduleName, inputContext, pluginBundleInfo, + hostBundName); + + applicationInfo->bundleName = "com.example.hostBundleName"; + auto ret1 = contextImpl->WrapContext(pluginBundleName, moduleName, inputContext, pluginBundleInfo, + hostBundName); + + EXPECT_EQ(ret1, nullptr); + + + GTEST_LOG_(INFO) << "AppExecFwk_AppContext_CreatePluginContext_001 end"; +} } // namespace AppExecFwk } -- Gitee