Fixes for non-HPV vaccinations

Two changes:

    generate-cohort age range has been increase so children can accept non-HPV vaccinations
    nurse-journey token regex changed to work with hyphenated sessions (EG session-8). Only affected non-HPV vaccinations

Author: simonnorris1

performance-tests/E2E/generate-cohort.jmx

@@ -57,7 +57,7 @@ def PARENT_2_PHONE = []
 def PARENT_2_RELATIONSHIP = []
 def CHILD_SCHOOL_URN =[]
 
-def startDate = Date.parse('yyyy-MM-dd','2011-09-01')
+def startDate = Date.parse('yyyy-MM-dd','2008-09-01')
 def endDate = Date.parse('yyyy-MM-dd','2012-08-31')
 def newNHSNumbers = []
 
@@ -88,7 +88,7 @@ try {
 		PARENT_2_PHONE.add(lineSplit[15])
 		PARENT_2_RELATIONSHIP.add(lineSplit[16])
 		CHILD_SCHOOL_URN.add(lineSplit[17])
-		
+
           line = reader.readLine();
      }
 
@@ -114,7 +114,7 @@ for(outrow=1;outrow<=rowcount;outrow++){
 	vars.put("CHILD_DATE_OF_BIRTH",(startDate + r.nextInt(endDate-startDate)).format('yyyy-MM-dd'))
 	vars.put("CHILD_FIRST_NAME",CHILD_FIRST_NAME.get(r.nextInt(CHILD_FIRST_NAME.size())))
 	vars.put("CHILD_LAST_NAME",CHILD_LAST_NAME.get(r.nextInt(CHILD_LAST_NAME.size())))
-	
+
 	checkdigit="10"
 	while(checkdigit=="10"){
 		nhsnumber=(r.nextInt(999999) + 999000000).toString()
@@ -132,7 +132,7 @@ for(outrow=1;outrow<=rowcount;outrow++){
 	//Add the unique nhs number to the array
 	newNHSNumbers.add(nhsnumber)
 	vars.put("CHILD_NHS_NUMBER",nhsnumber)
-	
+
 	vars.put("PARENT_1_NAME",PARENT_1_NAME.get(r.nextInt(PARENT_1_NAME.size())).tokenize(' ').first()  + " " + vars.get("CHILD_LAST_NAME"))
 	vars.put("PARENT_2_NAME",PARENT_2_NAME.get(r.nextInt(PARENT_2_NAME.size())).tokenize(' ').first()  + " " + vars.get("CHILD_LAST_NAME"))
 	vars.put("PARENT_1_EMAIL",vars.get("PARENT_1_NAME").replaceAll(' ','.') + "@example.com")
@@ -141,12 +141,12 @@ for(outrow=1;outrow<=rowcount;outrow++){
 	vars.put("PARENT_2_PHONE",PARENT_2_PHONE.get(r.nextInt(PARENT_2_PHONE.size())))
 	vars.put("PARENT_1_RELATIONSHIP",PARENT_1_RELATIONSHIP.get(r.nextInt(PARENT_1_RELATIONSHIP.size())))
 	vars.put("PARENT_2_RELATIONSHIP",PARENT_2_RELATIONSHIP.get(r.nextInt(PARENT_2_RELATIONSHIP.size())))
-	
+
 	vars.put("CHILD_SCHOOL_URN",vars.get("URN"))
-	
+
 	rowPartOne=(vars.get("CHILD_ADDRESS_LINE_1") + "," + vars.get("CHILD_ADDRESS_LINE_2") + "," + vars.get("CHILD_POSTCODE") + "," + vars.get("CHILD_TOWN") + "," + vars.get("CHILD_PREFERRED_GIVEN_NAME") + "," + vars.get("CHILD_DATE_OF_BIRTH") + "," + vars.get("CHILD_FIRST_NAME") + "," + vars.get("CHILD_LAST_NAME") + "," + vars.get("CHILD_NHS_NUMBER") + ",")
 	rowPartTwo=(vars.get("PARENT_1_EMAIL") + "," + vars.get("PARENT_1_NAME") + "," + vars.get("PARENT_1_PHONE") + "," + vars.get("PARENT_1_RELATIONSHIP") + "," + vars.get("PARENT_2_EMAIL") + "," + vars.get("PARENT_2_NAME") + "," + vars.get("PARENT_2_PHONE") + "," + vars.get("PARENT_2_RELATIONSHIP") + "," + vars.get("CHILD_SCHOOL_URN"))
-	
+
 	writer.println(rowPartOne + rowPartTwo)
 //	log.info(vars.get("CHILD_FIRST_NAME") + "," + vars.get("CHILD_LAST_NAME"))
 }

performance-tests/E2E/nurse-journey.jmx

@@ -1294,7 +1294,7 @@ vars.put("SessionId", cohortCodes.get(vars.get("CHILD_SCHOOL_URN&
                 <stringProp name="script">SampleResult.setIgnore()
 if(vars.get(&quot;BatchId&quot;)==&quot;BatchId_NotFound&quot;){
 	log.error(&quot;No batch found&quot;)
-	
+
 }
 </stringProp>
               </JSR223Sampler>
@@ -3005,7 +3005,7 @@ vars.put(&quot;ParentPhone&quot;,vars.get(&quot;ExistingContact_g4&quot;));</str
                     <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Authenticity_Token Regular Expression Extractor" enabled="true">
                       <stringProp name="RegexExtractor.useHeaders">false</stringProp>
                       <stringProp name="RegexExtractor.refname">Authenticity_Token</stringProp>
-                      <stringProp name="RegexExtractor.regex">&lt;form action=&quot;/sessions/\w+/patients/\d+/\w+/triages&quot; accept-charset=&quot;UTF-8&quot; method=&quot;post&quot;&gt;&lt;input type=&quot;hidden&quot; name=&quot;authenticity_token&quot; value=&quot;(.+?)&quot; autocomplete=&quot;off&quot; /&gt;</stringProp>
+                      <stringProp name="RegexExtractor.regex">&lt;form action=&quot;\/sessions\/.*?\/patients\/\d+\/.*?\/triages&quot; accept-charset=&quot;UTF-8&quot; method=&quot;post&quot;&gt;&lt;input type=&quot;hidden&quot; name=&quot;authenticity_token&quot; value=&quot;(.+?)&quot; autocomplete=&quot;off&quot; \/&gt;</stringProp>
                       <stringProp name="RegexExtractor.template">$1$</stringProp>
                       <stringProp name="RegexExtractor.default">Authenticity_Token_NotFoundfromhere</stringProp>
                       <boolProp name="RegexExtractor.default_empty_value">false</boolProp>
@@ -3276,7 +3276,7 @@ vars.put(&quot;ParentPhone&quot;,vars.get(&quot;ExistingContact_g4&quot;));</str
                   <stringProp name="script">SampleResult.setIgnore()
 if(vars.get(&quot;BatchId&quot;)==&quot;BatchId_NotFound&quot;){
 	log.error(&quot;No batch found&quot;)
-	
+
 }
 </stringProp>
                 </JSR223Sampler>
@@ -3449,7 +3449,7 @@ if(vars.get(&quot;BatchId&quot;)==&quot;BatchId_NotFound&quot;){
                   <stringProp name="script">SampleResult.setIgnore()
 if(vars.get(&quot;BatchId&quot;)==&quot;BatchId_NotFound&quot;){
 	log.error(&quot;No batch found&quot;)
-	
+
 }
 </stringProp>
                 </JSR223Sampler>