From bdcdbd83a84b7f1a2614cde67427887cdbf1d84a Mon Sep 17 00:00:00 2001
From: raoxian <raoxian@huawei.com>
Date: Tue, 14 Jun 2022 11:30:45 +0800
Subject: [PATCH] update fileio testcase

Signed-off-by: raoxian <raoxian@huawei.com>
---
 .../src/main/js/default/test/Common.js             |  5 +----
 .../test/module_fileio/class_stream/write.test.js  | 14 ++++++++------
 .../test/module_fileio/members/copyFile.test.js    | 12 +++---------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/storage/storagefileiojstest/src/main/js/default/test/Common.js b/storage/storagefileiojstest/src/main/js/default/test/Common.js
index d7c2311b2..a952af555 100644
--- a/storage/storagefileiojstest/src/main/js/default/test/Common.js
+++ b/storage/storagefileiojstest/src/main/js/default/test/Common.js
@@ -74,10 +74,7 @@ export function fileToWriteOnly(fpath) {
     return false
   }
 }
-export function nextFileName1(testName) {
-  const BASE_PATH = '/data/accounts/account_0/appdata/ohos.acts.storage.fileio/cache/'
-  return BASE_PATH + testName + '_' + randomString(testName.length);
-}
+
 export async function nextFileName(testName) {
   let context = featureAbility.getContext();
   let data = await context.getCacheDir();
diff --git a/storage/storagefileiojstest/src/main/js/default/test/module_fileio/class_stream/write.test.js b/storage/storagefileiojstest/src/main/js/default/test/module_fileio/class_stream/write.test.js
index f982f3020..146acc064 100644
--- a/storage/storagefileiojstest/src/main/js/default/test/module_fileio/class_stream/write.test.js
+++ b/storage/storagefileiojstest/src/main/js/default/test/module_fileio/class_stream/write.test.js
@@ -59,20 +59,22 @@ describe('fileio_stream', function () {
    * @tc.require
    */
   it('fileio_test_stream_write_async_001', 0, async function (done) {
-    let fpath = nextFileName1('fileio_test_stream_write_async_001');
+    let fpath = await nextFileName('fileio_test_stream_write_async_001');
     expect(prepareFile(fpath, FILE_CONTENT)).assertTrue();
 
     try {
       let ss = fileio.createStreamSync(fpath, 'r+');
       expect(ss !== null).assertTrue();
       ss.write(new ArrayBuffer(4096), { offset: 1, encoding: 'utf-8' }, function (err, bytesWritten) {
-        expect(bytesWritten == (FILE_CONTENT.length - 1)).assertTrue();
-        expect(fileio.unlinkSync(fpath) == null).assertTrue();
+        expect(bytesWritten == 4095).assertTrue();
+        fileio.unlinkSync(fpath);
+        ss.closeSync();
+        done();
       });
-      done();
-    } catch (e) {
-      console.log('fileio_test_stream_write_async_001 has failed for ' + e);
+    } catch (err) {
+      console.info('fileio_test_stream_write_async_001 has failed for ' + err);
       expect(null).assertFail();
+      done();
     }
   });
 });
diff --git a/storage/storagefileiojstest/src/main/js/default/test/module_fileio/members/copyFile.test.js b/storage/storagefileiojstest/src/main/js/default/test/module_fileio/members/copyFile.test.js
index b08051a8e..0815d947b 100644
--- a/storage/storagefileiojstest/src/main/js/default/test/module_fileio/members/copyFile.test.js
+++ b/storage/storagefileiojstest/src/main/js/default/test/module_fileio/members/copyFile.test.js
@@ -166,16 +166,10 @@ describe('fileio_copyfile', function () {
   it('fileio_copy_file_async_003', 0, async function (done) {
     let fpath = await nextFileName('fileio_copy_file_async_003');
     try {
-      fileio
-        .copyFile(1, fpath)
-        .then(function (err) {
-        })
-        .catch(function (e) {
-          expect(!!e).assertTrue();
-          done();
-        });
+      await fileio.copyFile(1, fpath);
     } catch (e) {
-      expect(!!e).assertTrue();
+      console.log('fileio_copy_file_async_003 has failed for ' + e);
+      expect(e.message == "Invalid argument").assertTrue();
       done();
     }
   });
-- 
GitLab