diff --git a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/code_sign_block_header_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/code_sign_block_header_test.cpp
index f9e3efe9fd9b7c0fa9ac739df586939abb0f21cd..54140743a882beb855ac11cd26d91cace1d0aebd 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/code_sign_block_header_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/code_sign_block_header_test.cpp
@@ -234,24 +234,7 @@ HWTEST_F(CodeSignBlockHeaderTest, setBlockSize, testing::ext::TestSize.Level1)
 
     api->SetBlockSize(1024);
 
-    EXPECT_EQ(true, 1);
-}
-
-/**
- * @tc.name: setFlags
- * @tc.desc: Test function of CodeSignBlockHeaderTest::setFlags() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockHeaderTest, setFlags, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlockHeader> api = std::make_shared<CodeSignBlockHeader>();
-
-    api->SetFlags(1);
-
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->GetBlockSize(), 1024);
 }
 
 /**
@@ -266,9 +249,10 @@ HWTEST_F(CodeSignBlockHeaderTest, setSegmentNum, testing::ext::TestSize.Level1)
 {
     std::shared_ptr<CodeSignBlockHeader> api = std::make_shared<CodeSignBlockHeader>();
 
+    api->SetFlags(1);
     api->SetSegmentNum(4);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->GetSegmentNum(), 4);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/code_sign_block_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/code_sign_block_test.cpp
index db1c73d6b26cbe51dca6b7ef5928a4103c4bfd4a..470bd677d9c2ff648980c5e87fcadbd598b2ad6b 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/code_sign_block_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/code_sign_block_test.cpp
@@ -34,24 +34,6 @@ public:
     void TearDown() {};
 };
 
-/**
- * @tc.name: addOneMerkleTree001
- * @tc.desc: Test function of CodeSignBlockTest::addOneMerkleTree001() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockTest, addOneMerkleTree001, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-
-    const std::string key;
-    std::vector<int8_t> merkleTree;
-    api->AddOneMerkleTree(key, merkleTree);  // 返回值void
-
-    EXPECT_EQ(true, true);
-}
 
 /**
  * @tc.name: addOneMerkleTree002
@@ -65,11 +47,13 @@ HWTEST_F(CodeSignBlockTest, addOneMerkleTree002, testing::ext::TestSize.Level1)
 {
     std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
 
-    const std::string key = "111";
+    const std::string key;
     std::vector<int8_t> merkleTree;
-    api->AddOneMerkleTree(key, merkleTree);
-
-    EXPECT_EQ(true, true);
+    api->AddOneMerkleTree(key, merkleTree);  // 返回值void
+    
+    api->AddOneMerkleTree("111", merkleTree);
+    std::vector<int8_t> merkleTreeTemp = api->GetOneMerkleTreeByFileName(key);
+    EXPECT_EQ(merkleTree.empty(), merkleTreeTemp.empty());
 }
 
 /**
@@ -86,8 +70,8 @@ HWTEST_F(CodeSignBlockTest, addToSegmentList, testing::ext::TestSize.Level1)
    
     SegmentHeader sh(SegmentHeader::CSB_NATIVE_LIB_INFO_SEG, 0);
     api->AddToSegmentList(sh);
-
-    EXPECT_EQ(true, true);
+    std::vector<SegmentHeader> header = api->GetSegmentHeaderList();
+    EXPECT_EQ(header[0].GetType(), sh.GetType());
 }
 
 /**
@@ -126,57 +110,6 @@ HWTEST_F(CodeSignBlockTest, computeMerkleTreeOffset001, testing::ext::TestSize.L
     EXPECT_EQ(offset, 0);
 }
 
-/**
- * @tc.name: computeSegmentOffset
- * @tc.desc: Test function of CodeSignBlockTest::computeSegmentOffset() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockTest, computeSegmentOffset, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-    
-    api->ComputeSegmentOffset();
-
-    EXPECT_EQ(true, 1);
-}
-
-/**
- * @tc.name: getCodeSignBlockHeader
- * @tc.desc: Test function of CodeSignBlockTest::getCodeSignBlockHeader() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockTest, getCodeSignBlockHeader, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-    
-    api->GetCodeSignBlockHeader();
-
-    EXPECT_EQ(true, 1);
-}
-
-/**
- * @tc.name: getHapInfoSegment
- * @tc.desc: Test function of CodeSignBlockTest::getHapInfoSegment() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockTest, getHapInfoSegment, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-
-    api->GetHapInfoSegment();
-
-    EXPECT_EQ(true, 1);
-}
-
 /**
  * @tc.name: getOneMerkleTreeByFileName001
  * @tc.desc: Test function of CodeSignBlockTest::getOneMerkleTreeByFileName001() interface for SUCCESS.
@@ -189,10 +122,13 @@ HWTEST_F(CodeSignBlockTest, getOneMerkleTreeByFileName001, testing::ext::TestSiz
 {
     std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
 
+    api->ComputeSegmentOffset();
+    api->GetCodeSignBlockHeader();
+    api->GetHapInfoSegment();
     std::string key = "test.so";
     std::vector<int8_t> name = api->GetOneMerkleTreeByFileName(key);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(name.size(), 0);
 }
 
 /**
@@ -242,41 +178,8 @@ HWTEST_F(CodeSignBlockTest, getSegmentHeaderList, testing::ext::TestSize.Level1)
 HWTEST_F(CodeSignBlockTest, getSoInfoSegment, testing::ext::TestSize.Level1)
 {
     std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-
-    api->GetSoInfoSegment();
-
-    EXPECT_EQ(true, 1);
-}
-
-/**
- * @tc.name: setCodeSignBlockFlag
- * @tc.desc: Test function of CodeSignBlockTest::setCodeSignBlockFlag() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockTest, setCodeSignBlockFlag, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-
     api->SetCodeSignBlockFlag();
 
-    EXPECT_EQ(true, 1);
-}
-
-/**
- * @tc.name: setCodeSignBlockFlag001
- * @tc.desc: Test function of CodeSignBlockTest::setCodeSignBlockFlag001() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockTest, setCodeSignBlockFlag001, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-
     NativeLibInfoSegment nativeLibInfoSegment(0,
     0,
     1,
@@ -288,7 +191,7 @@ HWTEST_F(CodeSignBlockTest, setCodeSignBlockFlag001, testing::ext::TestSize.Leve
     api->SetSoInfoSegment(nativeLibInfoSegment);
     api->SetCodeSignBlockFlag();
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(api->GetSoInfoSegment().GetSectionNum(), 0);
 }
 
 /**
@@ -314,27 +217,8 @@ HWTEST_F(CodeSignBlockTest, setCodeSignBlockHeader, testing::ext::TestSize.Level
     CodeSignBlockHeader codeSignBlockHeader(build);
 
     api->SetCodeSignBlockHeader(codeSignBlockHeader);
-
-    EXPECT_EQ(true, 1);
-}
-
-/**
- * @tc.name: setFsVerityInfoSegment
- * @tc.desc: Test function of CodeSignBlockTest::setFsVerityInfoSegment() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockTest, setFsVerityInfoSegment, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-    
-    FsVerityInfoSegment fsVeritySeg(1, 1, 12);
-
-    api->SetFsVerityInfoSegment(fsVeritySeg);
-
-    EXPECT_EQ(true, 1);
+    CodeSignBlockHeader tmp = api->GetCodeSignBlockHeader();
+    EXPECT_NE(tmp.GetBlockSize(), 0);
 }
 
 /**
@@ -362,8 +246,8 @@ HWTEST_F(CodeSignBlockTest, setHapInfoSegment, testing::ext::TestSize.Level1)
     SignInfo signInfo(saltSize, flags, dataSize, salt, sig);
     HapInfoSegment hapInfoSegment(10945, signInfo);
     api->SetHapInfoSegment(hapInfoSegment);
-
-    EXPECT_EQ(true, 1);
+    HapInfoSegment tmp = api->GetHapInfoSegment();
+    EXPECT_NE(tmp.GetSize(), 0);
 }
 
 /**
@@ -377,40 +261,11 @@ HWTEST_F(CodeSignBlockTest, setHapInfoSegment, testing::ext::TestSize.Level1)
 HWTEST_F(CodeSignBlockTest, setSegmentHeaders, testing::ext::TestSize.Level1)
 {
     std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-    
-    api->SetSegmentHeaders();
-
-    EXPECT_EQ(true, 1);
-}
-
-/**
- * @tc.name: setSegmentNum
- * @tc.desc: Test function of CodeSignBlockTest::setSegmentNum() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockTest, setSegmentNum, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
-
     api->SetSegmentNum();
-
-    EXPECT_EQ(true, 1);
-}
-
-/**
- * @tc.name: setSoInfoSegment
- * @tc.desc: Test function of CodeSignBlockTest::setSoInfoSegment() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSignBlockTest, setSoInfoSegment, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<CodeSignBlock> api = std::make_shared<CodeSignBlock>();
+    api->SetSegmentHeaders();
+    FsVerityInfoSegment fsVeritySeg(1, 1, 12);
+    api->SetFsVerityInfoSegment(fsVeritySeg);
+    std::vector<SegmentHeader>list = api->GetSegmentHeaderList();
 
     int32_t magic = 248702752;
     int32_t segmentSize = 0;
@@ -424,7 +279,8 @@ HWTEST_F(CodeSignBlockTest, setSoInfoSegment, testing::ext::TestSize.Level1)
         fileNameList, signInfoList, zeroPadding);
     api->SetSoInfoSegment(soSeg);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(list.size(), 0);
 }
+
 } // namespace SignatureTools
 } // namespace OHOS
\ No newline at end of file
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/fs_verity_info_segment_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/fs_verity_info_segment_test.cpp
index 10bdb64f78ef05d59718782d45a61a993750d298..0fc2dbca1cc0fb9a59e2d05a5aabe28e15fd4d7c 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/fs_verity_info_segment_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/fs_verity_info_segment_test.cpp
@@ -47,7 +47,7 @@ HWTEST_F(FsVerityInfoSegmentTest, fromByteArray001, testing::ext::TestSize.Level
     std::vector<int8_t> bytes;
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->Size(), 64);
 }
 
 /**
@@ -73,7 +73,7 @@ HWTEST_F(FsVerityInfoSegmentTest, fromByteArray002, testing::ext::TestSize.Level
     
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->Size(), 64);
 }
 
 /**
@@ -100,7 +100,7 @@ HWTEST_F(FsVerityInfoSegmentTest, fromByteArray003, testing::ext::TestSize.Level
     
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->Size(), 64);
 }
 
 /**
@@ -128,7 +128,7 @@ HWTEST_F(FsVerityInfoSegmentTest, fromByteArray004, testing::ext::TestSize.Level
     
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->Size(), 64);
 }
 
 /**
@@ -157,7 +157,7 @@ HWTEST_F(FsVerityInfoSegmentTest, fromByteArray005, testing::ext::TestSize.Level
     
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->Size(), 64);
 }
 
 /**
@@ -186,7 +186,7 @@ HWTEST_F(FsVerityInfoSegmentTest, fromByteArray006, testing::ext::TestSize.Level
     
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->Size(), 64);
 }
 
 /**
@@ -207,7 +207,7 @@ HWTEST_F(FsVerityInfoSegmentTest, fromByteArray, testing::ext::TestSize.Level1)
         38, 29, 12, 45, 58, -12, 38, 29, 13, 26 };
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->Size(), 64);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/hap_info_segment_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/hap_info_segment_test.cpp
index 6d4bf653e744602a855b4d74ca2027acd75f1a82..cfd709a54e18cd9fd79f9152db4dac2f4a0d880d 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/hap_info_segment_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/hap_info_segment_test.cpp
@@ -54,7 +54,7 @@ HWTEST_F(HapInfoSegmentTest, fromByteArray001, testing::ext::TestSize.Level1)
 
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(api->GetSize(), 0);
 }
 
 /**
@@ -91,7 +91,7 @@ HWTEST_F(HapInfoSegmentTest, fromByteArray002, testing::ext::TestSize.Level1)
 
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(api->GetSize(), 0);
 }
 
 /**
@@ -128,7 +128,7 @@ HWTEST_F(HapInfoSegmentTest, fromByteArray003, testing::ext::TestSize.Level1)
 
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(api->GetSize(), 0);
 }
 
 /**
@@ -165,7 +165,7 @@ HWTEST_F(HapInfoSegmentTest, fromByteArray004, testing::ext::TestSize.Level1)
 
     api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(api->GetSize(), 0);
 }
 
 
@@ -183,7 +183,7 @@ HWTEST_F(HapInfoSegmentTest, getSignInfo, testing::ext::TestSize.Level1)
 
     api->GetSignInfo();
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(api->GetSize(), 0);
 }
 
 /**
@@ -228,7 +228,7 @@ HWTEST_F(HapInfoSegmentTest, setSignInfo, testing::ext::TestSize.Level1)
     SignInfo signInfo(saltSize, flags, dataSize, salt, sig);
     api->SetSignInfo(signInfo);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(api->GetSize(), 0);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/merkle_tree_extension_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/merkle_tree_extension_test.cpp
index c951e7d8e52d0a7c9637fcd66bfb4a2717df0591..1c1b4c6427794cee90eba4203506ce076e2724fc 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/merkle_tree_extension_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/merkle_tree_extension_test.cpp
@@ -195,7 +195,8 @@ HWTEST_F(MerkleTreeExtensionTest, setMerkleTreeOffset, testing::ext::TestSize.Le
     int64_t offset = 927046;
     api->SetMerkleTreeOffset(offset);
 
-    EXPECT_EQ(true, 1);
+    int64_t flag = api->GetMerkleTreeOffset();
+    EXPECT_EQ(flag, offset);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/native_lib_info_segment_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/native_lib_info_segment_test.cpp
index fd9341341b5034df0865af881cd4158bc7d3f564..0491ff78aa957b0e13c5bcae5b5bff7ce9e48481 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/native_lib_info_segment_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/native_lib_info_segment_test.cpp
@@ -60,9 +60,9 @@ HWTEST_F(NativeLibInfoSegmentTest, fromByteArray001, testing::ext::TestSize.Leve
     byteBuffer.GetData(readComment, 4);
     std::vector<int8_t> bytes(readComment, readComment + 4);
 
-    api->FromByteArray(bytes);
+    NativeLibInfoSegment segment = api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(segment.Size(), 0);
 }
 
 /**
@@ -87,9 +87,9 @@ HWTEST_F(NativeLibInfoSegmentTest, fromByteArray002, testing::ext::TestSize.Leve
     byteBuffer.GetData(readComment, 8);
     std::vector<int8_t> bytes(readComment, readComment + 8);
 
-    api->FromByteArray(bytes);
+    NativeLibInfoSegment segment = api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(segment.Size(), 0);
 }
 
 /**
@@ -115,9 +115,9 @@ HWTEST_F(NativeLibInfoSegmentTest, fromByteArray003, testing::ext::TestSize.Leve
     byteBuffer.GetData(readComment, 12);
     std::vector<int8_t> bytes(readComment, readComment + 12);
 
-    api->FromByteArray(bytes);
+    NativeLibInfoSegment segment = api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(segment.GetSectionNum(), -1);
 }
 
 /**
@@ -155,9 +155,9 @@ HWTEST_F(NativeLibInfoSegmentTest, fromByteArray004, testing::ext::TestSize.Leve
     byteBuffer.GetData(readComment, 36);
     std::vector<int8_t> bytes(readComment, readComment + 36);
 
-    api->FromByteArray(bytes);
+    NativeLibInfoSegment segment = api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(segment.GetSectionNum(), 1);
 }
 
 /**
@@ -195,9 +195,9 @@ HWTEST_F(NativeLibInfoSegmentTest, fromByteArray005, testing::ext::TestSize.Leve
     byteBuffer.GetData(readComment, 36);
     std::vector<int8_t> bytes(readComment, readComment + 36);
 
-    api->FromByteArray(bytes);
+    NativeLibInfoSegment segment = api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(segment.GetFileNameList()[0], "");
 }
 
 /**
@@ -228,9 +228,9 @@ HWTEST_F(NativeLibInfoSegmentTest, getFileNameList, testing::ext::TestSize.Level
 HWTEST_F(NativeLibInfoSegmentTest, getSectionNum, testing::ext::TestSize.Level1)
 {
     std::shared_ptr<NativeLibInfoSegment> api = std::make_shared<NativeLibInfoSegment>();
-    api->GetSectionNum();
+    int32_t num = api->GetSectionNum();
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(num, 0);
 }
 
 /**
@@ -287,7 +287,7 @@ HWTEST_F(NativeLibInfoSegmentTest, setSoInfoList, testing::ext::TestSize.Level1)
 
     api->SetSoInfoList(soInfoList);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(api->GetSectionNum(), 2);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/sign_info_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/sign_info_test.cpp
index 90802898e6f5b451e0ab5dc91c15dee3288b5b4a..2c9451be468711534dd905f00719eeb18bea55c4 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/sign_info_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/sign_info_test.cpp
@@ -48,9 +48,9 @@ HWTEST_F(SignInfoTest, fromByteArray, testing::ext::TestSize.Level1)
         -71, -126, 60, 116, 60, 10, 15, -125, 107, 127, -123, 81, 68, 28, -121, -20,
         -42, -116, -81, -6, 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-    api->FromByteArray(bytes);
+    SignInfo signInfo = api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(signInfo.GetSize(), 0);
 }
 
 /**
@@ -72,7 +72,7 @@ HWTEST_F(SignInfoTest, getDataSize, testing::ext::TestSize.Level1)
 
 /**
  * @tc.name: getExtensionByType
- * @tc.desc: Test function of SignInfoTest::GenerateCsr() interface for SUCCESS.
+ * @tc.desc: Test function of SignInfoTest::getExtensionByType() interface for nullptr.
  * @tc.size: MEDIUM
  * @tc.type: FUNC
  * @tc.level Level 1
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/signed_file_pos_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/signed_file_pos_test.cpp
index e879d3598d3148160e7f8d20a9f261777714ea5f..34bffc4a8a81bce74b0a59137784c7ff22df9183 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/datastructure/signed_file_pos_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/datastructure/signed_file_pos_test.cpp
@@ -47,9 +47,9 @@ HWTEST_F(SignedFilePosTest, fromByteArray, testing::ext::TestSize.Level1)
         -126, 60, 116, 60, 10, 15, -125, 107, 127, -123, 81, 68, 28, -121, -20, -42, -116,
         -81, -6, 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0 };
-    api->FromByteArray(bytes);
+    SignedFilePos pos = api->FromByteArray(bytes);
 
-    EXPECT_EQ(true, 1);
+    EXPECT_NE(pos.GetFileNameOffset(), 0);
 }
 
 /**
@@ -133,8 +133,9 @@ HWTEST_F(SignedFilePosTest, increaseFileNameOffset, testing::ext::TestSize.Level
     std::shared_ptr<SignedFilePos> api = std::make_shared<SignedFilePos>(108, 31, 280, 2068);
 
     api->IncreaseFileNameOffset(1);
+    int32_t offset = api->GetFileNameOffset();
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(offset, 109);
 }
 
 /**
@@ -150,8 +151,9 @@ HWTEST_F(SignedFilePosTest, increaseSignInfoOffset, testing::ext::TestSize.Level
     std::shared_ptr<SignedFilePos> api = std::make_shared<SignedFilePos>(108, 31, 280, 2068);
 
     api->IncreaseSignInfoOffset(2);
+    int32_t offset = api->GetSignInfoOffset();
 
-    EXPECT_EQ(true, 1);
+    EXPECT_EQ(offset, 282);
 }
 } // namespace SignatureTools
 } // namespace OHOS
\ No newline at end of file
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/sign/bc_signeddata_generator_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/sign/bc_signeddata_generator_test.cpp
index 9a80263703621f87af723661cd132b4f3d915a71..171376ecc53af33124de73036cfd4ac76928412c 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/sign/bc_signeddata_generator_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/sign/bc_signeddata_generator_test.cpp
@@ -320,26 +320,12 @@ HWTEST_F(BCSignedDataGeneratorTest, GetSigAlg003, testing::ext::TestSize.Level1)
     options.emplace("inFile", std::string("./codeSigning/entry-default-unsigned-so.hap"));
     signerConfig.SetOptions(&options);
 
+    std::string ownerID;
+    api->SetOwnerId(ownerID);
+
     std::string sigAlg;
     int ret = api->GetSigAlg(&signerConfig, sigAlg);
     EXPECT_EQ(ret, 0);
 }
-
-/**
- * @tc.name: SetOwnerId
- * @tc.desc: Test function of SignToolServiceImpl::GenerateCsr() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(BCSignedDataGeneratorTest, SetOwnerId, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<BCSignedDataGenerator> api = std::make_shared<BCSignedDataGenerator>();
-
-    std::string ownerID;
-    api->SetOwnerId(ownerID);
-    EXPECT_EQ(true, 1);
-}
 } // namespace SignatureTools
 } // namespace OHOS
\ No newline at end of file
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/sign/code_signing_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/sign/code_signing_test.cpp
index e94e148dc88e37f80ab6467fcb3279bff4a3f053..0892be1060cd392cf22eb2f6e0c1838c2e8d23fa 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/sign/code_signing_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/sign/code_signing_test.cpp
@@ -276,6 +276,7 @@ HWTEST_F(CodeSigningTest, getTimestamp, testing::ext::TestSize.Level1)
     signerConfig.SetOptions(&options);
 
     CodeSigning codeSigning(&signerConfig);
+    codeSigning.UpdateCodeSignBlock();
     int64_t timeStamp = codeSigning.GetTimestamp();
     EXPECT_NE(timeStamp, 0);
 }
@@ -456,61 +457,6 @@ HWTEST_F(CodeSigningTest, signNativeLibs, testing::ext::TestSize.Level1)
     EXPECT_EQ(flag, false);
 }
 
-/**
- * @tc.name: updateCodeSignBlock
- * @tc.desc: Test function of CodeSigningTest::updateCodeSignBlock() interface for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(CodeSigningTest, updateCodeSignBlock, testing::ext::TestSize.Level1)
-{
-    SignerConfig signerConfig;
-    signerConfig.SetCompatibleVersion(9);
-
-    std::map<std::string, std::string> params;
-    params["keyPwd"] = "123456";
-    params["mode"] = "localSign";
-    params["keyAlias"] = "oh-app1-key-v1";
-    params["signAlg"] = "SHA256withECDSA";
-    params["appCertFile"] = "./codeSigning/app-release1.pem";
-    params["signCode"] = "1";
-    params["compatibleVersion"] = "9";
-    params["outFile"] = "./codeSigning/entry-default-signed-so.hap";
-    params["profileFile"] = "./codeSigning/signed-profile.p7b";
-    params["keystorePwd"] = "123456";
-    params["keystoreFile"] = "./codeSigning/ohtest.jks";
-    params["inFile"] = "./codeSigning/entry-default-unsigned-so.hap";
-    params["profileSigned"] = "1";
-    signerConfig.FillParameters(params);
-
-    ContentDigestAlgorithm contentDigestAlgorithm("SHA-256", 32);
-    std::pair<std::string, void*> signatureAlgAndParams("SHA256withECDSA", nullptr);
-    SignatureAlgorithmHelper signatureAlgorithm(SignatureAlgorithmId::DSA_WITH_SHA256, "ECDSA_WITH_SHA256",
-                                                contentDigestAlgorithm, signatureAlgAndParams);
-    std::vector<SignatureAlgorithmHelper> signatureAlgorithms;
-    signatureAlgorithms.push_back(signatureAlgorithm);
-    signerConfig.SetSignatureAlgorithms(signatureAlgorithms);
-
-    Options options;
-    options.emplace("mode", std::string("localSign"));
-    options.emplace("keyPwd", std::string("123456"));
-    options.emplace("outFile", std::string("./codeSigning/entry-default-signed-so.hap"));
-    options.emplace("keyAlias", std::string("oh-app1-key-v1"));
-    options.emplace("profileFile", std::string("./codeSigning/signed-profile.p7b"));
-    options.emplace("signAlg", std::string("SHA256withECDSA"));
-    options.emplace("keystorePwd", std::string("123456"));
-    options.emplace("keystoreFile", std::string("./codeSigning/ohtest.jks"));
-    options.emplace("appCertFile", std::string("./codeSigning/app-release1.pem"));
-    options.emplace("inFile", std::string("./codeSigning/entry-default-unsigned-so.hap"));
-    signerConfig.SetOptions(&options);
-
-    CodeSigning codeSigning(&signerConfig);
-    codeSigning.UpdateCodeSignBlock();
-    EXPECT_EQ(true, 1);
-}
-
 /**
  * @tc.name: AppendCodeSignBlock
  * @tc.desc: Test function of CodeSigningTest::AppendCodeSignBlock() interface for FAILED.
diff --git a/hapsigntool_cpp_test/unittest/codeSigning/utils/fs_digest_utils_test.cpp b/hapsigntool_cpp_test/unittest/codeSigning/utils/fs_digest_utils_test.cpp
index 53872026f13ad52f606feb79e87702fd8adacfa6..f5c4d184f99849264b569aea6a34c29f362e922f 100644
--- a/hapsigntool_cpp_test/unittest/codeSigning/utils/fs_digest_utils_test.cpp
+++ b/hapsigntool_cpp_test/unittest/codeSigning/utils/fs_digest_utils_test.cpp
@@ -53,7 +53,10 @@ HWTEST_F(DigestUtilsTest, addData001, testing::ext::TestSize.Level1)
     std::string data(charData);
     api->AddData(data);
 
-    EXPECT_EQ(true, 1);
+    DigestUtils::Type type = DigestUtils::Type::HEX;
+    std::string str = api->Result(type);
+
+    EXPECT_NE(str.size(), 0);
 }
 
 /**
@@ -73,7 +76,10 @@ HWTEST_F(DigestUtilsTest, addData002, testing::ext::TestSize.Level1)
     int length = 32;
     api->AddData(pData, length);
 
-    EXPECT_EQ(true, 1);
+    DigestUtils::Type type = DigestUtils::Type::HEX;
+    std::string str = api->Result(type);
+
+    EXPECT_NE(str.size(), 0);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp b/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp
index 64fe6c3523ac68cd25f1f282336037c6905a1595..a07dd6cea80a1857c24bdb75ec611c39c737eada 100644
--- a/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp
+++ b/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp
@@ -1102,21 +1102,6 @@ HWTEST_F(GenerateCaTest, get_csr_test_002, testing::ext::TestSize.Level1)
     EXPECT_EQ(ret, false);
 }
 
-/**
- * @tc.name: save_cert_to_file_test_001
- * @tc.desc: Test function of CertTools::SaveCertTofile interface for SUCCESS.
- * @tc.type: FUNC
- * @tc.require: SR000H63TL
- */
-HWTEST_F(GenerateCaTest, save_cert_to_file_test_001, testing::ext::TestSize.Level1)
-{
-    X509* cert = X509_new();
-    EXPECT_NE(cert, nullptr);
-    std::string rootoutFile = "root-ca1.cer";
-    CertTools::SaveCertTofile(rootoutFile, cert);
-}
-
-
 /**
  * @tc.name: save_cert_to_file_test_002
  * @tc.desc: Test function of CertTools::SaveCertTofile()  interface with a empty rootfile FAIL.
@@ -1127,7 +1112,8 @@ HWTEST_F(GenerateCaTest, save_cert_to_file_test_002, testing::ext::TestSize.Leve
 {
     X509* cert = X509_new();
     std::string rootoutFile = "";
-    CertTools::SaveCertTofile(rootoutFile, cert);
+    bool ret = CertTools::SaveCertTofile(rootoutFile, cert);
+    EXPECT_EQ(ret, false);
 }
 
 /**
@@ -1453,7 +1439,7 @@ HWTEST_F(GenerateCaTest, generate_key_store_001, testing::ext::TestSize.Level1)
 
 /**
 * @tc.name: handle_issuer_key_alias_empty_001
-* @tc.desc: Test function of HandleIssuerKeyAliasEmpty()  interface for SUCCESS.
+* @tc.desc: Test function of HandleIssuerKeyAliasEmpty()  interface for RET_FAILED.
 * @tc.type: FUNC
 * @tc.require: SR000H63TL
 */
@@ -1465,7 +1451,8 @@ HWTEST_F(GenerateCaTest, handle_issuer_key_alias_empty_001, testing::ext::TestSi
     std::string issuerKeystoreFile = "/data/test/generateCA/issuer.p12";
     (*params)["issuerKeystoreFile"] = issuerKeystoreFile;
     (*params)["keystoreFile"] = keystoreFile;
-    api->HandleIssuerKeyAliasEmpty(params.get());
+    int res = api->HandleIssuerKeyAliasEmpty(params.get());
+    EXPECT_EQ(res, RET_FAILED);
 }
 
 /**
@@ -1486,12 +1473,13 @@ HWTEST_F(GenerateCaTest, handle_issuer_key_alias_empty_002, testing::ext::TestSi
     (*params)["keystoreFile"] = keystoreFile;
     (*params)["issuerKeystorePwd"] = issuerstorepwd;
     (*params)["keystorePwd"] = keystorepwd;
-    api->HandleIssuerKeyAliasEmpty(params.get());
+    int res = api->HandleIssuerKeyAliasEmpty(params.get());
+    EXPECT_EQ(res, RET_FAILED);
 }
 
 /**
 * @tc.name: handle_issuer_key_alias_empty_003
-* @tc.desc: Test function of HandleIssuerKeyAliasEmpty()  interface for SUCCESS.
+* @tc.desc: Test function of HandleIssuerKeyAliasEmpty()  interface for RET_FAILED.
 * @tc.type: FUNC
 * @tc.require: SR000H63TL
 */
@@ -1507,12 +1495,13 @@ HWTEST_F(GenerateCaTest, handle_issuer_key_alias_empty_003, testing::ext::TestSi
     (*params)["keystoreFile"] = keystoreFile;
     (*params)["issuerKeystorePwd"] = issuerstorepwd;
     (*params)["keystorePwd"] = keystorepwd;
-    api->HandleIssuerKeyAliasEmpty(params.get());
+    int res = api->HandleIssuerKeyAliasEmpty(params.get());
+    EXPECT_EQ(res, RET_FAILED);
 }
 
 /**
 * @tc.name: handle_issuer_key_alias_empty_004
-* @tc.desc: Test function of HandleIssuerKeyAliasEmpty()  interface with a empty issuerKeystoreFile FAIL.
+* @tc.desc: Test function of HandleIssuerKeyAliasEmpty()  interface with a empty issuerKeystoreFile RET_OK.
 * @tc.type: FUNC
 * @tc.require: SR000H63TL
 */
@@ -1528,11 +1517,12 @@ HWTEST_F(GenerateCaTest, handle_issuer_key_alias_empty_004, testing::ext::TestSi
     (*params)["keystoreFile"] = keystoreFile;
     (*params)["issuerKeystorePwd"] = issuerstorepwd;
     (*params)["keystorePwd"] = keystorepwd;
-    api->HandleIssuerKeyAliasEmpty(params.get());
+    int res = api->HandleIssuerKeyAliasEmpty(params.get());
+    EXPECT_EQ(res, RET_OK);
 }
 /**
 * @tc.name: handle_issuer_key_alias_not_empty_001
-* @tc.desc: Test function of HandleIsserKeyAliasNotEmpty()  interface with a empty issuerKeystoreFile FAIL.
+* @tc.desc: Test function of HandleIsserKeyAliasNotEmpty()  interface with a empty issuerKeystoreFile RET_OK.
 * @tc.type: FUNC
 * @tc.require: SR000H63TL
 */
@@ -1542,7 +1532,8 @@ HWTEST_F(GenerateCaTest, handle_issuer_key_alias_not_empty_001, testing::ext::Te
     std::shared_ptr<SignToolServiceImpl> api = std::make_shared<SignToolServiceImpl>();
     std::string issuerKeystoreFile = "";
     (*params)["issuerKeystoreFile"] = issuerKeystoreFile;
-    api->HandleIsserKeyAliasNotEmpty(params.get());
+    int res = api->HandleIsserKeyAliasNotEmpty(params.get());
+    EXPECT_EQ(res, RET_OK);
 }
 
 /**
@@ -1557,7 +1548,8 @@ HWTEST_F(GenerateCaTest, handle_issuer_key_alias_not_empty_002, testing::ext::Te
     std::shared_ptr<SignToolServiceImpl> api = std::make_shared<SignToolServiceImpl>();
     std::string issuerKeystoreFile = "/data/test/generateCA/other.cer";
     (*params)["issuerKeystoreFile"] = issuerKeystoreFile;
-    api->HandleIsserKeyAliasNotEmpty(params.get());
+    int res = api->HandleIsserKeyAliasNotEmpty(params.get());
+    EXPECT_EQ(res, RET_FAILED);
 }
 
 /**
@@ -1770,7 +1762,8 @@ HWTEST_F(GenerateCaTest, issuer_key_store_file_001, testing::ext::TestSize.Level
     std::unique_ptr<LocalizationAdapter> adaptePtr = std::make_unique<LocalizationAdapter>(params.get());
     EVP_PKEY* keyPair = nullptr;
     keyPair = adaptePtr->GetAliasKey(true);
-    adaptePtr->IssuerKeyStoreFile(&keyPair, true);
+    int ret = adaptePtr->IssuerKeyStoreFile(&keyPair, true);
+    EXPECT_EQ(ret, RET_FAILED);
 }
 }
 }
\ No newline at end of file
diff --git a/hapsigntool_cpp_test/unittest/generateCsr/generate_csr_test.cpp b/hapsigntool_cpp_test/unittest/generateCsr/generate_csr_test.cpp
index 0b0c286422fe631c812d1abff54e86aa61247b47..09eb0df76d5752e8d38420addcd9f8463bca5505 100644
--- a/hapsigntool_cpp_test/unittest/generateCsr/generate_csr_test.cpp
+++ b/hapsigntool_cpp_test/unittest/generateCsr/generate_csr_test.cpp
@@ -717,6 +717,7 @@ HWTEST_F(GenerateCsrTest, process_cmd_test_004, testing::ext::TestSize.Level1)
 {
     char arg0[] = "", arg1[] = "-v";
     char* args[] = { arg0, arg1 };
+    ParamsRunTool::Version();
     EXPECT_EQ(ParamsRunTool::ProcessCmd(args, sizeof(args) / sizeof((char*)arg0)), true);
 }
 
@@ -733,17 +734,6 @@ HWTEST_F(GenerateCsrTest, is_valid_file_test_001, testing::ext::TestSize.Level1)
     EXPECT_EQ(FileUtils::IsValidFile("/data/test/generateCsr/"), false);
 }
 
-/**
- * @tc.name: version_test_001
- * @tc.desc: Test function of ParamsRunTool::Version() interface for SUCCESS.
- * @tc.type: FUNC
- * @tc.require: SR000H63TL
- */
-HWTEST_F(GenerateCsrTest, version_test_001, testing::ext::TestSize.Level1)
-{
-    ParamsRunTool::Version();
-}
-
 /**
  * @tc.name: convert2params_test_001
  * @tc.desc: Test function of CmdUtil::Convert2Params() interface for SUCCESS.
@@ -890,7 +880,8 @@ HWTEST_F(GenerateCsrTest, get_hash_algs_id_test_001, testing::ext::TestSize.Leve
     HashUtils::GetHashAlgsId("SHA-224");
     HashUtils::GetHashAlgsId("SHA-384");
     HashUtils::GetHashAlgsId("SHA-512");
-    HashUtils::GetHashAlgsId("SHA-1024");
+    int ret = HashUtils::GetHashAlgsId("SHA-1024");
+    EXPECT_EQ(ret, 0);
 }
 
 /**
@@ -904,19 +895,8 @@ HWTEST_F(GenerateCsrTest, get_hash_algs_name_test_001, testing::ext::TestSize.Le
     HashUtils::GetHashAlgName(5);
     HashUtils::GetHashAlgName(7);
     HashUtils::GetHashAlgName(8);
-    HashUtils::GetHashAlgName(9);
-}
-
-/**
- * @tc.name: get_digest_from_bytes_test_001
- * @tc.desc: Test function of HashUtils::GetDigestFromBytes() interface for SUCCESS.
- * @tc.type: FUNC
- * @tc.require: SR000H63TL
- */
-HWTEST_F(GenerateCsrTest, get_digest_from_bytes_test_001, testing::ext::TestSize.Level1)
-{
-    HashUtils::GetDigestFromBytes({}, 1, "");
-    HashUtils::GetDigestFromBytes({ 'a' }, 0, "");
+    std::string ret = HashUtils::GetHashAlgName(9);
+    EXPECT_EQ(ret, "");
 }
 
 /**
@@ -927,10 +907,14 @@ HWTEST_F(GenerateCsrTest, get_digest_from_bytes_test_001, testing::ext::TestSize
  */
 HWTEST_F(GenerateCsrTest, read_data_and_digest_update_test_001, testing::ext::TestSize.Level1)
 {
+    HashUtils::GetDigestFromBytes({}, 1, "");
+    HashUtils::GetDigestFromBytes({ 'a' }, 0, "");
+
     RandomAccessFile file;
     FileDataSource src(file, 0, 0, 0);
     DigestParameter param;
-    src.ReadDataAndDigestUpdate(param, -1);
+    bool ret = src.ReadDataAndDigestUpdate(param, -1);
+    EXPECT_EQ(ret, false);
 }
 
 /**
@@ -944,7 +928,8 @@ HWTEST_F(GenerateCsrTest, read_data_and_digest_update_test_002, testing::ext::Te
     ByteBuffer buffer;
     ByteBufferDataSource src(buffer);
     DigestParameter param;
-    src.ReadDataAndDigestUpdate(param, -1);
+    bool ret = src.ReadDataAndDigestUpdate(param, -1);
+    EXPECT_EQ(ret, false);
 }
 
 } // namespace SignatureTools
diff --git a/hapsigntool_cpp_test/unittest/generateKeyPair/hap_sign_tool_test.cpp b/hapsigntool_cpp_test/unittest/generateKeyPair/hap_sign_tool_test.cpp
index 825616d0c23b1e83508c121c86595d4122053f63..eb0c5f5e04a973672b512b366a4926de79a37ff8 100644
--- a/hapsigntool_cpp_test/unittest/generateKeyPair/hap_sign_tool_test.cpp
+++ b/hapsigntool_cpp_test/unittest/generateKeyPair/hap_sign_tool_test.cpp
@@ -836,17 +836,6 @@ HWTEST_F(HapSignToolTest, hap_sign_tool_test_021, testing::ext::TestSize.Level1)
     EXPECT_EQ(ret, true);
 }
 
-/*
- * @tc.name: hap_sign_tool_test_022
- * @tc.desc: Print version number.
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(HapSignToolTest, hap_sign_tool_test_022, testing::ext::TestSize.Level1)
-{
-    ParamsRunTool::Version();
-}
-
 /*
 * @tc.name: hap_sign_tool_test_023
 * @tc.desc: Generate the root certificate entry check.
diff --git a/hapsigntool_cpp_test/unittest/hapSign/block_data_test.cpp b/hapsigntool_cpp_test/unittest/hapSign/block_data_test.cpp
index 26e322ef4abe6af149bf311634cc295adc882656..e2bb0ab3c77174cbe280917c0ce86fa98f250814 100644
--- a/hapsigntool_cpp_test/unittest/hapSign/block_data_test.cpp
+++ b/hapsigntool_cpp_test/unittest/hapSign/block_data_test.cpp
@@ -80,7 +80,8 @@ HWTEST_F(BlockDataTest, SetBlockNum, testing::ext::TestSize.Level1)
 {
     std::shared_ptr<BlockData> api = std::make_shared<BlockData>(2, 0);
     api->SetBlockNum(3);
-    EXPECT_EQ(true, 1);
+    int32_t blockNum = api->GetBlockNum();
+    EXPECT_EQ(blockNum, 3);
 }
 
 /**
@@ -95,7 +96,8 @@ HWTEST_F(BlockDataTest, SetBlockStart, testing::ext::TestSize.Level1)
 {
     std::shared_ptr<BlockData> api = std::make_shared<BlockData>(2, 0);
     api->SetBlockStart(1);
-    EXPECT_EQ(true, 1);
+    int32_t blockStart = api->GetBlockStart();
+    EXPECT_EQ(blockStart, 1);
 }
 } // namespace SignatureTools
 } // namespace OHOS
\ No newline at end of file
diff --git a/hapsigntool_cpp_test/unittest/hapSign/block_head_test.cpp b/hapsigntool_cpp_test/unittest/hapSign/block_head_test.cpp
index a73d219fc04e251ee3c6ffbedd0f9125566983c1..c08a849a3d0489728bc5fa3c2417f09418b2c882 100644
--- a/hapsigntool_cpp_test/unittest/hapSign/block_head_test.cpp
+++ b/hapsigntool_cpp_test/unittest/hapSign/block_head_test.cpp
@@ -64,23 +64,8 @@ HWTEST_F(BlockHeadTest, GetBlockHead, testing::ext::TestSize.Level1)
 HWTEST_F(BlockHeadTest, GetBlockHeadLittleEndian, testing::ext::TestSize.Level1)
 {
     std::shared_ptr<BlockHead> api = std::make_shared<BlockHead>();
-    api->GetBlockHeadLittleEndian(0, 0, 0, 29148868);
-    EXPECT_EQ(true, 1);
-}
-
-/**
- * @tc.name: getBlockHeadLittleEndian
- * @tc.desc: Test get block head by little endian for SUCCESS.
- * @tc.size: MEDIUM
- * @tc.type: FUNC
- * @tc.level Level 1
- * @tc.require: SR000H63TL
- */
-HWTEST_F(BlockHeadTest, getBlockHeadLittleEndian, testing::ext::TestSize.Level1)
-{
-    std::shared_ptr<BlockHead> api = std::make_shared<BlockHead>();
-    api->GetBlockHeadLittleEndian(0, 0, 0, 29148868);
-    EXPECT_EQ(true, 1);
+    std::vector<int8_t> head = api->GetBlockHeadLittleEndian(0, 0, 0, 29148868);
+    EXPECT_NE(head.size(), 0);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/hapSign/sign_bin_test.cpp b/hapsigntool_cpp_test/unittest/hapSign/sign_bin_test.cpp
index 0521c018ea5b5d9661b213a563567ba7dbb6853e..950ed0ec518855a14eff16821f9ddb7cfebeb95e 100644
--- a/hapsigntool_cpp_test/unittest/hapSign/sign_bin_test.cpp
+++ b/hapsigntool_cpp_test/unittest/hapSign/sign_bin_test.cpp
@@ -182,8 +182,8 @@ HWTEST_F(SignBinTest, Sign001, testing::ext::TestSize.Level1)
     signParams["signCode"] = signCode;
     signParams["mode"] = mode;
 
-    api->Sign(signerConfig, signParams);
-    EXPECT_EQ(true, 1);
+    bool flag = api->Sign(signerConfig, signParams);
+    EXPECT_EQ(flag, false);
 }
 
 /**
@@ -208,8 +208,8 @@ HWTEST_F(SignBinTest, Sign002, testing::ext::TestSize.Level1)
     std::map<std::string, std::string> signParams;
     ConstructSignParams(signParams);
 
-    api->Sign(signerConfig, signParams);
-    EXPECT_EQ(true, 1);
+    bool flag = api->Sign(signerConfig, signParams);
+    EXPECT_EQ(flag, false);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/hapSign/sign_block_data_test.cpp b/hapsigntool_cpp_test/unittest/hapSign/sign_block_data_test.cpp
index 94adaffdc8865446bfa7e92ae59d9f2062d3dbfc..ee0b89c804d145344102d4bde3cfb4e25442598a 100644
--- a/hapsigntool_cpp_test/unittest/hapSign/sign_block_data_test.cpp
+++ b/hapsigntool_cpp_test/unittest/hapSign/sign_block_data_test.cpp
@@ -50,9 +50,11 @@ public:
 HWTEST_F(SignBlockDataTest, getBlockHead, testing::ext::TestSize.Level1)
 {
     std::vector<int8_t> signData(std::vector<int8_t>(32, 0));
+    std::vector<int8_t> blockHead(std::vector<int8_t>(32, 0));
     std::shared_ptr<SignBlockData> api = std::make_shared<SignBlockData>(signData, 3);
-    api->GetBlockHead();
-    EXPECT_EQ(true, 1);
+    api->SetBlockHead(blockHead);
+    std::vector<int8_t> head = api->GetBlockHead();
+    EXPECT_EQ(head.size(), blockHead.size());
 }
 
 /**
@@ -148,7 +150,8 @@ HWTEST_F(SignBlockDataTest, setBlockHead, testing::ext::TestSize.Level1)
     std::vector<int8_t> signData(std::vector<int8_t>(32, 0));
     std::shared_ptr<SignBlockData> api = std::make_shared<SignBlockData>(signData, 3);
     api->SetBlockHead(signData);
-    EXPECT_EQ(true, 1);
+    std::vector<int8_t> head = api->GetBlockHead();
+    EXPECT_EQ(head.size(), signData.size());
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/signProfile/profile_test.cpp b/hapsigntool_cpp_test/unittest/signProfile/profile_test.cpp
index 72b4010517a6c3847c78f808081d64a0d24271f5..13e70893b2dddd5cec1906a8f9e41fe0d7a43694 100644
--- a/hapsigntool_cpp_test/unittest/signProfile/profile_test.cpp
+++ b/hapsigntool_cpp_test/unittest/signProfile/profile_test.cpp
@@ -496,6 +496,7 @@ HWTEST_F(ProfileTest, profile_test015, testing::ext::TestSize.Level1)
     ProfileInfo info2;
     info = &info2;
     info2 = *info;
+    EXPECT_EQ(info2.profileBlockLength, info->profileBlockLength);
 }
 
 /**
@@ -566,6 +567,7 @@ HWTEST_F(ProfileTest, profile_test019, testing::ext::TestSize.Level1)
 {
     STACK_OF(X509)* certs = nullptr;
     PKCS7Data::PrintCertChainSub(certs);
+    EXPECT_EQ(certs, nullptr);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/signProfile/provision_test.cpp b/hapsigntool_cpp_test/unittest/signProfile/provision_test.cpp
index 0f21271236427fea6e4ceeae8c2574a8c29ab042..d9f2f7bf61db016dbf2957b4aa1e6cd13911232e 100644
--- a/hapsigntool_cpp_test/unittest/signProfile/provision_test.cpp
+++ b/hapsigntool_cpp_test/unittest/signProfile/provision_test.cpp
@@ -386,6 +386,7 @@ HWTEST_F(ProvisionTest, provision_test021, testing::ext::TestSize.Level1)
     ProfileInfo info2;
     info2.profileBlockLength = 0;
     info = info2;
+    EXPECT_EQ(info.profileBlockLength, info2.profileBlockLength);
 }
 
 /**
@@ -403,6 +404,7 @@ HWTEST_F(ProvisionTest, provision_test023, testing::ext::TestSize.Level1)
     info2.profileBlockLength = 5;
     info2.profileBlock = NULL;
     info = info2;
+    EXPECT_EQ(info.profileBlockLength, info2.profileBlockLength);
 }
 
 /**
@@ -659,6 +661,7 @@ HWTEST_F(ProvisionTest, provision_test032, testing::ext::TestSize.Level1)
     STACK_OF(X509)* certs = NULL;
     std::shared_ptr<Signer> signer = NULL;
     signer = std::make_shared<LocalSigner>(pkey, certs);
+    EXPECT_NE(signer, nullptr);
 }
 
 /**
@@ -696,6 +699,7 @@ HWTEST_F(ProvisionTest, provision_test033, testing::ext::TestSize.Level1)
     LocalizationAdapter adapter(&options);
     pkey = adapter.GetAliasKey(false);
     std::shared_ptr<Signer> signer = std::make_shared<LocalSigner>(pkey, certs);
+    EXPECT_NE(signer, nullptr);
 }
 
 /**
@@ -733,6 +737,7 @@ HWTEST_F(ProvisionTest, provision_test034, testing::ext::TestSize.Level1)
     LocalizationAdapter adapter(&options);
     pkey = adapter.GetAliasKey(false);
     std::shared_ptr<Signer> signer = std::make_shared<LocalSigner>(pkey, certs);
+    EXPECT_NE(signer, nullptr);
 }
 
 /**
@@ -776,6 +781,7 @@ HWTEST_F(ProvisionTest, provision_test035, testing::ext::TestSize.Level1)
     sk_X509_push(certsDup, cert);
     std::shared_ptr<Signer> signer2 = std::make_shared<LocalSigner>(pkey, certsDup);
     std::string signature = signer2->GetSignature("content", "SHA384withECDSA");
+    EXPECT_NE(signer, nullptr);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/signProfile/sign_profile_test.cpp b/hapsigntool_cpp_test/unittest/signProfile/sign_profile_test.cpp
index 918d4ac50d4f0e2ec06fad403a252464ea2d8a1e..6cf24bf5dabb35dd4bf34e007d84bc3c9c37ceda 100644
--- a/hapsigntool_cpp_test/unittest/signProfile/sign_profile_test.cpp
+++ b/hapsigntool_cpp_test/unittest/signProfile/sign_profile_test.cpp
@@ -279,8 +279,8 @@ HWTEST_F(SignProfileTest, print_cert_chain_sub_test001, testing::ext::TestSize.L
     std::shared_ptr<Signer> signer = factory.GetSigner(adapter);
     STACK_OF(X509)* certs = signer->GetCertificates();
     PKCS7Data::PrintCertChainSub(certs);
-    PKCS7Data::SortX509Stack(certs);
-    EXPECT_TRUE(true);
+    int ret = PKCS7Data::SortX509Stack(certs);
+    EXPECT_EQ(ret, RET_OK);
 }
 
 /**
@@ -297,7 +297,8 @@ HWTEST_F(SignProfileTest, run_verify_profile_test001, testing::ext::TestSize.Lev
     options[Options::IN_FILE] = VERIFY_PROFILE_IN_FILE;
     options[Options::OUT_FILE] = VERIFY_PROFILE_OUT_FILE;
     SignToolServiceImpl api;
-    ParamsRunTool::RunVerifyProfile(&options, api);
+    bool ret = ParamsRunTool::RunVerifyProfile(&options, api);
+    EXPECT_EQ(ret, true);
 }
 
 /**
diff --git a/hapsigntool_cpp_test/unittest/utils/file_utils_test.cpp b/hapsigntool_cpp_test/unittest/utils/file_utils_test.cpp
index a5a7f52dede013e4d4cb7197ac8b9a53cf881cd5..739fedd837cb0a874130c275e0442535d9e20641 100644
--- a/hapsigntool_cpp_test/unittest/utils/file_utils_test.cpp
+++ b/hapsigntool_cpp_test/unittest/utils/file_utils_test.cpp
@@ -593,12 +593,13 @@ HWTEST_F(FileUtilsTest, DelDir, testing::ext::TestSize.Level1)
 
     // create dir and file again
     std::filesystem::path dir_path(fileName);
-    std::filesystem::create_directories(dir_path);
+    bool ret = std::filesystem::create_directories(dir_path);
 
     std::filesystem::path file_path = dir_path / "example.txt";
     std::ofstream file(file_path, std::ios::binary | std::ios::out);
     file.close();
     FileUtils::DelDir(fileName);
+    EXPECT_EQ(ret, true);
 }
 
 /**
@@ -642,7 +643,8 @@ HWTEST_F(FileUtilsTest, GCheckDn001, testing::ext::TestSize.Level1)
 {
     std::vector<std::pair<std::string, std::string>> pairs;
     pairs.push_back({ "1111", "2222" });
-    g_checkDn(std::string(","), pairs);
+    int ret = g_checkDn(std::string(","), pairs);
+    EXPECT_NE(ret, 0);
 }
 
 /**
@@ -657,7 +659,8 @@ HWTEST_F(FileUtilsTest, GCheckDn002, testing::ext::TestSize.Level1)
 {
     std::vector<std::pair<std::string, std::string>> pairs;
     pairs.push_back({ "1111", "2222" });
-    g_checkDn(std::string("hello=="), pairs);
+    int ret = g_checkDn(std::string("hello=="), pairs);
+    EXPECT_NE(ret, 0);
 }
 } // namespace SignatureTools
 } // namespace OHOS
\ No newline at end of file