From ac48c9165a04b762d873e140d1f4b6176d93c8f6 Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Tue, 26 Jan 2021 10:07:06 +0100
Subject: [PATCH] TT#104401 scenarios: fixes detected with sip-tester v3.5.3

> Cannot record route set if there is no Contact

Change-Id: I6738721cd5c5550a6788ffe13662562a49e43dd5
---
 disabled/invite_speeddial/sipp_scenario03.xml | 11 ++----
 .../sipp_scenario_responder01.xml             |  8 ++---
 scenarios/invite_offline/sipp_scenario00.xml  | 34 +++++--------------
 .../invite_wrong_reg/sipp_scenario00.xml      | 19 +++--------
 4 files changed, 19 insertions(+), 53 deletions(-)

diff --git a/disabled/invite_speeddial/sipp_scenario03.xml b/disabled/invite_speeddial/sipp_scenario03.xml
index aacf24ec..b0108fba 100644
--- a/disabled/invite_speeddial/sipp_scenario03.xml
+++ b/disabled/invite_speeddial/sipp_scenario03.xml
@@ -27,9 +27,7 @@
     ]]>
   </send>
 
-  <recv response="100" rtd="1" optional="true">
-  </recv>
-
+  <recv response="100" rtd="1" optional="true"/>
   <recv response="407" rtd="2" auth="true"/>
 
   <send>
@@ -77,11 +75,8 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="484" rrs="true" rtd="3">
-  </recv>
+  <recv response="100" optional="true"/>
+  <recv response="484" rtd="3"/>
 
 <send>
     <![CDATA[
diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml
index 4fe2ff55..15c1e07a 100644
--- a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml
+++ b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml
@@ -80,11 +80,8 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="486" rrs="true" rtd="3">
-  </recv>
+  <recv response="100" optional="true"/>
+  <recv response="486" rtd="3"/>
 
   <send>
     <![CDATA[
@@ -94,7 +91,6 @@
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
-      [routes]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
diff --git a/scenarios/invite_offline/sipp_scenario00.xml b/scenarios/invite_offline/sipp_scenario00.xml
index 9869581a..f6b9a979 100644
--- a/scenarios/invite_offline/sipp_scenario00.xml
+++ b/scenarios/invite_offline/sipp_scenario00.xml
@@ -26,9 +26,7 @@
     ]]>
   </send>
 
-  <recv response="100" rtd="1" optional="true">
-  </recv>
-
+  <recv response="100" rtd="1" optional="true"/>
   <recv response="407" rtd="2" auth="true"/>
 
   <send>
@@ -75,17 +73,10 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <recv response="480" rrs="true" rtd="3">
-  </recv>
+  <recv response="100" optional="true"/>
+  <recv response="180" optional="true"/>
+  <recv response="183" optional="true"/>
+  <recv response="480" rtd="3"/>
 
   <send>
     <![CDATA[
@@ -131,17 +122,10 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <recv response="480" rrs="true" rtd="3">
-  </recv>
+  <recv response="100" optional="true"/>
+  <recv response="180" optional="true"/>
+  <recv response="183" optional="true"/>
+  <recv response="480" rtd="3"/>
 
   <send>
     <![CDATA[
diff --git a/scenarios/invite_wrong_reg/sipp_scenario00.xml b/scenarios/invite_wrong_reg/sipp_scenario00.xml
index 4a020dc4..f0d837d6 100644
--- a/scenarios/invite_wrong_reg/sipp_scenario00.xml
+++ b/scenarios/invite_wrong_reg/sipp_scenario00.xml
@@ -26,9 +26,7 @@
     ]]>
   </send>
 
-  <recv response="100" rtd="1" optional="true">
-  </recv>
-
+  <recv response="100" rtd="1" optional="true"/>
   <recv response="407" rtd="2" auth="true"/>
 
   <send>
@@ -75,17 +73,10 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <recv response="479" rrs="true" rtd="3">
-  </recv>
+  <recv response="100" optional="true"/>
+  <recv response="180" optional="true"/>
+  <recv response="183" optional="true"/>
+  <recv response="479" rtd="3"/>
 
   <send>
     <![CDATA[