From 1371ef8fa71c536569f2630e7e01da72cdea8a33 Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Tue, 11 Feb 2025 17:48:47 +0800 Subject: [PATCH 1/5] cpp unittest assert Signed-off-by: wangzeyu --- .../generateCA/generate_sub_ca_test.cpp | 4 +-- .../generateKeyPair/generate_keypair_test.cpp | 6 ++-- .../unittest/generateKeyPair/options_test.cpp | 30 ++++--------------- 3 files changed, 9 insertions(+), 31 deletions(-) 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 a07dd6ce..474e4698 100644 --- a/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp @@ -322,9 +322,7 @@ HWTEST_F(GenerateCaTest, set_pubkey_and_sign_cert_test_002, testing::ext::TestSi EXPECT_NE(csr, nullptr); X509_REQ* issuercsr = CertTools::GenerateCsr(keyPair, signAlgorithm, issuer); EXPECT_NE(issuercsr, nullptr); - X509* cert = nullptr; - EXPECT_EQ(cert, nullptr); - bool cert1 = CertTools::SetPubkeyAndSignCert(cert, issuercsr, csr, keyPair, params.get()); + bool cert1 = CertTools::SetPubkeyAndSignCert(cert, issuercsr, csr, keyPair, params.get()); EXPECT_EQ(cert1, false); } diff --git a/hapsigntool_cpp_test/unittest/generateKeyPair/generate_keypair_test.cpp b/hapsigntool_cpp_test/unittest/generateKeyPair/generate_keypair_test.cpp index c597fbf2..557930f1 100644 --- a/hapsigntool_cpp_test/unittest/generateKeyPair/generate_keypair_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateKeyPair/generate_keypair_test.cpp @@ -648,10 +648,9 @@ HWTEST_F(GenerateKeyPairTest, generate_keypair_test_024, testing::ext::TestSize. int nidKey = 1; int iter = 1; int maIter = 1; - bool ret = true; KeyStoreHelper keyhelper; keyhelper.SetNidMac(nidKey, iter, maIter); - EXPECT_EQ(ret, true); + EXPECT_NE(nidKey, 1); } /* @@ -665,10 +664,9 @@ HWTEST_F(GenerateKeyPairTest, generate_keypair_test_025, testing::ext::TestSize. int nidKey = 0; int iter = 0; int macIter = 0; - bool ret = true; KeyStoreHelper keyhelper; keyhelper.SetNidMac(nidKey, iter, macIter); - EXPECT_EQ(ret, true); + EXPECT_EQ(macIter, 0); } /* diff --git a/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp b/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp index d70df17c..6715b10c 100644 --- a/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp @@ -394,13 +394,7 @@ HWTEST_F(OptionsCmdTest, Options_test_019, testing::ext::TestSize.Level1) ParamsTrustList params_trust_list; std::vector trustList = params_trust_list.GetTrustList(argv[1]); - if (trustList.empty()) { - bool ret = false; - EXPECT_EQ(ret, false); - } else { - bool ret = true; - EXPECT_EQ(ret, true); - } + EXPECT_EQ(trustList.empty(), true); } /* @@ -1877,8 +1871,7 @@ HWTEST_F(OptionsCmdTest, Options_test_066, testing::ext::TestSize.Level1) ParamsSharedPtr param = std::make_shared(); param->SetMethod(argv[1]); bool ret = true; - EXPECT_EQ(ret, true); -} + } /* * @tc.name: Options_test_067 @@ -1890,13 +1883,8 @@ HWTEST_F(OptionsCmdTest, Options_test_067, testing::ext::TestSize.Level1) { std::string str = " 123456 "; std::string params = StringUtils::Trim(str); - if (params == "123456") { - bool ret = true; - EXPECT_EQ(ret, true); - } else { - bool ret = false; - EXPECT_EQ(ret, false); - } + bool ret = params == "123456"; + EXPECT_EQ(ret, true); } /* @@ -1918,14 +1906,8 @@ HWTEST_F(OptionsCmdTest, Options_test_068, testing::ext::TestSize.Level1) ParamsSharedPtr param = std::make_shared(); param->SetMethod(argv[1]); - - if (param->GetMethod().empty()) { - bool ret = false; - EXPECT_EQ(ret, false); - } else { - bool ret = true; - EXPECT_EQ(ret, true); - } + bool ret = param->GetMethod().empty(); + EXPECT_EQ(ret, true); } /* -- Gitee From 2d6c236ce9ffa542d15b10f25506ff7f7bd5bb16 Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Wed, 12 Feb 2025 16:00:04 +0800 Subject: [PATCH 2/5] cpp unittest assert Signed-off-by: wangzeyu --- .../generateKeyPair/hap_sign_tool_test.cpp | 14 +---------- .../unittest/generateKeyPair/options_test.cpp | 25 ++----------------- 2 files changed, 3 insertions(+), 36 deletions(-) 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 eb0c5f5e..a64f56b3 100644 --- a/hapsigntool_cpp_test/unittest/generateKeyPair/hap_sign_tool_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateKeyPair/hap_sign_tool_test.cpp @@ -813,6 +813,7 @@ HWTEST_F(HapSignToolTest, hap_sign_tool_test_020, testing::ext::TestSize.Level1) char* argv[] = { arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20, arg21 }; int argc = 22; + ParamsRunTool::PrintHelp(); ParamsSharedPtr param = std::make_shared(); CmdUtil cmdUtil; @@ -823,19 +824,6 @@ HWTEST_F(HapSignToolTest, hap_sign_tool_test_020, testing::ext::TestSize.Level1) EXPECT_EQ(ret, false); } -/* - * @tc.name: hap_sign_tool_test_021 - * @tc.desc: Print help document. - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(HapSignToolTest, hap_sign_tool_test_021, testing::ext::TestSize.Level1) -{ - ParamsRunTool::PrintHelp(); - bool ret = true; - EXPECT_EQ(ret, true); -} - /* * @tc.name: hap_sign_tool_test_023 * @tc.desc: Generate the root certificate entry check. diff --git a/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp b/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp index 6715b10c..a81aff74 100644 --- a/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp @@ -392,6 +392,8 @@ HWTEST_F(OptionsCmdTest, Options_test_019, testing::ext::TestSize.Level1) "-keystorePwd", "123456" }; + ParamsSharedPtr param = std::make_shared(); + param->SetMethod(argv[1]); ParamsTrustList params_trust_list; std::vector trustList = params_trust_list.GetTrustList(argv[1]); EXPECT_EQ(trustList.empty(), true); @@ -1850,29 +1852,6 @@ HWTEST_F(OptionsCmdTest, Options_test_065, testing::ext::TestSize.Level1) EXPECT_EQ(ret, false); } - -/* - * @tc.name: Options_test_066 - * @tc.desc: Set the first parameter of the command. - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(OptionsCmdTest, Options_test_066, testing::ext::TestSize.Level1) -{ - char argv[][100] = { "generate-keypair", - "-keyAlias", "oh-app1-key-v1", - "-keyPwd", "123456", - "-keyAlg", "ECC", - "-keySize", "NIST-P-384", - "-keystoreFile", "./generateKeyPair/OpenHarmony.p12", - "-keystorePwd", "123456" - }; - - ParamsSharedPtr param = std::make_shared(); - param->SetMethod(argv[1]); - bool ret = true; - } - /* * @tc.name: Options_test_067 * @tc.desc: Remove the white space. -- Gitee From 18a1e94cf7131f8d3ea31514b70e0cec7fb1b02c Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Wed, 12 Feb 2025 16:12:02 +0800 Subject: [PATCH 3/5] cpp unittest assert Signed-off-by: wangzeyu --- .../unittest/generateCA/generate_sub_ca_test.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 474e4698..22f94692 100644 --- a/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp @@ -322,7 +322,8 @@ HWTEST_F(GenerateCaTest, set_pubkey_and_sign_cert_test_002, testing::ext::TestSi EXPECT_NE(csr, nullptr); X509_REQ* issuercsr = CertTools::GenerateCsr(keyPair, signAlgorithm, issuer); EXPECT_NE(issuercsr, nullptr); - bool cert1 = CertTools::SetPubkeyAndSignCert(cert, issuercsr, csr, keyPair, params.get()); + X509* cert = nullptr; + bool cert1 = CertTools::SetPubkeyAndSignCert(cert, issuercsr, csr, keyPair, params.get()); EXPECT_EQ(cert1, false); } -- Gitee From 845c0d88abcc062c8cad673e6d2c3cf8351732a0 Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Wed, 12 Feb 2025 16:32:12 +0800 Subject: [PATCH 4/5] cpp unittest assert Signed-off-by: wangzeyu --- .../unittest/generateKeyPair/generate_keypair_test.cpp | 2 +- hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hapsigntool_cpp_test/unittest/generateKeyPair/generate_keypair_test.cpp b/hapsigntool_cpp_test/unittest/generateKeyPair/generate_keypair_test.cpp index 557930f1..5c69ef55 100644 --- a/hapsigntool_cpp_test/unittest/generateKeyPair/generate_keypair_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateKeyPair/generate_keypair_test.cpp @@ -666,7 +666,7 @@ HWTEST_F(GenerateKeyPairTest, generate_keypair_test_025, testing::ext::TestSize. int macIter = 0; KeyStoreHelper keyhelper; keyhelper.SetNidMac(nidKey, iter, macIter); - EXPECT_EQ(macIter, 0); + EXPECT_EQ(macIter, 146); } /* diff --git a/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp b/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp index a81aff74..fe5cb9f2 100644 --- a/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp @@ -1886,7 +1886,7 @@ HWTEST_F(OptionsCmdTest, Options_test_068, testing::ext::TestSize.Level1) ParamsSharedPtr param = std::make_shared(); param->SetMethod(argv[1]); bool ret = param->GetMethod().empty(); - EXPECT_EQ(ret, true); + EXPECT_EQ(ret, false); } /* -- Gitee From 534fdb6074f93524b6d84e0dabbb8203739f0628 Mon Sep 17 00:00:00 2001 From: wangzeyu Date: Wed, 12 Feb 2025 17:21:17 +0800 Subject: [PATCH 5/5] cpp unittest assert Signed-off-by: wangzeyu --- .../unittest/generateCA/generate_sub_ca_test.cpp | 1 + .../unittest/generateKeyPair/options_test.cpp | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) 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 22f94692..3aa8f1f4 100644 --- a/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateCA/generate_sub_ca_test.cpp @@ -325,6 +325,7 @@ HWTEST_F(GenerateCaTest, set_pubkey_and_sign_cert_test_002, testing::ext::TestSi X509* cert = nullptr; bool cert1 = CertTools::SetPubkeyAndSignCert(cert, issuercsr, csr, keyPair, params.get()); EXPECT_EQ(cert1, false); + EXPECT_EQ(cert, nullptr); } diff --git a/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp b/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp index fe5cb9f2..31a72d15 100644 --- a/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp +++ b/hapsigntool_cpp_test/unittest/generateKeyPair/options_test.cpp @@ -1862,8 +1862,7 @@ HWTEST_F(OptionsCmdTest, Options_test_067, testing::ext::TestSize.Level1) { std::string str = " 123456 "; std::string params = StringUtils::Trim(str); - bool ret = params == "123456"; - EXPECT_EQ(ret, true); + EXPECT_EQ(params, "123456"); } /* @@ -1885,8 +1884,7 @@ HWTEST_F(OptionsCmdTest, Options_test_068, testing::ext::TestSize.Level1) ParamsSharedPtr param = std::make_shared(); param->SetMethod(argv[1]); - bool ret = param->GetMethod().empty(); - EXPECT_EQ(ret, false); + EXPECT_EQ(param->GetMethod().empty(), false); } /* -- Gitee