<liuxueqi3@huawei.com>

Signed-off-by: Nlwx1121892 <liuxueqi3@huawei.com>

multimedia/image/image_js_standard/image/Test.json

@@ -19,33 +19,24 @@
         {
             "type": "ShellKit",
             "run-command": [
-                "mkdir   /data/app/el2/100/base/ohos.acts.multimedia.image/files",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files"
+                "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.image/haps/entry/files/",
+                "chmod -R 666 /data/app/el2/100/base/ohos.acts.multimedia.image/haps/entry/files/*"
+            ],
+            "teardown-command":[
+
             ]
         },
         {
             "type": "PushKit",
             "pre-push": [],
             "push": [
-                "./resource/image/test.bmp ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
-                "./resource/image/test.png ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
-                "./resource/image/test.123 ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
-                "./resource/image/test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
-                "./resource/image/test.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
-                "./resource/image/moving_test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image/files"
+                "./resource/image/test.bmp ->/data/app/el2/100/base/ohos.acts.multimedia.image/haps/entry/files",
+                "./resource/image/test.png ->/data/app/el2/100/base/ohos.acts.multimedia.image/haps/entry/files",
+                "./resource/image/test.123 ->/data/app/el2/100/base/ohos.acts.multimedia.image/haps/entry/files",
+                "./resource/image/test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image/haps/entry/files",
+                "./resource/image/test.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image/haps/entry/files",
+                "./resource/image/moving_test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image/haps/entry/files"
             ]
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.bmp",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.png",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.123",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.gif",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.jpg",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/moving_test.gif"
-            ],
-            "teardown-command": []
         }
     ]
 }
\ No newline at end of file

multimedia/image/image_js_standard/imageDecodeOptions/Test.json

@@ -19,31 +19,23 @@
         {
             "type": "ShellKit",
             "run-command": [
-                "mkdir   /data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files"
+                "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/haps/entry/files/",
+                "chmod -R 666 /data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/haps/entry/files/*"
+            ],
+            "teardown-command":[
+
             ]
         },
         {
             "type": "PushKit",
             "pre-push": [],
             "push": [
-                "./resource/image/test.bmp ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files",
-                "./resource/image/test.png ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files",
-                "./resource/image/test.tiff ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files",
-                "./resource/image/test.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files",
-                "./resource/image/moving_test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files"
+                "./resource/image/test.bmp ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/haps/entry/files",
+                "./resource/image/test.png ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/haps/entry/files",
+                "./resource/image/test.tiff ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/haps/entry/files",
+                "./resource/image/test.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/haps/entry/files",
+                "./resource/image/moving_test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/haps/entry/files"
             ]
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files/test.bmp",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files/test.png",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files/test.tiff",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files/test.jpg",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.DecodeOptions/files/moving_test.gif"
-            ],
-            "teardown-command": []
         }
     ]
 }
\ No newline at end of file

multimedia/image/image_js_standard/imageExif/Test.json

@@ -15,10 +15,12 @@
             "cleanup-apps": true
         },
         {
-            "type": "ShellKit",
             "run-command": [
-                "mkdir   /data/app/el2/100/base/ohos.acts.multimedia.image.Exif/files",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Exif/files"
+                "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.image.Exif/haps/entry/files/",
+                "chmod -R 666 /data/app/el2/100/base/ohos.acts.multimedia.image.Exif/haps/entry/files/*"
+            ],
+            "teardown-command":[
+
             ]
         },
 		{
@@ -26,19 +28,8 @@
             "pre-push": [
             ],
             "push": [
-				"./resource/image/test_exif.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image.Exif/files",
-				"./resource/image/test_exif1.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image.Exif/files"
-            ]
-        },
-   
-		{
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Exif/files/test_exif.jpg",
-		"chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Exif/files/test_exif1.jpg"
-            ],
-            "teardown-command":[
-              
+				"./resource/image/test_exif.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image.Exif/haps/entry/files",
+				"./resource/image/test_exif1.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image.Exif/haps/entry/files"
             ]
         }
     ]

multimedia/image/image_js_standard/imageExif/src/main/js/test/image.test.js

@@ -17,15 +17,28 @@ import image from '@ohos.multimedia.image'
 import fileio from '@ohos.fileio'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 import { tc_020buf, tc_020_1buf, tc_021buf, tc_021_1buf, tc_022buf } from './testImg'
-import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
-import bundle from '@ohos.bundle'
+import featureAbility from '@ohos.ability.featureAbility'
 
 describe('Image', function () {
-    var pathExifJpg = '/data/storage/el2/base/files/test_exif.jpg';
-    var pathExifJpg1 = '/data/storage/el2/base/files/test_exif1.jpg';	
+    let filePath;
+    let fdNumber;
     let globalpixelmap;
+    async function getFd(fileName) {
+        let context = await featureAbility.getContext();
+        await context.getFilesDir().then((data) => {
+            filePath = data + '/' + fileName;
+            console.info('image case filePath is ' + filePath);
+        })
+        await fileio.open(filePath).then((data) => {
+            fdNumber = data;
+            console.info("image case open fd success " + fdNumber);
+        }, (err) => {
+            console.info("image cese open fd fail" + err)
+        }).catch((err) => {
+            console.info("image case open fd err " + err);
+        })
+    }
     beforeAll(async function () {
-        await applyPermission();
         console.info('beforeAll case');
     })
 
@@ -44,35 +57,6 @@ describe('Image', function () {
         console.info('afterAll case');
     })
 
-    async function applyPermission() {
-        let appInfo = await bundle.getApplicationInfo('ohos.acts.multimedia.image.Exif', 0, 100);
-        let atManager = abilityAccessCtrl.createAtManager();
-        if (atManager != null) {
-            let tokenID = appInfo.accessTokenId;
-            console.info('[permission]case accessTokenId is' + tokenID);
-            let permissionName1 = 'ohos.permission.MEDIA_LOCATION';
-            let permissionName2 = 'ohos.permission.READ_MEDIA';
-            let permissionName3 = 'ohos.permission.WRITE_MEDIA';
-            await atManager.grantUserGrantedPermission(tokenID, permissionName1).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID, permissionName2).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID, permissionName3).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-        } else {
-            console.info('[permission]case apply permission failed,createAtManager failed');
-        }
-    }
-
     /**
          * @tc.number    : TC_001
          * @tc.name      : create pixelmap-promise (editable: true, pixelFormat: RGBA_8888, size: { height: 4, width: 6 }, bytes = buffer)
@@ -1231,7 +1215,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_171', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg1);
+        await getFd('test_exif1.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_171 create image source failed');
@@ -1264,7 +1248,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_171-1', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_171-1 create image source failed');
@@ -1297,7 +1281,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_171-2', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_171-2 create image source failed');
@@ -1330,7 +1314,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_171-3', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_171-3 create image source failed');
@@ -1363,7 +1347,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_171-4', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_171-4 create image source failed');
@@ -1396,7 +1380,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_171-5', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_171-5 create image source failed');
@@ -1429,7 +1413,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_171-6', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_171-6 create image source failed');
@@ -1462,7 +1446,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_171-7', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_171-7 create image source failed');
@@ -1495,7 +1479,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_171-8', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_171-8 create image source failed');
@@ -1527,7 +1511,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_172', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg1);
+        await getFd('test_exif1.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_172 create image source failed');
@@ -1559,7 +1543,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_172-1', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_172-1 create image source failed');
@@ -1591,7 +1575,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_172-2', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_172-2 create image source failed');
@@ -1623,7 +1607,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_172-3', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_172-3 create image source failed');
@@ -1655,7 +1639,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_172-4', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_172-4 create image source failed');
@@ -1687,7 +1671,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_172-5', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_172-5 create image source failed');
@@ -1719,7 +1703,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_172-6', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_172-6 create image source failed');
@@ -1751,7 +1735,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_172-7', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_172-7 create image source failed');
@@ -1783,7 +1767,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_172-8', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_172-8 create image source failed');
@@ -1816,7 +1800,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_173', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg1);
+        await getFd('test_exif1.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_173 create image source failed');
@@ -1850,7 +1834,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_173-1', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_173-1 create image source failed');
@@ -1884,7 +1868,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_173-2', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_173-2 create image source failed');
@@ -1918,7 +1902,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_173-3', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_173-3 create image source failed');
@@ -1952,7 +1936,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_173-4', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_173-4 create image source failed');
@@ -1986,7 +1970,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_173-5', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_173-5 create image source failed');
@@ -2020,7 +2004,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_173-6', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_173-6 create image source failed');
@@ -2054,7 +2038,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_173-7', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_173-7 create image source failed');
@@ -2088,7 +2072,7 @@ describe('Image', function () {
      * @tc.level     : Level 1
      */
     it('TC_173-8', 0, async function (done) {
-        let fdNumber = fileio.openSync(pathExifJpg);
+        await getFd('test_exif.jpg');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info('TC_173-8 create image source failed');

multimedia/image/image_js_standard/imageModifyProperty/Test.json

@@ -18,15 +18,18 @@
         {
             "type": "ShellKit",
             "run-command": [
-                "mkdir   /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/files",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/files"
+                "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/haps/entry/files/",
+                "chmod -R 666 /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/haps/entry/files/*"
+            ],
+            "teardown-command":[
+
             ]
         },
         {
             "type": "PushKit",
             "pre-push": [],
             "push": [
-                "./resource/image/test_exif.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/files"
+                "./resource/image/test_exif.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/haps/entry/files"
             ]
         },
         {
@@ -34,7 +37,7 @@
             "run-command": [
                 "hilog -Q pidoff",
                 "hilog -b D",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/files/test_exif.jpg"
+                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/haps/entry/files/test_exif.jpg"
             ],
             "teardown-command": [
                 "rm -rf /data/app/el2/100/base/ohos.acts.multimedia.image.ModifyProperty/*"

multimedia/image/image_js_standard/imageModifyProperty/src/main/js/test/modify.test.js

@@ -17,14 +17,28 @@ import image from '@ohos.multimedia.image'
 import fileio from '@ohos.fileio'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 import {modifyBuf} from './modifyBuffer'
-import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
-import bundle from '@ohos.bundle'
+import featureAbility from '@ohos.ability.featureAbility'
 
 export default function Image() {
 describe('Image', function () {
-    var pathExifJpg = '/data/storage/el2/base/files/test_exif.jpg';
+    let filePath;
+    let fdNumber;
+    async function getFd(fileName) {
+        let context = await featureAbility.getContext();
+        await context.getFilesDir().then((data) => {
+            filePath = data + '/' + fileName;
+            console.info('image case filePath is ' + filePath);
+        })
+        await fileio.open(filePath, 0o2 | 0o100, 0o777).then((data) => {
+            fdNumber = data;
+            console.info("image case open fd success " + fdNumber);
+        }, (err) => {
+            console.info("image cese open fd fail" + err)
+        }).catch((err) => {
+            console.info("image case open fd err " + err);
+        })
+    }
     beforeAll(async function () {
-        await applyPermission();
         console.info('beforeAll case');
     })
 
@@ -41,34 +55,6 @@ describe('Image', function () {
         console.info('afterAll case');
     })
 
-    async function applyPermission(){
-        let appInfo = await bundle.getApplicationInfo('ohos.acts.multimedia.image.ModifyProperty',0,100);
-        let atManager = abilityAccessCtrl.createAtManager();
-        if(atManager != null){
-            let tokenID = appInfo.accessTokenId;
-            console.info('[permission]case accessTokenId is' + tokenID);
-            let permissionName1 = 'ohos.permission.MEDIA_LOCATION';
-            let permissionName2 = 'ohos.permission.READ_MEDIA';
-            let permissionName3 = 'ohos.permission.WRITE_MEDIA';
-            await atManager.grantUserGrantedPermission(tokenID,permissionName1).then((result)=>{
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err)=>{
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID,permissionName2).then((result)=>{
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err)=>{
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID,permissionName3).then((result)=>{
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err)=>{
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-        }else{
-            console.info('[permission]case apply permission failed,createAtManager failed');
-        }
-    }
 
     async function modifyPromise(done, testNum, type, key, value, checkProps){
         let imageSourceApi;
@@ -76,8 +62,8 @@ describe('Image', function () {
             const data = modifyBuf.buffer;
             imageSourceApi = image.createImageSource(data);
         } else {
-            let fdExifJpg = fileio.openSync(pathExifJpg, 0o2 | 0o100, 0o777);
-            imageSourceApi = image.createImageSource(fdExifJpg);
+            await getFd('test_exif.jpg');
+            imageSourceApi = image.createImageSource(fdNumber);
         }
         if (imageSourceApi == undefined) {
             console.info(`${testNum} create image source failed`);
@@ -108,8 +94,8 @@ describe('Image', function () {
             const data = modifyBuf.buffer;
             imageSourceApi = image.createImageSource(data);
         } else {
-            let fdExifJpg = fileio.openSync(pathExifJpg, 0o2 | 0o100, 0o777);
-            imageSourceApi = image.createImageSource(fdExifJpg);
+            await getFd('test_exif.jpg');
+            imageSourceApi = image.createImageSource(fdNumber);
         }
         if (imageSourceApi == undefined) {
             console.info(`${testNum} create image source failed`);
@@ -143,8 +129,8 @@ describe('Image', function () {
             const data = modifyBuf.buffer;
             imageSourceApi = image.createImageSource(data);
         } else {
-            let fdExifJpg = fileio.openSync(pathExifJpg, 0o2 | 0o100, 0o777);
-            imageSourceApi = image.createImageSource(fdExifJpg);
+            await getFd('test_exif.jpg');
+            imageSourceApi = image.createImageSource(fdNumber);
         }
         if (imageSourceApi == undefined) {
             console.info(`${testNum} create image source failed`);
@@ -179,8 +165,8 @@ describe('Image', function () {
             const data = modifyBuf.buffer;
             imageSourceApi = image.createImageSource(data);
         } else {
-            let fdExifJpg = fileio.openSync(pathExifJpg, 0o2 | 0o100, 0o777);
-            imageSourceApi = image.createImageSource(fdExifJpg);
+            await getFd('test_exif.jpg');
+            imageSourceApi = image.createImageSource(fdNumber);
         }
         if (imageSourceApi == undefined) {
             console.info(`${testNum} create image source failed`);
@@ -202,8 +188,8 @@ describe('Image', function () {
             const data = modifyBuf.buffer;
             imageSourceApi = image.createImageSource(data);
         }else {
-            let fdExifJpg = fileio.openSync(pathExifJpg, 0o2 | 0o100, 0o777);
-            imageSourceApi = image.createImageSource(fdExifJpg);
+            await getFd('test_exif.jpg');
+            imageSourceApi = image.createImageSource(fdNumber);
         }
         if (imageSourceApi == undefined) {
             console.info(`${testNum} create image source failed`);
@@ -226,8 +212,8 @@ describe('Image', function () {
                 const data = modifyBuf.buffer;
                 imageSourceApi = image.createImageSource(data);
             } else {
-                let fdExifJpg = fileio.openSync(pathExifJpg, 0o2 | 0o100, 0o777);
-                imageSourceApi = image.createImageSource(fdExifJpg);
+                await getFd('test_exif.jpg');
+                imageSourceApi = image.createImageSource(fdNumber);
             }
         } catch (error) {
             expect(false).assertTrue();

multimedia/image/image_js_standard/imagePacking/src/main/js/test/packing.test.js

@@ -14,14 +14,12 @@
  */
 
 import image from '@ohos.multimedia.image'
-import fileio from '@ohos.fileio'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 
 export default function Image_test() {
 describe('Image_test', function () {
 
     beforeAll(async function () {
-        await applyPermission();
         console.info('beforeAll case');
     })
 
@@ -37,36 +35,6 @@ describe('Image_test', function () {
         console.info('afterAll case');
     })
 
-    async function applyPermission() {
-        console.info('[permission]case applyPermission in');
-        let appInfo = await bundle.getApplicationInfo('ohos.acts.multimedia.image.Packing', 0, 100);
-        let atManager = abilityAccessCtrl.createAtManager();
-        if (atManager != null) {
-            let tokenID = appInfo.accessTokenId;
-            console.info('[permission]case accessTokenId is' + tokenID);
-            let permissionName1 = 'ohos.permission.MEDIA_LOCATION';
-            let permissionName2 = 'ohos.permission.READ_MEDIA';
-            let permissionName3 = 'ohos.permission.WRITE_MEDIA';
-            await atManager.grantUserGrantedPermission(tokenID, permissionName1).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID, permissionName2).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID, permissionName3).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-        } else {
-            console.info('[permission]case apply permission failed,createAtManager failed');
-        }
-    }
-
     function packing_promise(done, testNum, pixFormat, arg) {
         let opts;
         const Color = new ArrayBuffer(96);

multimedia/image/image_js_standard/imageWebp/Test.json

@@ -19,30 +19,21 @@
         {
             "type": "ShellKit",
             "run-command": [
-                "mkdir   /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files"
+                "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/haps/entry/files/",
+                "chmod -R 666 /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/haps/entry/files/*"
             ],
             "teardown-command": []
         },
         {
             "type": "PushKit",
-            "pre-push": [],
             "push": [
-                "./resource/image/test_large.webp ->/data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files",
-                "./resource/image/test.png ->/data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files",
-                "./resource/image/test.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files",
-                "./resource/image/test.bmp ->/data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files",
-                "./resource/image/test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files"
+                "./resource/image/test_large.webp ->/data/app/el2/100/base/ohos.acts.multimedia.image.Webp/haps/entry/files"
             ]
         },
         {
             "type": "ShellKit",
             "run-command": [
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files/test.jpg",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files/test.png",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files/test.bmp",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files/test.gif",
-                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/files/test_large.webp",
+                "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image.Webp/haps/entry/files/test_large.webp",
                 "hilog -Q pidoff"
             ],
             "teardown-command": []

multimedia/image/image_js_standard/imageWebp/src/main/js/test/webp.test.js

@@ -16,18 +16,28 @@
 import image from '@ohos.multimedia.image'
 import fileio from '@ohos.fileio'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
-import bundle from '@ohos.bundle'
+import featureAbility from '@ohos.ability.featureAbility'
 
 export default function Image() {
 describe('Image', function () {
-    var pathJpg = '/data/storage/el2/base/files/test.jpg';
-    var pathWebp = '/data/storage/el2/base/files/test_large.webp';
-    var pathPng = '/data/storage/el2/base/files/test.png';
-    var pathBmp = '/data/storage/el2/base/files/test.bmp';
-    var pathGif = '/data/storage/el2/base/files/test.gif';
+    let filePath;
+    let fdNumber;
+    async function getFd(fileName) {
+        let context = await featureAbility.getContext();
+        await context.getFilesDir().then((data) => {
+            filePath = data + '/' + fileName;
+            console.info('image case filePath is ' + filePath);
+        })
+        await fileio.open(filePath).then((data) => {
+            fdNumber = data;
+            console.info("image case open fd success " + fdNumber);
+        }, (err) => {
+            console.info("image cese open fd fail" + err)
+        }).catch((err) => {
+            console.info("image case open fd err " + err);
+        })
+    }
     beforeAll(async function () {
-        await applyPermission();
         console.info('beforeAll case');
     })
 
@@ -43,37 +53,9 @@ describe('Image', function () {
         console.info('afterAll case');
     })
 
-    async function applyPermission() {
-        let appInfo = await bundle.getApplicationInfo('ohos.acts.multimedia.image.Webp', 0, 100);
-        let atManager = abilityAccessCtrl.createAtManager();
-        if (atManager != null) {
-            let tokenID = appInfo.accessTokenId;
-            console.info('[permission]case accessTokenId is' + tokenID);
-            let permissionName1 = 'ohos.permission.MEDIA_LOCATION';
-            let permissionName2 = 'ohos.permission.READ_MEDIA';
-            let permissionName3 = 'ohos.permission.WRITE_MEDIA';
-            await atManager.grantUserGrantedPermission(tokenID, permissionName1).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID, permissionName2).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID, permissionName3).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-        } else {
-            console.info('[permission]case apply permission failed,createAtManager failed');
-        }
-    }
 
     async function createPixMapCbErr(done, testNum, arg) {
-        let fdNumber = fileio.openSync(pathWebp);
+        await getFd('test_large.webp');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info(`${testNum} create image source failed`);
@@ -92,8 +74,37 @@ describe('Image', function () {
             })
         }
     }
+
+    
+    async function createPixMapCb(done, testNum, arg) {
+        await getFd('test_large.webp');
+        const imageSourceApi = image.createImageSource(fdNumber);
+        if (imageSourceApi == undefined) {
+            console.info(`${testNum} create image source failed`);
+            expect(false).assertTrue();
+            done();
+        } else {
+            imageSourceApi.createPixelMap(arg, (err, pixelmap) => {
+                if (err) {
+                    console.info(`${testNum} - fail `);
+                    expect(false).assertTrue();
+                    done();
+                } else {
+                    pixelmap.getImageInfo().then((imageInfo) => {
+                        expect(imageInfo.size.height == 2).assertTrue();
+                        expect(imageInfo.size.width == 1).assertTrue();
+                        console.info(`${testNum} - success `);
+                        console.info("imageInfo height :" + imageInfo.size.height + "width : " + imageInfo.size.width);
+                        done();
+                    }).catch((err) => {
+                        console.info(`${testNum} getimageInfo err ` + JSON.stringify(err));
+                    })
+                }
+            })
+        }
+    }
     async function createPixMapPromiseErr(done, testNum, arg) {
-        let fdNumber = fileio.openSync(pathWebp);
+        await getFd('test_large.webp');
         const imageSourceApi = image.createImageSource(fdNumber);
         if (imageSourceApi == undefined) {
             console.info(`${testNum} create image source failed`);
@@ -111,6 +122,31 @@ describe('Image', function () {
             })
         }
     }
+    async function createPixMapPromise(done, testNum, arg) {
+        await getFd('test_large.webp');
+        const imageSourceApi = image.createImageSource(fdNumber);
+        if (imageSourceApi == undefined) {
+            console.info(`${testNum} create image source failed`);
+            expect(false).assertTrue();
+            done();
+        } else {
+            imageSourceApi.createPixelMap(arg).then(pixelmap => {
+                pixelmap.getImageInfo().then((imageInfo) => {
+                    expect(imageInfo.size.height == 2).assertTrue();
+                    expect(imageInfo.size.width == 1).assertTrue();
+                    console.info(`${testNum} - success `);
+                    console.info("imageInfo height :" + imageInfo.size.height + "width : " + imageInfo.size.width);
+                    done();
+                }).catch((err) => {
+                    console.info(`${testNum} getimageInfo err ` + JSON.stringify(err));
+                })
+            }).catch(error => {
+                console.log(`${testNum} fail `);
+                expect(flase).assertTrue();
+                done();
+            })
+        }
+    }
     async function packingPromise(done, testNum, arg) {
         console.info(`${testNum} enter`);
         var height = 4
@@ -435,7 +471,7 @@ describe('Image', function () {
     */
     it('wbp_001', 0, async function (done) {
         try {
-            let fdNumber = fileio.openSync(pathWebp);
+            await getFd('test_large.webp');
             const imageSourceApi = image.createImageSource(fdNumber);
             if (imageSourceApi == undefined) {
                 console.info('wbp_001 create image source failed');
@@ -484,7 +520,7 @@ describe('Image', function () {
      */
     it('wbp_002', 0, async function (done) {
         try {
-            let fdNumber = fileio.openSync(pathWebp);
+            await getFd('test_large.webp');
             const imageSourceApi = image.createImageSource(fdNumber);
             if (imageSourceApi == undefined) {
                 console.info('wbp_002 create image source failed');
@@ -533,7 +569,7 @@ describe('Image', function () {
      */
     it('wbp_003', 0, async function (done) {
         try {
-            let fdNumber = fileio.openSync(pathWebp);
+            await getFd('test_large.webp');
             const imageSourceApi = image.createImageSource(fdNumber);
             if (imageSourceApi == undefined) {
                 console.info('wbp_003 create image source failed');
@@ -569,7 +605,7 @@ describe('Image', function () {
      */
     it('wbp_004', 0, async function (done) {
         try {
-            let fdNumber = fileio.openSync(pathWebp);
+            await getFd('test_large.webp');
             const imageSourceApi = image.createImageSource(fdNumber);
             if (imageSourceApi == undefined) {
                 console.info('wbp_004 create image source failed');
@@ -753,7 +789,7 @@ describe('Image', function () {
             desiredRegion: { size: { height: 10000, width: 10000 }, x: 0, y: 0 },
             index: 0
         };
-        createPixMapCbErr(done, 'wbp_009', decodingOptions)
+        createPixMapCb(done, 'wbp_009', decodingOptions)
     })
 
     /**
@@ -874,7 +910,7 @@ describe('Image', function () {
             desiredRegion: { size: { height: 10000, width: 10000 }, x: 0, y: 0 },
             index: 0
         };
-        createPixMapPromiseErr(done, 'wbp_014', decodingOptions)
+        createPixMapPromise(done, 'wbp_014', decodingOptions)
     })
 
     /**

multimedia/image/image_js_standard/imageYUV/src/main/js/test/yuv.test.js

@@ -20,7 +20,6 @@ export default function Image() {
 describe('Image', function () {
 
     beforeAll(async function () {
-        await applyPermission();
         console.info('beforeAll case');
     })
 
@@ -37,36 +36,6 @@ describe('Image', function () {
         console.info('afterAll case');
     })
 
-    async function applyPermission() {
-        console.info('[permission]case applyPermission in');
-        let appInfo = await bundle.getApplicationInfo('ohos.acts.multimedia.image.YUV', 0, 100);
-        let atManager = abilityAccessCtrl.createAtManager();
-        if (atManager != null) {
-            let tokenID = appInfo.accessTokenId;
-            console.info('[permission]case accessTokenId is' + tokenID);
-            let permissionName1 = 'ohos.permission.MEDIA_LOCATION';
-            let permissionName2 = 'ohos.permission.READ_MEDIA';
-            let permissionName3 = 'ohos.permission.WRITE_MEDIA';
-            await atManager.grantUserGrantedPermission(tokenID, permissionName1).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID, permissionName2).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-            await atManager.grantUserGrantedPermission(tokenID, permissionName3).then((result) => {
-                console.info('[permission]case grantUserGrantedPermission success:' + result);
-            }).catch((err) => {
-                console.info('[permission]case grantUserGrantedPermission failed:' + err);
-            });
-        } else {
-            console.info('[permission]case apply permission failed,createAtManager failed');
-        }
-    }
-
     function createBuffer(height, width) {
         var ySize = height * width;
         var uvSize = ySize / 2

multimedia/image/image_js_standard/image_ndk_test/entry/src/main/ets/test/NativeApiTest.ets

@@ -15,7 +15,7 @@
 
 // @ts-nocheck
 import image from '@ohos.multimedia.image'
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'hypium/index'
 import mypixelmap from "libimagePixelmap.so"
 
 export default function nativeApiImageJsunit() {