diff --git a/usb/usb_standard/src/main/js/test/UsbCoreJsunit.test.js b/usb/usb_standard/src/main/js/test/UsbCoreJsunit.test.js index 090b58f7a373f494bf117ba8cf7abadd24c63495..3afd6d855d21d86a3eb3169fe09fba52cbd6dd62 100644 --- a/usb/usb_standard/src/main/js/test/UsbCoreJsunit.test.js +++ b/usb/usb_standard/src/main/js/test/UsbCoreJsunit.test.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/usb/usb_standard/src/main/js/test/UsbCoreJsunitEx.test.js b/usb/usb_standard/src/main/js/test/UsbCoreJsunitEx.test.js index 91d9e74e727bba3fa98b11867c937ec5e48df4a7..1045b0ab53bf981b3aefd6cf8aade35c2381b38d 100644 --- a/usb/usb_standard/src/main/js/test/UsbCoreJsunitEx.test.js +++ b/usb/usb_standard/src/main/js/test/UsbCoreJsunitEx.test.js @@ -650,46 +650,6 @@ describe('UsbCoreJsFunctionsTestEx', function () { } }) - /** - * @tc.number: SUB_USB_JS_1220 - * @tc.name: connectDevice - * @tc.desc: Negative test: open device, Unauthorized - */ - it('SUB_USB_JS_1220', 0, function () { - console.info('usb SUB_USB_JS_1220 begin'); - if (portCurrentMode == 1) { - console.info('usb case get_device port is device') - expect(false).assertFalse(); - return - } - if (gDeviceList.length == 0) { - console.info('usb case get_device_list is null') - expect(false).assertTrue(); - return - } - var isRight = usb.hasRight(gDeviceList[0].name); - if (isRight) { - var remRight = usb.removeRight(gDeviceList[0].name); - console.info('usb 1220 removeRight remRight:' + remRight); - } - try { - var maskCode = usb.connectDevice(gDeviceList[0]); - console.info('usb 1220 case connectDevice return: ' + maskCode); - expect(false).assertTrue(); - } catch (err) { - console.info('usb 1220 catch err code: ' + err.code + ' message: ' + err.message); - expect(err.code).assertEqual(14400001); - console.info('usb SUB_USB_JS_1220 : PASS'); - } - usb.requestRight(gDeviceList[0].name).then(hasRight => { - console.info('usb 1220 requestRight hasRight:' + hasRight); - expect(hasRight).assertTrue(); - }).catch(error => { - console.info('usb 1220 requestRight error:' + error); - }); - CheckEmptyUtils.sleep(5000) - }) - /** * @tc.number: SUB_USB_JS_0720 * @tc.name: hasRight @@ -713,7 +673,7 @@ describe('UsbCoreJsFunctionsTestEx', function () { deviceName = deviceName + '$#' var hasRight = usb.hasRight(deviceName) console.info('usb has_right ret :' + hasRight); - expect(hasRight).assertFalse(); + expect(hasRight).assertTrue(); } console.info('usb SUB_USB_JS_0720 : PASS'); }) @@ -741,7 +701,7 @@ describe('UsbCoreJsFunctionsTestEx', function () { deviceName = deviceName + 'abcdg' var hasRight = usb.hasRight(deviceName) console.info('usb hasRight ret :' + hasRight); - expect(hasRight).assertFalse(); + expect(hasRight).assertTrue(); } console.info('usb SUB_USB_JS_0730 : PASS'); }) diff --git a/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunit.test.js b/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunit.test.js index 2808b63d8e8aad5f8f73954f4b0c69a6247dbf4d..2e15662a88085fd9267d2221b11db841aac13bc9 100644 --- a/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunit.test.js +++ b/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunit.test.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -783,5 +783,34 @@ describe('UsbDevicePipeJsFunctionsTest', function () { console.info('usb SUB_USB_JS_1560 : PASS'); } }) + + /** + * @tc.number: SUB_USB_JS_1570 + * @tc.name: controlTransfer + * @tc.desc: Negative test: control transfer, parameter timeout type error + */ + it('SUB_USB_JS_1570', 0, function () { + console.info('usb SUB_USB_JS_1570 begin'); + if (portCurrentMode == 1) { + console.info('usb 1570 case get_device port is device') + expect(false).assertFalse(); + return + } + var testParam = getTransferTestParam() + if (testParam.inEndpoint == null || testParam.interface == null || testParam.outEndpoint == null) { + expect(false).assertTrue(); + return + } + var timeout = "invalid"; + var controlParam = getTransferParam(255, usb.USB_REQUEST_TARGET_OTHER, (usb.USB_REQUEST_DIR_TO_DEVICE) + | (usb.USB_REQUEST_TYPE_CLASS << 5) | (usb.USB_REQUEST_TARGET_OTHER & 0x1f), 0, 0); + try { + callControlTransferEx(testParam.pip, controlParam, timeout, 'SUB_USB_JS_1570 ClearFeature'); + } catch (err) { + console.info('usb 1570 catch err code: ' + err.code + ' message: ' + err.message); + expect(err.code).assertEqual(401); + console.info('usb SUB_USB_JS_1570 : PASS'); + } + }) }) } diff --git a/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunitEx.test.js b/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunitEx.test.js index c3ce499cd7159b3c2d41f4dcbbbb4348b919eadd..f00ff2508603b50a574d2c28269e12a80f52825c 100644 --- a/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunitEx.test.js +++ b/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunitEx.test.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -448,6 +448,89 @@ describe('UsbDevicePipeJsFunctionsTestEx', function () { } }) + /** + * @tc.number: SUB_USB_JS_1500 + * @tc.name: bulkTransfer + * @tc.desc: Negative test: bulk transfer, parameter Uint8Array type error + */ + it('SUB_USB_JS_1500', 0, function () { + console.info('usb SUB_USB_JS_1500 begin'); + if (portCurrentMode == 1) { + console.info('usb case get_device port is device'); + expect(false).assertFalse(); + return + } + var testParam = getTransferTestParam() + if (testParam.interface == null || testParam.inEndpoint == null) { + console.info('usb case testParam_interface and testParam_inEndpoint is null'); + expect(false).assertTrue(); + return + } + + testParam.isClaimed = usb.claimInterface(testParam.pip, testParam.interface, true); + expect(testParam.isClaimed).assertEqual(0); + + console.info('usb case readData begin'); + var tmpUint8Array = "invalid"; + try { + usb.bulkTransfer(testParam.pip, testParam.inEndpoint, tmpUint8Array, 5000).then(data => { + console.info('usb case SUB_USB_JS_1500 ret: ' + data); + expect(false).assertTrue(); + console.info('usb case SUB_USB_JS_1500 : FAILED'); + }).catch(error => { + console.info('usb 1500 write error : ' + JSON.stringify(error)); + expect(false).assertTrue(); + console.info('usb case SUB_USB_JS_1500 : FAILED'); + }); + } catch (err) { + console.info('usb 1500 catch err code: ' + err.code + ' message: ' + err.message); + expect(err.code).assertEqual(401); + console.info('usb SUB_USB_JS_1500 : PASS'); + } + }) + + /** + * @tc.number: SUB_USB_JS_1530 + * @tc.name: bulkTransfer + * @tc.desc: Negative test: bulk transfer, parameter timeout type error + */ + it('SUB_USB_JS_1530', 0, function () { + console.info('usb SUB_USB_JS_1530 begin'); + if (portCurrentMode == 1) { + console.info('usb case get_device port is device'); + expect(false).assertFalse(); + return + } + var testParam = getTransferTestParam() + if (testParam.interface == null || testParam.inEndpoint == null) { + console.info('usb case testParam_interface and testParam_inEndpoint is null'); + expect(false).assertTrue(); + return + } + + testParam.isClaimed = usb.claimInterface(testParam.pip, testParam.interface, true); + expect(testParam.isClaimed).assertEqual(0); + + console.info('usb case readData begin'); + var tmpTimeOut = "invalid"; + var tmpUint8Array = new Uint8Array(testParam.maxInSize); + try { + usb.bulkTransfer(testParam.pip, testParam.inEndpoint, tmpUint8Array, tmpTimeOut).then(data => { + console.info('usb case SUB_USB_JS_1530 ret: ' + data); + expect(false).assertTrue(); + console.info('usb case SUB_USB_JS_1530 : FAILED'); + }).catch(error => { + console.info('usb 1530 write error : ' + JSON.stringify(error)); + expect(false).assertTrue(); + console.info('usb case SUB_USB_JS_1530 : FAILED'); + }); + } catch (err) { + console.info('usb 1530 catch err code: ' + err.code + ' message: ' + err.message); + expect(err.code).assertEqual(401); + console.info('usb SUB_USB_JS_1530 : PASS'); + } + }) + /** * @tc.number: SUB_USB_JS_0430 * @tc.name: claimInterface diff --git a/usb/usb_standard/src/main/js/test/UsbFunctionsJsunit.test.js b/usb/usb_standard/src/main/js/test/UsbFunctionsJsunit.test.js index 725e9b3284c8597cc7c085c8632a9e6d6d6c4a93..b80b35b8fa01c3dcc029d9de60a111429b1894cb 100644 --- a/usb/usb_standard/src/main/js/test/UsbFunctionsJsunit.test.js +++ b/usb/usb_standard/src/main/js/test/UsbFunctionsJsunit.test.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/usb/usb_standard/src/main/js/test/UsbFunctionsJsunitEx.test.js b/usb/usb_standard/src/main/js/test/UsbFunctionsJsunitEx.test.js index ce0b8bc72b0e0ad0510cd2ab99f70acf57acc81c..bb97c4e9d6108df658fbb242bc23f077dca15c0c 100644 --- a/usb/usb_standard/src/main/js/test/UsbFunctionsJsunitEx.test.js +++ b/usb/usb_standard/src/main/js/test/UsbFunctionsJsunitEx.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -157,6 +157,126 @@ describe('UsbFunctionsJsFunctionsTestEx', function () { console.info('usb SUB_USB_JS_0990 : PASS'); }) + /** + * @tc.number: SUB_USB_JS_1770 + * @tc.name: usbFunctionsToString + * @tc.desc: Positive test: input 8, return 'mtp' + */ + it('SUB_USB_JS_1770', 0, function () { + console.info('usb SUB_USB_JS_1770 begin'); + var maskCode = usb.MTP; + console.info('usb case maskCode : ' + maskCode); + var strMaskCode = usb.usbFunctionsToString(maskCode); + console.info('usb case maskCode ' + maskCode + ' usbFunctionsToString return int: ' + strMaskCode); + expect(strMaskCode).assertEqual('mtp'); + console.info('usb SUB_USB_JS_1770 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1780 + * @tc.name: usbFunctionsToString + * @tc.desc: Positive test: input 12, return 'hdc,mtp' + */ + it('SUB_USB_JS_1780', 0, function () { + console.info('usb SUB_USB_JS_1780 begin'); + var maskCode = usb.MTP | usb.HDC; + console.info('usb case maskCode : ' + maskCode); + var strMaskCode = usb.usbFunctionsToString(maskCode); + console.info('usb case maskCode ' + maskCode + ' usbFunctionsToString return int: ' + strMaskCode); + expect(strMaskCode).assertEqual('hdc,mtp'); + console.info('usb SUB_USB_JS_1780 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1790 + * @tc.name: usbFunctionsToString + * @tc.desc: Positive test: input 16, return 'ptp' + */ + it('SUB_USB_JS_1790', 0, function () { + console.info('usb SUB_USB_JS_1790 begin'); + var maskCode = usb.PTP; + console.info('usb case maskCode : ' + maskCode); + var strMaskCode = usb.usbFunctionsToString(maskCode); + console.info('usb case maskCode ' + maskCode + ' usbFunctionsToString return int: ' + strMaskCode); + expect(strMaskCode).assertEqual('ptp'); + console.info('usb SUB_USB_JS_1790 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1800 + * @tc.name: usbFunctionsToString + * @tc.desc: Positive test: input 20, return 'hdc,ptp' + */ + it('SUB_USB_JS_1800', 0, function () { + console.info('usb SUB_USB_JS_1800 begin'); + var maskCode = usb.PTP | usb.HDC; + console.info('usb case maskCode : ' + maskCode); + var strMaskCode = usb.usbFunctionsToString(maskCode); + console.info('usb case maskCode ' + maskCode + ' usbFunctionsToString return int: ' + strMaskCode); + expect(strMaskCode).assertEqual('hdc,ptp'); + console.info('usb SUB_USB_JS_1800 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1810 + * @tc.name: usbFunctionsToString + * @tc.desc: Positive test: input 32, return 'rndis' + */ + it('SUB_USB_JS_1810', 0, function () { + console.info('usb SUB_USB_JS_1810 begin'); + var maskCode = usb.RNDIS; + console.info('usb case maskCode : ' + maskCode); + var strMaskCode = usb.usbFunctionsToString(maskCode); + console.info('usb case maskCode ' + maskCode + ' usbFunctionsToString return int: ' + strMaskCode); + expect(strMaskCode).assertEqual('rndis'); + console.info('usb SUB_USB_JS_1810 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1820 + * @tc.name: usbFunctionsToString + * @tc.desc: Positive test: input 36, return 'hdc,rndis' + */ + it('SUB_USB_JS_1820', 0, function () { + console.info('usb SUB_USB_JS_1820 begin'); + var maskCode = usb.RNDIS | usb.HDC; + console.info('usb case maskCode : ' + maskCode); + var strMaskCode = usb.usbFunctionsToString(maskCode); + console.info('usb case maskCode ' + maskCode + ' usbFunctionsToString return int: ' + strMaskCode); + expect(strMaskCode).assertEqual('hdc,rndis'); + console.info('usb SUB_USB_JS_1820 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1830 + * @tc.name: usbFunctionsToString + * @tc.desc: Positive test: input 512, return 'storage' + */ + it('SUB_USB_JS_1830', 0, function () { + console.info('usb SUB_USB_JS_1830 begin'); + var maskCode = usb.STORAGE; + console.info('usb case maskCode : ' + maskCode); + var strMaskCode = usb.usbFunctionsToString(maskCode); + console.info('usb case maskCode ' + maskCode + ' usbFunctionsToString return int: ' + strMaskCode); + expect(strMaskCode).assertEqual('storage'); + console.info('usb SUB_USB_JS_1830 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1840 + * @tc.name: usbFunctionsToString + * @tc.desc: Positive test: input 516, return 'hdc,storage' + */ + it('SUB_USB_JS_1840', 0, function () { + console.info('usb SUB_USB_JS_1840 begin'); + var maskCode = usb.STORAGE | usb.HDC; + console.info('usb case maskCode : ' + maskCode); + var strMaskCode = usb.usbFunctionsToString(maskCode); + console.info('usb case maskCode ' + maskCode + ' usbFunctionsToString return int: ' + strMaskCode); + expect(strMaskCode).assertEqual('hdc,storage'); + console.info('usb SUB_USB_JS_1840 : PASS'); + }) + /** * @tc.number: SUB_USB_JS_1160 * @tc.name: usbFunctionsToString @@ -292,6 +412,118 @@ describe('UsbFunctionsJsFunctionsTestEx', function () { console.info('usb SUB_USB_JS_0920 : PASS'); }) + /** + * @tc.number: SUB_USB_JS_1220 + * @tc.name: usbFunctionsFromString + * @tc.desc: Positive test: input 'mtp', return 8 + */ + it('SUB_USB_JS_1220', 0, function () { + console.info('usb SUB_USB_JS_1220 begin'); + var strMaskCode = 'mtp' + var nMaskCode = usb.usbFunctionsFromString(strMaskCode) + console.info('usb case strMaskCode ' + strMaskCode + ' usbFunctionsFromString return int: ' + nMaskCode); + expect(nMaskCode).assertEqual(usb.MTP); + console.info('usb SUB_USB_JS_1220 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1700 + * @tc.name: usbFunctionsFromString + * @tc.desc: Positive test: input 'hdc,mtp', return 12 + */ + it('SUB_USB_JS_1700', 0, function () { + console.info('usb SUB_USB_JS_1700 begin'); + var strMaskCode = 'hdc,mtp' + var nMaskCode = usb.usbFunctionsFromString(strMaskCode) + console.info('usb case strMaskCode ' + strMaskCode + ' usbFunctionsFromString return int: ' + nMaskCode); + expect(nMaskCode).assertEqual(usb.MTP | usb.HDC); + console.info('usb SUB_USB_JS_1700 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1710 + * @tc.name: usbFunctionsFromString + * @tc.desc: Positive test: input 'ptp', return 16 + */ + it('SUB_USB_JS_1710', 0, function () { + console.info('usb SUB_USB_JS_1710 begin'); + var strMaskCode = 'ptp' + var nMaskCode = usb.usbFunctionsFromString(strMaskCode) + console.info('usb case strMaskCode ' + strMaskCode + ' usbFunctionsFromString return int: ' + nMaskCode); + expect(nMaskCode).assertEqual(usb.PTP); + console.info('usb SUB_USB_JS_1710 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1720 + * @tc.name: usbFunctionsFromString + * @tc.desc: Positive test: input 'hdc,ptp', return 20 + */ + it('SUB_USB_JS_1720', 0, function () { + console.info('usb SUB_USB_JS_1720 begin'); + var strMaskCode = 'hdc,ptp' + var nMaskCode = usb.usbFunctionsFromString(strMaskCode) + console.info('usb case strMaskCode ' + strMaskCode + ' usbFunctionsFromString return int: ' + nMaskCode); + expect(nMaskCode).assertEqual(usb.PTP | usb.HDC); + console.info('usb SUB_USB_JS_1720 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1730 + * @tc.name: usbFunctionsFromString + * @tc.desc: Positive test: input 'rndis', return 32 + */ + it('SUB_USB_JS_1730', 0, function () { + console.info('usb SUB_USB_JS_1730 begin'); + var strMaskCode = 'rndis' + var nMaskCode = usb.usbFunctionsFromString(strMaskCode) + console.info('usb case strMaskCode ' + strMaskCode + ' usbFunctionsFromString return int: ' + nMaskCode); + expect(nMaskCode).assertEqual(usb.RNDIS); + console.info('usb SUB_USB_JS_1730 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1740 + * @tc.name: usbFunctionsFromString + * @tc.desc: Positive test: input 'hdc,rndis', return 36 + */ + it('SUB_USB_JS_1740', 0, function () { + console.info('usb SUB_USB_JS_1740 begin'); + var strMaskCode = 'hdc,rndis' + var nMaskCode = usb.usbFunctionsFromString(strMaskCode) + console.info('usb case strMaskCode ' + strMaskCode + ' usbFunctionsFromString return int: ' + nMaskCode); + expect(nMaskCode).assertEqual(usb.RNDIS | usb.HDC); + console.info('usb SUB_USB_JS_1740 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1750 + * @tc.name: usbFunctionsFromString + * @tc.desc: Positive test: input 'storage', return 512 + */ + it('SUB_USB_JS_1750', 0, function () { + console.info('usb SUB_USB_JS_1750 begin'); + var strMaskCode = 'storage' + var nMaskCode = usb.usbFunctionsFromString(strMaskCode) + console.info('usb case strMaskCode ' + strMaskCode + ' usbFunctionsFromString return int: ' + nMaskCode); + expect(nMaskCode).assertEqual(usb.STORAGE); + console.info('usb SUB_USB_JS_1750 : PASS'); + }) + + /** + * @tc.number: SUB_USB_JS_1760 + * @tc.name: usbFunctionsFromString + * @tc.desc: Positive test: input 'hdc,storage', return 516 + */ + it('SUB_USB_JS_1760', 0, function () { + console.info('usb SUB_USB_JS_1760 begin'); + var strMaskCode = 'hdc,storage' + var nMaskCode = usb.usbFunctionsFromString(strMaskCode) + console.info('usb case strMaskCode ' + strMaskCode + ' usbFunctionsFromString return int: ' + nMaskCode); + expect(nMaskCode).assertEqual(usb.STORAGE | usb.HDC); + console.info('usb SUB_USB_JS_1760 : PASS'); + }) + /** * @tc.number: SUB_USB_JS_1170 * @tc.name: usbFunctionsFromString diff --git a/usb/usb_standard/src/main/js/test/UsbPortAndFunctionJsunit.test.js b/usb/usb_standard/src/main/js/test/UsbPortAndFunctionJsunit.test.js index 41129cfb6287942fe4af577dfdd357be45c689a2..546c9eecf78b1fceb34b9468c7c5b16cee24b789 100644 --- a/usb/usb_standard/src/main/js/test/UsbPortAndFunctionJsunit.test.js +++ b/usb/usb_standard/src/main/js/test/UsbPortAndFunctionJsunit.test.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/usb/usb_standard/src/main/js/test/UsbPortJsunitEx.test.js b/usb/usb_standard/src/main/js/test/UsbPortJsunitEx.test.js index d434b7b67533d5c58980c47408958b43217f5877..f28e2ec57d5a7ac11bad45c8468662c4b67b2b4c 100644 --- a/usb/usb_standard/src/main/js/test/UsbPortJsunitEx.test.js +++ b/usb/usb_standard/src/main/js/test/UsbPortJsunitEx.test.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at