!3747 update fileioerror

Merge pull request !3747 from raoxian/master

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

@@ -46,17 +46,6 @@ export async function fileName(testName) {
   return BASE_PATH + testName
 }
 
-export function randomString(num) {
-  let len= num;
-  var $chars = 'aaaabbbbcccc';
-  var maxPos = $chars.length;
-  var pwd = '';
-  for (var i = 0; i < len; i++) {
-    pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
-  }
-  return pwd;
-}
-
 export function isIntNum(val) {
   return typeof val === 'number' && val % 1 === 0;
 }

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

@@ -25,7 +25,6 @@ import {
   prepareFile,
   fileName,
   nextFileName,
-  randomString,
   isIntNum,
   isInclude
 }
@@ -47,7 +46,7 @@ describe('FileIOError', function () {
       let fd = fileio.openSync(dpath);
       expect(isIntNum(fd)).assertTrue();
       fileio.rmdirSync(dpath);
-    }
+    } 
     catch (err) {
       console.info('fileio_test_error_000 has failed for ' + err);
       expect(isInclude(err.message, 'Directory not empty')).assertTrue();
@@ -69,8 +68,7 @@ describe('FileIOError', function () {
       let fd = fileio.openSync(fpath);
       expect(isIntNum(fd)).assertTrue();
       fileio.rmdirSync(fpath);
-      expect(null).assertFail();
-    }
+    } 
     catch (err) {
       console.info('fileio_test_error_001 has failed for ' + err);
       expect(isInclude(err.message, 'Not a directory')).assertTrue();
@@ -82,15 +80,14 @@ describe('FileIOError', function () {
   /**
    * @tc.number SUB_STORAGE_FileIo_test_error_0200
    * @tc.name fileio_test_error_002
-   * @tc.desc Function of API, flags=0o102. missing mode parameter.
+   * @tc.desc Function of API, flags=0o100. missing mode parameter.
    */
   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();
-    }
+      fileio.openSync(fpath, 0o100);
+    } 
     catch (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();
@@ -102,17 +99,18 @@ describe('FileIOError', function () {
   /**
    * @tc.number SUB_STORAGE_FileIO_OpenSync_0300
    * @tc.name fileio_test_error_003
-   * @tc.desc Function of API, flags=0o102, missing mode parameter.
+   * @tc.desc Function of API,  flags=0o302. The test file is exist.
    */
   it('fileio_test_error_003', 0, async function (done) {
     let fpath = await nextFileName('fileio_test_error_003');
+    expect(prepareFile(fpath, FILE_CONTENT)).assertTrue();
     try {
-      fileio.openSync(fpath, 0o102);
-      expect(null).assertFail();
-    }
+      fileio.openSync(fpath, 0o302, 0o666);
+    } 
     catch (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();
+      expect(isInclude(err.message, 'File exists')).assertTrue();
+      fileio.unlinkSync(fpath);
       done();
     }
   });
@@ -120,18 +118,22 @@ describe('FileIOError', function () {
   /**
    * @tc.number SUB_STORAGE_FileIO_OpenSync_0400
    * @tc.name fileio_test_error_004
-   * @tc.desc Function of API,  flags=0o302. The test file is exist.
+   * @tc.desc Function of API, flags=0o400000. Symbolic link loop.
    */
   it('fileio_test_error_004', 0, async function (done) {
     let fpath = await nextFileName('fileio_test_error_004');
+    let ffpath = fpath + 'aaaa';
     expect(prepareFile(fpath, FILE_CONTENT)).assertTrue();
     try {
-      fileio.openSync(fpath, 0o302, 0o666);
-    }
+      fileio.symlinkSync(fpath, ffpath);
+      fileio.openSync(ffpath, 0o400000);
+    } 
     catch (err) {
       console.info('fileio_test_error_004 has failed for ' + err);
-      expect(isInclude(err.message, 'File exists')).assertTrue();
+      expect(isInclude(err.message, 'Symbolic link loop') || 
+        isInclude(err.message, 'Too many symbolic links encountered')).assertTrue();
       fileio.unlinkSync(fpath);
+      fileio.unlinkSync(ffpath);
       done();
     }
   });
@@ -139,118 +141,19 @@ describe('FileIOError', function () {
   /**
    * @tc.number SUB_STORAGE_FileIO_OpenSync_0500
    * @tc.name fileio_test_error_005
-   * @tc.desc Function of API,  flags=0o100002. The test file is exist.
+   * @tc.desc Function of API, flags=0o200000. Not a directory.
    */
   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();
-    }
+      fileio.openSync(fpath, 0o200000, 0o666);
+    } 
     catch (err) {
       console.info('fileio_test_error_005 has failed for ' + err);
+      expect(isInclude(err.message, 'Not a directory')).assertTrue();
       fileio.unlinkSync(fpath);
       done();
     }
   });
-
-  /**
-   * @tc.number SUB_STORAGE_FileIO_OpenSync_0600
-   * @tc.name fileio_test_error_006
-   * @tc.desc Function of API, flags=0o40002 The test file is exist.
-   */
-  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.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();
-    }
-  });
-
-  /**
-   * @tc.number SUB_STORAGE_FileIO_OpenSync_0700
-   * @tc.name fileio_test_error_007
-   * @tc.desc Function of API, flags=0o400002. The test file is exist.
-   */
-  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.info('fileio_test_error_007 has failed for ' + err);
-      fileio.unlinkSync(fpath);
-      done();
-    }
-  });
-
-  /**
-   * @tc.number SUB_STORAGE_FileIO_OpenSync_0800
-   * @tc.name fileio_test_error_008
-   * @tc.desc Function of API, flags=0o400002. The test file is exist.
-   */
-  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.info('fileio_test_error_008 has failed for ' + err);
-      fileio.unlinkSync(fpath);
-      done();
-    }
-  });
-
-  /**
-   * @tc.number SUB_STORAGE_FileIO_OpenSync_0900
-   * @tc.name fileio_test_error_009
-   * @tc.desc Function of API, flags=0o10000102. The test file is exist.
-   */
-  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.info('fileio_test_error_009 has failed for ' + err);
-      expect(isInclude(err.message, 'called with O_CREAT/O_TMPFILE but no mode')).assertTrue();
-      done();
-    }
-  });
-
-  /**
-   * @tc.number SUB_STORAGE_FileIO_OpenSync_1000
-   * @tc.name fileio_test_error_010
-   * @tc.desc Function of API, flags=0o200000. Invalid argument.
-   */
-  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.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/FileIO.test.js

@@ -492,11 +492,10 @@ describe('fileIOTest', function () {
     expect(prepareFile(fpath, FILE_CONTENT)).assertTrue();
     try {
       fileio.openSync(fpath, 0o40002, 0o700);
-      expect(null).assertFail();
+      fileio.unlinkSync(fpath);
     }catch (err) {
       console.info('fileio_test_open_019 has failed for ' + err);
-      expect(err.message == "Not a directory").assertTrue();
-      fileio.unlinkSync(fpath);
+      expect(null).assertFail();
     }
   });
 
@@ -523,17 +522,15 @@ describe('fileIOTest', function () {
   /**
    * @tc.number SUB_STORAGE_FileIO_OpenSync_2200
    * @tc.name fileio_test_open_022
-   * @tc.desc Function of API, flags=0o200002.
+   * @tc.desc Function of API, flags=0o200000.
    */
   it('fileio_test_open_022', 0, async function () {
-    let fpath = await nextFileName('fileio_test_open_022');
-    expect(prepareFile(fpath, FILE_CONTENT)).assertTrue();
+    let dpath = await nextFileName('fileio_test_open_022') + 'd';
+    fileio.mkdirSync(dpath);
     try {
-      let fd = fileio.openSync(fpath, 0o200002);
-      expect(fd !== null).assertTrue();
-      fileio.closeSync(fd);
-      fileio.unlinkSync(fpath);
-    } 
+      fileio.openSync(dpath, 0o200000, 0o666);
+      fileio.rmdirSync(dpath);
+    }
     catch (err) {
       console.info('fileio_test_open_022 has failed for ' + err);
       expect(null).assertFail();