diff --git a/storage/storagefileiojstest/src/main/js/default/test/FileIOStream.test.js b/storage/storagefileiojstest/src/main/js/default/test/FileIOStream.test.js index 8f1760073d2ea7eae95c5062a0260022a94aab48..36642547f5101432961fd2bc92e8d20333d00624 100644 --- a/storage/storagefileiojstest/src/main/js/default/test/FileIOStream.test.js +++ b/storage/storagefileiojstest/src/main/js/default/test/FileIOStream.test.js @@ -689,7 +689,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o0); let ss = fileio.fdopenStreamSync(fd, 'r'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -739,7 +738,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == text.length).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -760,7 +758,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o101, 0o222); let ss = fileio.fdopenStreamSync(fd, 'w'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -792,7 +789,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == text.length + 1).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -813,7 +809,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o101, 0o222); let ss = fileio.fdopenStreamSync(fd, 'a'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -835,7 +830,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o2); let ss = fileio.fdopenStreamSync(fd, 'r+'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -881,7 +875,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == text.length).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -902,7 +895,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o102, 0o666); let ss = fileio.fdopenStreamSync(fd, 'w+'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -933,7 +925,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == text.length + 1).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -954,7 +945,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o102, 0o666); let ss = fileio.fdopenStreamSync(fd, 'a+'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -977,7 +967,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o0); let ss = fileio.fdopenStreamSync(fd, 'rb'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1024,7 +1013,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == text.length).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1045,7 +1033,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o101, 0o222); let ss = fileio.fdopenStreamSync(fd, 'wb'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1077,7 +1064,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == text.length + 1).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1098,7 +1084,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o101, 0o222); let ss = fileio.fdopenStreamSync(fd, 'ab'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1165,7 +1150,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == text.length).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1186,7 +1170,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o102, 0o666); let ss = fileio.fdopenStreamSync(fd, 'wb+'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1217,7 +1200,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == text.length + 1).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1238,7 +1220,6 @@ describe('fileIOTestStream', function () { let fd = fileio.openSync(fpath, 0o102, 0o666); let ss = fileio.fdopenStreamSync(fd, 'ab+'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1517,7 +1498,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == 3).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1547,7 +1527,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == 3).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1638,7 +1617,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == 4).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1670,7 +1648,6 @@ describe('fileIOTestStream', function () { ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); expect(rlen == 2).assertTrue(); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } @@ -1871,7 +1848,6 @@ describe('fileIOTestStream', function () { expect(fileToReadOnly(fpath)).assertTrue(); ss = fileio.createStreamSync(fpath, 'r'); let rlen = ss.readSync(new ArrayBuffer(4096)); - expect(fileio.closeSync(fd) !== null).assertTrue(); expect(ss.closeSync() !== null).assertTrue(); expect(fileio.unlinkSync(fpath) !== null).assertTrue(); } diff --git a/storage/storagefileiojstest/src/main/js/default/test/module_fileio/class_stream/close.test.js b/storage/storagefileiojstest/src/main/js/default/test/module_fileio/class_stream/close.test.js index 9c7fe1918e08b9d45f7638f9532d862ceb0bff10..3e4f957331e70cbece87f3c0ec87769001a0dd77 100644 --- a/storage/storagefileiojstest/src/main/js/default/test/module_fileio/class_stream/close.test.js +++ b/storage/storagefileiojstest/src/main/js/default/test/module_fileio/class_stream/close.test.js @@ -81,7 +81,6 @@ describe('fileio_stream', function () { let fd = await fileio.openSync(fpath, 0o2); let ss = await fileio.fdopenStreamSync(fd, 'r+'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) == null).assertTrue(); expect(ss.closeSync() == null).assertTrue(); expect(fileio.unlinkSync(fpath) == null).assertTrue(); done(); @@ -108,7 +107,6 @@ describe('fileio_stream', function () { let fd = await fileio.openSync(fpath, 0o2); let ss = await fileio.fdopenStreamSync(fd, 'r+'); expect(ss !== null).assertTrue(); - expect(fileio.closeSync(fd) == null).assertTrue(); ss.close(function (err, stream) { expect(fileio.unlinkSync(fpath) == null).assertTrue(); }) diff --git a/storage/storagefileiojstest/src/main/js/default/test/module_fileio/members/open.test.js b/storage/storagefileiojstest/src/main/js/default/test/module_fileio/members/open.test.js index e27744d425177c68056e4c244329bfca367ba1f9..7e3e9d5a21403f021cea0c81fc00559c6fd51bc9 100644 --- a/storage/storagefileiojstest/src/main/js/default/test/module_fileio/members/open.test.js +++ b/storage/storagefileiojstest/src/main/js/default/test/module_fileio/members/open.test.js @@ -141,7 +141,7 @@ describe('fileio_open', function () { expect(prepareFile(fpath, FILE_CONTENT)).assertTrue(); try { - await fileio.open(fpath, function (err, fd) { + fileio.open(fpath, 0o2, function (err, fd) { fileio.read(fd, new ArrayBuffer(4096)) .then(function (res) { expect((String.fromCharCode.apply(null, new Uint8Array(res.buffer))) == FILE_CONTENT).assertTrue; @@ -188,7 +188,7 @@ describe('fileio_open', function () { expect(null).assertFail(); } }); - + /** * @tc.number SUB_DF_FILEIO_OPEN_ASYNC_0050 * @tc.name fileio_test_open_async_005 @@ -234,7 +234,7 @@ describe('fileio_open', function () { let fpath = await nextFileName('fileio_test_open_async_006'); expect(prepareFile(fpath, FILE_CONTENT)).assertTrue(); try { - await fileio.open(fpath, 0o1, 0o0200) + await fileio.open(fpath, 0o2, 0o0200) .then(function (fd) { fileio.read(fd, new ArrayBuffer(4096)) .then(function (res) { @@ -252,4 +252,90 @@ describe('fileio_open', function () { expect(null).assertFail(); } }); + + /** + * @tc.number SUB_DF_FILEIO_OPEN_ASYNC_0070 + * @tc.name fileio_test_open_async_007 + * @tc.desc Test openASync() interfaces. + * @tc.size MEDIUM + * @tc.type Functoin + * @tc.level Level 0 + * @tc.require + */ + it('fileio_test_open_async_007', 0, async function (done) { + let fpath = await nextFileName('fileio_test_open_async_007'); + try { + fileio.open(fpath, 0o0101, 0o0222, function (err, fd) { + expect(fd !== null).assertTrue(); + fileio.writeSync(fd, FILE_CONTENT, { + encoding: 'utf-8', + offset: 1, + length: 1, + }); + expect(fileio.closeSync(fd) !== null).assertTrue(); + expect(fileio.unlinkSync(fpath) !== null).assertTrue(); + done(); + }); + } catch (e) { + expect(null).assertFail(); + } + }); + + /** + * @tc.number SUB_DF_FILEIO_OPEN_ASYNC_0080 + * @tc.name fileio_test_open_async_008 + * @tc.desc Test openASync() interfaces. + * @tc.size MEDIUM + * @tc.type Functoin + * @tc.level Level 0 + * @tc.require + */ + it('fileio_test_open_async_008', 0, async function (done) { + let fpath = await nextFileName('fileio_test_open_async_008'); + try { + fileio.open(fpath, 0o100, 0o0444, function (err, fd) { + expect(fd !== null).assertTrue(); + expect(fileio.closeSync(fd) !== null).assertTrue(); + expect(fileio.unlinkSync(fpath) !== null).assertTrue(); + done(); + }); + } catch (e) { + expect(null).assertFail(); + } + }); + + /** + * @tc.number SUB_DF_FILEIO_OPEN_ASYNC_0090 + * @tc.name fileio_test_open_async_009 + * @tc.desc Test openASync() interfaces. + * @tc.size MEDIUM + * @tc.type Functoin + * @tc.level Level 0 + * @tc.require + */ + it('fileio_test_open_async_009', 0, async function (done) { + let fpath = await nextFileName('fileio_test_open_async_009'); + try { + fileio.open(fpath, 0o2101, 0o0222, function (err, fd) { + expect(fd !== null).assertTrue(); + let wri = fileio.writeSync(fd, 'hello1', { + encoding: 'utf-8', + offset: 1, + length: 1, + }); + expect(wri !== null).assertTrue(); + let writ = fileio.writeSync(fd, 'hello2', { + encoding: 'utf-8', + offset: 1, + length: 1, + }); + expect(writ !== null).assertTrue(); + expect(fileio.closeSync(fd) !== null).assertTrue(); + expect(fileio.unlinkSync(fpath) !== null).assertTrue(); + done(); + }); + } catch (e) { + expect(null).assertFail(); + } + }); });