From d5cc9cd52ada4702d951ddb3b715e4540ac18edc Mon Sep 17 00:00:00 2001 From: lixiaofeng_154b Date: Wed, 13 Jul 2022 17:01:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90xts=5Facts=E3=80=91=E3=80=90master?= =?UTF-8?q?=E3=80=91ActsUsbJSApiTest=E6=B5=8B=E8=AF=95=E5=A5=97=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E4=BF=AE=E6=94=B9,=E6=96=B0=E5=A2=9EUsbPortAndFunctio?= =?UTF-8?q?nJsunit.test.js=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lixiaofeng_154b Change-Id: I4cfd75ee15791600f426ff981acab685b8f335fd --- .../src/main/js/default/test/ListUsb.test.js | 1 + .../default/test/UsbFunctionsJsunit.test.js | 104 --------- .../test/UsbPortAndFunctionJsunit.test.js | 213 ++++++++++++++++++ .../js/default/test/UsbPortJsunit.test.js | 59 ----- 4 files changed, 214 insertions(+), 163 deletions(-) create mode 100644 usb/usb_standard/src/main/js/default/test/UsbPortAndFunctionJsunit.test.js diff --git a/usb/usb_standard/src/main/js/default/test/ListUsb.test.js b/usb/usb_standard/src/main/js/default/test/ListUsb.test.js index 5b6a5f44d..e565d2f46 100755 --- a/usb/usb_standard/src/main/js/default/test/ListUsb.test.js +++ b/usb/usb_standard/src/main/js/default/test/ListUsb.test.js @@ -27,5 +27,6 @@ require('./UsbFunctionsJsunitEx.test.js') /* device and host test case */ require('./UsbPortJsunit.test.js') require('./UsbPortJsunitEx.test.js') +// require('./UsbPortAndFunctionJsunit.test.js') require('./UsbAutoJsunit.test.js') diff --git a/usb/usb_standard/src/main/js/default/test/UsbFunctionsJsunit.test.js b/usb/usb_standard/src/main/js/default/test/UsbFunctionsJsunit.test.js index 541a009ec..2a4f0e330 100755 --- a/usb/usb_standard/src/main/js/default/test/UsbFunctionsJsunit.test.js +++ b/usb/usb_standard/src/main/js/default/test/UsbFunctionsJsunit.test.js @@ -95,108 +95,4 @@ describe('UsbFunctionsJsFunctionsTest', function () { console.info('usb SUB_USB_JS_0340 : PASS'); }) - function callSetCurFunction(caseName, iValue) { - CheckEmptyUtils.sleep(3000) - console.info('usb case param case name:' + caseName); - console.info('usb case param iValue:' + iValue); - usb.setCurrentFunctions(iValue).then(data => { - console.info('usb case SetCurFunction ret:' + data); - expect(data).assertTrue(); - console.info('usb case ' + caseName + ': PASS'); - }).catch(error => { - console.info('usb case ' + caseName + ' error : ' + error); - expect(false).assertTrue(); - }); - } - - /** - * @tc.number : SUB_USB_JS_0350 - * @tc.name : functions_test - * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 1 设置为ACM功能 - */ - it('SUB_USB_JS_0350', 0, function () { - CheckEmptyUtils.sleep(3000) - console.info('usb SUB_USB_JS_0350 set ACM begin'); - var maskCode = usb.getCurrentFunctions(); - console.info('usb case getCurrentFunctions return: ' + maskCode); - var funcString = usb.usbFunctionsToString(maskCode); - console.info('usb case funcString:' + funcString); - callSetCurFunction('SUB_USB_JS_0350 ACM 1', usb.ACM) - }) - - /** - * @tc.number : SUB_USB_JS_0360 - * @tc.name : functions_test - * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 2 设置为ECM功能 - */ - it('SUB_USB_JS_0360', 0, function () { - CheckEmptyUtils.sleep(3000) - console.info('usb SUB_USB_JS_0360 set ECM begin'); - var maskCode = usb.getCurrentFunctions(); - console.info('usb case getCurrentFunctions return: ' + maskCode); - var funcString = usb.usbFunctionsToString(maskCode); - console.info('usb case funcString:' + funcString); - callSetCurFunction('SUB_USB_JS_0360 ECM 2', usb.ECM) - }) - - /** - * @tc.number : SUB_USB_JS_0370 - * @tc.name : functions_test - * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 3 设置为ACM、ECM功能 - */ - it('SUB_USB_JS_0370', 0, function () { - CheckEmptyUtils.sleep(3000) - console.info('usb SUB_USB_JS_0370 set ACM ECM begin'); - var maskCode = usb.getCurrentFunctions(); - console.info('usb case getCurrentFunctions return: ' + maskCode); - var funcString = usb.usbFunctionsToString(maskCode); - console.info('usb case funcString:' + funcString); - callSetCurFunction('SUB_USB_JS_0370 ACM ECM 3', (usb.ACM | usb.ECM)) - }) - - /** - * @tc.number : SUB_USB_JS_0380 - * @tc.name : functions_test - * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 4 设置为HDC功能 - */ - it('SUB_USB_JS_0380', 0, function () { - CheckEmptyUtils.sleep(3000) - console.info('usb SUB_USB_JS_0380 set HDC begin'); - var maskCode = usb.getCurrentFunctions(); - console.info('usb case getCurrentFunctions return: ' + maskCode); - var funcString = usb.usbFunctionsToString(maskCode); - console.info('usb case funcString:' + funcString); - callSetCurFunction('SUB_USB_JS_0380 HDC 4', usb.HDC) - }) - - /** - * @tc.number : SUB_USB_JS_0390 - * @tc.name : functions_test - * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 5 设置为ACM、HDC功能 - */ - it('SUB_USB_JS_0390', 0, function () { - CheckEmptyUtils.sleep(3000) - console.info('usb SUB_USB_JS_0390 set ACM HDC begin'); - var maskCode = usb.getCurrentFunctions(); - console.info('usb case getCurrentFunctions return: ' + maskCode); - var funcString = usb.usbFunctionsToString(maskCode); - console.info('usb case funcString:' + funcString); - callSetCurFunction('SUB_USB_JS_0390 ACM HDC 5', (usb.HDC | usb.ACM)) - }) - - /** - * @tc.number : SUB_USB_JS_0400 - * @tc.name : functions_test - * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 6 设置为ECM、HDC功能 - */ - it('SUB_USB_JS_0400', 0, function () { - CheckEmptyUtils.sleep(3000) - console.info('usb SUB_USB_JS_0400 set ECM HDC begin'); - var maskCode = usb.getCurrentFunctions(); - console.info('usb case getCurrentFunctions return: ' + maskCode); - var funcString = usb.usbFunctionsToString(maskCode); - console.info('usb case funcString:' + funcString); - callSetCurFunction('SUB_USB_JS_0400 ECM HDC 6', (usb.HDC | usb.ECM)) - }) - }) diff --git a/usb/usb_standard/src/main/js/default/test/UsbPortAndFunctionJsunit.test.js b/usb/usb_standard/src/main/js/default/test/UsbPortAndFunctionJsunit.test.js new file mode 100644 index 000000000..564c31b11 --- /dev/null +++ b/usb/usb_standard/src/main/js/default/test/UsbPortAndFunctionJsunit.test.js @@ -0,0 +1,213 @@ +/* + * Copyright (c) 2021-2022 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import usb from '@ohos.usb'; +import CheckEmptyUtils from './CheckEmptyUtils.js'; +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' + +/* usb core functions test */ +describe('UsbPortAndFunctionsJsFunctionsTest', function () { + + beforeAll(function () { + console.log('*************Usb Unit UsbPortAndFunctionsJsFunctionsTest Begin*************'); + var Version = usb.getVersion() + console.info('begin test getversion :' + Version) + // version > 17 host currentMode = 2 device currentMode = 1 + var usbPortList = usb.getPorts() + if (usbPortList.length > 0) { + if (usbPortList[0].status.currentMode == 2) { + usb.setPortRoles(usbPortList[0].id, usb.SINK, usb.DEVICE).then(data => { + console.info('usb case setPortRoles return: ' + data); + }).catch(error => { + console.info('usb case setPortRoles error : ' + error); + }); + console.log('*************Usb Unit switch to device Begin*************'); + } + } + }) + beforeEach(function () { + console.info('beforeEach: *************Usb Unit Test Case*************'); + }) + afterEach(function () { + console.info('afterEach: *************Usb Unit Test Case*************'); + }) + afterAll(function () { + console.log('*************Usb Unit UsbPortAndFunctionsJsFunctionsTest End*************'); + }) + + function callSetCurFunction(caseName, iValue) { + CheckEmptyUtils.sleep(3000) + console.info('usb case param case name:' + caseName); + console.info('usb case param iValue:' + iValue); + usb.setCurrentFunctions(iValue).then(data => { + console.info('usb case SetCurFunction ret:' + data); + expect(data).assertTrue(); + console.info('usb case ' + caseName + ': PASS'); + }).catch(error => { + console.info('usb case ' + caseName + ' error : ' + error); + expect(false).assertTrue(); + }); + } + + /** + * @tc.number : SUB_USB_JS_0350 + * @tc.name : functions_test + * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 1 设置为ACM功能 + */ + it('SUB_USB_JS_0350', 0, function () { + CheckEmptyUtils.sleep(3000) + console.info('usb SUB_USB_JS_0350 set ACM begin'); + var maskCode = usb.getCurrentFunctions(); + console.info('usb case getCurrentFunctions return: ' + maskCode); + var funcString = usb.usbFunctionsToString(maskCode); + console.info('usb case funcString:' + funcString); + callSetCurFunction('SUB_USB_JS_0350 ACM 1', usb.ACM) + }) + + // /** + // * @tc.number : SUB_USB_JS_0360 + // * @tc.name : functions_test + // * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 2 设置为ECM功能 + // */ + it('SUB_USB_JS_0360', 0, function () { + CheckEmptyUtils.sleep(3000) + console.info('usb SUB_USB_JS_0360 set ECM begin'); + var maskCode = usb.getCurrentFunctions(); + console.info('usb case getCurrentFunctions return: ' + maskCode); + var funcString = usb.usbFunctionsToString(maskCode); + console.info('usb case funcString:' + funcString); + callSetCurFunction('SUB_USB_JS_0360 ECM 2', usb.ECM) + }) + + // /** + // * @tc.number : SUB_USB_JS_0370 + // * @tc.name : functions_test + // * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 3 设置为ACM、ECM功能 + // */ + it('SUB_USB_JS_0370', 0, function () { + CheckEmptyUtils.sleep(3000) + console.info('usb SUB_USB_JS_0370 set ACM ECM begin'); + var maskCode = usb.getCurrentFunctions(); + console.info('usb case getCurrentFunctions return: ' + maskCode); + var funcString = usb.usbFunctionsToString(maskCode); + console.info('usb case funcString:' + funcString); + callSetCurFunction('SUB_USB_JS_0370 ACM ECM 3', (usb.ACM | usb.ECM)) + }) + + /** + * @tc.number : SUB_USB_JS_0380 + * @tc.name : functions_test + * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 4 设置为HDC功能 + */ + it('SUB_USB_JS_0380', 0, function () { + CheckEmptyUtils.sleep(3000) + console.info('usb SUB_USB_JS_0380 set HDC begin'); + var maskCode = usb.getCurrentFunctions(); + console.info('usb case getCurrentFunctions return: ' + maskCode); + var funcString = usb.usbFunctionsToString(maskCode); + console.info('usb case funcString:' + funcString); + callSetCurFunction('SUB_USB_JS_0380 HDC 4', usb.HDC) + }) + + /** + * @tc.number : SUB_USB_JS_0390 + * @tc.name : functions_test + * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 5 设置为ACM、HDC功能 + */ + it('SUB_USB_JS_0390', 0, function () { + CheckEmptyUtils.sleep(3000) + console.info('usb SUB_USB_JS_0390 set ACM HDC begin'); + var maskCode = usb.getCurrentFunctions(); + console.info('usb case getCurrentFunctions return: ' + maskCode); + var funcString = usb.usbFunctionsToString(maskCode); + console.info('usb case funcString:' + funcString); + callSetCurFunction('SUB_USB_JS_0390 ACM HDC 5', (usb.HDC | usb.ACM)) + }) + + /** + * @tc.number : SUB_USB_JS_0400 + * @tc.name : functions_test + * @tc.desc : 在设备模式下设置当前的USB功能列表 Set 6 设置为ECM、HDC功能 + */ + it('SUB_USB_JS_0400', 0, function () { + CheckEmptyUtils.sleep(3000) + console.info('usb SUB_USB_JS_0400 set ECM HDC begin'); + var maskCode = usb.getCurrentFunctions(); + console.info('usb case getCurrentFunctions return: ' + maskCode); + var funcString = usb.usbFunctionsToString(maskCode); + console.info('usb case funcString:' + funcString); + callSetCurFunction('SUB_USB_JS_0400 ECM HDC 6', (usb.HDC | usb.ECM)) + }) + + /** + * @tc.number : SUB_USB_JS_0010 + * @tc.name : setPortRoles + * @tc.desc : 切换为Device set powerRole 2 DataRole 2 + */ + it('SUB_USB_JS_0010', 0, function () { + console.info('usb SUB_USB_JS_0010 device 2 2 begin'); + var usbPortList = usb.getPorts() + if (usbPortList.length == 0) { + console.info('usb SUB_USB_JS_0010 device 2 2 usbPortList is null'); + expect(false).assertTrue(); + return + } + + for (var i = 0; i < usbPortList.length; i++) { + console.info('usb case set data role 2, data role 2'); + usb.setPortRoles(usbPortList[i].id, usb.SINK, usb.DEVICE).then(data => { + console.info('usb case setPortRoles return: ' + data); + expect(data).assertTrue(); + }).catch(error => { + console.info('usb case setPortRoles error : ' + error); + expect(false).assertTrue(); + }); + } + + console.info('usb SUB_USB_JS_0010 device 2 2: PASS'); + expect(true).assertTrue(); + }) + + /** + * @tc.number : SUB_USB_JS_0020 + * @tc.name : setPortRoles + * @tc.desc : 切换为host set powerRole 1 DataRole 1 + */ + it('SUB_USB_JS_0020', 0, function () { + console.info('usb SUB_USB_JS_0020 host 1 1 begin'); + var usbPortList = usb.getPorts() + if (usbPortList.length == 0) { + console.info('usb SUB_USB_JS_0020 host 1 1 usbPortList is null'); + expect(false).assertTrue(); + return + } + + for (var i = 0; i < usbPortList.length; i++) { + console.info('usb case set data role 1, data role 1'); + CheckEmptyUtils.sleep(5000) + usb.setPortRoles(usbPortList[i].id, usb.SOURCE, usb.HOST).then(data => { + expect(data).assertTrue(); + console.info('usb case setPortRoles return: ' + data); + }).catch(error => { + console.info('usb case setPortRoles error : ' + error); + expect(false).assertTrue(); + }); + } + + console.info('usb SUB_USB_JS_0020 host 1 1: PASS'); + expect(true).assertTrue(); + }) + +}) diff --git a/usb/usb_standard/src/main/js/default/test/UsbPortJsunit.test.js b/usb/usb_standard/src/main/js/default/test/UsbPortJsunit.test.js index a80e07bf8..2a03aca2b 100755 --- a/usb/usb_standard/src/main/js/default/test/UsbPortJsunit.test.js +++ b/usb/usb_standard/src/main/js/default/test/UsbPortJsunit.test.js @@ -77,63 +77,4 @@ describe('UsbPortJsFunctionsTest', function () { expect(true).assertTrue(); }) - /** - * @tc.number : SUB_USB_JS_0010 - * @tc.name : setPortRoles - * @tc.desc : 切换为Device set powerRole 2 DataRole 2 - */ - it('SUB_USB_JS_0010', 0, function () { - console.info('usb SUB_USB_JS_0010 device 2 2 begin'); - var usbPortList = usb.getPorts() - if (usbPortList.length == 0) { - console.info('usb SUB_USB_JS_0010 device 2 2 usbPortList is null'); - expect(false).assertTrue(); - return - } - - for (var i = 0; i < usbPortList.length; i++) { - console.info('usb case set data role 2, data role 2'); - usb.setPortRoles(usbPortList[i].id, usb.SINK, usb.DEVICE).then(data => { - console.info('usb case setPortRoles return: ' + data); - expect(data).assertTrue(); - }).catch(error => { - console.info('usb case setPortRoles error : ' + error); - expect(false).assertTrue(); - }); - } - - console.info('usb SUB_USB_JS_0010 device 2 2: PASS'); - expect(true).assertTrue(); - }) - - /** - * @tc.number : SUB_USB_JS_0020 - * @tc.name : setPortRoles - * @tc.desc : 切换为host set powerRole 1 DataRole 1 - */ - it('SUB_USB_JS_0020', 0, function () { - console.info('usb SUB_USB_JS_0020 host 1 1 begin'); - var usbPortList = usb.getPorts() - if (usbPortList.length == 0) { - console.info('usb SUB_USB_JS_0020 host 1 1 usbPortList is null'); - expect(false).assertTrue(); - return - } - - for (var i = 0; i < usbPortList.length; i++) { - console.info('usb case set data role 1, data role 1'); - CheckEmptyUtils.sleep(5000) - usb.setPortRoles(usbPortList[i].id, usb.SOURCE, usb.HOST).then(data => { - expect(data).assertTrue(); - console.info('usb case setPortRoles return: ' + data); - }).catch(error => { - console.info('usb case setPortRoles error : ' + error); - expect(false).assertTrue(); - }); - } - - console.info('usb SUB_USB_JS_0020 host 1 1: PASS'); - expect(true).assertTrue(); - }) - }) -- GitLab