From 94534ae06654119d9b6957195021cb6a4af02355 Mon Sep 17 00:00:00 2001 From: GengYinzong Date: Thu, 22 Aug 2024 06:58:22 -0700 Subject: [PATCH] fix tdd rk Signed-off-by: GengYinzong --- .../unittest/src/sandbox_manager_kit_test.cpp | 44 +++++++++++++++++++ sandbox_manager.gni | 11 +++-- .../unittest/policy_info_manager_test.cpp | 6 +++ 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/sandbox_manager/test/unittest/src/sandbox_manager_kit_test.cpp b/interfaces/innerkits/sandbox_manager/test/unittest/src/sandbox_manager_kit_test.cpp index 96275ac..e0757c9 100644 --- a/interfaces/innerkits/sandbox_manager/test/unittest/src/sandbox_manager_kit_test.cpp +++ b/interfaces/innerkits/sandbox_manager/test/unittest/src/sandbox_manager_kit_test.cpp @@ -49,7 +49,9 @@ const std::string SET_POLICY_PERMISSION = "ohos.permission.SET_SANDBOX_POLICY"; const std::string ACCESS_PERSIST_PERMISSION = "ohos.permission.FILE_ACCESS_PERSIST"; const Security::AccessToken::AccessTokenID INVALID_TOKENID = 0; const uint64_t POLICY_VECTOR_SIZE_LIMIT = 500; +#ifdef MAC_ENABLED const int32_t FOUNDATION_UID = 5523; +#endif const size_t MAX_POLICY_NUM = 8; uint32_t g_selfTokenId; uint32_t g_mockToken; @@ -143,6 +145,7 @@ void SandboxManagerKitTest::TearDown() EXPECT_EQ(0, SetSelfTokenID(g_selfTokenId)); } +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy003 * @tc.desc: PersistPolicy with permission. @@ -183,7 +186,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy003, TestSize.Level1) ASSERT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::CheckPersistPolicy(g_mockToken, policy, checkResult2)); ASSERT_EQ(false, checkResult2[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicyByTokenID001 * @tc.desc: PersistPolicyByTokenId with permission. @@ -221,7 +226,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicyByTokenID001, TestSize.Level1) ASSERT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::CheckPersistPolicy(tokenId, policy, checkResult2)); ASSERT_EQ(false, checkResult2[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy004 * @tc.desc: PersistPolicy with invalid path. @@ -250,6 +257,7 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy004, TestSize.Level1) EXPECT_EQ(2, result2.size()); EXPECT_EQ(INVALID_MODE, result2[1]); } +#endif /** * @tc.name: PersistPolicy005 @@ -393,6 +401,7 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy007, TestSize.Level1) EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy008 * @tc.desc: PersistPolicy directory. @@ -433,7 +442,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy008, TestSize.Level1) EXPECT_EQ(1, unPersistResult.size()); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy009 * @tc.desc: PersistPolicy directory. @@ -480,7 +491,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy009, TestSize.Level1) EXPECT_EQ(1, unPersistResult.size()); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy009 * @tc.desc: PersistPolicy directory. @@ -525,7 +538,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy010, TestSize.Level1) EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[1]); EXPECT_EQ(POLICY_HAS_NOT_BEEN_PERSISTED, unPersistResult[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy009 * @tc.desc: PersistPolicy directory. @@ -570,6 +585,7 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy011, TestSize.Level1) EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); EXPECT_EQ(POLICY_HAS_NOT_BEEN_PERSISTED, unPersistResult[1]); } +#endif /** * @tc.name: PersistPolicy012 @@ -617,6 +633,7 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy012, TestSize.Level1) EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy009 * @tc.desc: PersistPolicy directory. @@ -663,6 +680,7 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy013, TestSize.Level1) EXPECT_EQ(POLICY_HAS_NOT_BEEN_PERSISTED, unPersistResult[1]); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#endif /** * @tc.name: PersistPolicy014 @@ -833,6 +851,7 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest002, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest003 * @tc.desc: Check parent directory policy with r+w @@ -878,7 +897,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest003, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest004 * @tc.desc: Check parent directory policy with r @@ -931,7 +952,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest004, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest005 * @tc.desc: Check parent directory policy with w @@ -984,7 +1007,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest005, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest006 * @tc.desc: Check parent directory policy with w @@ -1026,7 +1051,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest006, TestSize.Level1) EXPECT_TRUE(result[1]); EXPECT_FALSE(result[2]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest007 * @tc.desc: Check allowed policy with invalid tokenID @@ -1057,7 +1084,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest007, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policy[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest008 * @tc.desc: Check allowed policy with invalid policy @@ -1108,6 +1137,7 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest008, TestSize.Level1) ASSERT_EQ(1, result.size()); EXPECT_FALSE(result[0]); } +#endif /** * @tc.name: UnSetPolicyTest001 @@ -1134,6 +1164,7 @@ HWTEST_F(SandboxManagerKitTest, UnSetPolicyTest001, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policy[0])); } +#ifdef MAC_ENABLED /** * @tc.name: UnSetPolicyTest002 * @tc.desc: Unset allowed policy @@ -1180,6 +1211,7 @@ HWTEST_F(SandboxManagerKitTest, UnSetPolicyTest002, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policy[0])); } +#endif /** * @tc.name: UnSetPolicyTest003 @@ -1269,6 +1301,7 @@ HWTEST_F(SandboxManagerKitTest, PolicyAsyncTest001, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicyAsync(g_selfTokenId, policy[0])); } +#ifdef MAC_ENABLED /** * @tc.name: PolicyAsyncTest002 * @tc.desc: Set/Unset allowed policy @@ -1312,6 +1345,7 @@ HWTEST_F(SandboxManagerKitTest, PolicyAsyncTest002, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicyAsync(g_mockToken, policy[0])); } +#endif /** * @tc.name: PolicyAsyncTest003 @@ -1370,6 +1404,7 @@ HWTEST_F(SandboxManagerKitTest, PolicyAsyncTest004, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicyAsync(g_mockToken, policy[0])); } +#ifdef MAC_ENABLED /** * @tc.name: CleanPersistPolicyByPathTest001 * @tc.desc: Clean persist policy by path @@ -1419,7 +1454,9 @@ HWTEST_F(SandboxManagerKitTest, CleanPersistPolicyByPathTest001, TestSize.Level1 ASSERT_EQ(1, result2.size()); EXPECT_FALSE(result2[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CleanPersistPolicyByPathTest002 * @tc.desc: Clean child persist policy by path @@ -1479,7 +1516,9 @@ HWTEST_F(SandboxManagerKitTest, CleanPersistPolicyByPathTest002, TestSize.Level1 ASSERT_EQ(1, result.size()); EXPECT_FALSE(result[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CleanPersistPolicyByPathTest003 * @tc.desc: Clean child persist policy by path @@ -1534,6 +1573,7 @@ HWTEST_F(SandboxManagerKitTest, CleanPersistPolicyByPathTest003, TestSize.Level1 ASSERT_EQ(1, result.size()); EXPECT_FALSE(result[0]); } +#endif /** * @tc.name: CleanPersistPolicyByPathTest004 @@ -1611,6 +1651,7 @@ HWTEST_F(SandboxManagerKitTest, StartAccessingByTokenIdTest002, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::StartAccessingByTokenId(g_selfTokenId)); } +#ifdef MAC_ENABLED /** * @tc.name: StartAccessingByTokenIdTest003 * @tc.desc: Start accessing by tokenID @@ -1664,7 +1705,9 @@ HWTEST_F(SandboxManagerKitTest, StartAccessingByTokenIdTest003, TestSize.Level1) ASSERT_EQ(1, result.size()); EXPECT_TRUE(result[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: UnSetAllPolicyByTokenTest001 * @tc.desc: destroy all mac policy in kernel with given tokenid @@ -1696,6 +1739,7 @@ HWTEST_F(SandboxManagerKitTest, UnSetAllPolicyByTokenTest001, TestSize.Level1) ASSERT_EQ(1, result.size()); EXPECT_FALSE(result[0]); } +#endif } // SandboxManager } // AccessControl } // OHOS \ No newline at end of file diff --git a/sandbox_manager.gni b/sandbox_manager.gni index c4d52ec..1a9aae8 100644 --- a/sandbox_manager.gni +++ b/sandbox_manager.gni @@ -11,8 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -sandbox_manager_path = "//base/accesscontrol/sandbox_manager" +sandbox_manager_path = "//base/accesscontrol/sandbox_manager" module_output_path_interface_sandbox = - "sandbox_manager/interface/" -module_output_path_service_sandbox = - "sandbox_manager/service" + "sandbox_manager/sandbox_manager/interface/" +module_output_path_service_sandbox = "sandbox_manager/sandbox_manager/service/" + +if (product_name != "rk3568") { + defined += [ "MAC_ENABLED" ] +} diff --git a/services/sandbox_manager/test/unittest/policy_info_manager_test.cpp b/services/sandbox_manager/test/unittest/policy_info_manager_test.cpp index 3b78683..9ec9431 100644 --- a/services/sandbox_manager/test/unittest/policy_info_manager_test.cpp +++ b/services/sandbox_manager/test/unittest/policy_info_manager_test.cpp @@ -102,6 +102,7 @@ void PrintDbRecords() } } +#ifdef MAC_ENABLED /** * @tc.name: PolicyInfoManagerTest002 * @tc.desc: Test AddPolicy - normal cases @@ -151,7 +152,9 @@ HWTEST_F(PolicyInfoManagerTest, PolicyInfoManagerTest002, TestSize.Level1) PrintDbRecords(); // db should have result9, result10, result11, result13 } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PolicyInfoManagerTest004 * @tc.desc: Test MatchPolicy - normal @@ -197,6 +200,7 @@ HWTEST_F(PolicyInfoManagerTest, PolicyInfoManagerTest004, TestSize.Level1) EXPECT_EQ(sizeLimit, result14.size()); EXPECT_EQ(SandboxRetType::OPERATE_SUCCESSFULLY, result14[0]); } +#endif /** * @tc.name: PolicyInfoManagerTest006 @@ -302,6 +306,7 @@ HWTEST_F(PolicyInfoManagerTest, GenericValuesTest001, TestSize.Level1) EXPECT_EQ(str, variantValue.GetString()); } +#ifdef MAC_ENABLED /** * @tc.name: CleanPersistPolicyByPathTest001 * @tc.desc: Test CleanPersistPolicyByPath @@ -339,6 +344,7 @@ HWTEST_F(PolicyInfoManagerTest, CleanPersistPolicyByPathTest001, TestSize.Level1 EXPECT_EQ(SANDBOX_MANAGER_OK, PolicyInfoManager::GetInstance().MatchSinglePolicy(selfTokenId_, info, matchResult)); EXPECT_EQ(SandboxRetType::POLICY_HAS_NOT_BEEN_PERSISTED, matchResult); } +#endif /** * @tc.name: MacAdapterTest001 -- Gitee