From 4f1ef6c60418aa8acad33df5ce17d1f7ed664fc2 Mon Sep 17 00:00:00 2001 From: wupingyuan Date: Thu, 24 Aug 2023 10:09:15 +0800 Subject: [PATCH 1/3] add pop3 test --- .../entry/src/ohosTest/ets/test/POP3.test.ets | 313 ++++++------------ 1 file changed, 108 insertions(+), 205 deletions(-) diff --git a/POP3Client/entry/src/ohosTest/ets/test/POP3.test.ets b/POP3Client/entry/src/ohosTest/ets/test/POP3.test.ets index b22ec88..4a582e7 100644 --- a/POP3Client/entry/src/ohosTest/ets/test/POP3.test.ets +++ b/POP3Client/entry/src/ohosTest/ets/test/POP3.test.ets @@ -20,11 +20,9 @@ export default function POP3Test() { let client: Pop3Command = undefined let selectMsgNum: number = -1 let isListShow: boolean = false - let msgList: Array = [] describe('POP3Test', function () { - async function login() { globalThis.client = undefined; let jumpOption = undefined; @@ -102,264 +100,169 @@ export default function POP3Test() { if (client) { let result = await client.LIST() if (result && result.toString() && result.toString().length > 0) { - let arr = result.toString().split(',') - if (arr && arr.length >= 2) { - isListShow = true; - for (let i = 0; i < arr.length; i += 2) { - let index = parseInt(arr[i]); - let size = parseInt(arr[i+1]); - listData.push(`列表条目，序号：${index}，大小：${size}`) - let bean = new MsgBean() - bean.setIndex(index); - bean.setSize(size); - msgList.push(bean); - } - return - } + listData = result.toString().split(',') } - listData.push(`获取到LIST命令的结果解析失败，${result}`) - } else { - listData.push(`账号未登录，请需重新登录`) - expect(0).assertEqual(1) } - } catch (err) { - listData.push(`获取LIST命令结果失败：${'\r\n'}${err.message}`) - expect(0).assertEqual(1) } } - it('sendSTAT', 0, async function (done) { - isListShow = false - msgList = [] - listData = [] - selectMsgNum = -1; try { if (client) { let result = await client.STAT() - if (result && result.toString() && result.toString().length > 0) { - let arr = result.toString().split(' ') - if (arr && arr.length >= 1) { - let totalMailSize = parseInt(arr[0]); - if (totalMailSize > 0) { - isListShow = true; - listData.push(`获取到STAT命令的结果：${'\r\n'}${result}`) - return - } - } - } - listData.push(`获取到STAT命令的结果：${'\r\n'}获取到的结果为空`) done() } else { expect(0).assertEqual(1) - listData.push(`账号未登录，请需重新登录`) done() } } catch (err) { expect(0).assertEqual(1) - listData.push(`获取STAT命令结果失败：${'\r\n'}${err.message}`) done() } }) - it('sendNOOP', 0, function (done) { - setTimeout(async () => { - msgList = [] - listData = [] - selectMsgNum = -1; - try { - if (client) { - let result = await client.NOOP() - listData.push(`获取到NOOP命令的结果：${'\r\n'}${JSON.stringify(result)}`) - done() - } else { - listData.push(`账号未登录，请需重新登录`) - expect(0).assertEqual(1) - done() - } - - } catch (err) { - listData.push(`获取NOOP命令结果失败：${'\r\n'}${err.message}`) + it('sendNOOP', 0, async function (done) { + try { + if (client) { + let result = await client.NOOP() + done() + } else { expect(0).assertEqual(1) done() } - }, 200) + } catch (err) { + expect(0).assertEqual(1) + done() + } }) - it('sendUIDL', 0, function (done) { - setTimeout(async () => { - listData = [] - try { + it('sendUIDL', 0, async function (done) { + try { + if (listData.length > 0) { selectMsgNum = 1; - if (selectMsgNum === -1) { - expect(0).assertEqual(1) - return - } - if (client) { - let result = await client.UIDL(selectMsgNum + '') - listData.push(`获取到UIDL命令的结果：${'\r\n'}${result}`) - done() - } else { - listData.push(`账号未登录，请需重新登录`) - expect(0).assertEqual(1) - done() - } - - } catch (err) { - listData.push(`获取UIDL命令结果失败：${'\r\n'}${err.message}`) + } + else { + done() + return + } + if (selectMsgNum === -1) { + expect(0).assertEqual(1) + return + } + if (client) { + let result = await client.UIDL(selectMsgNum + '') + done() + } else { expect(0).assertEqual(1) done() } - selectMsgNum = -1; - }) - }) - it('sendLAST', 0, function (done) { - setTimeout(async () => { - msgList = [] - listData = [] - selectMsgNum = -1; - try { - if (client) { - let result = await client.LAST() - listData.push(`获取到LAST命令的结果：${'\r\n'}${result}`) - done() - } else { - listData.push(`账号未登录，请需重新登录`) - expect(0).assertEqual(1) - done() - } + } catch (err) { + expect(0).assertEqual(1) + done() + } + }) - } catch (err) { - listData.push(`获取LAST命令结果失败：${'\r\n'}${err.message}`) + it('sendRSET', 0, async function (done) { + try { + if (listData.length > 0) { + selectMsgNum = 1; + } + else { + done() + return + } + if (selectMsgNum === -1) { + return + } + if (client) { + let delResult = client.DELE(selectMsgNum + '') + let result = await client.RSET() // 用于撤销DELE命令 所以不需要等DELE命令返回 + done() + } else { expect(0).assertEqual(1) done() } - }, 200) - }) - it('sendRSET', 0, function (done) { - setTimeout(async () => { - listData = [] - try { - selectMsgNum = 3 - if (selectMsgNum === -1) { - return - } - if (client) { - let delResult = client.DELE(selectMsgNum + '') - listData.push(`发送DELE命令删除的结果：${'\r\n'}${delResult}`) - let result = await client.RSET() // 用于撤销DELE命令 所以不需要等DELE命令返回 - listData.push(`发送RSET命令取消删除操作的结果：${'\r\n'}${result}`) - done() - } else { - listData.push(`账号未登录，请需重新登录`) - expect(0).assertEqual(1) - done() - } + } catch (err) { + expect(0).assertEqual(1) + done() + } + }) - } catch (err) { - listData.push(`获取RSET命令结果失败：${'\r\n'}${err.message}`) + it('sendRETR', 0, async function (done) { + try { + if (listData.length > 0) { + selectMsgNum = 1; + } + else { + done() + return + } + if (selectMsgNum === -1) { + expect(0).assertEqual(1) + return + } + if (client) { + let result = await client.RETR(selectMsgNum + '') + expect(0).assertEqual(0) + done() + } else { expect(0).assertEqual(1) done() } - selectMsgNum = -1; - }, 200) + } catch (err) { + expect(0).assertEqual(1) + done() + } + selectMsgNum = -1; }) - it('sendRETR', 0, function (done) { - setTimeout(async () => { - listData = [] - try { - selectMsgNum = 4 - if (selectMsgNum === -1) { - expect(0).assertEqual(1) - return - } - if (client) { - let result = await client.RETR(selectMsgNum + '') - listData.push(`获取到RETR命令的结果，结果长度为：${'\r\n'}${result.toString().length}${'\r\n'}}`) - if (result.toString().length > 1000) { - listData.push(`由于RETR命令的结果太长text无法完全显示，取最后1000字节显示：${'\r\n'}${result.toString() - .substring(result.toString().length - 1000, result.toString().length)}`) - } else { - listData.push(`ETR命令的结果显示：${'\r\n'}${result.toString()}`) - } - expect(0).assertEqual(0) - done() - } else { - listData.push(`账号未登录，请需重新登录`) - expect(0).assertEqual(1) - done() - } - - } catch (err) { - listData.push(`获取RETR命令结果失败：${'\r\n'}${err.message}`) + it('sendDELE', 0, async function (done) { + try { + if (listData.length > 0) { + selectMsgNum = 1; + } + else { + done() + return + } + if (selectMsgNum === -1) { expect(0).assertEqual(1) done() + return } - selectMsgNum = -1; - }, 200) - }) - - - it('sendDELE', 0, function (done) { - setTimeout(async () => { - listData = [] - try { - selectMsgNum = 4 - if (selectMsgNum === -1) { - expect(0).assertEqual(1) - done() - return - } - if (client) { - let result = await client.DELE(selectMsgNum + '') - listData.push(`获取到DELE命令的结果：${'\r\n'}${result}`) - expect(0).assertEqual(0) - done() - } else { - listData.push(`账号未登录，请需重新登录`) - expect(0).assertEqual(1) - done() - } - - } catch (err) { - listData.push(`获取DELE命令结果失败：${'\r\n'}${err.message}`) + if (client) { + let result = await client.DELE(selectMsgNum + '') + expect(0).assertEqual(0) + done() + } else { expect(0).assertEqual(1) done() } - selectMsgNum = -1; - }, 500) - }) + } catch (err) { + expect(0).assertEqual(1) + done() + } + }) - it('sendQUIT', 0, function (done) { - setTimeout(async () => { - msgList = [] - listData = [] - selectMsgNum = -1; - try { - - if (client) { - const [quitInfo] = await client.QUIT(); - - listData.push(`获取到QUIT命令的结果：${'\r\n'}${quitInfo}`) - done() - } else { - listData.push(`账号未登录，请需重新登录`) - expect(0).assertEqual(1) - done() - } - } catch (err) { - listData.push(`获取RETR命令结果失败：${'\r\n'}${err.message}`) + it('sendQUIT', 0, async function (done) { + try { + if (client) { + const [quitInfo] = await client.QUIT(); + done() + } else { expect(0).assertEqual(1) done() } - }, 800) + } catch (err) { + expect(0).assertEqual(1) + done() + } }) }) -- Gitee From fa24327b6d2bbaea6211aa1e26902cd21097c272 Mon Sep 17 00:00:00 2001 From: wupingyuan Date: Thu, 24 Aug 2023 10:34:18 +0800 Subject: [PATCH 2/3] add ftp test --- .../src/ohosTest/ets/test/FTPClient.test.ets | 69 +++++++++++++++++-- 1 file changed, 65 insertions(+), 4 deletions(-) diff --git a/FTPClient/entry/src/ohosTest/ets/test/FTPClient.test.ets b/FTPClient/entry/src/ohosTest/ets/test/FTPClient.test.ets index d870d6b..4adc470 100644 --- a/FTPClient/entry/src/ohosTest/ets/test/FTPClient.test.ets +++ b/FTPClient/entry/src/ohosTest/ets/test/FTPClient.test.ets @@ -36,6 +36,7 @@ export default function FTPClientTest() { let textValue = '' let inputValue = 'click me' let operationType = '' + const BASE_COUNT = 1 let option = { ALPNProtocols: ["spdy/1", "http/1.1"], @@ -381,6 +382,7 @@ export default function FTPClientTest() { if (!ftpUtil.getLogin()) { return; } + let startTime1 = new Date().getTime(); ftpUtil.getCurrentDirectory({ currentDirectoryErr(err: Error) { expect(0).assertEqual(1) @@ -410,6 +412,9 @@ export default function FTPClientTest() { } else { currentFileList = result; } + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : getCurrentDirectoryAndFileList averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } @@ -439,6 +444,7 @@ export default function FTPClientTest() { operationType = '' return } + let startTime1 = new Date().getTime(); ftpUtil.uploadSingleFile(localUploadFilePath, inputValue, { uploadErr(err: Error) { expect(0).assertEqual(1) @@ -447,6 +453,9 @@ export default function FTPClientTest() { uploadStart(info) { }, uploadSuccess(msg: FTPResponse) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : uploadSingleFile averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() }, @@ -480,6 +489,7 @@ export default function FTPClientTest() { operationType = '' return } + let startTime1 = new Date().getTime(); ftpUtil.uploadDir(localUploadFileDir, inputValue, { uploadDirErr(err: Error) { expect(0).assertEqual(1) @@ -488,6 +498,9 @@ export default function FTPClientTest() { uploadDirStart(info) { }, uploadDirSuccess(msg) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : uploadDir averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() }, @@ -513,6 +526,7 @@ export default function FTPClientTest() { if (!selectFilePath || selectFilePath.length < 1) { return } + let startTime1 = new Date().getTime(); ftpUtil.downloadSingleFile(localPath, selectFilePath, { downloadErr(err: Error) { expect(0).assertEqual(1) @@ -534,6 +548,9 @@ export default function FTPClientTest() { } fs.fsyncSync(file.fd); fs.close(file) + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : downloadSingleFile averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() }, @@ -558,6 +575,7 @@ export default function FTPClientTest() { if (!selectDirPath || selectDirPath.length < 1) { return } + let startTime1 = new Date().getTime(); ftpUtil.downloadDir(localDir, selectDirPath, { downloadDirErr(err: Error) { expect(0).assertEqual(1) @@ -566,6 +584,9 @@ export default function FTPClientTest() { downloadDirStart(info) { }, downloadDirSuccess(msg) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : downloadDir averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() }, @@ -588,6 +609,7 @@ export default function FTPClientTest() { if (!selectFilePath || selectFilePath.length < 1) { return } + let startTime1 = new Date().getTime(); ftpUtil.getFileSize(selectFilePath, { getSizeErr(err: Error) { expect(0).assertEqual(1) @@ -596,6 +618,9 @@ export default function FTPClientTest() { getSizeStart(info) { }, getSizeSuccess(result: number) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : getFileSize averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } @@ -608,6 +633,7 @@ export default function FTPClientTest() { if (!ftpUtil.getLogin()) { return } + let startTime1 = new Date().getTime(); ftpUtil.getServerFeatures({ featuresErr(err: Error) { expect(0).assertEqual(1) @@ -616,6 +642,9 @@ export default function FTPClientTest() { featuresStart(info) { }, featuresSuccess(msg: Map) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : getServerFeatures averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } @@ -636,6 +665,7 @@ export default function FTPClientTest() { if (!selectFilePath || selectFilePath.length < 1) { return } + let startTime1 = new Date().getTime(); ftpUtil.getLastModify(selectFilePath, { lastModifyErr(err: Error) { expect(0).assertEqual(1) @@ -644,6 +674,9 @@ export default function FTPClientTest() { lastModifyStart(info) { }, lastModifySuccess(msg: Date) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : getLastModifyTime averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } @@ -674,7 +707,7 @@ export default function FTPClientTest() { if (!selectFilePath || selectFilePath.length < 1) { return } - + let startTime1 = new Date().getTime(); ftpUtil.renameFile(inputValue, selectFilePath, { renameFileErr(err: Error) { operationType = '' @@ -685,6 +718,9 @@ export default function FTPClientTest() { operationType = '' }, renameFileSuccess(result: FTPResponse) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : renameFile averageTime : " + averageTime1 + "us") operationType = '' expect(0).assertEqual(0) done() @@ -703,6 +739,7 @@ export default function FTPClientTest() { if (!remoteRoot || remoteRoot.length < 1) { return } + let startTime1 = new Date().getTime(); ftpUtil.cdToParentDirectory({ cdToParentDirectoryErr(err: Error) { expect(0).assertEqual(1) @@ -711,6 +748,9 @@ export default function FTPClientTest() { cdToParentDirectoryStart(info) { }, cdToParentDirectorySuccess(res: FTPResponse) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : cdToParentDirectory averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } @@ -739,6 +779,7 @@ export default function FTPClientTest() { operationType = '' return } + let startTime1 = new Date().getTime(); ftpUtil.ensureRemotePath(inputValue, { ensureRemotePathErr(err: Error) { operationType = '' @@ -749,6 +790,9 @@ export default function FTPClientTest() { operationType = '' }, ensureRemotePathSuccess(result) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : ensureRemotePath averageTime : " + averageTime1 + "us") operationType = '' expect(0).assertEqual(0) done() @@ -770,7 +814,7 @@ export default function FTPClientTest() { if (!selectDirPath || selectDirPath.length < 1) { return } - + let startTime1 = new Date().getTime(); ftpUtil.deleteEmptyDirectory(selectDirPath, { deleteEmptyDirectoryErr(err: Error) { expect(0).assertEqual(1) @@ -779,6 +823,9 @@ export default function FTPClientTest() { deleteEmptyDirectoryStart(info) { }, deleteEmptyDirectorySuccess(result: FTPResponse) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : deleteEmptyDirectory averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } @@ -801,6 +848,7 @@ export default function FTPClientTest() { if (!selectFilePath || selectFilePath.length < 1) { return } + let startTime1 = new Date().getTime(); ftpUtil.deleteFile(selectFilePath, { deleteFileErr(err: Error) { expect(0).assertEqual(1) @@ -809,6 +857,9 @@ export default function FTPClientTest() { deleteFileStart(info) { }, deleteFileSuccess(msg: FTPResponse) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : deleteSingleFile averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } @@ -832,7 +883,7 @@ export default function FTPClientTest() { if (!selectDirPath || selectDirPath.length < 1) { return } - + let startTime1 = new Date().getTime(); ftpUtil.deleteAll(selectDirPath, { deleteAllErr(err: Error) { expect(0).assertEqual(1) @@ -841,6 +892,9 @@ export default function FTPClientTest() { deleteAllStart(info) { }, deleteAllSuccess(result) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : deleteAll averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } @@ -858,6 +912,7 @@ export default function FTPClientTest() { return } remoteChildPath="/deleteSelfBuf" + let startTime1 = new Date().getTime(); ftpUtil.setWorkingDirectory(remoteChildPath, { setWorkingDirectoryErr(err: Error) { expect(0).assertEqual(1) @@ -874,6 +929,9 @@ export default function FTPClientTest() { deleteAllButSelfStart(info) { }, deleteAllButSelfSuccess(result) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : deleteAllButSelf averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } @@ -899,7 +957,7 @@ export default function FTPClientTest() { if (!remoteChildPath || remoteChildPath.length < 1) { return } - + let startTime1 = new Date().getTime(); ftpUtil.setWorkingDirectory(remoteChildPath, { setWorkingDirectoryErr(err: Error) { expect(0).assertEqual(1) @@ -908,6 +966,9 @@ export default function FTPClientTest() { setWorkingDirectoryStart(info) { }, setWorkingDirectorySuccess(result: FTPResponse) { + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("FTPClientTest : setWorkingDirectory averageTime : " + averageTime1 + "us") expect(0).assertEqual(0) done() } -- Gitee From 5616c53b7aaa968f9cf783cdab5100231bc2ee50 Mon Sep 17 00:00:00 2001 From: wupingyuan Date: Thu, 24 Aug 2023 10:34:56 +0800 Subject: [PATCH 3/3] add smtp test --- SMTPClient/entry/src/ohosTest/ets/test/SMTP.test.ets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SMTPClient/entry/src/ohosTest/ets/test/SMTP.test.ets b/SMTPClient/entry/src/ohosTest/ets/test/SMTP.test.ets index 8adcbfe..d787ebe 100644 --- a/SMTPClient/entry/src/ohosTest/ets/test/SMTP.test.ets +++ b/SMTPClient/entry/src/ohosTest/ets/test/SMTP.test.ets @@ -18,6 +18,7 @@ export default function SMTPTest() { let inputValue = 'click me' let secure = false let attachment: Array = [] + const BASE_COUNT = 1 beforeAll(function (done) { @@ -210,7 +211,11 @@ export default function SMTPTest() { subject: '鸿蒙客户端邮件主题', attachment: attachment } + let startTime1 = new Date().getTime(); const message = await globalThis.client.sendAsync(msg) + let endTime1 = new Date().getTime(); + let averageTime1 = ((endTime1 - startTime1) * 1000) / BASE_COUNT; + console.log("SMTPTest : sendMail averageTime : " + averageTime1 + "us") done() } catch (err) { expect(0).assertContain(1) -- Gitee