diff --git a/entry/src/ohosTest/ets/test/Ability.test.ets b/entry/src/ohosTest/ets/test/Ability.test.ets index 1ad6a65d04d710cbebc66ce6d079ba3adb2e517d..05a5e46ea67f1161f5279cf61afb803a60c628b3 100644 --- a/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/entry/src/ohosTest/ets/test/Ability.test.ets @@ -52,11 +52,6 @@ export default function abilityTest() { const formData: ESObject = new FormData(); formData.append("id", 1); expect(formData.result.name).assertUndefined() - let startTime = new Date().getTime() - for (let index = 0; index < BASE_COUNT; index++) { - formData.append("id", 1); - } - endTime(startTime,'test01'); }) it('test02', 0, () => { const formData: ESObject = new FormData(); @@ -74,11 +69,6 @@ export default function abilityTest() { result = false expect(result).assertDeepEquals(false) }) - let startTime = new Date().getTime() - for (let index = 0; index < BASE_COUNT; index++) { - fileUpload.post("/api/upload", formData) - } - endTime(startTime,'test02'); }) it('test03', 0, () => { const formData: ESObject = new FormData(); @@ -96,11 +86,6 @@ export default function abilityTest() { result = false expect(result).assertDeepEquals(false) }) - let startTime = new Date().getTime() - for (let index = 0; index < BASE_COUNT; index++) { - fileUpload.get("/api/upload", formData) - } - endTime(startTime,'test03'); }) it('test04', 0, () => { const formData: ESObject = new FormData(); @@ -118,11 +103,6 @@ export default function abilityTest() { result = false expect(result).assertDeepEquals(false) }) - let startTime = new Date().getTime() - for (let index = 0; index < BASE_COUNT; index++) { - fileUpload.head("/api/upload", formData) - } - endTime(startTime,'test04'); }) it('test05', 0, () => { const formData: ESObject = new FormData(); @@ -140,11 +120,6 @@ export default function abilityTest() { result = false expect(result).assertDeepEquals(false) }) - let startTime = new Date().getTime() - for (let index = 0; index < BASE_COUNT; index++) { - fileUpload.options("/api/upload", formData) - } - endTime(startTime,'test05'); }) it('test06', 0, () => { const formData: ESObject = new FormData(); @@ -162,11 +137,6 @@ export default function abilityTest() { result = false expect(result).assertDeepEquals(false) }) - let startTime = new Date().getTime() - for (let index = 0; index < BASE_COUNT; index++) { - fileUpload.put("/api/upload", formData) - } - endTime(startTime,'test06'); }) it('test07', 0, () => { const formData: ESObject = new FormData(); @@ -184,11 +154,6 @@ export default function abilityTest() { result = false expect(result).assertDeepEquals(false) }) - let startTime = new Date().getTime() - for (let index = 0; index < BASE_COUNT; index++) { - fileUpload.delete("/api/upload", formData) - } - endTime(startTime,'test07'); }) it('test08', 0, () => { const formData: ESObject = new FormData(); @@ -206,11 +171,6 @@ export default function abilityTest() { result = false expect(result).assertDeepEquals(false) }) - let startTime = new Date().getTime() - for (let index = 0; index < BASE_COUNT; index++) { - fileUpload.trace("/api/upload", formData) - } - endTime(startTime,'test08'); }) it('test09', 0, () => { const formData: ESObject = new FormData(); @@ -228,18 +188,6 @@ export default function abilityTest() { result = false expect(result).assertDeepEquals(false) }) - let startTime = new Date().getTime() - for (let index = 0; index < BASE_COUNT; index++) { - fileUpload.connect("/api/upload", formData) - } - endTime(startTime,'test09'); }) }) } - -function endTime(startTime: number, tag: string) { - let endTime: number = new Date().getTime(); - let averageTime = ((endTime - startTime) * 1000 / BASE_COUNT) - console.info(tag + ":endTime:" + endTime) - console.log(tag + ":averageTime:" + averageTime + "μs"); -} \ No newline at end of file diff --git a/entry/src/ohosTest/ets/test/InterfaceTime.test.ets b/entry/src/ohosTest/ets/test/InterfaceTime.test.ets index 9ed6124c37d81444ae89a71c9cf8e048a9588643..0e7ec87e41ba862485a46b0bd985c5f93f5daeef 100644 --- a/entry/src/ohosTest/ets/test/InterfaceTime.test.ets +++ b/entry/src/ohosTest/ets/test/InterfaceTime.test.ets @@ -15,11 +15,12 @@ import { describe, expect, it, TestType } from '@ohos/hypium' import {FormData,FileUpload} from "@ohos/commons-fileupload" +const BASE_COUNT = 2000 export default function InterfaceTime() { describe("InterfaceTime", () => { - const BASE_COUNT = 2000 + const BASELINE_CREATEHTTP = 2000 it("formData.append", TestType.PERFORMANCE, async (done: Function) => { @@ -35,5 +36,187 @@ export default function InterfaceTime() { expect(averageTime < BASELINE_CREATEHTTP).assertTrue(); done() }); + it('test02', 0, () => { + const formData: ESObject = new FormData(); + formData.append("id", 1); + let fileUpload = new FileUpload({ + baseUrl: "https://musetransfer.com/", + readTimeout: 60000, + connectTimeout: 60000 + }) + let result:boolean|ESObject; + fileUpload.post("/api/upload", formData).then((res:ESObject) => { + result = true + expect(result).assertDeepEquals(true) + }).catch((err:ESObject) => { + result = false + expect(result).assertDeepEquals(false) + }) + let startTime = new Date().getTime() + for (let index = 0; index < BASE_COUNT; index++) { + fileUpload.post("/api/upload", formData) + } + endTime(startTime,'test02'); + }) + it('test03', 0, () => { + const formData: ESObject = new FormData(); + formData.append("id", 1); + let fileUpload = new FileUpload({ + baseUrl: "https://musetransfer.com/", + readTimeout: 60000, + connectTimeout: 60000 + }) + let result:boolean|ESObject; + fileUpload.get("/api/upload", formData).then((res:ESObject) => { + result = true + expect(result).assertDeepEquals(true) + }).catch((err:ESObject) => { + result = false + expect(result).assertDeepEquals(false) + }) + let startTime = new Date().getTime() + for (let index = 0; index < BASE_COUNT; index++) { + fileUpload.get("/api/upload", formData) + } + endTime(startTime,'test03'); + }) + it('test04', 0, () => { + const formData: ESObject = new FormData(); + formData.append("id", 1); + let fileUpload = new FileUpload({ + baseUrl: "https://musetransfer.com/", + readTimeout: 60000, + connectTimeout: 60000 + }) + let result:boolean|ESObject; + fileUpload.head("/api/upload", formData).then((res:ESObject) => { + result = true + expect(result).assertDeepEquals(true) + }).catch((err:ESObject) => { + result = false + expect(result).assertDeepEquals(false) + }) + let startTime = new Date().getTime() + for (let index = 0; index < BASE_COUNT; index++) { + fileUpload.head("/api/upload", formData) + } + endTime(startTime,'test04'); + }) + it('test05', 0, () => { + const formData: ESObject = new FormData(); + formData.append("id", 1); + let fileUpload = new FileUpload({ + baseUrl: "https://musetransfer.com/", + readTimeout: 60000, + connectTimeout: 60000 + }) + let result:boolean|ESObject; + fileUpload.options("/api/upload", formData).then((res:ESObject) => { + result = true + expect(result).assertDeepEquals(true) + }).catch((err:ESObject) => { + result = false + expect(result).assertDeepEquals(false) + }) + let startTime = new Date().getTime() + for (let index = 0; index < BASE_COUNT; index++) { + fileUpload.options("/api/upload", formData) + } + endTime(startTime,'test05'); + }) + it('test06', 0, () => { + const formData: ESObject = new FormData(); + formData.append("id", 1); + let fileUpload = new FileUpload({ + baseUrl: "https://musetransfer.com/", + readTimeout: 60000, + connectTimeout: 60000 + }) + let result:boolean|ESObject; + fileUpload.put("/api/upload", formData).then((res:ESObject) => { + result = true + expect(result).assertDeepEquals(true) + }).catch((err:ESObject) => { + result = false + expect(result).assertDeepEquals(false) + }) + let startTime = new Date().getTime() + for (let index = 0; index < BASE_COUNT; index++) { + fileUpload.put("/api/upload", formData) + } + endTime(startTime,'test06'); + }) + it('test07', 0, () => { + const formData: ESObject = new FormData(); + formData.append("id", 1); + let fileUpload = new FileUpload({ + baseUrl: "https://musetransfer.com/", + readTimeout: 60000, + connectTimeout: 60000 + }) + let result:boolean|ESObject; + fileUpload.delete("/api/upload", formData).then((res:ESObject) => { + result = true + expect(result).assertDeepEquals(true) + }).catch((err:ESObject) => { + result = false + expect(result).assertDeepEquals(false) + }) + let startTime = new Date().getTime() + for (let index = 0; index < BASE_COUNT; index++) { + fileUpload.delete("/api/upload", formData) + } + endTime(startTime,'test07'); + }) + it('test08', 0, () => { + const formData: ESObject = new FormData(); + formData.append("id", 1); + let fileUpload = new FileUpload({ + baseUrl: "https://musetransfer.com/", + readTimeout: 60000, + connectTimeout: 60000 + }) + let result:boolean|ESObject; + fileUpload.trace("/api/upload", formData).then((res:ESObject) => { + result = true + expect(result).assertDeepEquals(true) + }).catch((err:ESObject) => { + result = false + expect(result).assertDeepEquals(false) + }) + let startTime = new Date().getTime() + for (let index = 0; index < BASE_COUNT; index++) { + fileUpload.trace("/api/upload", formData) + } + endTime(startTime,'test08'); + }) + it('test09', 0, () => { + const formData: ESObject = new FormData(); + formData.append("id", 1); + let fileUpload = new FileUpload({ + baseUrl: "https://musetransfer.com/", + readTimeout: 60000, + connectTimeout: 60000 + }) + let result:boolean|ESObject; + fileUpload.connect("/api/upload", formData).then((res:ESObject) => { + result = true + expect(result).assertDeepEquals(true) + }).catch((err:ESObject) => { + result = false + expect(result).assertDeepEquals(false) + }) + let startTime = new Date().getTime() + for (let index = 0; index < BASE_COUNT; index++) { + fileUpload.connect("/api/upload", formData) + } + endTime(startTime,'test09'); + }) }) +} +function endTime(startTime: number, tag: string) { + let endTime: number = new Date().getTime(); + let averageTime = ((endTime - startTime) * 1000 / BASE_COUNT) + console.info(tag + ":endTime:" + endTime) + console.log(tag + ":averageTime:" + averageTime + "μs"); } \ No newline at end of file diff --git a/entry/src/ohosTest/ets/test/List.test.ets b/entry/src/ohosTest/ets/test/List.test.ets index e8ac7b3572d77beba9bf928b2bfb3f426393dc29..cf54d83964748e5a857632de112e97915bae31bc 100644 --- a/entry/src/ohosTest/ets/test/List.test.ets +++ b/entry/src/ohosTest/ets/test/List.test.ets @@ -17,5 +17,5 @@ import InterfaceTime from './InterfaceTime.test' export default function testsuite() { abilityTest() - InterfaceTime() + // InterfaceTime() } \ No newline at end of file