From f4938f0e6c87fe82f7dddeecbe53dce53658e0ee Mon Sep 17 00:00:00 2001 From: zhenghui Date: Mon, 14 Oct 2024 14:17:16 +0800 Subject: [PATCH] =?UTF-8?q?tdd=E6=96=AD=E8=A8=80=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhenghui --- test/unittest/local_code_sign_test.cpp | 66 +++++-------------- .../local_code_sign_utils_mock_test.cpp | 25 ++++--- 2 files changed, 28 insertions(+), 63 deletions(-) diff --git a/test/unittest/local_code_sign_test.cpp b/test/unittest/local_code_sign_test.cpp index 93bfe91..07938da 100644 --- a/test/unittest/local_code_sign_test.cpp +++ b/test/unittest/local_code_sign_test.cpp @@ -145,47 +145,11 @@ HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0006, TestSize.Level0) /** * @tc.name: LocalCodeSignTest_0007 - * @tc.desc: load sa fail - * @tc.type: Func - * @tc.require: - */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0007, TestSize.Level0) -{ - LocalCodeSignLoadCallback cb; - cb.OnLoadSystemAbilityFail(LOCAL_CODE_SIGN_SA_ID); -} - -/** - * @tc.name: LocalCodeSignTest_0008 - * @tc.desc: load sa success and return sa id not code sign sa id - * @tc.type: Func - * @tc.require: - */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0008, TestSize.Level0) -{ - LocalCodeSignLoadCallback cb; - cb.OnLoadSystemAbilitySuccess(LOCAL_CODE_SIGN_SA_ID - 1, nullptr); -} - -/** - * @tc.name: LocalCodeSignTest_0009 - * @tc.desc: load sa success and return remote object is null - * @tc.type: Func - * @tc.require: - */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0009, TestSize.Level0) -{ - LocalCodeSignLoadCallback cb; - cb.OnLoadSystemAbilitySuccess(LOCAL_CODE_SIGN_SA_ID, nullptr); -} - -/** - * @tc.name: LocalCodeSignTest_0010 * @tc.desc: sign local code with owner ID successfully, parse owner ID from signature success * @tc.type: Func * @tc.require: issueI88PPA */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0010, TestSize.Level0) +HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0007, TestSize.Level0) { ByteBuffer sig; uint64_t selfTokenId = NativeTokenSet("compiler_service"); @@ -202,12 +166,12 @@ HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0010, TestSize.Level0) } /** - * @tc.name: LocalCodeSignTest_0011 + * @tc.name: LocalCodeSignTest_0008 * @tc.desc: sign local code with empty owner ID successfully * @tc.type: Func * @tc.require: issueI88PPA */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0011, TestSize.Level0) +HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0008, TestSize.Level0) { ByteBuffer sig; uint64_t selfTokenId = NativeTokenSet("compiler_service"); @@ -222,12 +186,12 @@ HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0011, TestSize.Level0) } /** - * @tc.name: LocalCodeSignTest_0012 + * @tc.name: LocalCodeSignTest_0009 * @tc.desc: sign local code with owner ID failed, reason = invalid path * @tc.type: Func * @tc.require: issueI88PPA */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0012, TestSize.Level0) +HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0009, TestSize.Level0) { ByteBuffer sig; uint64_t selfTokenId = NativeTokenSet("compiler_service"); @@ -238,12 +202,12 @@ HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0012, TestSize.Level0) } /** - * @tc.name: LocalCodeSignTest_0013 + * @tc.name: LocalCodeSignTest_0010 * @tc.desc: sign local code failed with invalid caller * @tc.type: Func * @tc.require: issueI88PPA */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0013, TestSize.Level0) +HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0010, TestSize.Level0) { ByteBuffer sig; std::string ownerID = "AppName123"; @@ -252,12 +216,12 @@ HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0013, TestSize.Level0) } /** - * @tc.name: LocalCodeSignTest_0014 + * @tc.name: LocalCodeSignTest_0011 * @tc.desc: sign local code failed with ownerID exceed 128 bytes * @tc.type: Func * @tc.require: issueI8FCGF */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0014, TestSize.Level0) +HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0011, TestSize.Level0) { ByteBuffer sig; uint64_t selfTokenId = NativeTokenSet("compiler_service"); @@ -268,12 +232,12 @@ HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0014, TestSize.Level0) } /** - * @tc.name: LocalCodeSignTest_0015 + * @tc.name: LocalCodeSignTest_0012 * @tc.desc: sign local code failed with ownerID exceed 128 bytes * @tc.type: Func * @tc.require: issueI8FCGF */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0015, TestSize.Level0) +HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0012, TestSize.Level0) { ByteBuffer sig; uint64_t selfTokenId = NativeTokenSet("compiler_service"); @@ -293,14 +257,18 @@ HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0015, TestSize.Level0) } /** - * @tc.name: LocalCodeSignTest_0016 + * @tc.name: LocalCodeSignTest_0013 * @tc.desc: load sa success and return remote object is not null * @tc.type: Func * @tc.require: */ -HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0016, TestSize.Level0) +HWTEST_F(LocalCodeSignTest, LocalCodeSignTest_0013, TestSize.Level0) { LocalCodeSignLoadCallback cb; + cb.OnLoadSystemAbilityFail(LOCAL_CODE_SIGN_SA_ID); + cb.OnLoadSystemAbilitySuccess(LOCAL_CODE_SIGN_SA_ID - 1, nullptr); + cb.OnLoadSystemAbilitySuccess(LOCAL_CODE_SIGN_SA_ID, nullptr); + sptr systemAbilityManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); EXPECT_NE(systemAbilityManager, nullptr); diff --git a/test/unittest/local_code_sign_utils_mock_test.cpp b/test/unittest/local_code_sign_utils_mock_test.cpp index baf8d03..5a773fe 100644 --- a/test/unittest/local_code_sign_utils_mock_test.cpp +++ b/test/unittest/local_code_sign_utils_mock_test.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include "cert_utils.h" #include "directory_ex.h" @@ -122,7 +123,7 @@ HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0002, TestSize.L HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0003, TestSize.Level0) { LocalSignKey &key = LocalSignKey::GetInstance(); - (void)key.GetSignCert(); + EXPECT_NE(key.GetSignCert(), nullptr); } /** @@ -138,6 +139,7 @@ HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0004, TestSize.L (void)OHOS::Security::CodeSign::FreeCertChain(&certChain, pos); certChain = static_cast(malloc(sizeof(struct HksCertChain))); + EXPECT_NE(certChain, nullptr); certChain->certs = nullptr; (void)OHOS::Security::CodeSign::FreeCertChain(&certChain, pos); } @@ -189,26 +191,21 @@ HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0007, TestSize.L EXPECT_EQ(bRet, false); } -/** - * @tc.name: LocalCodeSignUtilsMockTest_0008 - * @tc.desc: FsverityUtilsHelper GetCertChainFormBuffer func test - * @tc.type: Func - * @tc.require: issueI8FCGF - */ -HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0008, TestSize.Level0) -{ - (void)FsverityUtilsHelper::GetInstance().ErrorMsgLogCallback(nullptr); -} - /** * @tc.name: LocalCodeSignUtilsMockTest_0009 - * @tc.desc: cert_path IsDeveloperModeOn func test + * @tc.desc: cert_path IsDeveloperModeOn and GetCertChainFormBuffer func test * @tc.type: Func * @tc.require: issueI8FCGF */ HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0009, TestSize.Level0) { - (void)IsDeveloperModeOn(); + (void)FsverityUtilsHelper::GetInstance().ErrorMsgLogCallback(nullptr); + + if (OHOS::system::GetBoolParameter("const.security.developermode.state", false)) { + EXPECT_EQ(IsDeveloperModeOn(), true); + } else { + EXPECT_EQ(IsDeveloperModeOn(), false); + } } /** -- Gitee