diff --git a/storage/storagefileiojstest/src/main/js/default/test/Common.js b/storage/storagefileiojstest/src/main/js/default/test/Common.js index d7c2311b275150a240702cd00d77a961fbffade8..a952af5557f7db82d2523e9b52b7b54b7f4a158e 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 f982f30204970c817cf18341f2cb34bd32dcc77b..146acc064ebcb22a5bb967ebea6b6d3db8e32590 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 b08051a8e3781e61ac2034690e429018471e6241..0815d947bdf30b8f4b6857a1f2a6420ab4859038 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(); } });