From 1153f97c350877e20c336489e0146aa3d41200cd Mon Sep 17 00:00:00 2001 From: zhanzeyi Date: Fri, 2 Aug 2024 17:35:27 +0800 Subject: [PATCH 1/3] add Signed-off-by: zhanzeyi --- hapsigntool_cpp_test/unittest/BUILD.gn | 7 +++-- .../unittest/elfVerify/verify_elf_test.cpp | 6 ++-- ...lock_data_test.cpp => block_data_test.cpp} | 28 +++++++++---------- ...lock_head_test.cpp => block_head_test.cpp} | 24 ++++++++-------- ..._sign_head_test.cpp => sign_head_test.cpp} | 12 ++++---- 5 files changed, 39 insertions(+), 38 deletions(-) rename hapsigntool_cpp_test/unittest/hapSign/{hw_block_data_test.cpp => block_data_test.cpp} (64%) rename hapsigntool_cpp_test/unittest/hapSign/{hw_block_head_test.cpp => block_head_test.cpp} (73%) rename hapsigntool_cpp_test/unittest/hapSign/{hw_sign_head_test.cpp => sign_head_test.cpp} (81%) diff --git a/hapsigntool_cpp_test/unittest/BUILD.gn b/hapsigntool_cpp_test/unittest/BUILD.gn index 56a21a38..5470927e 100644 --- a/hapsigntool_cpp_test/unittest/BUILD.gn +++ b/hapsigntool_cpp_test/unittest/BUILD.gn @@ -67,9 +67,9 @@ ohos_unittest("hapsigntool_pc_unittest") { "./generateKeyPair/process_cmd_test.cpp", "./hapSign/hap_openssl_utils_test.cpp", "./hapSign/hap_sign_test.cpp", - "./hapSign/hw_block_data_test.cpp", - "./hapSign/hw_block_head_test.cpp", - "./hapSign/hw_sign_head_test.cpp", + "./hapSign/block_data_test.cpp", + "./hapSign/block_head_test.cpp", + "./hapSign/sign_head_test.cpp", "./hapSign/sign_bin_test.cpp", "./hapSign/sign_block_data_test.cpp", "./hapSign/sign_elf_test.cpp", @@ -85,6 +85,7 @@ ohos_unittest("hapsigntool_pc_unittest") { "./signProfile/sign_profile_test.cpp", "./utils/byte_array_utils_test.cpp", "./utils/file_utils_test.cpp", + "./utils/cert_tools_test.cpp", "./zip/random_access_file_input_output_test.cpp", "./zip/zip_signer_test.cpp", ] diff --git a/hapsigntool_cpp_test/unittest/elfVerify/verify_elf_test.cpp b/hapsigntool_cpp_test/unittest/elfVerify/verify_elf_test.cpp index d08fd629..689a798d 100644 --- a/hapsigntool_cpp_test/unittest/elfVerify/verify_elf_test.cpp +++ b/hapsigntool_cpp_test/unittest/elfVerify/verify_elf_test.cpp @@ -18,7 +18,7 @@ #include #include "verify_elf.h" -#include "hw_block_data.h" +#include "block_data.h" #include "sign_provider.h" #include "verify_hap.h" @@ -369,9 +369,9 @@ HWTEST_F(VerifyElfTest, CheckSignFile, testing::ext::TestSize.Level1) HWTEST_F(VerifyElfTest, GetSignBlockData, testing::ext::TestSize.Level1) { std::vector bytes = { 1, 1, 1, 1, 1, 1, 1, 1 }; - HwBlockData hwBlockData(0, 0); + BlockData BlockData(0, 0); - bool flag = VerifyElf::GetSignBlockData(bytes, hwBlockData, "elf"); + bool flag = VerifyElf::GetSignBlockData(bytes, BlockData, "elf"); EXPECT_EQ(flag, false); } diff --git a/hapsigntool_cpp_test/unittest/hapSign/hw_block_data_test.cpp b/hapsigntool_cpp_test/unittest/hapSign/block_data_test.cpp similarity index 64% rename from hapsigntool_cpp_test/unittest/hapSign/hw_block_data_test.cpp rename to hapsigntool_cpp_test/unittest/hapSign/block_data_test.cpp index 938fb777..26e322ef 100644 --- a/hapsigntool_cpp_test/unittest/hapSign/hw_block_data_test.cpp +++ b/hapsigntool_cpp_test/unittest/hapSign/block_data_test.cpp @@ -14,7 +14,7 @@ */ #include #include -#include "hw_block_data.h" +#include "block_data.h" namespace OHOS { namespace SignatureTools { @@ -22,7 +22,7 @@ namespace SignatureTools { /* * 测试套件,固定写法 */ -class HwBlockDataTest : public testing::Test { +class BlockDataTest : public testing::Test { public: static void SetUpTestCase(void) { @@ -40,60 +40,60 @@ public: /** * @tc.name: GetBlockNum - * @tc.desc: Test function of HwBlockDataTest::GetBlockNum() interface for SUCCESS. + * @tc.desc: Test function of BlockDataTest::GetBlockNum() interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwBlockDataTest, GetBlockNum, testing::ext::TestSize.Level1) +HWTEST_F(BlockDataTest, GetBlockNum, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(2, 0); + std::shared_ptr api = std::make_shared(2, 0); int32_t blockNum = api->GetBlockNum(); EXPECT_EQ(blockNum, 2); } /** * @tc.name: GetBlockStart - * @tc.desc: Test function of HwBlockDataTest::GetBlockStart() interface for SUCCESS. + * @tc.desc: Test function of BlockDataTest::GetBlockStart() interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwBlockDataTest, GetBlockStart, testing::ext::TestSize.Level1) +HWTEST_F(BlockDataTest, GetBlockStart, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(2, 0); + std::shared_ptr api = std::make_shared(2, 0); int32_t blockStart = api->GetBlockStart(); EXPECT_EQ(blockStart, 0); } /** * @tc.name: SetBlockNum - * @tc.desc: Test function of HwBlockDataTest::SetBlockNum() interface for SUCCESS. + * @tc.desc: Test function of BlockDataTest::SetBlockNum() interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwBlockDataTest, SetBlockNum, testing::ext::TestSize.Level1) +HWTEST_F(BlockDataTest, SetBlockNum, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(2, 0); + std::shared_ptr api = std::make_shared(2, 0); api->SetBlockNum(3); EXPECT_EQ(true, 1); } /** * @tc.name: SetBlockStart - * @tc.desc: Test function of HwBlockDataTest::SetBlockStart() interface for SUCCESS. + * @tc.desc: Test function of BlockDataTest::SetBlockStart() interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwBlockDataTest, SetBlockStart, testing::ext::TestSize.Level1) +HWTEST_F(BlockDataTest, SetBlockStart, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(2, 0); + std::shared_ptr api = std::make_shared(2, 0); api->SetBlockStart(1); EXPECT_EQ(true, 1); } diff --git a/hapsigntool_cpp_test/unittest/hapSign/hw_block_head_test.cpp b/hapsigntool_cpp_test/unittest/hapSign/block_head_test.cpp similarity index 73% rename from hapsigntool_cpp_test/unittest/hapSign/hw_block_head_test.cpp rename to hapsigntool_cpp_test/unittest/hapSign/block_head_test.cpp index 489e3795..a73d219f 100644 --- a/hapsigntool_cpp_test/unittest/hapSign/hw_block_head_test.cpp +++ b/hapsigntool_cpp_test/unittest/hapSign/block_head_test.cpp @@ -14,7 +14,7 @@ */ #include #include -#include "hw_block_head.h" +#include "block_head.h" namespace OHOS { namespace SignatureTools { @@ -22,7 +22,7 @@ namespace SignatureTools { /* * 测试套件,固定写法 */ -class HwBlockHeadTest : public testing::Test { +class BlockHeadTest : public testing::Test { public: static void SetUpTestCase(void) { @@ -46,9 +46,9 @@ public: * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwBlockHeadTest, GetBlockHead, testing::ext::TestSize.Level1) +HWTEST_F(BlockHeadTest, GetBlockHead, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(); + std::shared_ptr api = std::make_shared(); std::string blockHead = api->GetBlockHead(0, 0, 0, 29148868); EXPECT_NE(blockHead.size(), 0); } @@ -61,9 +61,9 @@ HWTEST_F(HwBlockHeadTest, GetBlockHead, testing::ext::TestSize.Level1) * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwBlockHeadTest, GetBlockHeadLittleEndian, testing::ext::TestSize.Level1) +HWTEST_F(BlockHeadTest, GetBlockHeadLittleEndian, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(); + std::shared_ptr api = std::make_shared(); api->GetBlockHeadLittleEndian(0, 0, 0, 29148868); EXPECT_EQ(true, 1); } @@ -76,9 +76,9 @@ HWTEST_F(HwBlockHeadTest, GetBlockHeadLittleEndian, testing::ext::TestSize.Level * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwBlockHeadTest, getBlockHeadLittleEndian, testing::ext::TestSize.Level1) +HWTEST_F(BlockHeadTest, getBlockHeadLittleEndian, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(); + std::shared_ptr api = std::make_shared(); api->GetBlockHeadLittleEndian(0, 0, 0, 29148868); EXPECT_EQ(true, 1); } @@ -91,9 +91,9 @@ HWTEST_F(HwBlockHeadTest, getBlockHeadLittleEndian, testing::ext::TestSize.Level * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwBlockHeadTest, GetBlockLen, testing::ext::TestSize.Level1) +HWTEST_F(BlockHeadTest, GetBlockLen, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(); + std::shared_ptr api = std::make_shared(); int blockLen = api->GetBlockLen(); EXPECT_EQ(blockLen, 8); } @@ -106,9 +106,9 @@ HWTEST_F(HwBlockHeadTest, GetBlockLen, testing::ext::TestSize.Level1) * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwBlockHeadTest, GetElfBlockLen, testing::ext::TestSize.Level1) +HWTEST_F(BlockHeadTest, GetElfBlockLen, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(); + std::shared_ptr api = std::make_shared(); int elfBlockLen = api->GetElfBlockLen(); EXPECT_EQ(elfBlockLen, 12); } diff --git a/hapsigntool_cpp_test/unittest/hapSign/hw_sign_head_test.cpp b/hapsigntool_cpp_test/unittest/hapSign/sign_head_test.cpp similarity index 81% rename from hapsigntool_cpp_test/unittest/hapSign/hw_sign_head_test.cpp rename to hapsigntool_cpp_test/unittest/hapSign/sign_head_test.cpp index fa5c2c4c..86d35be4 100644 --- a/hapsigntool_cpp_test/unittest/hapSign/hw_sign_head_test.cpp +++ b/hapsigntool_cpp_test/unittest/hapSign/sign_head_test.cpp @@ -14,7 +14,7 @@ */ #include #include -#include "hw_sign_head.h" +#include "sign_head.h" namespace OHOS { namespace SignatureTools { @@ -22,7 +22,7 @@ namespace SignatureTools { /* * 测试套件,固定写法 */ -class HwSignHeadTest : public testing::Test { +class SignHeadTest : public testing::Test { public: static void SetUpTestCase(void) { @@ -46,9 +46,9 @@ public: * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwSignHeadTest, GetSignHead, testing::ext::TestSize.Level1) +HWTEST_F(SignHeadTest, GetSignHead, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(); + std::shared_ptr api = std::make_shared(); std::vector signHead = api->GetSignHead(5254); EXPECT_EQ(signHead.size(), 32); } @@ -61,9 +61,9 @@ HWTEST_F(HwSignHeadTest, GetSignHead, testing::ext::TestSize.Level1) * @tc.level Level 1 * @tc.require: SR000H63TL */ -HWTEST_F(HwSignHeadTest, getSignHeadLittleEndian, testing::ext::TestSize.Level1) +HWTEST_F(SignHeadTest, getSignHeadLittleEndian, testing::ext::TestSize.Level1) { - std::shared_ptr api = std::make_shared(); + std::shared_ptr api = std::make_shared(); std::vector signHeadLittleEndian = api->GetSignHeadLittleEndian(1024, 1); EXPECT_EQ(signHeadLittleEndian.size(), 32); } -- Gitee From 1616af82ee1548d28063fb26a28d8a4b4d947e77 Mon Sep 17 00:00:00 2001 From: zhanzeyi Date: Mon, 5 Aug 2024 14:23:48 +0800 Subject: [PATCH 2/3] update Signed-off-by: zhanzeyi --- hapsigntool_cpp_test/unittest/BUILD.gn | 8 ++++---- .../unittest/codeSigning/utils/fs_digest_utils_test.cpp | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hapsigntool_cpp_test/unittest/BUILD.gn b/hapsigntool_cpp_test/unittest/BUILD.gn index 5470927e..4a6a2233 100644 --- a/hapsigntool_cpp_test/unittest/BUILD.gn +++ b/hapsigntool_cpp_test/unittest/BUILD.gn @@ -65,14 +65,14 @@ ohos_unittest("hapsigntool_pc_unittest") { "./generateKeyPair/options_test.cpp", "./generateKeyPair/process_cmd_expansion_test.cpp", "./generateKeyPair/process_cmd_test.cpp", - "./hapSign/hap_openssl_utils_test.cpp", - "./hapSign/hap_sign_test.cpp", "./hapSign/block_data_test.cpp", "./hapSign/block_head_test.cpp", - "./hapSign/sign_head_test.cpp", + "./hapSign/hap_openssl_utils_test.cpp", + "./hapSign/hap_sign_test.cpp", "./hapSign/sign_bin_test.cpp", "./hapSign/sign_block_data_test.cpp", "./hapSign/sign_elf_test.cpp", + "./hapSign/sign_head_test.cpp", "./hapSign/sign_provider_test.cpp", "./hapVerify/hap_cert_verify_openssl_utils_test.cpp", "./hapVerify/hap_signer_block_utils_test.cpp", @@ -84,8 +84,8 @@ ohos_unittest("hapsigntool_pc_unittest") { "./signProfile/provision_test.cpp", "./signProfile/sign_profile_test.cpp", "./utils/byte_array_utils_test.cpp", - "./utils/file_utils_test.cpp", "./utils/cert_tools_test.cpp", + "./utils/file_utils_test.cpp", "./zip/random_access_file_input_output_test.cpp", "./zip/zip_signer_test.cpp", ] 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 a8f9d137..53872026 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 @@ -17,9 +17,9 @@ #include #include "fs_digest_utils.h" - /* - * 测试套件,固定写法 - */ +namespace OHOS { +namespace SignatureTools { + class DigestUtilsTest : public testing::Test { public: static void SetUpTestCase(void) @@ -93,3 +93,5 @@ HWTEST_F(DigestUtilsTest, result, testing::ext::TestSize.Level1) EXPECT_EQ(str.size(), 64); } +} // namespace SignatureTools +} // namespace OHOS \ No newline at end of file -- Gitee From bf60d92dcc936d4cafa083d5e43c3bf0da30c8c2 Mon Sep 17 00:00:00 2001 From: zhanzeyi Date: Tue, 6 Aug 2024 09:24:47 +0800 Subject: [PATCH 3/3] update Signed-off-by: zhanzeyi --- hapsigntool_cpp_test/unittest/elfVerify/verify_elf_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hapsigntool_cpp_test/unittest/elfVerify/verify_elf_test.cpp b/hapsigntool_cpp_test/unittest/elfVerify/verify_elf_test.cpp index 689a798d..444b94f1 100644 --- a/hapsigntool_cpp_test/unittest/elfVerify/verify_elf_test.cpp +++ b/hapsigntool_cpp_test/unittest/elfVerify/verify_elf_test.cpp @@ -369,9 +369,9 @@ HWTEST_F(VerifyElfTest, CheckSignFile, testing::ext::TestSize.Level1) HWTEST_F(VerifyElfTest, GetSignBlockData, testing::ext::TestSize.Level1) { std::vector bytes = { 1, 1, 1, 1, 1, 1, 1, 1 }; - BlockData BlockData(0, 0); + BlockData blockData(0, 0); - bool flag = VerifyElf::GetSignBlockData(bytes, BlockData, "elf"); + bool flag = VerifyElf::GetSignBlockData(bytes, blockData, "elf"); EXPECT_EQ(flag, false); } -- Gitee