From 64935b05cbffaca3998c059f5f1d7098b7c14096 Mon Sep 17 00:00:00 2001
From: wangzhaohao <wangzhaohao@huawei.com>
Date: Sat, 13 Jul 2024 16:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=81=BF=E4=BB=A3=E7=A0=81=E5=B7=AE?=
 =?UTF-8?q?=E5=BC=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangzhaohao <wangzhaohao@huawei.com>
---
 .../newdeviceprofile_fuzzer/project.xml       |  2 +-
 ...tributed_device_profile_client_kv_test.cpp |  2 +-
 .../core/test/unittest/profile_utils_test.cpp | 72 +++++++++++++++++++
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/services/core/test/fuzztest/newdeviceprofile_fuzzer/project.xml b/services/core/test/fuzztest/newdeviceprofile_fuzzer/project.xml
index 95d7da33..1bd6e94e 100644
--- a/services/core/test/fuzztest/newdeviceprofile_fuzzer/project.xml
+++ b/services/core/test/fuzztest/newdeviceprofile_fuzzer/project.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2023 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2024 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.
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 91512f5e..84d186fa 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
@@ -410,7 +410,7 @@ HWTEST_F(DistributedDeviceProfileClientKvTest, OnServiceDied001, TestSize.Level1
     OHOS::wptr<OHOS::IRemoteObject> remsotes = nullptr;
     DistributedDeviceProfileClient::DeviceProfileDeathRecipient deathRecipient;
     deathRecipient.OnRemoteDied(remsotes);
- 
+
     OHOS::sptr<OHOS::IRemoteObject> remote = nullptr;
     DistributedDeviceProfileClient::GetInstance().OnServiceDied(remote);
     EXPECT_EQ(nullptr, DistributedDeviceProfileClient::GetInstance().dpProxy_);
diff --git a/services/core/test/unittest/profile_utils_test.cpp b/services/core/test/unittest/profile_utils_test.cpp
index dc57754a..b18c3e00 100644
--- a/services/core/test/unittest/profile_utils_test.cpp
+++ b/services/core/test/unittest/profile_utils_test.cpp
@@ -1017,6 +1017,16 @@ HWTEST_F(ProfileUtilsTest, IsPropertyValid001, TestSize.Level1)
     int32_t minValue = 0;
     bool res2 = ProfileUtils::IsPropertyValid(propertyMap, property, minValue, maxValue);
     EXPECT_EQ(false, res2);
+    
+    uint32_t u32MinValue = 0;
+    uint32_t u32MaxValue = 1;
+    bool res3 = ProfileUtils::IsPropertyValid(propertyMap, property, u32MinValue, u32MaxValue);
+    EXPECT_EQ(false, res3);
+    
+    int64_t i64MinValue = 0;
+    int64_t i64MaxValue = 1;
+    bool res4 = ProfileUtils::IsPropertyValid(propertyMap, property, i64MinValue, i64MaxValue);
+    EXPECT_EQ(false, res4);
 }
 
 /**
@@ -1080,6 +1090,68 @@ HWTEST_F(ProfileUtilsTest, IsPropertyValid003, TestSize.Level1)
     EXPECT_EQ(false, res4);
 }
 
+/**
+ * @tc.name: IsPropertyValid004
+ * @tc.desc: IsPropertyValid overload 3.
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(ProfileUtilsTest, IsPropertyValid004, TestSize.Level1)
+{
+    map<string, string> propertyMap;
+    string property = "property";
+    string value = "5";
+    propertyMap[property] = value;
+    uint32_t maxValue = 10;
+    uint32_t minValue = 0;
+    bool res1 = ProfileUtils::IsPropertyValid(propertyMap, property, minValue, maxValue);
+    EXPECT_EQ(true, res1);
+    
+    maxValue = 0;
+    bool res2 = ProfileUtils::IsPropertyValid(propertyMap, property, minValue, maxValue);
+    EXPECT_EQ(false, res2);
+    
+    value = "0";
+    propertyMap[property] = value;
+    bool res3 = ProfileUtils::IsPropertyValid(propertyMap, property, minValue, maxValue);
+    EXPECT_EQ(false, res3);
+    
+    propertyMap.erase(property);
+    bool res4 = ProfileUtils::IsPropertyValid(propertyMap, property, minValue, maxValue);
+    EXPECT_EQ(false, res4);
+}
+
+/**
+ * @tc.name: IsPropertyValid005
+ * @tc.desc: IsPropertyValid overload 4.
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(ProfileUtilsTest, IsPropertyValid005, TestSize.Level1)
+{
+    map<string, string> propertyMap;
+    string property = "property";
+    string value = "5";
+    propertyMap[property] = value;
+    int64_t maxValue = 10;
+    int64_t minValue = 0;
+    bool res1 = ProfileUtils::IsPropertyValid(propertyMap, property, minValue, maxValue);
+    EXPECT_EQ(true, res1);
+    
+    maxValue = 0;
+    bool res2 = ProfileUtils::IsPropertyValid(propertyMap, property, minValue, maxValue);
+    EXPECT_EQ(false, res2);
+    
+    value = "0";
+    propertyMap[property] = value;
+    bool res3 = ProfileUtils::IsPropertyValid(propertyMap, property, minValue, maxValue);
+    EXPECT_EQ(false, res3);
+    
+    propertyMap.erase(property);
+    bool res4 = ProfileUtils::IsPropertyValid(propertyMap, property, minValue, maxValue);
+    EXPECT_EQ(false, res4);
+}
+
 /**
  * @tc.name: GetIntValue001
  * @tc.desc: GetIntValue failed, ValuesBucket is empty.