!1081 删除storage下storagefileiojstest的file案例

Merge pull request !1081 from Storage sandboxing/master

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

@@ -13,9 +13,14 @@
  * limitations under the License.
  */
 
-import fileio from '@system.fileio'
+import fileio from '@ohos.fileio';
 
-export const FILE_CONTENT = 'hello world'
+export const FILE_CONTENT = 'hello world';
+
+import {
+  expect
+}
+from 'deccjsunit/index'
 
 export function prepareFile(fpath, content) {
   try {
@@ -39,7 +44,7 @@ export function prepareFile1(fpath, content) {
     fileio.fsyncSync(fd)
     fileio.closeSync(fd)
     return true
-  } 
+  }
   catch (e) {
     console.log('Failed to prepareFile for ' + e)
     return false
@@ -50,7 +55,7 @@ export function prepareEmptyFile(fpath) {
     let fd = fileio.openSync(fpath, 0o102, 0o777)
     fileio.closeSync(fd)
     return true
-  } 
+  }
   catch (e) {
     console.log('Failed to prepareFile for ' + e)
     return false
@@ -63,7 +68,7 @@ export function fileToReadOnly(fpath) {
     fileio.fsyncSync(fd)
     fileio.closeSync(fd)
     return true
-  } 
+  }
   catch (e) {
     console.log('Failed to fileToReadOnly for ' + e);
     return false
@@ -76,7 +81,7 @@ export function fileToWriteOnly(fpath) {
     fileio.fsyncSync(fd)
     fileio.closeSync(fd)
     return true
-  } 
+  }
   catch (e) {
     console.log('Failed to fileToWriteOnly ' + e)
     return false
@@ -89,7 +94,7 @@ export function fileToReadAndWrite(fpath) {
     fileio.fsyncSync(fd)
     fileio.closeSync(fd)
     return true
-  } 
+  }
   catch (e) {
     console.log('Failed to fileToReadAndWrite ' + e);
     return false
@@ -97,27 +102,27 @@ export function fileToReadAndWrite(fpath) {
 }
 export function appName(testName) {
   const BASE_PATH = '/data/accounts/account_0/appdata/ohos.acts.stroage.fileio/'
-  return BASE_PATH + testName
+  return BASE_PATH + testName + '_' + randomString(testName.length);
 }
 export function nextFileName(testName) {
   const BASE_PATH = '/data/accounts/account_0/appdata/ohos.acts.stroage.fileio/cache/'
-  return BASE_PATH + testName
+  return BASE_PATH + testName + '_' + randomString(testName.length);
 }
 export function fileName(testName) {
   const BASE_PATH = '/data/accounts/account_0/appdata/ohos.acts.stroage.fileio/files/'
-  return BASE_PATH + testName
+  return BASE_PATH + testName + '_' + randomString(testName.length);
 }
 export function cacheFileName(testName) {
   const BASE_PATH = '/data/accounts/account_0/appdata/ohos.acts.stroage.fileio/files/cache/'
-  return BASE_PATH + testName
+  return BASE_PATH + testName + '_' + randomString(testName.length);
 }
 export function differentFileName(testName) {
   const BASE_PATH = '/data/accounts/account_0/ohos.acts.distributeddatamgr.distributedfile/'
-  return BASE_PATH + testName
+  return BASE_PATH + testName + '_' + randomString(testName.length);
 }
 export function differentCacheName(testName) {
   const BASE_PATH = '/data/accounts/account_0/ohos.acts.distributeddatamgr.distributedfile/cache/'
-  return BASE_PATH + testName
+  return BASE_PATH + testName + '_' + randomString(testName.length);
 }
 
 export function getFileTextLen(fpath) {
@@ -130,7 +135,7 @@ export function getFileTextLen(fpath) {
     console.log('file lenth:' + len)
     expect(ss.closeSync() !== null).assertTrue()
     return len
-  } 
+  }
   catch (e) {
     console.log('Failed to getFileTextLen ' + e)
     expect(ss.closeSync() !== null).assertTrue()
@@ -143,7 +148,7 @@ export function isFileExist(fpath) {
     console.log('file:' + fpath)
     console.log('status:exist')
     return true
-  } 
+  }
   catch (e) {
     console.log('file:' + fpath)
     console.log('status:non-existen')
@@ -167,4 +172,4 @@ export function randomString(num) {
     pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
   }
   return pwd;
-}
+}
\ No newline at end of file

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

@@ -14,8 +14,6 @@
  */
 
 import fileio from '@ohos.fileio';
-import file from '@system.file';
-import bundle_mgr from '@ohos.bundle_mgr'
 import {
   describe,
   beforeAll,
@@ -1592,41 +1590,6 @@ describe('fileIOTest', function () {
     }
   });
 
-  /**
-   * @tc.number SUB_STORAGE_FileIO_ReadSync_0000
-   * @tc.name fileio_test_read_sync_000
-   * @tc.desc Function of API, readSync.
-   */
-  it('fileio_test_read_sync_000', 0, async function (done) {
-    let fpath = nextFileName('fileio_test_read_sync_000');
-    let text = '0123456789abcdefg';
-    expect(prepareFile(fpath, text)).assertTrue();
-    sleep(10)
-    try {
-      let fd = fileio.openSync(fpath, 0o2);
-      let len = fileio.readSync(fd, new ArrayBuffer(4096));
-      expect(len == text.length).assertTrue();
-      expect(fileio.closeSync(fd) !== null).assertTrue();
-      file.readText({
-        uri: 'internal://cache/fileio_test_read_sync_000',
-        success: function (data) {
-          console.log('call readText success: ' + data.text);
-          expect(text == data.text).assertTrue();
-          expect(fileio.unlinkSync(fpath) !== null).assertTrue();
-          done();
-        },
-        fail: function (data, code) {
-          console.error('call fail callback fail, code: ' + code + ', data: ' + data);
-          expect(null).assertFail();
-        },
-      });
-    }
-    catch (e) {
-      console.log('fileio_test_read_sync_000 has failed for ' + e);
-      expect(null).assertFail();
-    }
-  });
-
   /**
    * @tc.number SUB_STORAGE_FileIO_ReadSync_0100
    * @tc.name fileio_test_read_sync_001

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

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import fileio from '@system.fileio';
+import fileio from '@ohos.fileio';
 import {
   describe,
   it,

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

@@ -14,7 +14,6 @@
  */
 
 import fileio from '@ohos.fileio';
-import file from '@system.file'
 import {
   describe,
   beforeAll,
@@ -713,7 +712,9 @@ describe('fileIOTestStream', function () {
    */
   it('fileio_test_stream_fdopen_stream_sync_001', 0, function () {
     try {
-      expect(fileio.fdopenStreamSync(-1, 'r') == null).assertTrue();
+      let fd = -1;
+      let mode = 'r+';
+      fileio.fdopenStreamSync(fd, mode);
       expect(null).assertFail();
     } 
     catch (e) {
@@ -1278,7 +1279,7 @@ describe('fileIOTestStream', function () {
     expect(prepareFile(fpath, FILE_CONTENT)).assertTrue();
     try {
       let fd = fileio.openSync(fpath, 0o2);
-      expect(fileio.fdopenStreamSync(fd, '') == null).assertTrue();
+      fileio.fdopenStreamSync(fd, '')
       expect(null).assertFail();
     } 
     catch (e) {

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

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-require('./File.test.js')
 require('./FileIO.test.js')
 require('./FileIODir.test.js')
 require('./FileIODirent.test.js')