From 1e7a96958a87c87c55cd11b1e3b242181f2c37b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=93=9D=E8=89=B2=E5=A4=A7=E9=AD=94=E7=8E=8B?= Date: Tue, 29 Jul 2025 15:02:45 +0800 Subject: [PATCH 1/3] Signed-off-by:hanqiaosheng --- .../update_partitions_unittest.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/test/unittest/updater_binary/update_partitions_unittest.cpp b/test/unittest/updater_binary/update_partitions_unittest.cpp index 8b17113c..0dd476b2 100755 --- a/test/unittest/updater_binary/update_partitions_unittest.cpp +++ b/test/unittest/updater_binary/update_partitions_unittest.cpp @@ -129,22 +129,12 @@ HWTEST_F(UpdatePartitionsUnitTest, UpdatePartitions_Unitest04, TestSize.Level1) } )"; cJSON *root = cJSON_Parse(partitionInfo); - if (root == nullptr) { - cout << "cJSON_Parse error" << endl; - return; - } + EXCEPT_NE(root, nullptr); cJSON *partitions = cJSON_GetObjectItem(root, "Partition"); - if (partitions == nullptr) { - cout << "cJSON_GetObjectItem error" << endl; - cJSON_Delete(root); - return; - } + EXCEPT_NE(root, nullptr); + EXCEPT_NE(partitions, nullptr); struct Partition *myPartition = static_cast(calloc(1, sizeof(struct Partition))); - if (!myPartition) { - cout << "calloc error" << endl; - cJSON_Delete(root); - return; - } + EXCEPT_NE(myPartition, nullptr); UpdatePartitions partition; EXPECT_TRUE(!partition.SetPartitionInfo(partitions, 10, myPartition)); // 10: error index -- Gitee From dc3abe451b2f6d89c7582790bbb427ee427aac45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=93=9D=E8=89=B2=E5=A4=A7=E9=AD=94=E7=8E=8B?= Date: Tue, 29 Jul 2025 08:48:01 +0000 Subject: [PATCH 2/3] update test/unittest/updater_binary/update_partitions_unittest.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 蓝色大魔王 --- .../updater_binary/update_partitions_unittest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unittest/updater_binary/update_partitions_unittest.cpp b/test/unittest/updater_binary/update_partitions_unittest.cpp index 0dd476b2..00d5786b 100755 --- a/test/unittest/updater_binary/update_partitions_unittest.cpp +++ b/test/unittest/updater_binary/update_partitions_unittest.cpp @@ -129,12 +129,12 @@ HWTEST_F(UpdatePartitionsUnitTest, UpdatePartitions_Unitest04, TestSize.Level1) } )"; cJSON *root = cJSON_Parse(partitionInfo); - EXCEPT_NE(root, nullptr); + ASSERT_NE(root, nullptr); cJSON *partitions = cJSON_GetObjectItem(root, "Partition"); - EXCEPT_NE(root, nullptr); - EXCEPT_NE(partitions, nullptr); + ASSERT_NE(root, nullptr); + ASSERT_NE(partitions, nullptr); struct Partition *myPartition = static_cast(calloc(1, sizeof(struct Partition))); - EXCEPT_NE(myPartition, nullptr); + ASSERT_NE(myPartition, nullptr); UpdatePartitions partition; EXPECT_TRUE(!partition.SetPartitionInfo(partitions, 10, myPartition)); // 10: error index -- Gitee From 1b76ebb8c27df185341ae5cda47ad25483229e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=93=9D=E8=89=B2=E5=A4=A7=E9=AD=94=E7=8E=8B?= Date: Tue, 29 Jul 2025 12:52:59 +0000 Subject: [PATCH 3/3] update test/unittest/updater_binary/update_partitions_unittest.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 蓝色大魔王 --- test/unittest/updater_binary/update_partitions_unittest.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unittest/updater_binary/update_partitions_unittest.cpp b/test/unittest/updater_binary/update_partitions_unittest.cpp index 00d5786b..09961621 100755 --- a/test/unittest/updater_binary/update_partitions_unittest.cpp +++ b/test/unittest/updater_binary/update_partitions_unittest.cpp @@ -131,7 +131,6 @@ HWTEST_F(UpdatePartitionsUnitTest, UpdatePartitions_Unitest04, TestSize.Level1) cJSON *root = cJSON_Parse(partitionInfo); ASSERT_NE(root, nullptr); cJSON *partitions = cJSON_GetObjectItem(root, "Partition"); - ASSERT_NE(root, nullptr); ASSERT_NE(partitions, nullptr); struct Partition *myPartition = static_cast(calloc(1, sizeof(struct Partition))); ASSERT_NE(myPartition, nullptr); -- Gitee