!3518 update storage sandbox path

Merge pull request !3518 from raoxian/master

storage/storagefileioerrorjstest/src/main/js/default/test/Common.js

@@ -14,6 +14,7 @@
  */
 
 import fileio from '@ohos.fileio'
+import featureAbility from '@ohos.ability.featureAbility';
 
 export const FILE_CONTENT = 'hello world'
 
@@ -32,12 +33,16 @@ export function prepareFile(fpath, content) {
   }
 }
 
-export function nextFileName(testName) {
-  const BASE_PATH = '/data/storage/el2/base/haps/entry/cache/'
+export async function nextFileName(testName) {
+  let context = featureAbility.getContext();
+  let data = await context.getCacheDir();
+  let BASE_PATH = data + '/';
   return BASE_PATH + testName
 }
-export function fileName(testName) {
-  const BASE_PATH = '/data/storage/el2/base/haps/entry/files/'
+export async function fileName(testName) {
+  let context = featureAbility.getContext();
+  let data = await context.getFilesDir();
+  let BASE_PATH = data + '/';
   return BASE_PATH + testName
 }
 

storage/storagefileioerrorjstest/src/main/js/default/test/FileIOError.test.js

@@ -38,8 +38,8 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_000
    * @tc.desc Function of API, Delete directories with files
    */
-  it('fileio_test_error_000', 0, function () {
-    let dpath = fileName('fileio_test_error_000d');
+  it('fileio_test_error_000', 0, async function (done) {
+    let dpath = await fileName('fileio_test_error_000d');
     let fpath = dpath + '/fileio_test_error_000f';
     fileio.mkdirSync(dpath);
     expect(prepareFile(fpath, 'hello')).assertTrue();
@@ -47,12 +47,13 @@ describe('FileIOError', function () {
       let fd = fileio.openSync(dpath);
       expect(isIntNum(fd)).assertTrue();
       fileio.rmdirSync(dpath);
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_000 has failed for ' + err);
+      console.info('fileio_test_error_000 has failed for ' + err);
       expect(isInclude(err.message, 'Directory not empty')).assertTrue();
       fileio.unlinkSync(fpath);
       fileio.rmdirSync(dpath);
+      done();
     }
   });
 
@@ -61,19 +62,20 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_001
    * @tc.desc Function of API, delete file
    */
-  it('fileio_test_error_001', 0, function () {
-    let fpath = fileName('fileio_test_error_001f');
+  it('fileio_test_error_001', 0, async function (done) {
+    let fpath = await fileName('fileio_test_error_001f');
     expect(prepareFile(fpath, 'hello')).assertTrue();
     try {
       let fd = fileio.openSync(fpath);
       expect(isIntNum(fd)).assertTrue();
       fileio.rmdirSync(fpath);
       expect(null).assertFail();
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_001 has failed for ' + err);
+      console.info('fileio_test_error_001 has failed for ' + err);
       expect(isInclude(err.message, 'Not a directory')).assertTrue();
       fileio.unlinkSync(fpath);
+      done();
     }
   });
 
@@ -82,17 +84,18 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_002
    * @tc.desc Function of API, flags=0o102. missing mode parameter.
    */
-  it('fileio_test_error_002', 0, function () {
-    let fpath = nextFileName('fileio_test_error_002');
+  it('fileio_test_error_002', 0, async function (done) {
+    let fpath = await nextFileName('fileio_test_error_002');
     expect(prepareFile(fpath, FILE_CONTENT)).assertTrue();
     try {
       fileio.openSync(fpath, 0o102);
       expect(null).assertFail();
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_002 has failed for ' + err);
+      console.info('fileio_test_error_002 has failed for ' + err);
       expect(isInclude(err.message, 'called with O_CREAT/O_TMPFILE but no mode')).assertTrue();
       fileio.unlinkSync(fpath);
+      done();
     }
   });
 
@@ -101,15 +104,16 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_003
    * @tc.desc Function of API, flags=0o102, missing mode parameter.
    */
-  it('fileio_test_error_003', 0, function () {
-    let fpath = nextFileName('fileio_test_error_003');
+  it('fileio_test_error_003', 0, async function (done) {
+    let fpath = await nextFileName('fileio_test_error_003');
     try {
       fileio.openSync(fpath, 0o102);
       expect(null).assertFail();
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_003 has failed for ' + err);
+      console.info('fileio_test_error_003 has failed for ' + err);
       expect(isInclude(err.message, 'called with O_CREAT/O_TMPFILE but no mode')).assertTrue();
+      done();
     }
   });
 
@@ -118,16 +122,17 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_004
    * @tc.desc Function of API,  flags=0o302. The test file is exist.
    */
-  it('fileio_test_error_004', 0, function () {
-    let fpath = nextFileName('fileio_test_error_004');
+  it('fileio_test_error_004', 0, async function (done) {
+    let fpath = await nextFileName('fileio_test_error_004');
     expect(prepareFile(fpath, FILE_CONTENT)).assertTrue();
     try {
       fileio.openSync(fpath, 0o302, 0o666);
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_004 has failed for ' + err);
+      console.info('fileio_test_error_004 has failed for ' + err);
       expect(isInclude(err.message, 'File exists')).assertTrue();
       fileio.unlinkSync(fpath);
+      done();
     }
   });
 
@@ -136,16 +141,17 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_005
    * @tc.desc Function of API,  flags=0o100002. The test file is exist.
    */
-  it('fileio_test_error_005', 0, function () {
-    let fpath = nextFileName('fileio_test_error_005');
+  it('fileio_test_error_005', 0, async function (done) {
+    let fpath = await nextFileName('fileio_test_error_005');
     expect(prepareFile(fpath, FILE_CONTENT)).assertTrue();
     try {
       fileio.openSync(fpath, 0o100002);
       expect(null).assertFail();
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_005 has failed for ' + err);
+      console.info('fileio_test_error_005 has failed for ' + err);
       fileio.unlinkSync(fpath);
+      done();
     }
   });
 
@@ -154,17 +160,18 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_006
    * @tc.desc Function of API, flags=0o40002 The test file is exist.
    */
-  it('fileio_test_error_006', 0, function () {
-    let dpath = nextFileName('fileio_test_error_006');
+  it('fileio_test_error_006', 0, async function (done) {
+    let dpath = await nextFileName('fileio_test_error_006');
     fileio.mkdirSync(dpath);
     try {
       fileio.openSync(dpath, 0o40002);
       expect(null).assertFail();
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_006 has failed for ' + err);
+      console.info('fileio_test_error_006 has failed for ' + err);
       expect(isInclude(err.message, 'called with O_CREAT/O_TMPFILE but no mode')).assertTrue();
       fileio.rmdirSync(dpath);
+      done();
     }
   });
 
@@ -173,17 +180,18 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_007
    * @tc.desc Function of API, flags=0o400002. The test file is exist.
    */
-  it('fileio_test_error_007', 0, function () {
-    let fpath = nextFileName('fileio_test_error_007');
+  it('fileio_test_error_007', 0, async function (done) {
+    let fpath = await nextFileName('fileio_test_error_007');
     let txt = 'h'
     expect(prepareFile(fpath, txt)).assertTrue();
     try {
       fileio.openSync(fpath, 0o400002);
       expect(null).assertFail();
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_007 has failed for ' + err);
+      console.info('fileio_test_error_007 has failed for ' + err);
       fileio.unlinkSync(fpath);
+      done();
     }
   });
 
@@ -192,17 +200,18 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_008
    * @tc.desc Function of API, flags=0o400002. The test file is exist.
    */
-  it('fileio_test_error_008', 0, function () {
-    let fpath = nextFileName('fileio_test_error_008');
+  it('fileio_test_error_008', 0, async function (done) {
+    let fpath = await nextFileName('fileio_test_error_008');
     let txt = randomString(5000);
     expect(prepareFile(fpath, txt)).assertTrue();
     try {
       fileio.openSync(fpath, 0o400002);
       expect(null).assertFail();
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_008 has failed for ' + err);
+      console.info('fileio_test_error_008 has failed for ' + err);
       fileio.unlinkSync(fpath);
+      done();
     }
   });
 
@@ -211,15 +220,16 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_009
    * @tc.desc Function of API, flags=0o10000102. The test file is exist.
    */
-  it('fileio_test_error_009', 0, function () {
-    let fpath = nextFileName('fileio_test_error_009');
+  it('fileio_test_error_009', 0, async function (done) {
+    let fpath = await nextFileName('fileio_test_error_009');
     try {
       fileio.openSync(fpath, 0o10000102);
       expect(null).assertFail();
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_009 has failed for ' + err);
+      console.info('fileio_test_error_009 has failed for ' + err);
       expect(isInclude(err.message, 'called with O_CREAT/O_TMPFILE but no mode')).assertTrue();
+      done();
     }
   });
 
@@ -228,17 +238,18 @@ describe('FileIOError', function () {
    * @tc.name fileio_test_error_010
    * @tc.desc Function of API, flags=0o200000. Invalid argument.
    */
-  it('fileio_test_error_010', 0, function () {
-    let dpath = fileName('fileio_test_error_010d');
+  it('fileio_test_error_010', 0, async function (done) {
+    let dpath = await fileName('fileio_test_error_010d');
     fileio.mkdirSync(dpath);
     try {
       fileio.openSync(dpath, 0o200000);
       expect(null).assertFail();
-    } 
+    }
     catch (err) {
-      console.log('fileio_test_error_010 has failed for ' + err);
+      console.info('fileio_test_error_010 has failed for ' + err);
       expect(isInclude(err.message, 'Invalid argument')).assertTrue();
       fileio.rmdirSync(dpath);
+      done();
     }
   });
 

storage/storagefileiojstest/src/main/js/default/test/Common.js

@@ -19,7 +19,7 @@ import featureAbility from '@ohos.ability.featureAbility';
 export const FILE_CONTENT = 'hello world';
 
 import {
-  describe, beforeAll, beforeEach, afterEach, afterAll, it, expect
+  describe, it, expect
 }
 from 'deccjsunit/index'
 
@@ -77,8 +77,8 @@ export function fileToWriteOnly(fpath) {
 
 export async function nextFileName(testName) {
   let context = featureAbility.getContext();
-  let data = await context.getFilesDir();
-  let BASE_PATH = data.substring(0, data.length - 5) + 'cache/';
+  let data = await context.getCacheDir();
+  let BASE_PATH = data + '/';
   return BASE_PATH + testName + '_' + randomString(testName.length);
 }
 export async function fileName(testName) {
@@ -126,10 +126,6 @@ export {
   isString,
   isBoolean,
   describe,
-  beforeAll,
-  beforeEach,
-  afterEach,
-  afterAll,
   it,
   expect
 };
\ No newline at end of file

storage/storagefilejstest/src/main/js/default/test/Common.js

@@ -19,7 +19,7 @@ import featureAbility from '@ohos.ability.featureAbility'
 export const FILE_CONTENT = 'hello world';
 
 import {
-  describe, beforeAll, beforeEach, afterEach, afterAll, it, expect
+  describe, it, expect
 }
 from 'deccjsunit/index'
 
@@ -51,8 +51,8 @@ export function prepareEmptyFile(fpath) {
 
 export async function nextFileName(testName) {
   var context = featureAbility.getContext();
-  let data = await context.getFilesDir();
-  let BASE_PATH = data.substring(0, data.length - 5) + 'cache/';
+  let data = await context.getCacheDir();
+  let BASE_PATH = data + '/';
   return BASE_PATH + testName
 }
 export async function fileName(testName) {
@@ -91,10 +91,6 @@ export function randomString(num) {
 export {
   fileio,
   describe,
-  beforeAll,
-  beforeEach,
-  afterEach,
-  afterAll,
   it,
   expect
 };
\ No newline at end of file

storage/storagefilejstest/src/main/js/default/test/File.test.js

@@ -17,10 +17,6 @@ import fileio from '@ohos.fileio';
 import file from '@system.file';
 import {
   describe,
-  beforeAll,
-  beforeEach,
-  afterEach,
-  afterAll,
   it,
   expect
 }