diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index cd842ef2fccb9d013f05cdfd8d8cdcd9ad744f9f..8dd21cea2438942a7669e964cf89dd024d0435c3 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -30,13 +30,21 @@ using namespace OHOS; using namespace FileAccessFwk; int uid = 5003; int ok = 0; -int error = 102825984; +int error = 102825986; +shared_ptr fah = nullptr; +Uri newDirUri(""); class FileAccessHelperTest : public testing::Test { public: static void SetUpTestCase(void) { cout << "FileAccessHelperTest code test" << endl; + + auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + auto remoteObj = saManager->GetSystemAbility(uid); + AAFwk::Want want; + want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); + fah = FileAccessHelper::Creator(remoteObj, want); } static void TearDownTestCase() {}; void SetUp() {}; @@ -118,8 +126,6 @@ public: }; }; -Uri newDirUri(""); - /** * @tc.number: SUB_user_file_service_file_access_helper_OpenFile_0000 * @tc.name: file_access_helper_OpenFile_0000 @@ -138,12 +144,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(tokenId); - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(remoteObj, want); - sleep(3); + sleep(3); // sleep 3 seconds vector info = fah->GetRoots(); Uri parentUri(""); @@ -203,14 +204,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0001, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - sleep(1); - Uri uri(""); int result = fah->OpenFile(uri, 0); EXPECT_EQ(result, error); @@ -234,14 +227,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0002, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - sleep(1); - Uri newFileUri(""); int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0002.txt", newFileUri); EXPECT_EQ(result, ok); @@ -272,13 +257,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0003, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri uri("~!@#$%^&*()_"); int result = fah->OpenFile(uri, 0); EXPECT_EQ(result, error); @@ -302,19 +280,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0004, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, ok); result = fah->OpenFile(newFileUri, -1); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; result = fah->Delete(newFileUri); @@ -338,13 +309,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0005, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0005"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, ok); @@ -374,13 +338,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0006, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0006"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, ok); @@ -410,13 +367,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0000, testing::ext: { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); int result = fah->CreateFile(newDirUri, "file_access_helper_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, ok); @@ -443,13 +393,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0001, testing::ext: { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); Uri parentUri(""); int result = fah->CreateFile(parentUri, "file_access_helper_CreateFile_0001.txt", newFileUri); @@ -474,13 +417,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0002, testing::ext: { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); Uri parentUri("storage/media/100/local/files/Download"); int result = fah->CreateFile(parentUri, "file_access_helper_CreateFile_0002.txt", newFileUri); @@ -505,13 +441,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0003, testing::ext: { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); Uri parentUri("~!@#$%^&*()_"); int result = fah->CreateFile(parentUri, "file_access_helper_CreateFile_0003.txt", newFileUri); @@ -536,13 +465,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0004, testing::ext: { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); string displayName = ""; int result = fah->CreateFile(newDirUri, displayName, newFileUri); @@ -567,13 +489,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0000, testing::ext::Test { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "file_access_helper_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, ok); @@ -600,13 +515,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0001, testing::ext::Test { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); Uri parentUri(""); int result = fah->Mkdir(parentUri, "file_access_helper_Mkdir_0001", newDirUriTest); @@ -631,13 +539,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0002, testing::ext::Test { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); Uri parentUri("storage/media/100/local/files/Download"); int result = fah->Mkdir(parentUri, "file_access_helper_Mkdir_0002", newDirUriTest); @@ -662,13 +563,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0003, testing::ext::Test { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); Uri parentUri("~!@#$%^&*()_"); int result = fah->Mkdir(parentUri, "file_access_helper_Mkdir_0003", newDirUriTest); @@ -693,13 +587,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0004, testing::ext::Test { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); string displayName = ""; int result = fah->Mkdir(newDirUri, displayName, newDirUriTest); @@ -724,13 +611,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0000, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -764,13 +644,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0001, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -797,16 +670,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0002, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri selectFileUri(""); int result = fah->Delete(selectFileUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -827,20 +693,13 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0003, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); Uri selectFileUri("storage/media/100/local/files/Download/test"); result = fah->Delete(selectFileUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); result = fah->Delete(newDirUriTest); EXPECT_GE(result, ok); @@ -864,16 +723,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0004, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri selectFileUri("!@#$%^&*()"); int result = fah->Delete(selectFileUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -894,13 +746,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0000, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest1(""); Uri newDirUriTest2(""); int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); @@ -942,13 +787,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0001, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest1(""); Uri newDirUriTest2(""); int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); @@ -987,13 +825,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0002, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -1001,7 +832,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0002, testing::ext::TestS Uri testUri(""); Uri sourceFileUri(""); result = fah->Move(sourceFileUri, newDirUriTest, testUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1025,13 +856,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0003, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest1(""); Uri newDirUriTest2(""); int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); @@ -1047,7 +871,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0003, testing::ext::TestS Uri testUri2(""); Uri sourceFileUri("storage/media/100/local/files/Download/test1/test.txt"); result = fah->Move(sourceFileUri, newDirUriTest2, testUri2); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1074,13 +898,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0004, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -1088,7 +905,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0004, testing::ext::TestS Uri testUri(""); Uri sourceFileUri("~!@#$%^&*()_"); result = fah->Move(sourceFileUri, newDirUriTest, testUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1112,13 +929,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0005, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0005"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, ok); @@ -1130,7 +940,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0005, testing::ext::TestS Uri testUri2(""); Uri targetParentUri(""); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1154,13 +964,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0006, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0006"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest1(""); Uri newDirUriTest2(""); int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); @@ -1176,7 +979,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0006, testing::ext::TestS Uri testUri2(""); Uri targetParentUri("storage/media/100/local/files/Download/test2"); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1203,13 +1006,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0007, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0007"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest1(""); Uri newDirUriTest2(""); int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); @@ -1225,7 +1021,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0007, testing::ext::TestS Uri testUri2(""); Uri targetParentUri("~!@#$^%&*()_"); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1252,13 +1048,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0008, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0008"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest1(""); Uri newDirUriTest2(""); int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); @@ -1293,13 +1082,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0009, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0009"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest1(""); Uri newDirUriTest2(""); int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); @@ -1340,13 +1122,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0010, testing::ext::TestS { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0010"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest1(""); Uri newDirUriTest2(""); int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); @@ -1387,13 +1162,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0000, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -1428,13 +1196,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0001, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -1465,17 +1226,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0002, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri renameUri(""); Uri sourceFileUri(""); int result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1496,13 +1250,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0003, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -1514,7 +1261,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0003, testing::ext::Tes Uri renameUri(""); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Rename_0003 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1538,17 +1285,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0004, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri renameUri(""); Uri sourceFileUri("~!@#$%^&*()_"); int result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1569,13 +1309,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0005, testing::ext::Tes { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0005"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -1586,7 +1319,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0005, testing::ext::Tes Uri renameUri(""); result = fah->Rename(testUri, "", renameUri); - EXPECT_EQ(result, error); + + int errorCode = 102825990; + EXPECT_EQ(result, errorCode); GTEST_LOG_(INFO) << "Rename_0005 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1610,13 +1345,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -1650,13 +1378,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri sourceFileUri(""); std::vector fileInfo = fah->ListFile(sourceFileUri); EXPECT_EQ(fileInfo.size(), 0); @@ -1680,13 +1401,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, ok); @@ -1721,13 +1435,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri sourceFileUri("~!@#$%^&*()_"); std::vector fileInfo = fah->ListFile(sourceFileUri); EXPECT_EQ(fileInfo.size(), 0); @@ -1752,14 +1459,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_GetRoots_0000"; try { uint64_t selfTokenId_ = GetSelfTokenID(); - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - sleep(1); - + vector info = fah->GetRoots(); EXPECT_GT(info.size(), 0); GTEST_LOG_(INFO) << "GetRoots_0000 result:" << info.size() << endl; diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index ee403b90c1aa636f59afcd65a1d7943a6748e521..ae026196d7350f7f218db9c793d73d2a1ec828c5 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -29,13 +29,20 @@ using namespace OHOS; using namespace FileAccessFwk; int uid = 5003; int ok = 0; -int error = 102825984; +int error = 102825986; +shared_ptr fah = nullptr; class FileExtensionHelperTest : public testing::Test { public: static void SetUpTestCase(void) { cout << "FileExtensionHelperTest code test" << endl; + + auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + auto remoteObj = saManager->GetSystemAbility(uid); + AAFwk::Want want; + want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); + fah = FileAccessHelper::Creator(remoteObj, want); } static void TearDownTestCase() {}; void SetUp() {}; @@ -135,12 +142,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(tokenId); - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(remoteObj, want); - sleep(1); + sleep(2); // sleep 2 seconds vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { @@ -196,14 +198,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0001, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - sleep(1); - Uri uri(""); int result = fah->OpenFile(uri, 0); EXPECT_EQ(result, error); @@ -227,14 +221,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0002, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - sleep(1); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -269,13 +255,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0003, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri uri("~!@#$%^&*()_"); int result = fah->OpenFile(uri, 0); EXPECT_EQ(result, error); @@ -299,13 +278,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -314,7 +286,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing:: EXPECT_EQ(result, ok); result = fah->OpenFile(newFileUri, -1); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; result = fah->Delete(newFileUri); @@ -339,13 +311,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0005, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0005"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -379,13 +344,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0006"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -419,13 +377,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0000, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -456,13 +407,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0001, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); Uri parentUri(""); int result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0001.txt", newFileUri); @@ -487,13 +431,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0002, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); Uri parentUri("storage/media/100/local/files/Download"); int result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0002.txt", newFileUri); @@ -518,13 +455,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0003, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newFileUri(""); Uri parentUri("~!@#$%^&*()_"); int result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0003.txt", newFileUri); @@ -549,13 +479,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0004, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -584,13 +507,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0000, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -621,13 +537,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0001, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); Uri parentUri(""); int result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0001", newDirUriTest); @@ -652,13 +561,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0002, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); Uri parentUri("storage/media/100/local/files/Download"); int result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0002", newDirUriTest); @@ -683,13 +585,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0003, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri newDirUriTest(""); Uri parentUri("~!@#$%^&*()_"); int result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0003", newDirUriTest); @@ -714,13 +609,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0004, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -749,13 +637,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -793,13 +674,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0001, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -830,16 +704,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0002, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri selectFileUri(""); int result = fah->Delete(selectFileUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -860,13 +727,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0003, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -876,7 +736,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0003, testing::ex Uri selectFileUri("storage/media/100/local/files/Download/test"); result = fah->Delete(selectFileUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); result = fah->Delete(newDirUriTest); EXPECT_GE(result, ok); @@ -902,16 +762,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0004, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri selectFileUri("!@#$%^&*()"); int result = fah->Delete(selectFileUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -932,13 +785,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -984,13 +830,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1033,13 +872,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1050,7 +882,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: Uri testUri(""); Uri sourceFileUri(""); result = fah->Move(sourceFileUri, newDirUriTest, testUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1075,13 +907,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1100,7 +925,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: Uri testUri2(""); Uri sourceFileUri("storage/media/100/local/files/Download/test1/test.txt"); result = fah->Move(sourceFileUri, newDirUriTest2, testUri2); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1128,13 +953,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1145,7 +963,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: Uri testUri(""); Uri sourceFileUri("~!@#$%^&*()_"); result = fah->Move(sourceFileUri, newDirUriTest, testUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1170,13 +988,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0005"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1191,7 +1002,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: Uri testUri2(""); Uri targetParentUri(""); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1216,13 +1027,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0006"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1241,7 +1045,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: Uri testUri2(""); Uri targetParentUri("storage/media/100/local/files/Download/test2"); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1269,13 +1073,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0007"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1294,7 +1091,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: Uri testUri2(""); Uri targetParentUri("~!@#$^%&*()_"); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1322,13 +1119,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0008"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1367,13 +1157,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0009"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1419,13 +1202,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0010"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1471,13 +1247,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0011"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1489,7 +1258,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: Uri testUri(""); fah->CreateFile(newDirUriTest1, "test.txt", testUri); - for (size_t j = 1; j < info.size(); j++) { + for (size_t j = i + 1; j < info.size(); j++) { Uri otherUri = info[j].uri; result = fah->Mkdir(otherUri, "test2", newDirUriTest2); EXPECT_EQ(result, ok); @@ -1501,9 +1270,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: EXPECT_GE(result, ok); GTEST_LOG_(INFO) << "Move_0011 result:" << result << endl; + + result = fah->Delete(newDirUriTest2); + EXPECT_GE(result, ok); } - result = fah->Delete(newDirUriTest2); + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, ok); } } catch (...) { @@ -1525,13 +1297,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1570,13 +1335,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1589,7 +1347,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ex EXPECT_GE(result, ok); GTEST_LOG_(INFO) << "Rename_0001 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = fah->Delete(renameUri); EXPECT_GE(result, ok); } } catch (...) { @@ -1611,17 +1369,10 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0002, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri renameUri(""); Uri sourceFileUri(""); int result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -1642,13 +1393,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1663,7 +1407,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex Uri renameUri(""); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Rename_0003 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1688,17 +1432,10 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0004, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0004"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri renameUri(""); Uri sourceFileUri("~!@#$%^&*()_"); int result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); - EXPECT_EQ(result, error); + EXPECT_LT(result, ok); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -1719,13 +1456,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0005"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1739,7 +1469,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex Uri renameUri(""); result = fah->Rename(testUri, "", renameUri); - EXPECT_EQ(result, error); + + int errorCode = 102825990; + EXPECT_EQ(result, errorCode); GTEST_LOG_(INFO) << "Rename_0005 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1764,13 +1496,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0000"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1808,13 +1533,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0001"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri sourceFileUri(""); std::vector fileInfo = fah->ListFile(sourceFileUri); EXPECT_EQ(fileInfo.size(), 0); @@ -1838,13 +1556,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0002"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; @@ -1883,13 +1594,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0003"; try { - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - Uri sourceFileUri("~!@#$%^&*()_"); std::vector fileInfo = fah->ListFile(sourceFileUri); EXPECT_EQ(fileInfo.size(), 0); @@ -1914,18 +1618,11 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_GetRoots_0000"; try { uint64_t selfTokenId_ = GetSelfTokenID(); - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); - sptr &token = remoteObj; - AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - std::shared_ptr fah = FileAccessHelper::Creator(token, want); - sleep(1); vector info = fah->GetRoots(); EXPECT_GT(info.size(), 0); GTEST_LOG_(INFO) << "GetRoots_0000 result:" << info.size() << endl; - + SetSelfTokenID(selfTokenId_); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred.";