diff --git a/interfaces/kits/napi/src/napi_print_task.cpp b/interfaces/kits/napi/src/napi_print_task.cpp index 800fd5987766274bae5996a638bd1ba4e4360d36..db919fe69f84ee9b0b210b4ed61a549a96f4f0ce 100644 --- a/interfaces/kits/napi/src/napi_print_task.cpp +++ b/interfaces/kits/napi/src/napi_print_task.cpp @@ -162,7 +162,7 @@ bool NapiPrintTask::IsValidFile(const std::string &fileName) fclose(file); return true; } - if (fileName.find("datashare://") == 0 || fileName.find("fd://") == 0) { + if (fileName.find("file://") == 0 || fileName.find("fd://") == 0) { return true; } PRINT_HILOGE("invalid file name"); diff --git a/interfaces/kits/napi/src/print_task.cpp b/interfaces/kits/napi/src/print_task.cpp index aea6a7be9c9bfebceedd9498702cad72c73c1f3b..c303bb5d760327cef392812ceb832e189f452dd2 100644 --- a/interfaces/kits/napi/src/print_task.cpp +++ b/interfaces/kits/napi/src/print_task.cpp @@ -41,7 +41,7 @@ PrintTask::PrintTask(const std::vector &innerList) : taskId_("") fileList_.assign(innerList.begin(), innerList.end()); pathType_ = FILE_PATH_ABSOLUTED; if (fileList_.size() > 0) { - if (fileList_.begin()->find("datashare://") == 0) { + if (fileList_.begin()->find("file://") == 0) { pathType_ = FILE_PATH; } } diff --git a/test/unittest/fwk_inner_napi_test/print_service_proxy_test.cpp b/test/unittest/fwk_inner_napi_test/print_service_proxy_test.cpp index eade0d6223bf5d52bdeffc15c54e04620e9e9dfa..445aae34bd3fb56f1f14d704ba249a9df964f157 100644 --- a/test/unittest/fwk_inner_napi_test/print_service_proxy_test.cpp +++ b/test/unittest/fwk_inner_napi_test/print_service_proxy_test.cpp @@ -53,8 +53,8 @@ void PrintServiceProxyTest::TearDown(void) {} */ HWTEST_F(PrintServiceProxyTest, PrintServiceProxyTest_0001, TestSize.Level1) { - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; OHOS::Print::PrintManagerClient client; diff --git a/test/unittest/fwk_inner_napi_test/print_task_test.cpp b/test/unittest/fwk_inner_napi_test/print_task_test.cpp index 9047646bd57527ac8ca2b6d3e818c4bb0c7a8ec9..4270e10349ec1e4628ed5adef90238f91b7a4558 100644 --- a/test/unittest/fwk_inner_napi_test/print_task_test.cpp +++ b/test/unittest/fwk_inner_napi_test/print_task_test.cpp @@ -53,8 +53,8 @@ void PrintTaskTest::TearDown(void) {} */ HWTEST_F(PrintTaskTest, PrintTaskTest_0001, TestSize.Level1) { - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; PrintTask task(fileList); EXPECT_TRUE(true); } diff --git a/test/unittest/service_test/print_manager_client_test.cpp b/test/unittest/service_test/print_manager_client_test.cpp index a713a7587ef59250faddd0db467c599e588604ad..1dad7cfec307b2b1ba34a03fc2e0adde6b265050 100644 --- a/test/unittest/service_test/print_manager_client_test.cpp +++ b/test/unittest/service_test/print_manager_client_test.cpp @@ -54,8 +54,8 @@ void PrintManagerClientTest::TearDown(void) {} HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0001, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; PrintExtensionInfo printExtensionInfo; @@ -81,8 +81,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0002, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionInfos; @@ -103,8 +103,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0003, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -123,8 +123,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0004, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList; @@ -143,8 +143,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0005, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -164,8 +164,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0006, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -200,8 +200,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0007, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -222,8 +222,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0008, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -251,8 +251,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0009, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -275,8 +275,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0010, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -299,8 +299,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0011, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -328,8 +328,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0012, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -351,8 +351,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0013, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -380,8 +380,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0014, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -404,8 +404,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0015, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -433,8 +433,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0016, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -456,8 +456,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0017, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -479,8 +479,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0018, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -526,8 +526,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0019, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -550,8 +550,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0020, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -598,8 +598,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0021, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -624,8 +624,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0022, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -650,8 +650,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0023, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -699,8 +699,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0024, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -725,8 +725,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0025, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -751,8 +751,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0026, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -799,8 +799,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0027, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -827,8 +827,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0028, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -855,8 +855,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0029, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -883,8 +883,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0030, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -909,8 +909,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0031, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -935,8 +935,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0032, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -984,8 +984,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0033, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1010,8 +1010,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0034, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1036,8 +1036,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0035, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1085,8 +1085,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0036, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1110,8 +1110,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0037, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1160,8 +1160,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0038, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1186,8 +1186,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0039, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1233,8 +1233,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0040, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1260,8 +1260,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0041, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1287,8 +1287,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0044, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1314,8 +1314,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0045, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId; std::vector extensionList = {"3"}; @@ -1341,8 +1341,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0046, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1369,8 +1369,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0047, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId; std::vector extensionList = {"3"}; @@ -1397,8 +1397,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0048, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1425,8 +1425,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0049, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; @@ -1455,8 +1455,8 @@ HWTEST_F(PrintManagerClientTest, PrintManagerClientTest_0050, TestSize.Level1) { OHOS::Print::PrintManagerClient Testclient; - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; std::vector fdList = {1, 2}; std::string taskId = "2"; std::vector extensionList = {"3"}; diff --git a/test/unittest/service_test/print_task_test.cpp b/test/unittest/service_test/print_task_test.cpp index e46f4dbb338e035ea8396c14f9a5e8d43bd0b138..f6868c333b29c54c59bcedf8cf6a94d4c24dfaef 100644 --- a/test/unittest/service_test/print_task_test.cpp +++ b/test/unittest/service_test/print_task_test.cpp @@ -53,8 +53,8 @@ void PrintTaskTest::TearDown(void) {} */ HWTEST_F(PrintTaskTest, PrintTaskTest_0001, TestSize.Level1) { - std::vector fileList = {"datashare://data/print/a.png", - "datashare://data/print/b.png", "datashare://data/print/c.png"}; + std::vector fileList = {"file://data/print/a.png", + "file://data/print/b.png", "file://data/print/c.png"}; OHOS::Print::PrintTask task(fileList); }