From d5e336aa5e41ebb11d72a5507e4e117bd5abbea0 Mon Sep 17 00:00:00 2001
From: Milanka Ringwald <mila@ringwald.ch>
Date: Thu, 7 Jan 2016 15:43:11 +0100
Subject: [PATCH 1/5] hfp test: HF TWC enabled

---
 src/hfp_hf.c                  |   4 +
 src/hfp_hf.h                  |   1 +
 test/hfp/hfp_hf_client_test.c |  10 +-
 test/hfp/test_sequences.c     | 259 ++++++++++++----------------------
 4 files changed, 105 insertions(+), 169 deletions(-)

diff --git a/src/hfp_hf.c b/src/hfp_hf.c
index 0d2b2ef71..dc22920d0 100644
--- a/src/hfp_hf.c
+++ b/src/hfp_hf.c
@@ -1063,6 +1063,10 @@ void hfp_hf_init(uint16_t rfcomm_channel_nr, uint32_t supported_features, uint16
     }
 }
 
+void hfp_hf_set_supported_features(bd_addr_t bd_addr, uint32_t supported_features){
+    hfp_supported_features = supported_features;
+}
+
 void hfp_hf_establish_service_level_connection(bd_addr_t bd_addr){
     hfp_establish_service_level_connection(bd_addr, SDP_HandsfreeAudioGateway);
 }
diff --git a/src/hfp_hf.h b/src/hfp_hf.h
index b8b8bbf70..5e764e50f 100644
--- a/src/hfp_hf.h
+++ b/src/hfp_hf.h
@@ -83,6 +83,7 @@ void hfp_hf_register_packet_handler(hfp_callback_t callback);
  * - retrieve which HF indicators are enabled on the AG, if possible
  */
 void hfp_hf_establish_service_level_connection(bd_addr_t bd_addr);
+void hfp_hf_set_supported_features(uint32_t supported_features);
 
 /**
  * @brief Release the RFCOMM channel and the audio connection between the HF and the AG. 
diff --git a/test/hfp/hfp_hf_client_test.c b/test/hfp/hfp_hf_client_test.c
index 96597272b..f3e78f391 100644
--- a/test/hfp/hfp_hf_client_test.c
+++ b/test/hfp/hfp_hf_client_test.c
@@ -312,12 +312,16 @@ static void user_command(char cmd){
 
 void simulate_test_sequence(hfp_test_item_t * test_item){
     char ** test_steps = test_item->test;
-    printf("\nSimulate test sequence: \"%s\"\n", test_item->name);
+    printf("\nSimulate test sequence: \"%s\" [%d steps]\n", test_item->name, test_item->len);
 
     int i = 0;
+    int previous_step = -1;
     while ( i < test_item->len){
+        previous_step++;
+        if (i < previous_step) exit(0);
         char * expected_cmd = test_steps[i];
         int expected_cmd_len = strlen(expected_cmd);
+        // printf("\nStep %d, %s \n", i, expected_cmd);
         
         if (strncmp(expected_cmd, "USER:", 5) == 0){
             user_command(expected_cmd[5]);
@@ -343,6 +347,7 @@ void simulate_test_sequence(hfp_test_item_t * test_item){
             int supported_features = 0;
             sscanf(&expected_cmd[8],"%d", &supported_features);
             printf("Call hfp_hf_init with SF %d\n", supported_features);
+            hfp_hf_release_service_level_connection(device_addr);
             hfp_hf_init(rfcomm_channel_nr, supported_features, indicators, sizeof(indicators)/sizeof(uint16_t), 1);
             user_command('a');
             while (has_more_hfp_hf_commands()){
@@ -361,7 +366,7 @@ void simulate_test_sequence(hfp_test_item_t * test_item){
             printf("\n---> NEXT STEP expect from HF: %s\n", expected_cmd);
             while (has_more_hfp_hf_commands()){
                 char * ag_cmd = get_next_hfp_hf_command();
-                //printf("HF response verify %s == %s[%d]\n", expected_cmd, ag_cmd, expected_cmd_len);
+                printf("HF response verify %s == %s[%d]\n", expected_cmd, ag_cmd, expected_cmd_len);
 
                 int equal_cmds = strncmp(ag_cmd, expected_cmd, expected_cmd_len) == 0;
                 if (!equal_cmds){
@@ -487,6 +492,7 @@ TEST_GROUP(HFPClient){
     }
 };
 
+
 TEST(HFPClient, PTSRHHTests){
     for (int i = 0; i < hfp_pts_hf_rhh_tests_size(); i++){
         simulate_test_sequence(&hfp_pts_hf_rhh_tests()[i]);
diff --git a/test/hfp/test_sequences.c b/test/hfp/test_sequences.c
index ad0cc830f..26f566d3d 100644
--- a/test/hfp/test_sequences.c
+++ b/test/hfp/test_sequences.c
@@ -1138,20 +1138,17 @@ const char * TC_HF_TWC_BV_02_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 4,1" ,
     "+CIEV: 2,0" ,
@@ -1168,7 +1165,7 @@ const char * TC_HF_TWC_BV_02_I[] = {
     "OK" ,
     "AT+CHLD=?" ,
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
-    "OK" ,
+    "OK",
     "AT+VGM=9" ,
     "AT+VGS=9" ,
     "+BSIR: 0" ,
@@ -1176,8 +1173,7 @@ const char * TC_HF_TWC_BV_02_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -1204,15 +1200,13 @@ const char * TC_HF_TWC_BV_02_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,// "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 2,0"
@@ -1242,20 +1236,17 @@ const char * TC_HF_TWC_BV_03_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 4,1" ,
     "+CIEV: 2,0" ,
@@ -1280,8 +1271,7 @@ const char * TC_HF_TWC_BV_03_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -1308,15 +1298,13 @@ const char * TC_HF_TWC_BV_03_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 2,0" ,
@@ -1335,8 +1323,8 @@ const char * TC_HF_TWC_BV_03_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -1344,24 +1332,20 @@ const char * TC_HF_TWC_BV_03_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 4,1" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
     "+CIEV: 2,0"
@@ -1391,20 +1375,17 @@ const char * TC_HF_TWC_BV_04_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 4,1" ,
     "+CIEV: 2,0" ,
@@ -1429,8 +1410,7 @@ const char * TC_HF_TWC_BV_04_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -1457,15 +1437,13 @@ const char * TC_HF_TWC_BV_04_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 2,0" ,
@@ -1484,8 +1462,8 @@ const char * TC_HF_TWC_BV_04_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -1493,24 +1471,20 @@ const char * TC_HF_TWC_BV_04_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 4,1" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
     "+CIEV: 2,0" ,
@@ -1537,15 +1511,13 @@ const char * TC_HF_TWC_BV_04_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
@@ -1573,20 +1545,17 @@ const char * TC_HF_TWC_BV_04_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
-    "USER:V" ,
-    "AT+CHLD=3" ,
+    "USER:V" , // "AT+CHLD=3" ,
     "OK" ,
     "+CIEV: 4,0" ,
     "+CIEV: 2,0"
@@ -1617,8 +1586,7 @@ const char * TC_HF_TWC_BV_05_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -1646,45 +1614,38 @@ const char * TC_HF_TWC_BV_05_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
-    "USER:W" ,
-    "AT+BLDN" ,
+    "USER:W" , //"AT+BLDN" ,
     "OK" ,
     "+CIEV: 3,2" ,
     "+CIEV: 4,2" ,
     "+CIEV: 3,3" ,
     "+CIEV: 4,1" ,
     "+CIEV: 3,0" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
-    "USER:I" ,
-    "ATD7654321;" ,
+    "USER:I" , // "ATD7654321;" ,
     "OK" ,
     "+CIEV: 3,2" ,
     "+CIEV: 4,2" ,
     "+CIEV: 3,3" ,
     "+CIEV: 4,1" ,
     "+CIEV: 3,0" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
-    "USER:j" ,
-    "ATD>1;" ,
+    "USER:j" , // "ATD>1;" ,
     "OK" ,
     "+CIEV: 3,2" ,
     "+CIEV: 4,2" ,
     "+CIEV: 3,3" ,
     "+CIEV: 4,1" ,
     "+CIEV: 3,0" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
     "+CIEV: 2,0"
@@ -1714,8 +1675,7 @@ const char * TC_HF_TWC_BV_06_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -1743,45 +1703,38 @@ const char * TC_HF_TWC_BV_06_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
-    "USER:W" ,
-    "AT+BLDN" ,
+    "USER:W" , //"AT+BLDN" ,
     "OK" ,
     "+CIEV: 3,2" ,
     "+CIEV: 4,2" ,
     "+CIEV: 3,3" ,
     "+CIEV: 4,1" ,
     "+CIEV: 3,0" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
-    "USER:I" ,
-    "ATD7654321;" ,
+    "USER:I" , // "ATD7654321;" ,
     "OK" ,
     "+CIEV: 3,2" ,
     "+CIEV: 4,2" ,
     "+CIEV: 3,3" ,
     "+CIEV: 4,1" ,
     "+CIEV: 3,0" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
-    "USER:j" ,
-    "ATD>1;" ,
+    "USER:j" , // "ATD>1;" ,
     "OK" ,
     "+CIEV: 3,2" ,
     "+CIEV: 4,2" ,
     "+CIEV: 3,3" ,
     "+CIEV: 4,1" ,
     "+CIEV: 3,0" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
     "+CIEV: 2,0" ,
@@ -1808,20 +1761,17 @@ const char * TC_HF_TWC_BV_06_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
-    "USER:w" ,
-    "AT+CHLD=4" ,
+    "USER:w" , // "AT+CHLD=4" ,
     "OK" ,
     "+CIEV: 4,0" ,
     "+CIEV: 2,0"
@@ -1830,11 +1780,11 @@ const char * TC_HF_TWC_BV_06_I[] = {
 
 hfp_test_item_t pts_hf_twc_tests[] = {
     TEST_SEQUENCE(TC_HF_TWC_BV_01_I),
-    // TEST_SEQUENCE(TC_HF_TWC_BV_02_I),
-    // TEST_SEQUENCE(TC_HF_TWC_BV_03_I),
-    // TEST_SEQUENCE(TC_HF_TWC_BV_04_I),
-    // TEST_SEQUENCE(TC_HF_TWC_BV_05_I),
-    // TEST_SEQUENCE(TC_HF_TWC_BV_06_I)
+    TEST_SEQUENCE(TC_HF_TWC_BV_02_I),
+    TEST_SEQUENCE(TC_HF_TWC_BV_03_I),
+    TEST_SEQUENCE(TC_HF_TWC_BV_04_I),
+    TEST_SEQUENCE(TC_HF_TWC_BV_05_I),
+    TEST_SEQUENCE(TC_HF_TWC_BV_06_I)
 };
 
 
@@ -2058,8 +2008,7 @@ const char * TC_HF_ECS_BV_03_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -2222,15 +2171,13 @@ const char * TC_HF_ECC_BV_01_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
@@ -2257,21 +2204,18 @@ const char * TC_HF_ECC_BV_01_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
     "+CIEV: 4,0" ,
-    "USER:y" ,
-    "AT+CHLD=12" ,
+    "USER:y" , // "AT+CHLD=12" ,
     "OK" ,
     "+CIEV: 4,1" ,
     "+CIEV: 4,0" ,
@@ -2301,15 +2245,13 @@ const char * TC_HF_ECC_BV_02_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
@@ -2336,15 +2278,13 @@ const char * TC_HF_ECC_BV_02_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
@@ -2377,25 +2317,21 @@ const char * TC_HF_ECC_BV_02_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
     "+CIEV: 4,0" ,
-    "USER:Y" ,
-    "AT+CHLD=22" ,
+    "USER:Y" , //"AT+CHLD=22" ,
     "OK" ,
     "+CIEV: 4,1" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
     "+CIEV: 2,0" ,
@@ -2413,33 +2349,29 @@ const char * TC_HF_ECC_BV_02_I[] = {
     "AT+CHLD=?" ,
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
-    "AT+VGM=9" ,
-    "AT+VGS=9" ,
+    "USER:Q", // "AT+VGM=9" ,
+    "USER:O",  // "AT+VGS=9" ,
     "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
     "+CCWA: \"7654321\",129" ,
     "+CIEV: 3,1" ,
-    "USER:v" ,
-    "AT+CHLD=2" ,
+    "USER:v" , //"AT+CHLD=2" ,
     "OK" ,
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
     "+CIEV: 4,0" ,
-    "USER:Y" ,
-    "AT+CHLD=22" ,
+    "USER:Y" , //"AT+CHLD=22" ,
     "OK" ,
     "+CIEV: 4,1" ,
-    "USER:U" ,
-    "AT+CHLD=1" ,
+    "USER:U" ,  // "AT+CHLD=1" ,
     "OK" ,
     "+CIEV: 4,0" ,
     "+CIEV: 2,0"
@@ -2844,8 +2776,7 @@ const char * TC_HF_RHH_BV_02_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -2894,7 +2825,7 @@ const char * TC_HF_RHH_BV_02_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "USER:I" ,
-    "ATD7654321;" ,
+    "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -2975,8 +2906,7 @@ const char * TC_HF_RHH_BV_03_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -3025,7 +2955,7 @@ const char * TC_HF_RHH_BV_03_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "USER:I" ,
-    "ATD7654321;" ,
+    "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3133,8 +3063,7 @@ const char * TC_HF_RHH_BV_04_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -3183,7 +3112,7 @@ const char * TC_HF_RHH_BV_04_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "USER:I" ,
-    "ATD7654321;" ,
+    "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3315,8 +3244,7 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -3365,7 +3293,7 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "USER:I" ,
-    "ATD7654321;" ,
+    "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3518,8 +3446,7 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -3568,7 +3495,7 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "USER:I" ,
-    "ATD7654321;" ,
+    "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3746,8 +3673,7 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -3796,7 +3722,7 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "USER:I" ,
-    "ATD7654321;" ,
+    "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3994,8 +3920,7 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "RING" ,
     "RING" ,
     "RING" ,
-    "USER:f" ,
-    "ATA" ,
+    "USER:f" , //"ATA" ,
     "OK" ,
     "+CIEV: 2,1" ,
     "+CIEV: 3,0" ,
@@ -4044,7 +3969,7 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "USER:I" ,
-    "ATD7654321;" ,
+    "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,

From bb83c570c8335432470066ea88845238dab563c4 Mon Sep 17 00:00:00 2001
From: Milanka Ringwald <mila@ringwald.ch>
Date: Thu, 7 Jan 2016 15:49:39 +0100
Subject: [PATCH 2/5] hfp test: enable HF ECS

---
 test/hfp/test_sequences.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/hfp/test_sequences.c b/test/hfp/test_sequences.c
index 26f566d3d..2ec107618 100644
--- a/test/hfp/test_sequences.c
+++ b/test/hfp/test_sequences.c
@@ -1923,12 +1923,11 @@ const char * TC_HF_ECS_BV_01_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
-    "USER:X" ,
-    "AT+CLCC" ,
+    "USER:X" , // "AT+CLCC" ,
     "+CLCC:1,1,1,0,0" ,
     "+CLCC:2,1,0,0,0" ,
     "OK" ,
@@ -1953,8 +1952,8 @@ const char * TC_HF_ECS_BV_02_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 4,0" ,
@@ -1978,8 +1977,8 @@ const char * TC_HF_ECS_BV_03_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 4,0" ,
@@ -2021,9 +2020,9 @@ const char * TC_HF_ECS_BV_03_I[] = {
 };
 
 hfp_test_item_t pts_hf_ecs_tests[] = {
-    // TEST_SEQUENCE(TC_HF_ECS_BV_01_I),
-    // TEST_SEQUENCE(TC_HF_ECS_BV_02_I),
-    // TEST_SEQUENCE(TC_HF_ECS_BV_03_I)
+    TEST_SEQUENCE(TC_HF_ECS_BV_01_I),
+    TEST_SEQUENCE(TC_HF_ECS_BV_02_I),
+    TEST_SEQUENCE(TC_HF_ECS_BV_03_I)
 };
 
 

From 75cc07684c703c8fbdcc43d07a333628ccbe3211 Mon Sep 17 00:00:00 2001
From: Milanka Ringwald <mila@ringwald.ch>
Date: Thu, 7 Jan 2016 15:54:02 +0100
Subject: [PATCH 3/5] hfp test: enable HF ECC

---
 test/hfp/test_sequences.c | 55 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/test/hfp/test_sequences.c b/test/hfp/test_sequences.c
index 2ec107618..480a18603 100644
--- a/test/hfp/test_sequences.c
+++ b/test/hfp/test_sequences.c
@@ -2288,8 +2288,7 @@ const char * TC_HF_ECC_BV_02_I[] = {
     "+CIEV: 3,0" ,
     "+CIEV: 4,1" ,
     "+CIEV: 4,0" ,
-    "USER:y" ,
-    "AT+CHLD=12" ,
+    "USER:y" , // "AT+CHLD=12" ,
     "OK" ,
     "+CIEV: 4,1" ,
     "+CIEV: 4,0" ,
@@ -2309,8 +2308,8 @@ const char * TC_HF_ECC_BV_02_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -2377,8 +2376,8 @@ const char * TC_HF_ECC_BV_02_I[] = {
 };
 
 hfp_test_item_t pts_hf_ecc_tests[] = {
-    // TEST_SEQUENCE(TC_HF_ECC_BV_01_I),
-    // TEST_SEQUENCE(TC_HF_ECC_BV_02_I)
+    TEST_SEQUENCE(TC_HF_ECC_BV_01_I),
+    TEST_SEQUENCE(TC_HF_ECC_BV_02_I)
 };
 
 
@@ -2794,8 +2793,8 @@ const char * TC_HF_RHH_BV_02_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -2817,8 +2816,8 @@ const char * TC_HF_RHH_BV_02_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -2924,8 +2923,8 @@ const char * TC_HF_RHH_BV_03_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -2947,8 +2946,8 @@ const char * TC_HF_RHH_BV_03_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3081,8 +3080,8 @@ const char * TC_HF_RHH_BV_04_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3104,8 +3103,8 @@ const char * TC_HF_RHH_BV_04_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3184,8 +3183,8 @@ const char * TC_HF_RHH_BV_04_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "USER:{" ,
@@ -3262,8 +3261,8 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3285,8 +3284,8 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3365,8 +3364,8 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "USER:{" ,
@@ -3389,8 +3388,8 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+BTRH: 1" ,
@@ -3464,8 +3463,8 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3487,8 +3486,8 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3567,8 +3566,8 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "USER:{" ,
@@ -3591,8 +3590,8 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+BTRH: 1" ,
@@ -3691,8 +3690,8 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3714,8 +3713,8 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3794,8 +3793,8 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "USER:{" ,
@@ -3818,8 +3817,8 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+BTRH: 1" ,
@@ -3938,8 +3937,8 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -3961,8 +3960,8 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+CIEV: 3,1" ,
@@ -4041,8 +4040,8 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "USER:{" ,
@@ -4065,8 +4064,8 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "+CHLD: (0,1,1x,2,2x,3,4)" ,
     "OK" ,
     "AT+VGM=9" ,
-    "+BSIR: 0" ,
     "AT+VGS=9" ,
+    "+BSIR: 0" ,
     "OK" ,
     "OK" ,
     "+BTRH: 1" ,

From 8915264d72e101ba9740d33bdb7b3b6f7b03823d Mon Sep 17 00:00:00 2001
From: Milanka Ringwald <mila@ringwald.ch>
Date: Thu, 7 Jan 2016 15:56:10 +0100
Subject: [PATCH 4/5] hfp test: enable HF RHH

---
 test/hfp/test_sequences.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/hfp/test_sequences.c b/test/hfp/test_sequences.c
index 480a18603..2999c55cf 100644
--- a/test/hfp/test_sequences.c
+++ b/test/hfp/test_sequences.c
@@ -4139,14 +4139,14 @@ const char * TC_HF_RHH_BV_08_I[] = {
 };
 
 hfp_test_item_t pts_hf_rhh_tests[] = {
-    // TEST_SEQUENCE(TC_HF_RHH_BV_01_I),
-    // TEST_SEQUENCE(TC_HF_RHH_BV_02_I),
-    // TEST_SEQUENCE(TC_HF_RHH_BV_03_I),
-    // TEST_SEQUENCE(TC_HF_RHH_BV_04_I),
-    // TEST_SEQUENCE(TC_HF_RHH_BV_05_I),
-    // TEST_SEQUENCE(TC_HF_RHH_BV_06_I),
-    // TEST_SEQUENCE(TC_HF_RHH_BV_07_I),
-    // TEST_SEQUENCE(TC_HF_RHH_BV_08_I)
+    TEST_SEQUENCE(TC_HF_RHH_BV_01_I),
+    TEST_SEQUENCE(TC_HF_RHH_BV_02_I),
+    TEST_SEQUENCE(TC_HF_RHH_BV_03_I),
+    TEST_SEQUENCE(TC_HF_RHH_BV_04_I),
+    TEST_SEQUENCE(TC_HF_RHH_BV_05_I),
+    TEST_SEQUENCE(TC_HF_RHH_BV_06_I),
+    TEST_SEQUENCE(TC_HF_RHH_BV_07_I),
+    TEST_SEQUENCE(TC_HF_RHH_BV_08_I)
 };
 
 /////////

From 0a81931800954ac40cc838db94ab44767a739785 Mon Sep 17 00:00:00 2001
From: Milanka Ringwald <mila@ringwald.ch>
Date: Thu, 7 Jan 2016 16:07:46 +0100
Subject: [PATCH 5/5] hfp test: enabled all HF tests

---
 test/hfp/hfp_hf_client_test.c |  2 +-
 test/hfp/test_sequences.c     | 87 ++++++++++++-----------------------
 2 files changed, 30 insertions(+), 59 deletions(-)

diff --git a/test/hfp/hfp_hf_client_test.c b/test/hfp/hfp_hf_client_test.c
index f3e78f391..97ced1307 100644
--- a/test/hfp/hfp_hf_client_test.c
+++ b/test/hfp/hfp_hf_client_test.c
@@ -321,7 +321,7 @@ void simulate_test_sequence(hfp_test_item_t * test_item){
         if (i < previous_step) exit(0);
         char * expected_cmd = test_steps[i];
         int expected_cmd_len = strlen(expected_cmd);
-        // printf("\nStep %d, %s \n", i, expected_cmd);
+        printf("\nStep %d, %s \n", i, expected_cmd);
         
         if (strncmp(expected_cmd, "USER:", 5) == 0){
             user_command(expected_cmd[5]);
diff --git a/test/hfp/test_sequences.c b/test/hfp/test_sequences.c
index 2999c55cf..8cac76197 100644
--- a/test/hfp/test_sequences.c
+++ b/test/hfp/test_sequences.c
@@ -2799,8 +2799,7 @@ const char * TC_HF_RHH_BV_02_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:i" ,
-    "ATD1234567;" ,
+    "USER:i" , // "ATD1234567;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -2822,8 +2821,7 @@ const char * TC_HF_RHH_BV_02_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:I" ,
-    "ATD // 21;" ,
+    "USER:I" , // "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -2846,8 +2844,7 @@ const char * TC_HF_RHH_BV_02_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:]" ,
-    "AT+BTRH=0" ,
+    "USER:]" , // "AT+BTRH=0" ,
     "+BTRH: 0" ,
     "OK" ,
     "+CIEV: 2,1" ,
@@ -2929,8 +2926,7 @@ const char * TC_HF_RHH_BV_03_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:i" ,
-    "ATD1234567;" ,
+    "USER:i" , // "ATD1234567;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -2952,8 +2948,7 @@ const char * TC_HF_RHH_BV_03_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:I" ,
-    "ATD // 21;" ,
+    "USER:I" , // "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -2976,8 +2971,7 @@ const char * TC_HF_RHH_BV_03_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:]" ,
-    "AT+BTRH=0" ,
+    "USER:]" , // "AT+BTRH=0" ,
     "+BTRH: 0" ,
     "OK" ,
     "+CIEV: 2,1" ,
@@ -3086,8 +3080,7 @@ const char * TC_HF_RHH_BV_04_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:i" ,
-    "ATD1234567;" ,
+    "USER:i" , // "ATD1234567;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3109,8 +3102,7 @@ const char * TC_HF_RHH_BV_04_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:I" ,
-    "ATD // 21;" ,
+    "USER:I" , // "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3133,8 +3125,7 @@ const char * TC_HF_RHH_BV_04_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:]" ,
-    "AT+BTRH=0" ,
+    "USER:]" , // "AT+BTRH=0" ,
     "+BTRH: 0" ,
     "OK" ,
     "+CIEV: 2,1" ,
@@ -3187,8 +3178,7 @@ const char * TC_HF_RHH_BV_04_I[] = {
     "+BSIR: 0" ,
     "OK" ,
     "OK" ,
-    "USER:{" ,
-    "AT+BTRH=1" ,
+    "USER:{" , // "AT+BTRH=1" ,
     "+BTRH: 1" ,
     "OK" ,
     "+CIEV: 2,0"
@@ -3267,8 +3257,7 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:i" ,
-    "ATD1234567;" ,
+    "USER:i" , // "ATD1234567;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3290,8 +3279,7 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:I" ,
-    "ATD // 21;" ,
+    "USER:I" , // "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3314,8 +3302,7 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:]" ,
-    "AT+BTRH=0" ,
+    "USER:]" , // "AT+BTRH=0" ,
     "+BTRH: 0" ,
     "OK" ,
     "+CIEV: 2,1" ,
@@ -3368,8 +3355,7 @@ const char * TC_HF_RHH_BV_05_I[] = {
     "+BSIR: 0" ,
     "OK" ,
     "OK" ,
-    "USER:{" ,
-    "AT+BTRH=1" ,
+    "USER:{" , // "AT+BTRH=1" ,
     "+BTRH: 1" ,
     "OK" ,
     "+CIEV: 2,0" ,
@@ -3469,8 +3455,7 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:i" ,
-    "ATD1234567;" ,
+    "USER:i" , // "ATD1234567;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3492,8 +3477,7 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:I" ,
-    "ATD // 21;" ,
+    "USER:I" , // "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3516,8 +3500,7 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:]" ,
-    "AT+BTRH=0" ,
+    "USER:]" , // "AT+BTRH=0" ,
     "+BTRH: 0" ,
     "OK" ,
     "+CIEV: 2,1" ,
@@ -3570,8 +3553,7 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "+BSIR: 0" ,
     "OK" ,
     "OK" ,
-    "USER:{" ,
-    "AT+BTRH=1" ,
+    "USER:{" , // "AT+BTRH=1" ,
     "+BTRH: 1" ,
     "OK" ,
     "+CIEV: 2,0" ,
@@ -3615,8 +3597,7 @@ const char * TC_HF_RHH_BV_06_I[] = {
     "+BSIR: 0" ,
     "OK" ,
     "OK" ,
-    "USER:}" ,
-    "AT+BTRH=2" ,
+    "USER:}" , // "AT+BTRH=2" ,
     "+BTRH: 2" ,
     "OK" ,
     "+CIEV: 2,0"
@@ -3696,8 +3677,7 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:i" ,
-    "ATD1234567;" ,
+    "USER:i" , // "ATD1234567;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3719,8 +3699,7 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:I" ,
-    "ATD // 21;" ,
+    "USER:I" , // "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3743,8 +3722,7 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:]" ,
-    "AT+BTRH=0" ,
+    "USER:]" , // "AT+BTRH=0" ,
     "+BTRH: 0" ,
     "OK" ,
     "+CIEV: 2,1" ,
@@ -3797,8 +3775,7 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "+BSIR: 0" ,
     "OK" ,
     "OK" ,
-    "USER:{" ,
-    "AT+BTRH=1" ,
+    "USER:{" , // "AT+BTRH=1" ,
     "+BTRH: 1" ,
     "OK" ,
     "+CIEV: 2,0" ,
@@ -3842,8 +3819,7 @@ const char * TC_HF_RHH_BV_07_I[] = {
     "+BSIR: 0" ,
     "OK" ,
     "OK" ,
-    "USER:}" ,
-    "AT+BTRH=2" ,
+    "USER:}" , // "AT+BTRH=2" ,
     "+BTRH: 2" ,
     "OK" ,
     "+CIEV: 2,0" ,
@@ -3943,8 +3919,7 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:i" ,
-    "ATD1234567;" ,
+    "USER:i" , // "ATD1234567;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3966,8 +3941,7 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "OK" ,
     "+CIEV: 3,1" ,
     "RING" ,
-    "USER:I" ,
-    "ATD // 21;" ,
+    "USER:I" , // "ATD // 21;" ,
     "AT+BRSF=951" ,
     "+BRSF: 511" ,
     "OK" ,
@@ -3990,8 +3964,7 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "+CIEV: 3,1" ,
     "RING" ,
     "RING" ,
-    "USER:]" ,
-    "AT+BTRH=0" ,
+    "USER:]" , // "AT+BTRH=0" ,
     "+BTRH: 0" ,
     "OK" ,
     "+CIEV: 2,1" ,
@@ -4044,8 +4017,7 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "+BSIR: 0" ,
     "OK" ,
     "OK" ,
-    "USER:{" ,
-    "AT+BTRH=1" ,
+    "USER:{" , // "AT+BTRH=1" ,
     "+BTRH: 1" ,
     "OK" ,
     "+CIEV: 2,0" ,
@@ -4089,8 +4061,7 @@ const char * TC_HF_RHH_BV_08_I[] = {
     "+BSIR: 0" ,
     "OK" ,
     "OK" ,
-    "USER:}" ,
-    "AT+BTRH=2" ,
+    "USER:}" , // "AT+BTRH=2" ,
     "+BTRH: 2" ,
     "OK" ,
     "+CIEV: 2,0" ,