Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
大约 1 年 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts

体验新版 GitCode，发现更多精彩内容 >>

提交 435ea842 编写于 作者: Y yangbo
浏览文件
操作

medialibrary兼容api10 

Signed-off-by: Nyangbo <yangbo258@huawei.com>
上级 7d45fba3
展开全部 隐藏空白更改
内联 并排
Showing with 1130 addition and 1448 deletion
multimedia/medialibrary/common.js
浏览文件 @ 435ea842
/*
* Copyright (C) 2022-2023 Huawei Device Co., Ltd.
* Copyright (C) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
......@@ -94,13 +94,13 @@ const fileIdFetchOps = function (testNum, id) {
return ops;
};
const albumFetchOps = function (testNum, path, albumName, type, others) {
if (!others) {
others = { order: FILEKEY.DATE_ADDED + " DESC" };
}
const albumFetchOps = function (testNum, albumName, others) {
// if (!others) {
// others = { order: FILEKEY.DATE_ADDED + " DESC" };
// }
let ops = {
selections: RELATIVE_PATH + "= ? AND " + ALBUM_NAME + "= ? AND " + MEDIA_TYPE + "= ?",
selectionArgs: [path, albumName, type.toString()],
selections: ALBUM_NAME + "= ?",
selectionArgs: [albumName],
...others,
};
console.info(`${testNum}: fetchOps${JSON.stringify(ops)}`);
......@@ -170,13 +170,22 @@ const albumThreeTypesFetchOps = function (testNum, paths, albumName, types, othe
],
...others,
};
console.info(`${testNum}: fetchOps${JSON.stringify(ops)}`);
console.info(`${testNum}: fetchOps ${JSON.stringify(ops)}`);
return ops;
} catch (error) {
console.info(`albumThreeTypesFetchOps :: error: ${error}`);
}
};
const fileFetchOption = function (testNum, selections, selectionArgs) {
let ops = {
selections: selections,
selectionArgs: selectionArgs,
};
console.info(`${testNum} fetchOps: ${JSON.stringify(ops)}`);
return ops;
}
const checkPresetsAssets = async function (media, hapName) {
console.info("checkPresetsAssets start");
let albumList = await media.getAlbums(allFetchOp());
......@@ -282,6 +291,7 @@ export {
nameFetchOps,
idFetchOps,
albumFetchOps,
fileFetchOption,
albumTwoTypesFetchOps,
albumThreeTypesFetchOps,
checkPresetsAssets,
......
multimedia/medialibrary/mediaLibrary_album/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,15 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /storage/media/100/local/files/.*",
"scanner",
"sleep 5",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"killall com.ohos.medialibrary.medialibrarydata",
"sleep 3",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -32,22 +33,19 @@
"pre-push": [],
"push": [
"./resource/medialibrary/01.jpg ->/storage/media/100/local/temp",
"./resource/medialibrary/01.mp3 ->/storage/media/100/local/temp",
"./resource/medialibrary/01.mp4 ->/storage/media/100/local/temp"
]
},
{
"type": "ShellKit",
"run-command": [
"mkdir -pv /storage/media/100/local/files/Pictures/Static",
"mkdir -pv /storage/media/100/local/files/Videos/Static",
"mkdir -pv /storage/media/100/local/files/Audios/Static",
"for i in $$(seq 6); do mkdir -pv /storage/media/100/local/files/Pictures/DynamicPro$$i; done;",
"for i in $$(seq 6); do mkdir -pv /storage/media/100/local/files/Pictures/DynamicCb$$i; done;",
"for d in Static; do for i in $$(seq 5); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in Static; do for i in $$(seq 5); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in Static; do for i in $$(seq 5); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in DynamicPro1 DynamicPro2 DynamicPro3 DynamicPro4 DynamicPro5 DynamicPro6 DynamicCb1 DynamicCb2 DynamicCb3 DynamicCb4 DynamicCb5 DynamicCb6; do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d ;done;",
"mkdir -pv /storage/media/100/local/files/Pictures/Screenshots",
"mkdir -pv /storage/media/100/local/files/Videos/ScreenRecordings",
"cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Camera/01.jpg",
"cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/01.mp4",
"cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/Screenshots/01.jpg",
"cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/ScreenRecordings/01.mp4",
"chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff",
......@@ -58,16 +56,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_album/entry/src/main/ets/MainAbility/MainAbility.ts
浏览文件 @ 435ea842
......@@ -12,7 +12,7 @@ export default class MainAbility extends Ability {
console.log("[Demo] MainAbility onDestroy")
}
async onWindowStageCreate(windowStage) {
onWindowStageCreate(windowStage) {
console.log("[Demo] MainAbility onWindowStageCreate windowStage=" + windowStage)
globalThis.windowStage = windowStage
globalThis.abilityContext = this.context
......
multimedia/medialibrary/mediaLibrary_base/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -43,11 +42,13 @@
"mkdir -pv /storage/media/100/local/files/Pictures/{Static,On,Off,OnAlbum,OffAlbum}",
"mkdir -pv /storage/media/100/local/files/Videos//{Static,On,Off}",
"mkdir -pv /storage/media/100/local/files/Audios/{Static,On,Off}",
"mkdir -pv /storage/media/100/local/files/Documents/{Static,On,Off}",
"mkdir -pv /storage/media/100/local/files/Documents/{Static,On,Off,deviceOn,remoteOn,deviceOff,remoteOff}",
"mkdir -pv /storage/media/100/local/files/Pictures/Screenshots",
"cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/Screenshots/01.jpg",
"for d in Static On Off OnAlbum OffAlbum; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in Static On Off; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in Static On Off; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in Static On Off; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"for d in Static On Off deviceOn remoteOn deviceOff remoteOff; do for i in $$(seq 1); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff",
......@@ -58,16 +59,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/MainAbility/MainAbility.ts
浏览文件 @ 435ea842
......@@ -33,6 +33,33 @@ export default class MainAbility extends Ability {
// let array: Array<string> = ["ohos.permission.MEDIA_LOCATION", "ohos.permission.READ_MEDIA", "ohos.permission.WRITE_MEDIA"];
// //requestPermissionsFromUser会判断权限的授权状态来决定是否唤起弹窗
// context.requestPermissionsFromUser(array).then(async function (data) {
// console.log("data type:" + JSON.stringify(data));
// console.log("data:" + data);
// console.log("data permissions:" + data.permissions);
// console.log("data result:" + data.authResults);
// }, (err) => {
// console.error('Failed to start ability', err.code);
// });
// console.info("getPermission 1");
// await new Promise((res) => setTimeout(res, 200));
// let driver = Driver.create();
// console.info("getPermission 2");
// console.info(`driver is ${JSON.stringify(driver)}`);
// await new Promise((res) => setTimeout(res, 200));
// let button = await driver.findComponent(ON.text("允许"));
// while (button) {
// console.info(`button is ${JSON.stringify(button)}`);
// await new Promise((res) => setTimeout(res, 200));
// await button.click();
// button = await driver.findComponent(ON.text("允许"));
// }
// console.info("getPermission 3");
console.log("[Demo] MainAbility onWindowStageCreate windowStage=" + windowStage)
globalThis.windowStage = windowStage
globalThis.abilityContext = this.context
......
multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/test/mediaLibraryTestPromiseOnOff.test.ets
浏览文件 @ 435ea842
......@@ -26,12 +26,15 @@ import {
albumFetchOps,
getPermission,
checkAlbumsCount,
FILEKEY,
fileFetchOption,
} from "../../../../../../common";
export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
describe("mediaLibraryTestPromiseOnOffTest", function () {
const media = mediaLibrary.getMediaLibrary(abilityContext);
beforeAll(async function () {
await getPermission(null, abilityContext);
console.info("beforeAll case");
});
beforeEach(function () {
......@@ -55,10 +58,10 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 1);
if (!checkAssetCountPass) return;
const asset = await fetchFileResult.getFirstObject();
asset.title = asset.title + "changename";
asset.title = testNum + asset.title;
await asset.commitModify();
await sleep(1000);
expect(count > 0).assertTrue();
expect(count).assertEqual(1);
fetchFileResult.close();
done();
} catch (error) {
......@@ -71,16 +74,19 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
try {
let count = 0;
media.on(type, () => {
console.info(`${testNum}:: on`);
count++;
});
const fetchFileResult = await media.getFileAssets(fetchOps);
console.info(`${testNum}:: fetchFileResult :${fetchFileResult.getCount()}`);
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 1);
if (!checkAssetCountPass) return;
const asset = await fetchFileResult.getFirstObject();
asset.title = asset.title + "changename";
asset.title = testNum + asset.title;
media.off(type);
await asset.commitModify();
await sleep(1000);
console.info(`${testNum}:: count :${count}`);
expect(count).assertEqual(0);
fetchFileResult.close();
done();
......@@ -165,18 +171,21 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
media.on("albumChange", () => {
count++;
});
let currentFetchOps = albumFetchOps(testNum, "Pictures/", "OnAlbum", IMAGE_TYPE);
const albumList = await media.getAlbums(currentFetchOps);
const selections = FILEKEY.ALBUM_NAME + '= ?';
const currentFetchOp = fileFetchOption(testNum, selections, ['Screenshots']);
const albumList = await media.getAlbums(currentFetchOp);
console.info(`${testNum} albumList: ${albumList.length}`)
const albumCountPass = await checkAlbumsCount(done, testNum, albumList, 1);
if (!albumCountPass) return;
const album = albumList[0];
const oldName = album.albumName;
album.albumName = album.albumName + "changename";
console.info(`${testNum} oldName: ${oldName}`)
album.albumName = testNum + album.albumName;
await album.commitModify();
await sleep(1000);
expect(count > 0).assertTrue();
album.albumName = oldName;
await album.commitModify();
expect(count).assertEqual(1);
done();
} catch (error) {
console.info(`${testNum}:: error :${error}`);
......@@ -197,27 +206,21 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_PROMISE_ON_006";
try {
let count = 0;
expect(true).assertTrue();
done();
media.on("deviceChange", () => {
console.info("MediaLibraryTest : on 006 callback");
count++;
});
let currentFetchOps = fetchOps(testNum, "Documents/On/", FILE_TYPE);
let currentFetchOps = fetchOps(testNum, "Documents/deviceOn/", FILE_TYPE);
const fetchFileResult = await media.getFileAssets(currentFetchOps);
const asset = await fetchFileResult.getFirstObject();
asset.title = asset.title + "changename";
asset.title = testNum + asset.title;
await asset.commitModify();
await new Promise((res) => {
setTimeout(() => {
res(true);
}, 1000);
});
expect(count == 0).assertTrue();
await sleep(1000);
expect(count).assertEqual(0);
fetchFileResult.close();
done();
} catch (error) {
console.info(`MediaLibraryTest : on 006 failed, error: ${error}`);
console.info(`${testNum}:: error :${error}`);
expect(false).assertTrue();
media.off("deviceChange");
done();
......@@ -236,28 +239,22 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_PROMISE_ON_007";
try {
let count = 0;
expect(true).assertTrue();
done();
media.on("remoteFileChange", () => {
console.info("MediaLibraryTest : on 007 callback");
count++;
});
let currentFetchOps = fetchOps(testNum, "Documents/On/", FILE_TYPE);
let currentFetchOps = fetchOps(testNum, "Documents/remoteOn/", FILE_TYPE);
const fetchFileResult = await media.getFileAssets(currentFetchOps);
const asset = await fetchFileResult.getFirstObject();
asset.title = asset.title + "changename";
asset.title = testNum + asset.title;
await asset.commitModify();
await new Promise((res) => {
setTimeout(() => {
res(true);
}, 1000);
});
await sleep(1000);
expect(count == 0).assertTrue();
fetchFileResult.close();
done();
} catch (error) {
console.info(`MediaLibraryTest : on 007 failed, error: ${error}`);
console.info(`${testNum}:: error :${error}`);
expect(false).assertTrue();
media.off("remoteFileChange");
done();
......@@ -341,13 +338,13 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
});
await sleep(300);
media.off("albumChange");
let currentFetchOps = albumFetchOps(testNum, "Pictures/", "OffAlbum", IMAGE_TYPE);
let currentFetchOps = albumFetchOps(testNum, "Screenshots");
const albumList = await media.getAlbums(currentFetchOps);
const albumCountPass = await checkAlbumsCount(done, testNum, albumList, 1);
if (!albumCountPass) return;
const album = albumList[0];
const oldName = album.albumName;
album.albumName = album.albumName + "changename";
album.albumName = album.albumName + testNum;
await sleep(1000);
await album.commitModify();
await sleep(300);
......@@ -361,6 +358,7 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
done();
}
});
/**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_PROMISE_OFF_006
* @tc.name : off
......@@ -373,38 +371,24 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_PROMISE_OFF_006";
try {
media.on("deviceChange", () => {
console.info("MediaLibraryTest : off 006 failed");
console.info(`${testNum}:: failed`);
expect(false).assertTrue();
media.off("deviceChange");
done();
});
await new Promise((res) => {
setTimeout(() => {
res(true);
}, 300);
});
await sleep(1000);
let currentFetchOps = fetchOps(testNum, "Documents/On/", FILE_TYPE);
const fetchFileResult = await media.getFileAssets(currentFetchOps);
const asset = await fetchFileResult.getFirstObject();
asset.title = asset.title + "deviceChange";
asset.title = testNum + asset.title;
media.off("deviceChange");
await new Promise((res) => {
setTimeout(() => {
res(true);
}, 600);
});
await sleep(1000);
await asset.commitModify();
await new Promise((res) => {
setTimeout(() => {
res(true);
}, 1000);
});
console.info("MediaLibraryTest : off 006 passed");
expect(true).assertTrue();
await sleep(1000);
fetchFileResult.close();
done();
} catch (error) {
console.info(`MediaLibraryTest : off 006 failed, error: ${error}`);
console.info(`${testNum}:: error :${error}`);
expect(false).assertTrue();
media.off("fileChange");
done();
......@@ -423,35 +407,21 @@ export default function mediaLibraryTestPromiseOnOffTest(abilityContext) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_PROMISE_OFF_007";
try {
media.on("remoteFileChange", () => {
console.info("MediaLibraryTest : off 007 failed");
console.info(`${testNum} failed`);
expect(false).assertTrue();
media.off("remoteFileChange");
done();
});
await new Promise((res) => {
setTimeout(() => {
res(true);
}, 300);
});
await sleep(1000);
media.off("remoteFileChange");
let currentFetchOps = fetchOps(testNum, "Documents/On/", FILE_TYPE);
const fetchFileResult = await media.getFileAssets(currentFetchOps);
const asset = await fetchFileResult.getFirstObject();
asset.title = asset.title + "remoteFileChange";
await new Promise((res) => {
setTimeout(() => {
res(true);
}, 600);
});
asset.title = testNum + asset.title;
await sleep(1000);
await asset.commitModify();
await new Promise((res) => {
setTimeout(() => {
res(true);
}, 1000);
});
console.info("MediaLibraryTest : off 007 passed");
expect(true).assertTrue();
await sleep(1000);
fetchFileResult.close();
done();
} catch (error) {
......
multimedia/medialibrary/mediaLibrary_favorite/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -58,16 +57,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_file/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -62,16 +61,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_fileAsset/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -62,16 +61,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetCallback2.test.ets
浏览文件 @ 435ea842
......@@ -56,24 +56,27 @@ export default function fileAssetCallback2Test(abilityContext) {
asset[prop] = val;
const id = asset.id;
asset.commitModify(async (err) => {
if (err) {
console.info(`${testNum} err : ${err}`);
expect().assertFail();
fetchFileResult.close();
done();
return;
try {
if (err) {
console.info(`${testNum} err : ${err}`);
expect(false).assertTrue();
} else {
let currentfetchOp = {
selections: FILEKEY.ID + "= ?",
selectionArgs: [id + ""],
};
const fetchFileResultById = await media.getFileAssets(currentfetchOp);
const currentAsset = await fetchFileResultById.getFirstObject();
expect(currentAsset[prop]).assertEqual(val);
fetchFileResultById.close();
}
} catch (error) {
console.info(`${testNum} failed, error : ${error}`);
expect(false).assertTrue();
}
let currentfetchOp = {
selections: FILEKEY.ID + "= ?",
selectionArgs: [id + ""],
};
const fetchFileResultById = await media.getFileAssets(currentfetchOp);
const currentAsset = await fetchFileResultById.getFirstObject();
expect(currentAsset[prop]).assertEqual(val);
asset[prop] = oldVal;
await asset.commitModify();
fetchFileResult.close();
await fetchFileResultById.close();
done();
});
} catch (error) {
......@@ -226,7 +229,7 @@ export default function fileAssetCallback2Test(abilityContext) {
let fetchOp = nameFetchOps(testNum, "Pictures/ModifyCb/", "07.jpg", IMAGE_TYPE);
let prop = "title";
let val = "";
for (var i = 0; i < 85; i++) {
for (var i = 0; i < 83; i++) {
val += "中";
}
await checkCommitModify(done, testNum, fetchOp, prop, val);
......@@ -245,7 +248,7 @@ export default function fileAssetCallback2Test(abilityContext) {
let fetchOp = nameFetchOps(testNum, "Pictures/ModifyCb/", "08.jpg", IMAGE_TYPE);
let prop = "title";
let val = "";
for (var i = 0; i < 255; i++) {
for (var i = 0; i < 251; i++) {
val += "a";
}
await checkCommitModify(done, testNum, fetchOp, prop, val);
......
multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetPromise2.test.ets
浏览文件 @ 435ea842
......@@ -234,7 +234,7 @@ export default function fileAssetPromise2Test(abilityContext) {
let fetchOp = nameFetchOps(testNum, "Pictures/ModifyPro/", "07.jpg", IMAGE_TYPE);
let prop = "title";
let val = "";
for (var i = 0; i < 85; i++) {
for (var i = 0; i < 83; i++) {
val += "中";
}
await checkCommitModify(done, testNum, fetchOp, prop, val);
......@@ -253,7 +253,7 @@ export default function fileAssetPromise2Test(abilityContext) {
let fetchOp = nameFetchOps(testNum, "Pictures/ModifyPro/", "08.jpg", IMAGE_TYPE);
let prop = "title";
let val = "";
for (var i = 0; i < 255; i++) {
for (var i = 0; i < 251; i++) {
val += "a";
}
await checkCommitModify(done, testNum, fetchOp, prop, val);
......
multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/test/fileAssetTestCallback.test.ets
浏览文件 @ 435ea842
......@@ -52,44 +52,46 @@ export default function fileAssetTestCallbackTest(abilityContext) {
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, expectCount);
if (!checkAssetCountPass) return;
const dataList = await fetchFileResult.getAllObject();
fetchFileResult.close();
asset = dataList[0];
console.info(`${testNum} :: asset.name: ${asset.displayName}, asset.id: ${asset.id}`);
asset.open("rw", async (err, fd) => {
if (err) {
console.info(`${testNum} :: err: ${err}`);
expect().assertFail();
fetchFileResult.close();
done();
return;
try {
if (err) {
console.info(`${testNum} :: err: ${err}`);
expect(false).assertTrue();
} else {
expect(isNum(fd)).assertTrue();
let buf = new ArrayBuffer(4096);
let res = await fileio.read(fd, buf);
expect(res.bytesRead).assertEqual(assetProps.bytesRead);
asset1 = dataList[1];
fd1 = await asset1.open("r");
expect(isNum(fd1)).assertTrue();
let buf1 = new ArrayBuffer(4096);
await fileio.read(fd1, buf1);
let write = await fileio.write(fd, buf1);
expect(write).assertEqual(assetProps.write);
console.info(`res.bytesRead:${res.bytesRead},write:${write}`);
console.info(`fd1:${fd1},fd:${fd}`);
await asset.close(fd);
await asset1.close(fd1);
await sleep(50);
let newFetchFileResult = await media.getFileAssets(fileIdFetchOps(testNum, asset.id));
let checkAssetCountPass = await checkAssetsCount(done, testNum, newFetchFileResult, 1);
if (!checkAssetCountPass) return;
let newAsset = await newFetchFileResult.getFirstObject();
expect(newAsset.dateModified != asset.dateModified).assertTrue();
newFetchFileResult.close();
}
} catch (error) {
console.info(`${testNum} failed, error: ${error}`);
}
expect(isNum(fd)).assertTrue();
let buf = new ArrayBuffer(4096);
let res = await fileio.read(fd, buf);
expect(res.bytesRead).assertEqual(assetProps.bytesRead);
asset1 = dataList[1];
fd1 = await asset1.open("r");
expect(isNum(fd1)).assertTrue();
let buf1 = new ArrayBuffer(4096);
await fileio.read(fd1, buf1);
let write = await fileio.write(fd, buf1);
expect(write).assertEqual(assetProps.write);
console.info(`res.bytesRead:${res.bytesRead},write:${write}`);
console.info(`fd1:${fd1},fd:${fd}`);
await asset.close(fd);
await asset1.close(fd1);
await sleep(50);
let newFetchFileResult = await media.getFileAssets(fileIdFetchOps(testNum, asset.id));
let checkAssetCountPass = await checkAssetsCount(done, testNum, newFetchFileResult, 1);
if (!checkAssetCountPass) return;
let newAsset = await newFetchFileResult.getFirstObject();
expect(newAsset.dateModified != asset.dateModified).assertTrue();
fetchFileResult.close();
newFetchFileResult.close();
done();
});
} catch (error) {
console.info(`${testNum} :: error: ${error}`);
await asset.close(fd);
await asset1.close(fd1);
expect().assertFail();
done();
}
......@@ -102,29 +104,25 @@ export default function fileAssetTestCallbackTest(abilityContext) {
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, expectCount);
if (!checkAssetCountPass) return;
const dataList = await fetchFileResult.getAllObject();
fetchFileResult.close()
asset = dataList[0];
asset.open("r", async (err, fd) => {
if (err) {
console.info(`${testNum} :: err: ${err}`);
expect().assertFail();
fetchFileResult.close();
done();
return;
}
expect(isNum(fd)).assertTrue();
let buf = new ArrayBuffer(4096);
let res = await fileio.read(fd, buf);
console.log(" bytesRead: " + res.bytesRead);
expect(res.bytesRead).assertEqual(assetProps.bytesRead);
try {
await fileio.write(fd, buf);
expect().assertFail();
if (err) {
console.info(`${testNum} :: err: ${err}`);
expect(false).assertTrue();
} else {
expect(isNum(fd)).assertTrue();
let buf = new ArrayBuffer(4096);
let res = await fileio.read(fd, buf);
console.log(" bytesRead: " + res.bytesRead);
expect(res.bytesRead).assertEqual(assetProps.bytesRead);
}
} catch (error) {
expect(true).assertTrue();
await asset.close(fd);
fetchFileResult.close();
done();
console.info(`${testNum} failed, error: ${error}`);
}
await asset.close(fd);
done();
});
} catch (error) {
console.info(`${testNum} :: error: ${error}`);
......@@ -142,25 +140,29 @@ export default function fileAssetTestCallbackTest(abilityContext) {
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, expectCount);
if (!checkAssetCountPass) return;
const dataList = await fetchFileResult.getAllObject();
fetchFileResult.close();
asset = dataList[0];
asset1 = dataList[1];
asset.open("w", async (err, fd) => {
if (err) {
console.info(`${testNum} :: err: ${err}`);
expect().assertFail();
fetchFileResult.close();
done();
return;
try {
if (err) {
console.info(`${testNum} :: err: ${err}`);
expect(false).assertTrue();
} else {
expect(isNum(fd)).assertTrue();
fd1 = await asset1.open("r");
let buf = new ArrayBuffer(4096);
await fileio.read(fd1, buf);
let write = await fileio.write(fd, buf);
console.info(`${testNum} :: write: ${write}`);
expect(write).assertEqual(assetProps.write);
}
} catch (error) {
console.info(`${testNum} failed, error: ${error}`);
}
expect(isNum(fd)).assertTrue();
fd1 = await asset1.open("r");
let buf = new ArrayBuffer(4096);
await fileio.read(fd1, buf);
let write = await fileio.write(fd, buf);
console.info(`${testNum} :: write: ${write}`);
expect(write).assertEqual(assetProps.write);
fetchFileResult.close();
await asset.close(fd);
await asset1.close(fd1);
done();
});
} catch (error) {
......@@ -180,31 +182,34 @@ export default function fileAssetTestCallbackTest(abilityContext) {
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 2);
if (!checkAssetCountPass) return;
const asset = await fetchFileResult.getFirstObject();
fetchFileResult.close();
fd = await asset.open("r");
expect(isNum(fd)).assertTrue();
asset.close(fd, async (err) => {
if (err) {
console.info(`${testNum} :: err: ${err}`);
expect().assertFail();
fetchFileResult.close();
done();
return;
}
let count = 0;
let buf = new ArrayBuffer(4096);
try {
await fileio.read(fd, buf);
if (err) {
console.info(`${testNum} :: err: ${err}`);
expect().assertFail();
} else {
let count = 0;
let buf = new ArrayBuffer(4096);
try {
await fileio.read(fd, buf);
} catch (error) {
count++;
}
try {
await fileio.write(fd, buf);
} catch (error) {
count++;
}
await sleep(1000);
expect(count).assertEqual(2);
}
} catch (error) {
count++;
console.info(`${testNum} error:${error}`);
}
try {
await fileio.write(fd, buf);
} catch (error) {
count++;
}
await sleep(1000);
expect(count).assertEqual(2);
fetchFileResult.close();
await asset.close(fd);
done();
});
} catch (error) {
......
multimedia/medialibrary/mediaLibrary_fileKey/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -54,16 +53,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/test/filekeyTestCallback.test.ets
浏览文件 @ 435ea842
......@@ -25,7 +25,7 @@ import {
checkAssetsCount,
fetchOps,
getPermission,
checkAlbumsCount,
fileFetchOption,
} from "../../../../../../common";
export default function filekeyTestCallbackTest(abilityContext) {
......@@ -251,19 +251,6 @@ export default function filekeyTestCallbackTest(abilityContext) {
await getFileAssetsBy(done, testNum, "orientation", ORIENTATION);
});
/**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_FILE_KEY_CALLBACK_012
* @tc.name : getFileAssets
* @tc.desc : filekey widthOp
* @tc.size : MEDIUM
* @tc.type : Function
* @tc.level : Level 0
*/
it("SUB_MEDIA_MEDIALIBRARY_FILE_KEY_CALLBACK_012", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_FILE_KEY_CALLBACK_012";
await getFileAssetsBy(done, testNum, "albumId", ALBUM_ID);
});
/**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_FILE_KEY_CALLBACK_014
* @tc.name : getFileAssets
......@@ -327,20 +314,24 @@ export default function filekeyTestCallbackTest(abilityContext) {
it("SUB_MEDIA_MEDIALIBRARY_FILE_KEY_CALLBACK_018", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_FILE_KEY_CALLBACK_018";
try {
let albumName = "ImageInfo";
let currentFetchOp = {
selections: RELATIVE_PATH + "= ? AND " + ALBUM_NAME + "= ? AND " + MEDIA_TYPE + "= ?",
selectionArgs: ["Pictures/", albumName, IMAGE_TYPE.toString()],
};
console.info(`${testNum} currentFetchOp : ${JSON.stringify(currentFetchOp)}`);
const albumList = await media.getAlbums(currentFetchOp);
const album = albumList[0];
const albumCountPass = await checkAlbumsCount(done, testNum, albumList, 1);
if (!albumCountPass) return;
expect(album.albumName).assertEqual(albumName);
done();
let currentFetchOp = fileFetchOption(testNum, ALBUM_NAME + '= ?', ['Camera']);
media.getAlbums(currentFetchOp, (err, albumList) => {
try {
if (err) {
console.info(`${testNum} err : ${err}`);
expect(false).assertTrue();
} else {
expect(albumList.length).assertEqual(1);
const album = albumList[0];
expect(album.albumName).assertEqual('Camera');
}
} catch (error) {
console.info(`${testNum} error : ${error}`);
}
done();
})
} catch (error) {
console.info(`${testNum} error : ${error}`);
console.info(`${testNum} faild, error : ${error}`);
expect(false).assertTrue();
done();
}
......
multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/test/filekeyTestPromise.test.ets
浏览文件 @ 435ea842
......@@ -21,10 +21,10 @@ import {
sleep,
IMAGE_TYPE,
AUDIO_TYPE,
checkAlbumsCount,
FILEKEY,
checkAssetsCount,
fetchOps,
fileFetchOption,
} from "../../../../../../common";
export default function filekeyTestPromiseTest(abilityContext) {
......@@ -241,19 +241,6 @@ export default function filekeyTestPromiseTest(abilityContext) {
await getFileAssetsBy(done, testNum, "orientation", ORIENTATION);
});
/**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_FILE_KEY_PROMISE_012
* @tc.name : getFileAssets
* @tc.desc : filekey widthOp
* @tc.size : MEDIUM
* @tc.type : Function
* @tc.level : Level 0
*/
it("SUB_MEDIA_MEDIALIBRARY_FILE_KEY_PROMISE_012", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_FILE_KEY_PROMISE_012";
await getFileAssetsBy(done, testNum, "albumId", ALBUM_ID);
});
/**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_FILE_KEY_PROMISE_014
* @tc.name : getFileAssets
......@@ -317,17 +304,11 @@ export default function filekeyTestPromiseTest(abilityContext) {
it("SUB_MEDIA_MEDIALIBRARY_FILE_KEY_PROMISE_018", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_FILE_KEY_PROMISE_018";
try {
let albumName = "ImageInfo";
let currentFetchOp = {
selections: RELATIVE_PATH + "= ? AND " + ALBUM_NAME + "= ? AND " + MEDIA_TYPE + "= ?",
selectionArgs: ["Pictures/", albumName, IMAGE_TYPE.toString()],
};
console.info(`${testNum} currentFetchOp : ${JSON.stringify(currentFetchOp)}`);
let currentFetchOp = fileFetchOption(testNum, ALBUM_NAME + '= ?', ['Camera']);
const albumList = await media.getAlbums(currentFetchOp);
const albumCountPass = await checkAlbumsCount(done, testNum, albumList, 1);
if (!albumCountPass) return;
expect(albumList.length).assertEqual(1);
const album = albumList[0];
expect(album.albumName).assertEqual(albumName);
expect(album.albumName).assertEqual('Camera');
done();
} catch (error) {
console.info(`${testNum} error : ${error}`);
......
multimedia/medialibrary/mediaLibrary_fileResult/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -58,16 +57,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_getExifNoLocation/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -49,16 +48,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_getExiflocation/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -49,16 +48,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -55,16 +54,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/test/getThumbnailCallback.test.ets
浏览文件 @ 435ea842
......@@ -81,31 +81,45 @@ export default function getThumbnailCallback(abilityContext) {
async function testGetThumbnail(done, testNum, dOp, size) {
try {
let fetchFileResult = await media.getFileAssets(dOp);
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 1);
if (!checkAssetCountPass) return;
expect(fetchFileResult.getCount()).assertEqual(1);
let asset = await fetchFileResult.getFirstObject();
console.info(`${testNum} asset :${asset}, size: ${size}`);
if (size == "default") {
size = { width: 256, height: 256 };
asset.getThumbnail(async (err, pixelmap) => {
await pixelmap.getImageInfo((err, info) => {
expect(info.size.width).assertEqual(size.width);
expect(info.size.height).assertEqual(size.height);
fetchFileResult.close();
done();
});
try {
if (err) {
console.info(`${testNum}:: err :${err}`);
expect(false).assertTrue();
} else {
const info = await pixelmap.getImageInfo();
expect(info.size.width).assertEqual(size.width);
expect(info.size.height).assertEqual(size.height);
}
} catch (error) {
console.info(`${testNum}:: error1 :${error}`);
}
done();
});
} else {
asset.getThumbnail(size, async (err, pixelmap) => {
await pixelmap.getImageInfo((err, info) => {
expect(info.size.width).assertEqual(size.width);
expect(info.size.height).assertEqual(size.height);
fetchFileResult.close();
done();
});
try {
if (err) {
console.info(`${testNum} err :${err}`);
expect(false).assertTrue();
} else {
const info = await pixelmap.getImageInfo();
expect(info.size.width).assertEqual(size.width);
expect(info.size.height).assertEqual(size.height);
}
} catch (error) {
console.info(`${testNum}:: error2 :${error}`);
}
done();
});
}
} catch (error) {
console.info(`${testNum}:: error :${error}`);
console.info(`${testNum}:: error3 :${error}`);
expect(false).assertTrue();
done();
}
......
multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/test/getThumbnailPromise.test.ets
浏览文件 @ 435ea842
......@@ -87,11 +87,11 @@ export default function getThumbnailPromise(abilityContext) {
size = { width: 256, height: 256 };
pixelmap = await asset.getThumbnail();
} else {
if (size === undefined || size === null) {
size = { width: 256, height: 256 };
}
pixelmap = await asset.getThumbnail(size);
}
if (size === undefined || size === null) {
size = { width: 256, height: 256 };
}
let info = await pixelmap.getImageInfo();
expect(info.size.width).assertEqual(size.width);
expect(info.size.height).assertEqual(size.height);
......@@ -248,7 +248,7 @@ export default function getThumbnailPromise(abilityContext) {
/**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_GETTHUMBNAIL_PROMISE_001_08
* @tc.name : getThumbnail
* @tc.desc : getThumbnail(image) by undefined size
* @tc.desc : getThumbnail(image) by undefined
* @tc.size : MEDIUM
* @tc.type : Function
* @tc.level : Level 0
......@@ -263,7 +263,7 @@ export default function getThumbnailPromise(abilityContext) {
/**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_GETTHUMBNAIL_PROMISE_001_09
* @tc.name : getThumbnail
* @tc.desc : getThumbnail(image) by null size
* @tc.desc : getThumbnail(image) by null
* @tc.size : MEDIUM
* @tc.type : Function
* @tc.level : Level 0
......@@ -334,7 +334,7 @@ export default function getThumbnailPromise(abilityContext) {
let size = false;
await testGetThumbnailError(done, testNum, dOp, size);
});
/**
* @tc.number : SUB_MEDIA_MEDIALIBRARY_GETTHUMBNAIL_PROMISE_ERROR_001_08
* @tc.name : getThumbnail
......
multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -40,14 +39,11 @@
{
"type": "ShellKit",
"run-command": [
"mkdir -pv /storage/media/100/local/files/Pictures/Static",
"mkdir -pv /storage/media/100/local/files/Videos/Static",
"mkdir -pv /storage/media/100/local/files/Audios/Static",
"mkdir -pv /storage/media/100/local/files/Documents/Static",
"for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in Static; do for i in $$(seq 2); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/01.jpg",
"cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/01.mp3",
"cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/01.mp4",
"cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/01.dat",
"chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff",
......@@ -58,16 +54,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/test/mediafetchoptionsCallback.test.ets
浏览文件 @ 435ea842
......@@ -27,6 +27,8 @@ import {
checkAssetsCount,
fetchOps,
getPermission,
fileFetchOption,
FILEKEY,
} from "../../../../../../common";
export default function mediafetchoptionsCallback(abilityContext) {
......@@ -50,12 +52,9 @@ export default function mediafetchoptionsCallback(abilityContext) {
const serachUri = async (done, testNum, fetchOp, type) => {
try {
const fetchFileResult = await media.getFileAssets(fetchOp);
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 2);
if (!checkAssetCountPass) {
fetchFileResult.close();
return;
}
expect(fetchFileResult.getCount()).assertEqual(1);
let firstObject = await fetchFileResult.getFirstObject();
fetchFileResult.close();
const id = firstObject.id;
const uri = firstObject.uri;
const serachUri = `file://media/${type}/${id}`;
......@@ -68,21 +67,21 @@ export default function mediafetchoptionsCallback(abilityContext) {
};
media.getFileAssets(serchfetchOp, async (err, result) => {
if (err) {
console.info(`${testNum}, err: ${err}`);
try {
if (err) {
console.info(`${testNum}, err: ${err}`);
expect(false).assertTrue();
} else {
expect(result.getCount()).assertEqual(1);
let asset = await result.getFirstObject();
expect(asset.uri).assertEqual(serachUri);
expect(asset.id).assertEqual(id);
result.close();
}
} catch (error) {
console.info(`${testNum} error: ${error}`);
expect(false).assertTrue();
fetchFileResult.close();
await result.close();
done();
return;
}
checkAssetCountPass = await checkAssetsCount(done, testNum, result, 1);
if (!checkAssetCountPass) return;
let asset = await result.getFirstObject();
expect(asset.uri).assertEqual(serachUri);
expect(asset.id).assertEqual(id);
fetchFileResult.close();
await result.close();
done();
});
} catch (error) {
......@@ -101,7 +100,7 @@ export default function mediafetchoptionsCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_ASSET_URI_CALLBACK_001", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_ASSET_URI_CALLBACK_001";
let currentFetchOp = fetchOps(testNum, "Pictures/Static/", IMAGE_TYPE);
let currentFetchOp = fileFetchOption(testNum, FILEKEY.DISPLAY_NAME + "=?", ['01.jpg']);
let type = "image";
await serachUri(done, testNum, currentFetchOp, type);
});
......@@ -116,7 +115,7 @@ export default function mediafetchoptionsCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_ASSET_URI_CALLBACK_002", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_ASSET_URI_CALLBACK_002";
let currentFetchOp = fetchOps(testNum, "Audios/Static/", AUDIO_TYPE);
let currentFetchOp = fileFetchOption(testNum, FILEKEY.DISPLAY_NAME + "=?", ['01.mp3']);
let type = "audio";
await serachUri(done, testNum, currentFetchOp, type);
});
......@@ -131,7 +130,7 @@ export default function mediafetchoptionsCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_ASSET_URI_CALLBACK_003", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_ASSET_URI_CALLBACK_003";
let currentFetchOp = fetchOps(testNum, "Videos/Static/", VIDEO_TYPE);
let currentFetchOp = fileFetchOption(testNum, FILEKEY.DISPLAY_NAME + "=?", ['01.mp4']);
let type = "video";
await serachUri(done, testNum, currentFetchOp, type);
});
......@@ -146,7 +145,7 @@ export default function mediafetchoptionsCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_ASSET_URI_CALLBACK_004", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_ASSET_URI_CALLBACK_004";
let currentFetchOp = fetchOps(testNum, "Documents/Static/", FILE_TYPE);
let currentFetchOp = fileFetchOption(testNum, FILEKEY.DISPLAY_NAME + "=?", ['01.dat']);
let type = "file";
await serachUri(done, testNum, currentFetchOp, type);
});
......
multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/test/mediafetchoptionsPromise.test.ets
浏览文件 @ 435ea842
......@@ -26,6 +26,7 @@ import {
FILEKEY,
checkAssetsCount,
fetchOps,
fileFetchOption,
} from "../../../../../../common";
export default function mediafetchoptionsPromise(abilityContext) {
......@@ -48,8 +49,7 @@ export default function mediafetchoptionsPromise(abilityContext) {
const serachUri = async (done, testNum, fetchOp, type) => {
try {
const fetchFileResult = await media.getFileAssets(fetchOp);
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 2);
if (!checkAssetCountPass) return;
expect(fetchFileResult.getCount()).assertEqual(1);
let firstObject = await fetchFileResult.getFirstObject();
const id = firstObject.id;
const uri = firstObject.uri;
......@@ -63,8 +63,7 @@ export default function mediafetchoptionsPromise(abilityContext) {
};
const result = await media.getFileAssets(serchfetchOp);
checkAssetCountPass = await checkAssetsCount(done, testNum, result, 1);
if (!checkAssetCountPass) return;
expect(result.getCount()).assertEqual(1);
let asset = await result.getFirstObject();
expect(asset.uri).assertEqual(serachUri);
......@@ -89,7 +88,7 @@ export default function mediafetchoptionsPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_ASSET_URI_PROMISE_001", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_ASSET_URI_PROMISE_001";
let currentFetchOp = fetchOps(testNum, "Pictures/Static/", IMAGE_TYPE);
let currentFetchOp = fileFetchOption(testNum, FILEKEY.DISPLAY_NAME + "=?", ['01.jpg']);
let type = "image";
await serachUri(done, testNum, currentFetchOp, type);
});
......@@ -104,7 +103,7 @@ export default function mediafetchoptionsPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_ASSET_URI_PROMISE_002", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_ASSET_URI_PROMISE_002";
let currentFetchOp = fetchOps(testNum, "Audios/Static/", AUDIO_TYPE);
let currentFetchOp = fileFetchOption(testNum, FILEKEY.DISPLAY_NAME + "=?", ['01.mp3']);
let type = "audio";
await serachUri(done, testNum, currentFetchOp, type);
});
......@@ -119,7 +118,7 @@ export default function mediafetchoptionsPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_ASSET_URI_PROMISE_003", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_ASSET_URI_PROMISE_003";
let currentFetchOp = fetchOps(testNum, "Videos/Static/", VIDEO_TYPE);
let currentFetchOp = fileFetchOption(testNum, FILEKEY.DISPLAY_NAME + "=?", ['01.mp4']);
let type = "video";
await serachUri(done, testNum, currentFetchOp, type);
});
......@@ -134,7 +133,7 @@ export default function mediafetchoptionsPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_ASSET_URI_PROMISE_004", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_ASSET_URI_PROMISE_004";
let currentFetchOp = fetchOps(testNum, "Documents/Static/", FILE_TYPE);
let currentFetchOp = fileFetchOption(testNum, FILEKEY.DISPLAY_NAME + "=?", ['01.dat']);
let type = "file";
await serachUri(done, testNum, currentFetchOp, type);
});
......@@ -152,11 +151,11 @@ export default function mediafetchoptionsPromise(abilityContext) {
try {
const currentFetchOps = {
selections: FILEKEY.RELATIVE_PATH + "= ? AND " + FILEKEY.MEDIA_TYPE + "=?",
selectionArgs: ["Pictures/Static/", IMAGE_TYPE.toString()],
selectionArgs: ["Pictures/", IMAGE_TYPE.toString()],
networkId: "",
};
const fetchFileResult = await media.getFileAssets(currentFetchOps);
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 2);
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 1);
expect(checkAssetCountPass).assertTrue();
fetchFileResult.close();
......@@ -182,19 +181,11 @@ export default function mediafetchoptionsPromise(abilityContext) {
try {
const currentFetchOps = {
selections: FILEKEY.RELATIVE_PATH + "= ? AND " + FILEKEY.MEDIA_TYPE + "=?",
selectionArgs: ["Pictures/Static/", IMAGE_TYPE.toString()],
selectionArgs: ["Pictures/", IMAGE_TYPE.toString()],
networkId: "93db533035b33a1ca118a2759c1fbb8654ce57061430effaf0b51bbe03388b8b",
};
try {
const fetchFileResult = await media.getFileAssets(currentFetchOps);
let count = await fetchFileResult.getCount();
expect(count == 0).assertTrue();
fetchFileResult.close();
done();
} catch (err) {
expect(false).assertTrue();
done();
}
await media.getFileAssets(currentFetchOps);
done();
} catch (error) {
console.info(`${testNum} failed error: ${error}`);
expect(false).assertTrue();
......@@ -215,11 +206,11 @@ export default function mediafetchoptionsPromise(abilityContext) {
try {
const currentFetchOps = {
selections: FILEKEY.RELATIVE_PATH + "= ? AND " + FILEKEY.MEDIA_TYPE + "=?",
selectionArgs: ["Pictures/Static/", IMAGE_TYPE.toString()],
selectionArgs: ["Pictures/", IMAGE_TYPE.toString()],
extendArgs: "",
};
const fetchFileResult = await media.getFileAssets(currentFetchOps);
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 2);
let checkAssetCountPass = await checkAssetsCount(done, testNum, fetchFileResult, 1);
expect(checkAssetCountPass).assertTrue();
fetchFileResult.close();
......
multimedia/medialibrary/mediaLibrary_trash/Test.json
浏览文件 @ 435ea842
......@@ -13,14 +13,13 @@
"type": "ShellKit",
"pre-push": [],
"run-command": [
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"mkdir -p /storage/media/100/local/temp",
"rm -rf /storage/media/100/local/files/*",
"rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
"kill -9 `pidof com.ohos.medialibrary.medialibrarydata`",
"scanner",
"sleep 5",
"mkdir -pv /storage/media/100/local/files/{Camera,Pictures,Videos,Audios,Documents,Download}",
"mkdir /storage/media/100/local/temp",
"param set persist.ace.testmode.enabled 1",
"power-shell wakeup",
"uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
......@@ -40,14 +39,14 @@
{
"type": "ShellKit",
"run-command": [
"mkdir -pv /storage/media/100/local/files/Pictures/{trash,trashCb}",
"mkdir -pv /storage/media/100/local/files/Videos/{trash,trashCb}",
"mkdir -pv /storage/media/100/local/files/Audios/{trash,trashCb}",
"mkdir -pv /storage/media/100/local/files/Documents/{trash,trashCb}",
"for d in trash trashCb; do for i in $$(seq 3); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
"for i in $$(seq 3); do cp /storage/media/100/local/temp/01.jpg /storage/media/100/local/files/Camera/0$$i.jpg; done;",
"for i in $$(seq 3); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/0$$i.mp4; done;",
"for d in trash trashCb; do for i in $$(seq 3); do cp /storage/media/100/local/temp/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
"for d in trash trashCb; do for i in $$(seq 3); do cp /storage/media/100/local/temp/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
"for d in trash trashCb; do for i in $$(seq 3); do cp /storage/media/100/local/temp/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
"chmod -R 777 /storage/media/100/local/files/*",
"chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
"hilog -Q pidoff",
......@@ -58,16 +57,7 @@
"sleep 10"
],
"teardown-command": [
"hilog -b X -D 0xD002B70",
"power-shell setmode 600",
"rm -rf /storage/media/100/local/files/Audios/*",
"rm -rf /storage/media/100/local/files/Camera/*",
"rm -rf /storage/media/100/local/files/Documents/*",
"rm -rf /storage/media/100/local/files/Download/*",
"rm -rf /storage/media/100/local/files/Pictures/*",
"rm -rf /storage/media/100/local/files/Videos/*",
"rm -rf /storage/media/100/local/temp",
"scanner"
"power-shell setmode 600"
]
},
{
......
multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashCallback.test.ets
浏览文件 @ 435ea842
......@@ -48,14 +48,15 @@ export default function trashCallback(abilityContext) {
const media = mediaLibrary.getMediaLibrary(abilityContext);
async function setTrash(done, testNum, databasefFetchOps, ablumFetchOps, noAlbum) {
async function setTrash(done, testNum, assetOps, albumOps, noAlbum) {
try {
// database info
let databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
let databaseFetchFileResult = await media.getFileAssets(assetOps);
let count = databaseFetchFileResult.getCount();
console.info(`${testNum} count: ${count}`);
//album info
if (!noAlbum) {
let albumList = await media.getAlbums(ablumFetchOps);
let albumList = await media.getAlbums(albumOps);
let album = albumList[0];
let albumFetchFileResult = await album.getFileAssets();
let albumFilesCount = albumFetchFileResult.getCount();
......@@ -64,58 +65,39 @@ export default function trashCallback(abilityContext) {
}
// file info
let asset = await databaseFetchFileResult.getFirstObject();
let id = asset.id;
databaseFetchFileResult.close();
let istrash = await asset.isTrash();
expect(istrash).assertFalse();
// trash operation
asset.trash(true, async (err) => {
if (err) {
console.info(`${testNum} err: ${err}`);
expect(false).assertTrue();
databaseFetchFileResult.close();
done();
return;
}
asset.isTrash(async (err, trashState) => {
try {
if (err) {
console.info(`${testNum} err: ${err}`);
expect(false).assertTrue();
databaseFetchFileResult.close();
done();
return;
}
expect(trashState).assertTrue();
try {
} else {
const trashState = await asset.isTrash();
expect(trashState).assertTrue();
// after trash database info
databaseFetchFileResult.close();
databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
databaseFetchFileResult = await media.getFileAssets(assetOps);
let databaseCount = databaseFetchFileResult.getCount();
expect(databaseCount).assertEqual(count - 1);
//album info
if (!noAlbum) {
let albumList = await media.getAlbums(ablumFetchOps);
let albumList = await media.getAlbums(albumOps);
let album = albumList[0];
let albumFetchFileResult = await album.getFileAssets();
let albumFilesCount = albumFetchFileResult.getCount();
albumFetchFileResult.close();
expect(albumFilesCount).assertEqual(count - 1);
}
let assetOpts = fileIdFetchOps(id);
let trashAssetResult = await media.getFileAssets(assetOpts);
let afterTrashAssetConut = trashAssetResult.getCount();
expect(afterTrashAssetConut).assertEqual(0);
await asset.trash(false);
databaseFetchFileResult.close();
trashAssetResult.close();
done();
} catch (error) {
console.info(`${testNum} error: ${error}`);
expect(false).assertTrue();
databaseFetchFileResult.close();
done();
}
});
} catch (error) {
console.info(`${testNum} failed, error: ${error}`);
expect(false).assertTrue();
}
done();
});
} catch (error) {
console.info(`${testNum} error: ${error}`);
......@@ -124,80 +106,50 @@ export default function trashCallback(abilityContext) {
}
}
async function recovery(done, testNum, databasefFetchOps, ablumFetchOps, noAlbum) {
async function recovery(done, testNum, assetOps, albumOps, noAlbum) {
try {
let databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
let databaseFetchFileResult = await media.getFileAssets(assetOps);
let count = databaseFetchFileResult.getCount();
let asset = await databaseFetchFileResult.getFirstObject();
let id = asset.id;
await asset.trash(true);
let istrash = await asset.isTrash();
if (!istrash) {
console.info(`${testNum} istrash failed: ${istrash}`);
expect(istrash).assertFalse();
databaseFetchFileResult.close();
return;
}
expect(istrash).assertTrue();
asset.trash(false, async (err) => {
if (err) {
console.info(`${testNum} err: ${err}`);
expect(false).assertTrue();
databaseFetchFileResult.close();
done();
return;
}
asset.isTrash(async (err, trashState) => {
try {
if (err) {
console.info(`${testNum} err: ${err}`);
expect(false).assertTrue();
databaseFetchFileResult.close();
done();
return;
}
expect(trashState).assertFalse();
try {
databaseFetchFileResult.close();
databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
} else {
let trashState = await asset.isTrash();
expect(!trashState).assertTrue();
databaseFetchFileResult = await media.getFileAssets(assetOps);
let databaseCount = databaseFetchFileResult.getCount();
expect(databaseCount).assertEqual(count);
//album info
if (!noAlbum) {
let albumList = await media.getAlbums(ablumFetchOps);
let albumList = await media.getAlbums(albumOps);
let album = albumList[0];
let albumFetchFileResult = await album.getFileAssets();
let albumFilesCount = albumFetchFileResult.getCount();
expect(albumFilesCount).assertEqual(count);
albumFetchFileResult.close();
}
// asset after trash Conut
let assetOpts = fileIdFetchOps(testNum, id);
let recoveryAssetResult = await media.getFileAssets(assetOpts);
let afterRecoveryAssetConut = recoveryAssetResult.getCount();
expect(afterRecoveryAssetConut).assertEqual(1);
let recoveryAsset = await recoveryAssetResult.getFirstObject();
let recoveryAssetState = await recoveryAsset.isTrash();
expect(recoveryAssetState).assertFalse();
databaseFetchFileResult.close();
await recoveryAssetResult.close();
done();
} catch (error) {
console.info(`${testNum} error: ${error}`);
expect(false).assertTrue();
databaseFetchFileResult.close();
done();
}
});
} catch (error) {
console.info(`${testNum} error: ${error}`);
}
databaseFetchFileResult.close();
done();
});
} catch (error) {
console.info(`${testNum} error: ${error}`);
console.info(`${testNum} failed, error: ${error}`);
expect(false).assertTrue();
done();
}
}
async function trashError(done, testNum, databasefFetchOps, value) {
async function trashError(done, testNum, assetOps, value) {
try {
let databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
let databaseFetchFileResult = await media.getFileAssets(assetOps);
try {
let asset = await databaseFetchFileResult.getFirstObject();
let count = databaseFetchFileResult.getCount();
......@@ -218,7 +170,7 @@ export default function trashCallback(abilityContext) {
} catch (error) {
console.info(`${testNum} error: ${error}`);
databaseFetchFileResult.close();
databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
databaseFetchFileResult = await media.getFileAssets(assetOps);
let count2 = databaseFetchFileResult.getCount();
expect(count).assertEqual(count2);
databaseFetchFileResult.close();
......@@ -247,10 +199,10 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_001", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_001";
let rOps = fetchOps(testNum, "Pictures/trashCb/", IMAGE_TYPE);
let aOps = albumFetchOps(testNum, "Pictures/", "trashCb", IMAGE_TYPE);
let assetOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let albumOps = albumFetchOps(testNum, "Camera");
let noAlbum = false;
await setTrash(done, testNum, rOps, aOps, noAlbum);
await setTrash(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -263,10 +215,10 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_002", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_002";
let rOps = fetchOps(testNum, "Videos/trashCb/", VIDEO_TYPE);
let aOps = albumFetchOps(testNum, "Videos/", "trashCb", VIDEO_TYPE);
let assetOps = fetchOps(testNum, "Videos/", VIDEO_TYPE);
let albumOps = albumFetchOps(testNum, "Videos");
let noAlbum = false;
await setTrash(done, testNum, rOps, aOps, noAlbum);
await setTrash(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -279,10 +231,10 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_003", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_003";
let rOps = fetchOps(testNum, "Audios/trashCb/", AUDIO_TYPE);
let aOps = albumFetchOps(testNum, "Audios/", "trashCb", AUDIO_TYPE);
let noAlbum = false;
await setTrash(done, testNum, rOps, aOps, noAlbum);
let assetOps = fetchOps(testNum, "Audios/trashCb/", AUDIO_TYPE);
let albumOps = undefined;
let noAlbum = true;
await setTrash(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -295,10 +247,10 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_004", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_CALLBACK_01_004";
let rOps = fetchOps(testNum, "Documents/trashCb/", FILE_TYPE);
let aOps = albumFetchOps(testNum, "Documents/", "trashCb", FILE_TYPE);
let assetOps = fetchOps(testNum, "Documents/trashCb/", FILE_TYPE);
let albumOps = undefined;
let noAlbum = true;
await setTrash(done, testNum, rOps, aOps, noAlbum);
await setTrash(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -311,7 +263,7 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_001", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_001";
let rOps = fetchOps(testNum, "Pictures/trashCb/", IMAGE_TYPE);
let rOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = 1;
await trashError(done, testNum, rOps, value);
});
......@@ -326,7 +278,7 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_002", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_002";
let rOps = fetchOps(testNum, "Pictures/trashCb/", IMAGE_TYPE);
let rOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = "abc";
await trashError(done, testNum, rOps, value);
});
......@@ -341,7 +293,7 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_003", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_003";
let rOps = fetchOps(testNum, "Pictures/trashCb/", IMAGE_TYPE);
let rOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = { a: 10 };
await trashError(done, testNum, rOps, value);
});
......@@ -356,7 +308,7 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_004", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_004";
let rOps = fetchOps(testNum, "Pictures/trashCb/", IMAGE_TYPE);
let rOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = undefined;
await trashError(done, testNum, rOps, value);
});
......@@ -371,7 +323,7 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_005", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_CALLBACK_02_005";
let rOps = fetchOps(testNum, "Pictures/trashCb/", IMAGE_TYPE);
let rOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = null;
await trashError(done, testNum, rOps, value);
});
......@@ -386,10 +338,10 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_001", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_001";
let rOps = fetchOps(testNum, "Pictures/trash/", IMAGE_TYPE);
let aOps = albumFetchOps(testNum, "Pictures/", "trash", IMAGE_TYPE);
let assetOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let albumOps = albumFetchOps(testNum, "Camera");
let noAlbum = false;
await recovery(done, testNum, rOps, aOps, noAlbum);
await recovery(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -402,10 +354,10 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_002", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_002";
let rOps = fetchOps(testNum, "Videos/trash/", VIDEO_TYPE);
let aOps = albumFetchOps(testNum, "Videos/", "trash", VIDEO_TYPE);
let assetOps = fetchOps(testNum, "Videos/", VIDEO_TYPE);
let albumOps = albumFetchOps(testNum, "Videos");
let noAlbum = false;
await recovery(done, testNum, rOps, aOps, noAlbum);
await recovery(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -418,10 +370,10 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_003", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_003";
let rOps = fetchOps(testNum, "Audios/trash/", AUDIO_TYPE);
let aOps = albumFetchOps(testNum, "Audios/", "trash", AUDIO_TYPE);
let assetOps = fetchOps(testNum, "Audios/trash/", AUDIO_TYPE);
let albumOps = undefined;
let noAlbum = false;
await recovery(done, testNum, rOps, aOps, noAlbum);
await recovery(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -434,10 +386,10 @@ export default function trashCallback(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_004", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_CALLBACK_03_004";
let rOps = fetchOps(testNum, "Documents/trash/", FILE_TYPE);
let aOps = albumFetchOps(testNum, "Documents/", "trash", FILE_TYPE);
let assetOps = fetchOps(testNum, "Documents/trash/", FILE_TYPE);
let albumOps = undefined;
let noAlbum = true;
await recovery(done, testNum, rOps, aOps, noAlbum);
await recovery(done, testNum, assetOps, albumOps, noAlbum);
});
});
}
multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/test/trashPromise.test.ets
浏览文件 @ 435ea842
......@@ -47,6 +47,7 @@ export default function trashPromise(abilityContext) {
// database info
let databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
let count = databaseFetchFileResult.getCount();
console.info(`${testNum} count: ${count}`);
//album info
if (!noAlbum) {
......@@ -60,14 +61,10 @@ export default function trashPromise(abilityContext) {
// file info
let asset = await databaseFetchFileResult.getFirstObject();
let id = asset.id;
let istrash = await asset.isTrash();
expect(istrash).assertFalse();
// trash operation
await asset.trash(true);
istrash = await asset.isTrash();
let istrash = await asset.isTrash();
console.info(`${testNum} istrash: ${istrash}`);
databaseFetchFileResult.close();
expect(istrash).assertTrue();
databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
let databaseCount = databaseFetchFileResult.getCount();
expect(databaseCount).assertEqual(count - 1);
......@@ -81,14 +78,8 @@ export default function trashPromise(abilityContext) {
albumFetchFileResult.close();
}
// asset after trash Conut
let assetOpts = fileIdFetchOps(id);
let trashAssetResult = await media.getFileAssets(assetOpts);
let afterTrashAssetConut = trashAssetResult.getCount();
expect(afterTrashAssetConut).assertEqual(0);
await asset.trash(false);
databaseFetchFileResult.close();
await trashAssetResult.close();
done();
} catch (error) {
console.info(`${testNum} error: ${error}`);
......@@ -134,22 +125,25 @@ export default function trashPromise(abilityContext) {
try {
let databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
let count = databaseFetchFileResult.getCount();
//album info
if (!noAlbum) {
let albumList = await media.getAlbums(ablumFetchOps);
let album = albumList[0];
let albumFetchFileResult = await album.getFileAssets();
let albumFilesCount = albumFetchFileResult.getCount();
expect(albumFilesCount).assertEqual(count);
albumFetchFileResult.close();
}
let asset = await databaseFetchFileResult.getFirstObject();
let id = asset.id;
await asset.trash(true);
databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
let databaseCount = databaseFetchFileResult.getCount();
expect(databaseCount).assertEqual(count - 1);
let istrash = await asset.isTrash();
if (!istrash) {
console.info(`${testNum} istrash failed: ${istrash}`);
expect(istrash).assertFalse();
databaseFetchFileResult.close();
return;
}
await asset.trash(false);
databaseFetchFileResult.close();
databaseFetchFileResult = await media.getFileAssets(databasefFetchOps);
let databaseCount = databaseFetchFileResult.getCount();
databaseCount = databaseFetchFileResult.getCount();
expect(databaseCount).assertEqual(count);
//album info
if (!noAlbum) {
......@@ -161,16 +155,7 @@ export default function trashPromise(abilityContext) {
albumFetchFileResult.close();
}
// asset after trash Conut
let assetOpts = fileIdFetchOps(testNum, id);
let recoveryAssetResult = await media.getFileAssets(assetOpts);
let afterRecoveryAssetConut = recoveryAssetResult.getCount();
expect(afterRecoveryAssetConut).assertEqual(1);
let recoveryAsset = await recoveryAssetResult.getFirstObject();
let recoveryAssetState = await recoveryAsset.isTrash();
expect(recoveryAssetState).assertFalse();
databaseFetchFileResult.close();
await recoveryAssetResult.close();
done();
} catch (error) {
console.info(`${testNum} error: ${error}`);
......@@ -188,10 +173,10 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_001", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_001";
let rOps = fetchOps(testNum, "Pictures/trash/", IMAGE_TYPE);
let aOps = albumFetchOps(testNum, "Pictures/", "trash", IMAGE_TYPE);
let assetOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let albumOps = albumFetchOps(testNum, "Camera");
let noAlbum = false;
await setTrash(done, testNum, rOps, aOps, noAlbum);
await setTrash(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -204,10 +189,10 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_002", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_002";
let rOps = fetchOps(testNum, "Videos/trash/", VIDEO_TYPE);
let aOps = albumFetchOps(testNum, "Videos/", "trash", VIDEO_TYPE);
let assetOps = fetchOps(testNum, "Videos/", VIDEO_TYPE);
let albumOps = albumFetchOps(testNum, "Videos");
let noAlbum = false;
await setTrash(done, testNum, rOps, aOps, noAlbum);
await setTrash(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -220,10 +205,10 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_003", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_003";
let rOps = fetchOps(testNum, "Audios/trash/", AUDIO_TYPE);
let aOps = albumFetchOps(testNum, "Audios/", "trash", AUDIO_TYPE);
let noAlbum = false;
await setTrash(done, testNum, rOps, aOps, noAlbum);
let assetOps = fetchOps(testNum, "Audios/trash/", AUDIO_TYPE);
let albumOps = undefined;
let noAlbum = true;
await setTrash(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -236,10 +221,10 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_004", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_PROMISE_01_004";
let rOps = fetchOps(testNum, "Documents/trash/", FILE_TYPE);
let aOps = albumFetchOps(testNum, "Documents/", "trash", FILE_TYPE);
let assetOps = fetchOps(testNum, "Documents/trash/", FILE_TYPE);
let albumOps = undefined;
let noAlbum = true;
await setTrash(done, testNum, rOps, aOps, noAlbum);
await setTrash(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -252,9 +237,9 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_001", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_001";
let rOps = fetchOps(testNum, "Pictures/trash/", IMAGE_TYPE);
let assetOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = 1;
await trashError(done, testNum, rOps, value);
await trashError(done, testNum, assetOps, value);
});
/**
......@@ -267,9 +252,9 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_002", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_002";
let rOps = fetchOps(testNum, "Pictures/trash/", IMAGE_TYPE);
let assetOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = "abc";
await trashError(done, testNum, rOps, value);
await trashError(done, testNum, assetOps, value);
});
/**
......@@ -282,9 +267,9 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_003", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_003";
let rOps = fetchOps(testNum, "Pictures/trash/", IMAGE_TYPE);
let assetOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = { a: 10 };
await trashError(done, testNum, rOps, value);
await trashError(done, testNum, assetOps, value);
});
/**
......@@ -297,9 +282,9 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_004", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_004";
let rOps = fetchOps(testNum, "Pictures/trash/", IMAGE_TYPE);
let assetOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = undefined;
await trashError(done, testNum, rOps, value);
await trashError(done, testNum, assetOps, value);
});
/**
......@@ -312,9 +297,9 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_005", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_ERROR_PROMISE_02_005";
let rOps = fetchOps(testNum, "Pictures/trash/", IMAGE_TYPE);
let assetOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let value = null;
await trashError(done, testNum, rOps, value);
await trashError(done, testNum, assetOps, value);
});
/**
......@@ -327,10 +312,10 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_001", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_001";
let rOps = fetchOps(testNum, "Pictures/trash/", IMAGE_TYPE);
let aOps = albumFetchOps(testNum, "Pictures/", "trash", IMAGE_TYPE);
let assetOps = fetchOps(testNum, "Camera/", IMAGE_TYPE);
let albumOps = albumFetchOps(testNum, "Camera");
let noAlbum = false;
await recovery(done, testNum, rOps, aOps, noAlbum);
await recovery(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -343,10 +328,10 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_002", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_002";
let rOps = fetchOps(testNum, "Videos/trash/", VIDEO_TYPE);
let aOps = albumFetchOps(testNum, "Videos/", "trash", VIDEO_TYPE);
let assetOps = fetchOps(testNum, "Videos/", VIDEO_TYPE);
let albumOps = albumFetchOps(testNum, "Videos");
let noAlbum = false;
await recovery(done, testNum, rOps, aOps, noAlbum);
await recovery(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -359,10 +344,10 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_003", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_003";
let rOps = fetchOps(testNum, "Audios/trash/", AUDIO_TYPE);
let aOps = albumFetchOps(testNum, "Audios/", "trash", AUDIO_TYPE);
let noAlbum = false;
await recovery(done, testNum, rOps, aOps, noAlbum);
let assetOps = fetchOps(testNum, "Audios/trash/", AUDIO_TYPE);
let albumOps = undefined;
let noAlbum = true;
await recovery(done, testNum, assetOps, albumOps, noAlbum);
});
/**
......@@ -375,10 +360,10 @@ export default function trashPromise(abilityContext) {
*/
it("SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_004", 0, async function (done) {
let testNum = "SUB_MEDIA_MEDIALIBRARY_TRASH_RECOVERY_PROMISE_03_004";
let rOps = fetchOps(testNum, "Documents/trash/", FILE_TYPE);
let aOps = albumFetchOps(testNum, "Documents/", "trash", FILE_TYPE);
let assetOps = fetchOps(testNum, "Documents/trash/", FILE_TYPE);
let albumOps = undefined;
let noAlbum = true;
await recovery(done, testNum, rOps, aOps, noAlbum);
await recovery(done, testNum, assetOps, albumOps, noAlbum);
});
});
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或