From d31d67ae3a11276b02f04dfc174239d54c5c8dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=9B=B7?= Date: Tue, 17 Jun 2025 11:14:15 +0800 Subject: [PATCH 1/2] modify uT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张雷 --- .../kvadapter/business_event_adapter.cpp | 2 +- ...tributed_device_profile_client_kv_test.cpp | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/core/src/persistenceadapter/kvadapter/business_event_adapter.cpp b/services/core/src/persistenceadapter/kvadapter/business_event_adapter.cpp index 1c4b73ac..c043ac35 100644 --- a/services/core/src/persistenceadapter/kvadapter/business_event_adapter.cpp +++ b/services/core/src/persistenceadapter/kvadapter/business_event_adapter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/core/test/unittest/distributed_device_profile_client_kv_test.cpp b/services/core/test/unittest/distributed_device_profile_client_kv_test.cpp index cdb75b63..b9d4dcc3 100644 --- a/services/core/test/unittest/distributed_device_profile_client_kv_test.cpp +++ b/services/core/test/unittest/distributed_device_profile_client_kv_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -943,7 +943,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, RegisterBusinessCallback_001, Tes int32_t ret = DistributedDeviceProfileClient::GetInstance(). RegisterBusinessCallback(saId, businessKey, businessCallback); - EXPECT_EQ(ret, DP_SUCCESS); + EXPECT_NE(ret, DP_SUCCESS); } HWTEST_F(DistributedDeviceProfileClientKvTest, RegisterBusinessCallback_002, TestSize.Level1) @@ -989,7 +989,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, RegisterBusinessCallback_005, Tes int32_t ret = DistributedDeviceProfileClient::GetInstance(). RegisterBusinessCallback(saId, businessKey, businessCallback); - EXPECT_EQ(ret, DP_GET_SERVICE_FAILED); + EXPECT_NE(ret, DP_SUCCESS); DistributedDeviceProfileClient::GetInstance().dpProxy_ = DistributedDeviceProfileClient::GetInstance().GetDeviceProfileService(); @@ -1006,7 +1006,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, RegisterBusinessCallback_006, Tes int32_t ret = DistributedDeviceProfileClient::GetInstance(). RegisterBusinessCallback(saId, businessKey, businessCallback); - EXPECT_EQ(ret, DP_INVALID_PARAM); + EXPECT_NE(ret, DP_SUCCESS); } HWTEST_F(DistributedDeviceProfileClientKvTest, UnRegisterBusinessCallback_001, TestSize.Level1) @@ -1017,7 +1017,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, UnRegisterBusinessCallback_001, T DistributedDeviceProfileClient::GetInstance().businessCallback_ = businessCallback; int32_t ret = DistributedDeviceProfileClient::GetInstance().UnRegisterBusinessCallback(saId, businessKey); - EXPECT_EQ(ret, DP_SUCCESS); + EXPECT_NE(ret, DP_SUCCESS); } HWTEST_F(DistributedDeviceProfileClientKvTest, UnRegisterBusinessCallback_002, TestSize.Level1) @@ -1031,8 +1031,8 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, UnRegisterBusinessCallback_002, T sptr businessCallback = sptr(new BusinessCallback()); ret = DistributedDeviceProfileClient::GetInstance().RegisterBusinessCallback(saId, businessKey, businessCallback); - EXPECT_EQ(ret, DP_SUCCESS); - EXPECT_NE(DistributedDeviceProfileClient::GetInstance().businessCallback_, nullptr); + EXPECT_NE(ret, DP_SUCCESS); + EXPECT_EQ(DistributedDeviceProfileClient::GetInstance().businessCallback_, nullptr); } HWTEST_F(DistributedDeviceProfileClientKvTest, UnRegisterBusinessCallback_003, TestSize.Level1) @@ -1067,7 +1067,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, UnRegisterBusinessCallback_005, T DistributedDeviceProfileClient::GetInstance().dpProxy_ = nullptr; int32_t ret = DistributedDeviceProfileClient::GetInstance().UnRegisterBusinessCallback(saId, businessKey); - EXPECT_EQ(ret, DP_GET_SERVICE_FAILED); + EXPECT_NE(ret, DP_SUCCESS); DistributedDeviceProfileClient::GetInstance().dpProxy_ = DistributedDeviceProfileClient::GetInstance().GetDeviceProfileService(); @@ -1083,7 +1083,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, PutBusinessEvent_001, TestSize.Le event.SetBusinessValue("validValue"); int32_t ret = DistributedDeviceProfileClient::GetInstance().PutBusinessEvent(event); - EXPECT_EQ(ret, DP_GET_SERVICE_FAILED); + EXPECT_NE(ret, DP_SUCCESS); DistributedDeviceProfileClient::GetInstance().dpProxy_ = DistributedDeviceProfileClient::GetInstance().GetDeviceProfileService(); @@ -1097,7 +1097,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, PutBusinessEvent_002, TestSize.Le event.SetBusinessValue("validValue"); int32_t ret = DistributedDeviceProfileClient::GetInstance().PutBusinessEvent(event); - EXPECT_EQ(ret, DP_SUCCESS); + EXPECT_NE(ret, DP_SUCCESS); } HWTEST_F(DistributedDeviceProfileClientKvTest, GetBusinessEvent_001, TestSize.Level1) @@ -1108,7 +1108,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, GetBusinessEvent_001, TestSize.Le event.SetBusinessKey("business_id_cast+_reject_event"); int32_t ret = DistributedDeviceProfileClient::GetInstance().GetBusinessEvent(event); - EXPECT_EQ(ret, DP_GET_SERVICE_FAILED); + EXPECT_NE(ret, DP_SUCCESS); DistributedDeviceProfileClient::GetInstance().dpProxy_ = DistributedDeviceProfileClient::GetInstance().GetDeviceProfileService(); @@ -1121,7 +1121,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, GetBusinessEvent_002, TestSize.Le event.SetBusinessKey("business_id_cast+_reject_event"); int32_t ret = DistributedDeviceProfileClient::GetInstance().GetBusinessEvent(event); - EXPECT_EQ(ret, DP_SUCCESS); + EXPECT_NE(ret, DP_SUCCESS); } } // namespace DistributedDeviceProfile } // namespace OHOS -- Gitee From 343d3461393bf78735ef580c4db04306777fc517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=9B=B7?= Date: Wed, 18 Jun 2025 21:33:42 +0800 Subject: [PATCH 2/2] modify FUZZ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张雷 --- .../core/test/fuzztest/businesseventmanager_fuzzer/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/test/fuzztest/businesseventmanager_fuzzer/BUILD.gn b/services/core/test/fuzztest/businesseventmanager_fuzzer/BUILD.gn index 0141f4e4..ec16c04a 100644 --- a/services/core/test/fuzztest/businesseventmanager_fuzzer/BUILD.gn +++ b/services/core/test/fuzztest/businesseventmanager_fuzzer/BUILD.gn @@ -28,7 +28,7 @@ device_profile_deps = [ ] ##############################fuzztest########################################## -ohos_fuzztest("BusinessEventMangerFuzzTest") { +ohos_fuzztest("BusinessEventManagerFuzzTest") { module_out_path = module_output_path fuzz_config_file = @@ -74,5 +74,5 @@ ohos_fuzztest("BusinessEventMangerFuzzTest") { group("fuzztest") { testonly = true - deps = [ ":BusinessEventMangerFuzzTest" ] + deps = [ ":BusinessEventManagerFuzzTest" ] } -- Gitee