From 921651288cc64276bdf0d8c4933232e906947c21 Mon Sep 17 00:00:00 2001 From: wangweiyuan2 Date: Wed, 23 Jul 2025 13:54:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=9A=E8=BF=87recordCount?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E8=A7=92=E6=A0=87=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangweiyuan2 Change-Id: Ied45756c85a7267da079809978c610e4cc62dfb7 --- adapter/ohos/capability/udmf/udmf_impl.cpp | 6 ------ adapter/ohos/capability/udmf/udmf_impl.h | 1 - .../core/common/udmf/data_load_params.h | 1 - .../event/gesture_event_hub_drag.cpp | 3 --- .../drag_drop/drag_drop_func_wrapper.cpp | 2 -- .../drag_controller/js_drag_controller.cpp | 2 -- test/mock/core/common/mock_udmf.h | 1 - .../event/gesture_event_hub_test_three_ng.cpp | 20 ------------------- ...rag_drop_func_wrapper_test_ng_coverage.cpp | 18 ----------------- 9 files changed, 54 deletions(-) diff --git a/adapter/ohos/capability/udmf/udmf_impl.cpp b/adapter/ohos/capability/udmf/udmf_impl.cpp index 4ef1eab6f94..e826cdb4941 100644 --- a/adapter/ohos/capability/udmf/udmf_impl.cpp +++ b/adapter/ohos/capability/udmf/udmf_impl.cpp @@ -258,12 +258,6 @@ void UnifiedDataImpl::SetUnifiedData(std::shared_ptr unifiedD unifiedData_ = unifiedData; } -uint32_t DataLoadParamsImpl::GetRecordCount() -{ - CHECK_NULL_RETURN(dataLoadParams_, 0); - return dataLoadParams_->dataLoadInfo.recordCount; -} - std::shared_ptr DataLoadParamsImpl::GetDataLoadParams() const { return dataLoadParams_; diff --git a/adapter/ohos/capability/udmf/udmf_impl.h b/adapter/ohos/capability/udmf/udmf_impl.h index 9b9f9375c09..935eb884df5 100644 --- a/adapter/ohos/capability/udmf/udmf_impl.h +++ b/adapter/ohos/capability/udmf/udmf_impl.h @@ -105,7 +105,6 @@ public: DataLoadParamsImpl() = default; ~DataLoadParamsImpl() = default; - uint32_t GetRecordCount() override; std::shared_ptr GetDataLoadParams() const; void SetDataLoadParams(const std::shared_ptr& dataLoadParams); diff --git a/frameworks/core/common/udmf/data_load_params.h b/frameworks/core/common/udmf/data_load_params.h index 2f9704a5a21..3c02bd9c088 100644 --- a/frameworks/core/common/udmf/data_load_params.h +++ b/frameworks/core/common/udmf/data_load_params.h @@ -25,7 +25,6 @@ class DataLoadParams : public AceType { public: DataLoadParams() = default; ~DataLoadParams() = default; - virtual uint32_t GetRecordCount() = 0; }; } // namespace OHOS::Ace #endif diff --git a/frameworks/core/components_ng/event/gesture_event_hub_drag.cpp b/frameworks/core/components_ng/event/gesture_event_hub_drag.cpp index 7f59ad63d16..f7c712ee00f 100644 --- a/frameworks/core/components_ng/event/gesture_event_hub_drag.cpp +++ b/frameworks/core/components_ng/event/gesture_event_hub_drag.cpp @@ -1689,9 +1689,6 @@ int32_t GestureEventHub::GetBadgeNumber(const RefPtr& drag } else if (unifiedData && !isUseDataLoadParams) { auto recordSize = unifiedData->GetSize(); badgeNumber = recordSize > 1 ? recordSize : 1; - } else if (dataLoadParams && isUseDataLoadParams) { - auto recodeCount = dataLoadParams->GetRecordCount(); - badgeNumber = (recodeCount == 0 || recodeCount > INT32_MAX) ? 1 : static_cast(recodeCount); } auto dragPreviewOptions = frameNode->GetDragPreviewOption(); diff --git a/frameworks/core/components_ng/manager/drag_drop/drag_drop_func_wrapper.cpp b/frameworks/core/components_ng/manager/drag_drop/drag_drop_func_wrapper.cpp index 9ee41bf0b40..951b55a74d4 100644 --- a/frameworks/core/components_ng/manager/drag_drop/drag_drop_func_wrapper.cpp +++ b/frameworks/core/components_ng/manager/drag_drop/drag_drop_func_wrapper.cpp @@ -196,8 +196,6 @@ void DragDropFuncWrapper::EnvelopedData(std::shared_ptrdataLoadParams->GetRecordCount(); - dataSize = (recodeCount == 0 || recodeCount > INT32_MAX) ? 1 : static_cast(recodeCount); } if (ret == 0) { ret = UdmfClient::GetInstance()->GetSummary(udKey, summary, detailedSummary); diff --git a/interfaces/napi/kits/drag_controller/js_drag_controller.cpp b/interfaces/napi/kits/drag_controller/js_drag_controller.cpp index 096ccb6f65e..eadf13b2fce 100644 --- a/interfaces/napi/kits/drag_controller/js_drag_controller.cpp +++ b/interfaces/napi/kits/drag_controller/js_drag_controller.cpp @@ -799,8 +799,6 @@ int32_t SetUnifiedData(std::shared_ptr asyncCtx, std::st if (ret != 0) { TAG_LOGI(AceLogTag::ACE_DRAG, "udmf set delayInfo failed, return value is %{public}d", ret); } - auto recodeCount = asyncCtx->dataLoadParams->GetRecordCount(); - dataSize = (recodeCount == 0 || recodeCount > INT32_MAX) ? 1 : static_cast(recodeCount); } if (asyncCtx->unifiedData) { ret = UdmfClient::GetInstance()->SetData(asyncCtx->unifiedData, udKey); diff --git a/test/mock/core/common/mock_udmf.h b/test/mock/core/common/mock_udmf.h index 4d12c122441..cc70a74397f 100644 --- a/test/mock/core/common/mock_udmf.h +++ b/test/mock/core/common/mock_udmf.h @@ -102,7 +102,6 @@ class MockDataLoadParams : public DataLoadParams { public: MockDataLoadParams() {}; ~MockDataLoadParams() = default; - MOCK_METHOD(uint32_t, GetRecordCount, (), (override)); }; } // namespace OHOS::Ace #endif // FOUNDATION_ACE_TEST_MOCK_CORE_COMMON_MOCK_UDMF_H diff --git a/test/unittest/core/event/gesture_event_hub_test_three_ng.cpp b/test/unittest/core/event/gesture_event_hub_test_three_ng.cpp index 696d16aff29..cdd3a2e8749 100644 --- a/test/unittest/core/event/gesture_event_hub_test_three_ng.cpp +++ b/test/unittest/core/event/gesture_event_hub_test_three_ng.cpp @@ -883,26 +883,6 @@ HWTEST_F(GestureEventHubTestNg, GetBadgeNumber_001, TestSize.Level1) dragEvent->SetUseDataLoadParams(false); auto ret1 = guestureEventHub->GetBadgeNumber(dragEvent); EXPECT_EQ(ret1, 5); - - dragEvent->SetUseDataLoadParams(true); - RefPtr mockDataLoadParams = AceType::MakeRefPtr(); - ASSERT_NE(mockDataLoadParams, nullptr); - dragEvent->SetDataLoadParams(mockDataLoadParams); - EXPECT_CALL(*mockDataLoadParams, GetRecordCount()).WillRepeatedly(testing::Return(-1)); - auto ret2 = guestureEventHub->GetBadgeNumber(dragEvent); - EXPECT_EQ(ret2, 1); - - EXPECT_CALL(*mockDataLoadParams, GetRecordCount()).WillRepeatedly(testing::Return(0)); - auto ret3 = guestureEventHub->GetBadgeNumber(dragEvent); - EXPECT_EQ(ret3, 1); - - EXPECT_CALL(*mockDataLoadParams, GetRecordCount()).WillRepeatedly(testing::Return(INT32_MAX + 1)); - auto ret4 = guestureEventHub->GetBadgeNumber(dragEvent); - EXPECT_EQ(ret4, 1); - - EXPECT_CALL(*mockDataLoadParams, GetRecordCount()).WillRepeatedly(testing::Return(10)); - auto ret5 = guestureEventHub->GetBadgeNumber(dragEvent); - EXPECT_EQ(ret5, 10); } /** diff --git a/test/unittest/core/manager/drag_drop/drag_drop_func_wrapper_test_ng_coverage.cpp b/test/unittest/core/manager/drag_drop/drag_drop_func_wrapper_test_ng_coverage.cpp index dc1f656b435..50ce97aec37 100644 --- a/test/unittest/core/manager/drag_drop/drag_drop_func_wrapper_test_ng_coverage.cpp +++ b/test/unittest/core/manager/drag_drop/drag_drop_func_wrapper_test_ng_coverage.cpp @@ -1507,23 +1507,5 @@ HWTEST_F(DragDropFuncWrapperTestNgCoverage, DragDropFuncWrapperTestNgCoverage042 EXPECT_CALL(*mockUdmfClient, SetDelayInfo(_, _)).WillRepeatedly(testing::Return(1)); DragDropFuncWrapper::EnvelopedData(dragAction, udKey, summary, detailedSummary, dataSize); EXPECT_EQ(dataSize, 1); - - EXPECT_CALL(*mockUdmfClient, SetDelayInfo(_, _)).WillRepeatedly(testing::Return(0)); - EXPECT_CALL(*mockDataLoadParams, GetRecordCount()).WillRepeatedly(testing::Return(10)); - EXPECT_CALL(*mockUdmfClient, GetSummary(_, _, _)).WillRepeatedly(testing::Return(1)); - DragDropFuncWrapper::EnvelopedData(dragAction, udKey, summary, detailedSummary, dataSize); - EXPECT_EQ(dataSize, 10); - - EXPECT_CALL(*mockDataLoadParams, GetRecordCount()).WillRepeatedly(testing::Return(-1)); - DragDropFuncWrapper::EnvelopedData(dragAction, udKey, summary, detailedSummary, dataSize); - EXPECT_EQ(dataSize, 1); - - EXPECT_CALL(*mockDataLoadParams, GetRecordCount()).WillRepeatedly(testing::Return(0)); - DragDropFuncWrapper::EnvelopedData(dragAction, udKey, summary, detailedSummary, dataSize); - EXPECT_EQ(dataSize, 1); - - EXPECT_CALL(*mockDataLoadParams, GetRecordCount()).WillRepeatedly(testing::Return(INT32_MAX + 1)); - DragDropFuncWrapper::EnvelopedData(dragAction, udKey, summary, detailedSummary, dataSize); - EXPECT_EQ(dataSize, 1); } } // namespace OHOS::Ace::NG -- Gitee