diff --git a/performance-tests/STS/consent-journey.jmx b/performance-tests/STS/consent-journey.jmx
index 61effc93e97..0f4a8ddb5ae 100644
--- a/performance-tests/STS/consent-journey.jmx
+++ b/performance-tests/STS/consent-journey.jmx
@@ -139,6 +139,14 @@ URN ${__P(URN, 137390)}
+
+
+ Test Plan
+ Test Plan
+ Wait for STS alive
+
+
+
groovy
@@ -152,7 +160,8 @@ log.info(vars.get("Duration"))
log.info(vars.get("User"))
log.info(vars.get("ConsentThreads"))
log.info(vars.get("BaseURL"))
-log.info(vars.get("AddNewSession"))
+log.info(vars.get("AddNewSession"))
+
@@ -1168,13 +1177,13 @@ log.info("Total Consents found: " + consentCount.toString());
-
- ${__jexl3("${AddNewSession}" == "True")}
+
+ ${__jexl3("${AddNewSession}" == "true")}
false
true
-
+
Test Plan
Test Plan
@@ -1384,13 +1393,13 @@ vars.get("VaccineCount_td_ipv",props.get("VaccineCount_td_ipv&quo
-
+
9191
true
C:\apache-jmeter-5.6.3\bin
-
+
false
saveConfig
@@ -1546,7 +1555,7 @@ log.info("number of patients per Vaccine required: " + props.get("
-
+
start
true
GET
@@ -1667,7 +1676,7 @@ log.info("number of patients per Vaccine required: " + props.get("
-
+
sessions
true
GET
@@ -1733,7 +1742,7 @@ without actual network activity. This helps debugging tests.
-
+
SessionID
CurrentSessionID
true
@@ -1946,7 +1955,7 @@ JSR223 Sampler: HPV
false
-
+
groovy
@@ -1996,7 +2005,7 @@ if(props.get("VaccineCount_" + vars.get("Programme").toLower
-
+
Test Plan
Test Plan
@@ -2009,7 +2018,7 @@ if(props.get("VaccineCount_" + vars.get("Programme").toLower
-
+
true
true
6
@@ -2357,7 +2366,7 @@ vars.put("postbody",postbody);
-
+
${__jexl3("${DateAlreadyUsed}" == "noError")}
false
true
@@ -6625,6 +6634,59 @@ Grab the three session ID's and use 'set session date and in progress&
+
+
+
+ ${__jexl3("${responseCode}"!="200")}
+
+
+
+ localhost
+ 9191
+ http
+ /sts/STATUS
+ true
+ GET
+ true
+ false
+
+
+
+
+
+
+ groovy
+
+
+ true
+ vars.put("responseCode","goNoFurtherYet")
+
+
+
+ groovy
+
+
+ true
+ vars.put("responseCode",prev.getResponseCode());
+
+log.info("Response code is " + vars.get("responseCode"));
+
+
+
+ groovy
+
+
+ true
+ prev.setIgnore()
+
+
+
+
+ 1000
+
+
+
+
diff --git a/performance-tests/STS/nurse-journey.jmx b/performance-tests/STS/nurse-journey.jmx
index 36b847a7db7..ee3d757c74c 100644
--- a/performance-tests/STS/nurse-journey.jmx
+++ b/performance-tests/STS/nurse-journey.jmx
@@ -5,8 +5,6 @@
- false
- false
@@ -151,7 +149,7 @@
BaseURL
- ${__P(BaseURL,qa.mavistesting.com)}
+ ${__P(BaseURL,performance.mavistesting.com)}
=
@@ -187,7 +185,7 @@
false
-
+
false
@@ -215,6 +213,14 @@
+
+
+ Test Plan
+ Mavis_NURSE - 4.4.0
+ Wait for STS alive
+
+
+
groovy
@@ -298,7 +304,7 @@ log.info(vars.get("BaseURL"))
-
+
9191
true
C:\apache-jmeter-5.6.3\bin
@@ -351,7 +357,7 @@ props.put("VaccineCount_td_ipv","0")
-
+
localhost
9191
http
@@ -374,7 +380,7 @@ props.put("VaccineCount_td_ipv","0")
-
+
start
true
GET
@@ -385,7 +391,7 @@ props.put("VaccineCount_td_ipv","0")
-
+
groovy
@@ -394,7 +400,7 @@ props.put("VaccineCount_td_ipv","0")
-
+
users/sign-in
true
GET
@@ -405,7 +411,7 @@ props.put("VaccineCount_td_ipv","0")
-
+
false
Authenticity_Token
\/users\/sign-in"[\s\S]*?authenticity_token" value="(.*?)"
@@ -415,7 +421,7 @@ props.put("VaccineCount_td_ipv","0")
1
-
+
groovy
@@ -486,7 +492,7 @@ props.put("VaccineCount_td_ipv","0")
-
+
groovy
@@ -506,7 +512,7 @@ props.put("VaccineCount_td_ipv","0")
-
+
groovy
@@ -515,7 +521,7 @@ props.put("VaccineCount_td_ipv","0")
-
+
(assuming they all fit on one page)
sessions?q=&%5Bprogrammes%5D%5B%5D=&status=scheduled&type=school
true
@@ -527,7 +533,7 @@ props.put("VaccineCount_td_ipv","0")
-
+
false
SessionID
sessions\/(.*?)"[\s\S]{1,400}nhsuk-tag nhsuk-tag--white">(.*?)<
@@ -667,7 +673,7 @@ log.info("After sessionID : " + vars.get("CurrentSessionID")
-
+
groovy
@@ -682,7 +688,7 @@ log.info("After sessionID : " + vars.get("CurrentSessionID")
true
-
+
localhost
9191
http
@@ -718,7 +724,7 @@ log.info("After sessionID : " + vars.get("CurrentSessionID")
-
+
groovy
@@ -728,7 +734,7 @@ log.info("After sessionID : " + vars.get("CurrentSessionID")
-
+
groovy
@@ -751,7 +757,7 @@ while(vars.get("vaccination_" + i)){
-
+
localhost
9191
http
@@ -765,7 +771,7 @@ while(vars.get("vaccination_" + i)){
-
+
true
@@ -798,14 +804,43 @@ while(vars.get("vaccination_" + i)){
+
+ false
+ true
+ 200
+ OK
+ Dummy Sampler used to simulate requests and responses
+without actual network activity. This helps debugging tests.
+ Dummy Sampler used to simulate requests and responses
+without actual network activity. This helps debugging tests.
+ 0
+ 0
+ 0
+
+ org.apache.jmeter.samplers.SampleResult
+
+
+
+ groovy
+
+
+ true
+ vars.put("VaccineCount_flu",props.get("VaccineCount_flu"))
+vars.put("VaccineCount_hpv",props.get("VaccineCount_hpv"))
+vars.put("VaccineCount_menacwy",props.get("VaccineCount_menacwy"))
+vars.put("VaccineCount_td_ipv",props.get("VaccineCount_td_ipv"))
+
+
+
+
-
+
false
-
+
start
true
GET
@@ -816,7 +851,7 @@ while(vars.get("vaccination_" + i)){
-
+
users/sign-in
true
GET
@@ -1586,7 +1621,7 @@ vars.put("vaccineCount",vaccineCount.toString())
-
+
//From Flu it's 'Consent given for nasal spray'
//From others it's 'Consent given'
@@ -2860,11 +2895,11 @@ if(vars.get("BatchId")=="BatchId_NotFound"){
-
+
false
-
+
Get a random patient to search for, use flu as programme but don't consume the data
localhost
9191
@@ -3062,6 +3097,59 @@ if(vars.get("BatchId")=="BatchId_NotFound"){
+
+
+
+ ${__jexl3("${responseCode}"!="200")}
+
+
+
+ localhost
+ 9191
+ http
+ /sts/STATUS
+ true
+ GET
+ true
+ false
+
+
+
+
+
+
+ groovy
+
+
+ true
+ vars.put("responseCode","goNoFurtherYet")
+
+
+
+ groovy
+
+
+ true
+ vars.put("responseCode",prev.getResponseCode());
+
+log.info("Response code is " + vars.get("responseCode"));
+
+
+
+ groovy
+
+
+ true
+ prev.setIgnore()
+
+
+
+
+ 1000
+
+
+
+