!5935 【xts_acts】【master】用例优化,if条件修改

Merge pull request !5935 from 李晓枫/usb1017_js

!5935 【xts_acts】【master】用例优化,if条件修改
Merge pull request !5935 from 李晓枫/usb1017_js
ef77a260 · openharmony_ci · Gitee · 17479549 · abd110b2 · ef77a260
3 changed file
--- a/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunit.test.js
+++ b/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunit.test.js
@@ -77,7 +77,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
        if (endpoint.direction == usb.USB_REQUEST_DIR_TO_DEVICE) {
          testParam.maxOutSize = endpoint.maxPacketSize;
          testParam.outEndpoint = endpoint;
-        } else if (endpoint.direction == usb.USB_REQUEST_DIR_FROM_DEVICE) {
+        } else if (endpoint.direction == (usb.USB_REQUEST_DIR_FROM_DEVICE << 7)) {
          testParam.maxInSize = endpoint.maxPacketSize;
          testParam.inEndpoint = endpoint
        }
@@ -412,7 +412,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
      expect(true).assertTrue();
    }).catch(error => {
      console.info('usb controlTransfer error : ' + JSON.stringify(error));
-      console.info('usb' + caseName + ':  PASS');
+      console.info('usb' + caseName + ':  FAILED');
      expect(false).assertTrue();
    });
    CheckEmptyUtils.sleep(3000);
@@ -421,7 +421,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
  /**
   * @tc.number    : SUB_USB_JS_0540
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 GetDescriptor: cmd 6 reqType 128 value 512 index 0
+   * @tc.desc      : 控制传输 GetDescriptor: cmd 6 target 2 reqType 128 value 512 index 0
   */
  it('SUB_USB_JS_0540', 0, function () {
    console.info('usb SUB_USB_JS_0540 begin');
@@ -445,7 +445,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
  /**
   * @tc.number    : SUB_USB_JS_0550
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 GetStatus: cmd 0 reqType 128 value 0 index 0
+   * @tc.desc      : 控制传输 GetStatus: cmd 0 target 0 reqType 128 value 0 index 0
   */
  it('SUB_USB_JS_0550', 0, function () {
    console.info('usb SUB_USB_JS_0550 begin');
@@ -469,7 +469,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
  /**
   * @tc.number    : SUB_USB_JS_0560
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 GetConfiguration: cmd 8 reqType 128 value 0 index 0
+   * @tc.desc      : 控制传输 GetConfiguration: cmd 8 target 0 reqType 128 value 0 index 0
   */
  it('SUB_USB_JS_0560', 0, function () {
    console.info('usb SUB_USB_JS_0560 begin');
@@ -493,7 +493,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
  /**
   * @tc.number    : SUB_USB_JS_0570
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 GetInterface: cmd 8 reqType 129 value 0 index 1
+   * @tc.desc      : 控制传输 GetInterface: cmd 10 target 0 reqType 129 value 0 index 1
   */
  it('SUB_USB_JS_0570', 0, function () {
    console.info('usb SUB_USB_JS_0570 begin');
@@ -517,7 +517,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
  /**
   * @tc.number    : SUB_USB_JS_0580
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 ClearFeature: cmd 1 reqType 0 value 0 index 0
+   * @tc.desc      : 控制传输 ClearFeature: cmd 1 target 0 reqType 0 value 0 index 0
   */
  it('SUB_USB_JS_0580', 0, function () {
    console.info('usb SUB_USB_JS_0580 begin');
@@ -541,7 +541,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
  /**
   * @tc.number    : SUB_USB_JS_0590
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 129 value 512 index 0
+   * @tc.desc      : 控制传输 ClearFeature: cmd 255 target 1 reqType 129 value 512 index 0
   */
   it('SUB_USB_JS_0590', 0, function () {
    console.info('usb SUB_USB_JS_0590 begin');
@@ -565,7 +565,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
  /**
   * @tc.number    : SUB_USB_JS_0600
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 3 value 512 index 0
+   * @tc.desc      : 控制传输 ClearFeature: cmd 255 target 2 reqType 34 value 512 index 0
   */
   it('SUB_USB_JS_0600', 0, function () {
    console.info('usb SUB_USB_JS_0600 begin');
@@ -589,7 +589,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
  /**
   * @tc.number    : SUB_USB_JS_0610
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 5 value 512 index 0
+   * @tc.desc      : 控制传输 ClearFeature: cmd 255 target 3 reqType 67 value 512 index 0
   */
    it('SUB_USB_JS_0610', 0, function () {
      console.info('usb SUB_USB_JS_0610 begin');
@@ -613,7 +613,7 @@ describe('UsbDevicePipeJsFunctionsTest', function () {
  /**
   * @tc.number    : SUB_USB_JS_0620
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 4 value 0 index 0
+   * @tc.desc      : 控制传输 ClearFeature: cmd 255 target 3 reqType 35 value 0 index 0
   */
      it('SUB_USB_JS_0620', 0, function () {
        console.info('usb SUB_USB_JS_0620 begin');

--- a/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunitEx.test.js
+++ b/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunitEx.test.js
@@ -77,7 +77,7 @@ describe('UsbDevicePipeJsFunctionsTestEx', function () {
        if (endpoint.direction == usb.USB_REQUEST_DIR_TO_DEVICE) {
          testParam.outEndpoint = endpoint;
          testParam.maxOutSize = endpoint.maxPacketSize;
-        } else if (endpoint.direction == usb.USB_REQUEST_DIR_FROM_DEVICE) {
+        } else if (endpoint.direction == (usb.USB_REQUEST_DIR_FROM_DEVICE << 7)) {
          testParam.inEndpoint = endpoint
          testParam.maxInSize = endpoint.maxPacketSize;
        }

--- a/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunit_A.test.js
+++ b/usb/usb_standard/src/main/js/test/UsbDevicePipeJsunit_A.test.js
@@ -427,7 +427,7 @@ describe('UsbDevicePipeJsFunctionsTestA', function () {
      expect(true).assertTrue();
    }).catch(error => {
      console.info('usb controlTransfer error : ' + JSON.stringify(error));
-      console.info('usb' + caseName + ':  PASS');
+      console.info('usb' + caseName + ':  FAILED');
      expect(false).assertTrue();
    });
    CheckEmptyUtils.sleep(3000);
@@ -508,7 +508,7 @@ describe('UsbDevicePipeJsFunctionsTestA', function () {
  /**
   * @tc.number    : SUB_USB_JS_0570
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 GetInterface: cmd 8 reqType 129 value 0 index 1
+   * @tc.desc      : 控制传输 GetInterface: cmd 10 reqType 129 value 0 index 1
   */
  it('SUB_USB_JS_0570', 0, function () {
    console.info('usb SUB_USB_JS_0570 begin');
@@ -580,7 +580,7 @@ describe('UsbDevicePipeJsFunctionsTestA', function () {
  /**
   * @tc.number    : SUB_USB_JS_0600
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 3 value 512 index 0
+   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 34 value 512 index 0
   */
   it('SUB_USB_JS_0600', 0, function () {
    console.info('usb SUB_USB_JS_0600 begin');
@@ -604,7 +604,7 @@ describe('UsbDevicePipeJsFunctionsTestA', function () {
  /**
   * @tc.number    : SUB_USB_JS_0610
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 5 value 512 index 0
+   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 67 value 512 index 0
   */
    it('SUB_USB_JS_0610', 0, function () {
      console.info('usb SUB_USB_JS_0610 begin');
@@ -628,7 +628,7 @@ describe('UsbDevicePipeJsFunctionsTestA', function () {
  /**
   * @tc.number    : SUB_USB_JS_0620
   * @tc.name      : controlTransfer
-   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 4 value 0 index 0
+   * @tc.desc      : 控制传输 ClearFeature: cmd 255 reqType 35 value 0 index 0
   */
      it('SUB_USB_JS_0620', 0, function () {
        console.info('usb SUB_USB_JS_0620 begin');