From a015072a7e32d2f4de0175085b84e692f6898bfc Mon Sep 17 00:00:00 2001 From: chensheng Date: Thu, 8 Nov 2018 11:23:59 +0800 Subject: [PATCH] test: bugfix create service check message change for v3.1 --- .../integration_test/TC_IT_BTSTK_GATT.yml | 59 ++++++++++++++----- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/components/idf_test/integration_test/TC_IT_BTSTK_GATT.yml b/components/idf_test/integration_test/TC_IT_BTSTK_GATT.yml index f6e1be536..8a0f6fc8b 100644 --- a/components/idf_test/integration_test/TC_IT_BTSTK_GATT.yml +++ b/components/idf_test/integration_test/TC_IT_BTSTK_GATT.yml @@ -22,9 +22,11 @@ .included_service_connection: &included_primary_service_connection LIST_MERGE: - - "SSC SSC2 gatts -S -z load -p 0xA1" - - ["R SSC2 C +GATTS:LoadProfile,OK,A001", "R SSC2 C +GATTS:StartService,OK,A001"] + - ["R SSC2 C +GATTS:CreateService,OK,A001"] - - "SSC SSC2 gatts -S -z include -p 0xA1 -i 0xA0" - ["R SSC2 C +GATTS:AddIncludedService,OK"] + - - "SSC SSC2 gatts -S -z add -p 0xA1" + - ["R SSC2 C +GATTS:StartService,OK,A001"] - - SSC SSC1 gattc -F -r - ['R SSC1 C +GATTC:OK'] - - "SSC SSC1 bleconn -C -p 0x10 -a " @@ -35,7 +37,9 @@ - - "SSC SSC2 gatts -S -z load -p 0xA4" - ["R SSC2 C +GATTS:StartService,OK,A004"] - - "SSC SSC2 gatts -S -z load -p 0xA1" - - ["R SSC2 C +GATTS:LoadProfile,OK,A001", "R SSC2 C +GATTS:StartService,OK,A001"] + - ["R SSC2 C +GATTS:CreateService,OK,A001"] + - - "SSC SSC1 gatts -S -z add -p 0xA1" + - ["R SSC1 C +GATTS:StartService,OK,A001"] - - "SSC SSC2 gatts -S -z include -p 0xA1 -i 0xA4" - ["R SSC2 C +GATTS:AddIncludedService,OK"] - - SSC SSC1 gattc -F -r @@ -102,6 +106,8 @@ test cases: - - "SSC SSC1 gatts -S -z load -p 0xA0" - ["R SSC1 C +GATTS:StartService,OK,A000"] - - "SSC SSC1 gatts -S -z load -p 0xA1" + - ["R SSC1 C +GATTS:CreateService,OK,A001"] + - - "SSC SSC1 gatts -S -z add -p 0xA1" - ["R SSC1 C +GATTS:StartService,OK,A001"] - ID: BTSTK_GATT_20001 <<: *GATT_CASE @@ -123,6 +129,8 @@ test cases: - *included_primary_service_connection - - "SSC SSC1 gattc -D -z primaryService -p 0x10" - ["R SSC1 C +GATTC:DiscoverService,A000 C +GATTC:DiscoverService,A001"] + - - SSC SSC1 gattc -F -r + - ['R SSC1 C +GATTC:OK'] - ID: BTSTK_GATT_20002 <<: *GATT_CASE test point 2: BLE GATT client service / char discovery @@ -147,6 +155,8 @@ test cases: - ["R SSC1 C +GATTC:DiscoverService,A000 A :GATTC:DiscoverService,A001,(\\d+-\\d+)"] - - "SSC SSC1 gattc -D -z includedService -p 0x10 -s 0xA001 -i 0xA000 -q -k 1" - ["R SSC1 C +GATTC:IncludedService,0010,A001,A000"] + - - SSC SSC1 gattc -F -r + - ['R SSC1 C +GATTC:OK'] - ID: BTSTK_GATT_20003 <<: *GATT_CASE test point 2: BLE GATT client service / char discovery @@ -713,7 +723,7 @@ test cases: cmd set: - "" - - "SSC SSC2 gatts -S -z load -p 0xA1" - - ["R SSC2 C +GATTS:StartService,OK,A001"] + - ["R SSC2 C +GATTS:CreateService,OK,A001"] - - SSC SSC1 gattc -F -r - ['R SSC1 C +GATTC:OK'] - - "SSC SSC1 bleconn -C -p 0x10 -a " @@ -742,7 +752,7 @@ test cases: cmd set: - "" - - "SSC SSC2 gatts -S -z load -p 0xA1" - - ["R SSC2 C +GATTS:StartService,OK,A001"] + - ["R SSC2 C +GATTS:CreateService,OK,A001"] - - SSC SSC1 gattc -F -r - ['R SSC1 C +GATTC:OK'] - - "SSC SSC1 bleconn -C -p 0x10 -a " @@ -1008,7 +1018,7 @@ test cases: cmd set: - "" - - "SSC SSC2 gatts -S -z load -p 0xA1" - - ["R SSC2 C +GATTS:StartService,OK,A001"] + - ["R SSC2 C +GATTS:CreateService,OK,A001"] - - SSC SSC1 gattc -F -r - ['R SSC1 C +GATTC:OK'] - - "SSC SSC1 bleconn -C -p 0x10 -a " @@ -1036,7 +1046,7 @@ test cases: cmd set: - "" - - "SSC SSC2 gatts -S -z load -p 0xA1" - - ["R SSC2 C +GATTS:StartService,OK,A001"] + - ["R SSC2 C +GATTS:CreateService,OK,A001"] - - SSC SSC1 gattc -F -r - ['R SSC1 C +GATTC:OK'] - - "SSC SSC1 bleconn -C -p 0x10 -a " @@ -1805,9 +1815,9 @@ test cases: cmd set: - "" - *primary_service_discovery - - - "SSC SSC1 gattc -W -z char -s 0xA002 -c 0xC302 -p 0x10 -v -x01 -w 1" + - - "SSC SSC1 gattc -W -z char -s 0xA002 -c 0xC302 -p 0x10 -v 0x01 -w 1" - ["R SSC1 C +GATTC:Write,OK"] - - - "SSC SSC1 gattc -W -z char -s 0xA002 -c 0xC302 -p 0x10 -v -x01 -w 1" + - - "SSC SSC1 gattc -W -z char -s 0xA002 -c 0xC302 -p 0x10 -v 0x01 -w 1" - ["R SSC1 C +GATTC:Write,OK"] - ID: BTSTK_GATT_25015 <<: *GATT_CASE @@ -2002,6 +2012,7 @@ test cases: - ["R SSC1 C +GATTC:WriteOnce,0010,A000,C109"] - ID: BTSTK_GATT_27001 <<: *GATT_CASE + CI ready: 'No' test point 2: BLE GATT read multiple summary: GATT client read 2 char and 11 char of same service steps: | @@ -2021,6 +2032,7 @@ test cases: - ['R SSC1 C +GATTC:Read,ERROR'] - ID: BTSTK_GATT_27002 <<: *GATT_CASE + CI ready: 'No' test point 2: BLE GATT read multiple summary: GATT client read char and descriptor steps: | @@ -2036,6 +2048,25 @@ test cases: - ['R SSC1 C +GATTC:ReadOnce', 'R SSC1 C +GATTC:ReadMultiple,OK'] - ID: BTSTK_GATT_27003 <<: *GATT_CASE + CI ready: 'No' + test point 2: BLE GATT read multiple + summary: GATT client read char and descriptor of table create service + steps: | + 1. DUT1 do discover + 2. GATT client read all char and descriptor + expected result: | + 1. succeed + 2. succeed + cmd set: + - "" + - - "SSC SSC2 gatts -S -z load -p 0xA2" + - ['R SSC2 C +GATTS:StartService,OK,A002'] + - *primary_service_discovery + - - "SSC SSC1 gattc -R -z multiple -u 0xA20xC300#0xA20xC301#0xA20xC310#0xA20xC311#" + - ['R SSC1 C +GATTC:ReadOnce', 'R SSC1 C +GATTC:ReadMultiple,OK'] +- ID: BTSTK_GATT_27004 + <<: *GATT_CASE + CI ready: 'No' test point 2: BLE GATT read multiple summary: GATT client read char and descriptor of included service and table service initial condition: BLE_INIT2 @@ -2861,9 +2892,9 @@ test cases: - "" - - gatt_op = "write" - "" - - - op_char = "0xC304" + - - op_char = "0xC317" - "" - - - op_len = 256 + - - op_len = 490 - "" - - master_duts = ["SSC1"] - "" @@ -2894,9 +2925,9 @@ test cases: - "" - - gatt_op = "write" - "" - - - op_char = "0xC304" + - - op_char = "0xC317" - "" - - - op_len = 256 + - - op_len = 490 - "" - - master_duts = ["SSC2", "SSC3", "SSC4", "SSC5"] - "" @@ -2929,7 +2960,7 @@ test cases: - "" - - op_char = "0xC305" - "" - - - op_len = 256 + - - op_len = 490 - "" - - master_duts = ["SSC1"] - "" @@ -2962,7 +2993,7 @@ test cases: - "" - - op_char = "0xC305" - "" - - - op_len = 256 + - - op_len = 490 - "" - - master_duts = ["SSC2", "SSC3", "SSC4", "SSC5"] - ""