Skip to content

Commit 4a53f2f

Browse files
simonnorris1simonnorris1
authored
Merge pull request #537 from NHSDigital/perf_team_page_removal
Change to script to remove team page
2 parents 33afda9 + 2a5d6eb commit 4a53f2f

File tree

1 file changed

+42
-27
lines changed

1 file changed

+42
-27
lines changed

‎performance-tests/E2E/nurse-journey.jmx‎

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</collectionProp>
4343
</HeaderManager>
4444
<hashTree/>
45-
<CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
45+
<CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config">
4646
<stringProp name="delimiter">,</stringProp>
4747
<stringProp name="fileEncoding">UTF-8</stringProp>
4848
<stringProp name="filename">${BaseDirectory}${InputFile}</stringProp>
@@ -136,13 +136,13 @@
136136
</elementProp>
137137
<elementProp name="Loops" elementType="Argument">
138138
<stringProp name="Argument.name">Loops</stringProp>
139-
<stringProp name="Argument.value">${__P(Loops, 5)}</stringProp>
139+
<stringProp name="Argument.value">${__P(Loops, 10)}</stringProp>
140140
<stringProp name="Argument.metadata">=</stringProp>
141141
<stringProp name="Argument.desc">How many loops total (must be multiple times higher than vaccinationloop)</stringProp>
142142
</elementProp>
143143
<elementProp name="Threads" elementType="Argument">
144144
<stringProp name="Argument.name">Threads</stringProp>
145-
<stringProp name="Argument.value">${__P(Threads, 1)}</stringProp>
145+
<stringProp name="Argument.value">${__P(Threads, 10)}</stringProp>
146146
<stringProp name="Argument.metadata">=</stringProp>
147147
<stringProp name="Argument.desc"></stringProp>
148148
</elementProp>
@@ -388,11 +388,11 @@
388388
<hashTree/>
389389
</hashTree>
390390
</hashTree>
391-
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Select Teams" enabled="true">
391+
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Select Teams" enabled="false">
392392
<boolProp name="TransactionController.includeTimers">false</boolProp>
393393
</TransactionController>
394394
<hashTree>
395-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Team" enabled="true">
395+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Team">
396396
<stringProp name="HTTPSampler.path">users/teams</stringProp>
397397
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
398398
<stringProp name="HTTPSampler.method">POST</stringProp>
@@ -437,11 +437,11 @@
437437
<hashTree/>
438438
</hashTree>
439439
</hashTree>
440-
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Calculate slug from API" enabled="true">
440+
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Calculate slug from API">
441441
<boolProp name="TransactionController.includeTimers">false</boolProp>
442442
</TransactionController>
443443
<hashTree>
444-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get school name" enabled="true">
444+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get school name">
445445
<stringProp name="TestPlan.comments">Temporarily remove the &apos;open&apos; filter &amp;status=open</stringProp>
446446
<stringProp name="HTTPSampler.path">api/testing/locations?type=school</stringProp>
447447
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
@@ -473,7 +473,7 @@
473473
</RegexExtractor>
474474
<hashTree/>
475475
</hashTree>
476-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Sessions page" enabled="true">
476+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Sessions page">
477477
<stringProp name="HTTPSampler.path">sessions</stringProp>
478478
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
479479
<stringProp name="HTTPSampler.method">GET</stringProp>
@@ -493,7 +493,7 @@
493493
</JSR223PostProcessor>
494494
<hashTree/>
495495
</hashTree>
496-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search for school session" enabled="true">
496+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Search for school session">
497497
<stringProp name="HTTPSampler.path">sessions?q=${schoolName}&amp;%5Bprogrammes%5D%5B%5D=&amp;academic_year=2024&amp;status=&amp;type=</stringProp>
498498
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
499499
<stringProp name="HTTPSampler.method">GET</stringProp>
@@ -523,7 +523,7 @@
523523
</RegexExtractor>
524524
<hashTree/>
525525
</hashTree>
526-
<JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="Calculate slug" enabled="true">
526+
<JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="Calculate slug">
527527
<stringProp name="scriptLanguage">groovy</stringProp>
528528
<stringProp name="parameters"></stringProp>
529529
<stringProp name="filename"></stringProp>
@@ -735,7 +735,7 @@ props.put(&quot;SessionId&quot;, vars.get(&quot;SessionSlug&quot;));</stringProp
735735
</RegexExtractor>
736736
<hashTree/>
737737
</hashTree>
738-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="1.4 Select Team" enabled="true">
738+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="1.4 Select Team" enabled="false">
739739
<stringProp name="HTTPSampler.path">users/teams</stringProp>
740740
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
741741
<stringProp name="HTTPSampler.method">POST</stringProp>
@@ -921,7 +921,7 @@ log.info(&quot;session ID is &quot; + vars.get(&quot;SessionId&quot;))</stringPr
921921
</hashTree>
922922
</hashTree>
923923
</hashTree>
924-
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="2.0 Register attendance">
924+
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="2.0 Register attendance" enabled="true">
925925
<boolProp name="TransactionController.includeTimers">false</boolProp>
926926
</TransactionController>
927927
<hashTree>
@@ -931,7 +931,7 @@ log.info(&quot;session ID is &quot; + vars.get(&quot;SessionId&quot;))</stringPr
931931
<boolProp name="displaySystemProperties">false</boolProp>
932932
</DebugSampler>
933933
<hashTree/>
934-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="2.1 Open session">
934+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="2.1 Open session" enabled="true">
935935
<stringProp name="HTTPSampler.path">sessions/${SessionId}</stringProp>
936936
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
937937
<stringProp name="HTTPSampler.method">GET</stringProp>
@@ -963,7 +963,7 @@ log.info(&quot;session ID is &quot; + vars.get(&quot;SessionId&quot;))</stringPr
963963
</ConstantTimer>
964964
<hashTree/>
965965
</hashTree>
966-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="2.3 Search by first/last name">
966+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="2.3 Search by first/last name" enabled="true">
967967
<stringProp name="HTTPSampler.path">sessions/${SessionId}/register?q=${CHILD_FIRST_NAME}+${CHILD_LAST_NAME}&amp;%5Bprogramme_types%5D%5B%5D=&amp;register_status=&amp;%5Byear_groups%5D%5B%5D=&amp;date_of_birth_day=&amp;date_of_birth_month=&amp;date_of_birth_year=&amp;missing_nhs_number=0</stringProp>
968968
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
969969
<stringProp name="HTTPSampler.method">GET</stringProp>
@@ -988,7 +988,7 @@ log.info(&quot;session ID is &quot; + vars.get(&quot;SessionId&quot;))</stringPr
988988
<stringProp name="RegexExtractor.match_number">1</stringProp>
989989
</RegexExtractor>
990990
<hashTree/>
991-
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get PatientID">
991+
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get PatientID" enabled="true">
992992
<stringProp name="RegexExtractor.useHeaders">false</stringProp>
993993
<stringProp name="RegexExtractor.refname">PatientId</stringProp>
994994
<stringProp name="RegexExtractor.regex">href=&quot;\/sessions\/.*?\/patients\/(.*?)\/(hpv|flu)</stringProp>
@@ -998,7 +998,7 @@ log.info(&quot;session ID is &quot; + vars.get(&quot;SessionId&quot;))</stringPr
998998
<stringProp name="RegexExtractor.match_number">-1</stringProp>
999999
</RegexExtractor>
10001000
<hashTree/>
1001-
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get PatientNames">
1001+
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get PatientNames" enabled="true">
10021002
<stringProp name="RegexExtractor.useHeaders">false</stringProp>
10031003
<stringProp name="RegexExtractor.refname">PatientName</stringProp>
10041004
<stringProp name="RegexExtractor.regex">href=&quot;\/sessions\/.*?\/patients\/.*?\/(hpv|flu)\?return_to=register&quot;&gt;(.*?)&lt;</stringProp>
@@ -1008,7 +1008,7 @@ log.info(&quot;session ID is &quot; + vars.get(&quot;SessionId&quot;))</stringPr
10081008
<stringProp name="RegexExtractor.match_number">-1</stringProp>
10091009
</RegexExtractor>
10101010
<hashTree/>
1011-
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="SessionStatus RegEx">
1011+
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="SessionStatus RegEx" enabled="true">
10121012
<stringProp name="RegexExtractor.useHeaders">false</stringProp>
10131013
<stringProp name="RegexExtractor.refname">SessionStatus</stringProp>
10141014
<stringProp name="RegexExtractor.regex">nhsuk-tag nhsuk-tag--(.*?)&quot;&gt;(.*?)&lt;</stringProp>
@@ -1031,13 +1031,28 @@ log.info(&quot;session ID is &quot; + vars.get(&quot;SessionId&quot;))</stringPr
10311031
<boolProp name="IfController.useExpression">true</boolProp>
10321032
</IfController>
10331033
<hashTree>
1034-
<TestAction guiclass="TestActionGui" testclass="TestAction" testname="Stop Thread If No More Patients">
1034+
<TestAction guiclass="TestActionGui" testclass="TestAction" testname="Go to next thread as patient isn&apos;t found">
1035+
<intProp name="ActionProcessor.action">3</intProp>
1036+
<intProp name="ActionProcessor.target">0</intProp>
1037+
<stringProp name="ActionProcessor.duration">0</stringProp>
1038+
</TestAction>
1039+
<hashTree>
1040+
<JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Search failed" enabled="true">
1041+
<stringProp name="cacheKey">true</stringProp>
1042+
<stringProp name="filename"></stringProp>
1043+
<stringProp name="parameters"></stringProp>
1044+
<stringProp name="script">log.error(&quot;Fuzzy search failed&quot;)</stringProp>
1045+
<stringProp name="scriptLanguage">groovy</stringProp>
1046+
</JSR223PreProcessor>
1047+
<hashTree/>
1048+
</hashTree>
1049+
<TestAction guiclass="TestActionGui" testclass="TestAction" testname="Stop Thread If No More Patients" enabled="false">
10351050
<intProp name="ActionProcessor.action">0</intProp>
10361051
<intProp name="ActionProcessor.target">0</intProp>
10371052
<stringProp name="ActionProcessor.duration">0</stringProp>
10381053
</TestAction>
10391054
<hashTree>
1040-
<JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="No Patients ">
1055+
<JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="No Patients " enabled="true">
10411056
<stringProp name="cacheKey">true</stringProp>
10421057
<stringProp name="filename"></stringProp>
10431058
<stringProp name="parameters"></stringProp>
@@ -1047,7 +1062,7 @@ log.info(&quot;session ID is &quot; + vars.get(&quot;SessionId&quot;))</stringPr
10471062
<hashTree/>
10481063
</hashTree>
10491064
</hashTree>
1050-
<JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="Get correct patient name">
1065+
<JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="Get correct patient name" enabled="true">
10511066
<stringProp name="scriptLanguage">groovy</stringProp>
10521067
<stringProp name="parameters"></stringProp>
10531068
<stringProp name="filename"></stringProp>
@@ -1070,7 +1085,7 @@ for(loop=1;loop&lt;=PatientCount;loop++){
10701085
</stringProp>
10711086
</JSR223Sampler>
10721087
<hashTree/>
1073-
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="If PatientId_NotFound (Fuzzy search failed)">
1088+
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="If PatientId_NotFound (Fuzzy search failed)" enabled="true">
10741089
<stringProp name="IfController.condition">${__jexl3(&quot;${PatientId}&quot; == &quot;PatientSearchFailed&quot;)}</stringProp>
10751090
<boolProp name="IfController.evaluateAll">false</boolProp>
10761091
<boolProp name="IfController.useExpression">true</boolProp>
@@ -1082,7 +1097,7 @@ for(loop=1;loop&lt;=PatientCount;loop++){
10821097
<stringProp name="ActionProcessor.duration">0</stringProp>
10831098
</TestAction>
10841099
<hashTree>
1085-
<JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Search failed">
1100+
<JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Search failed" enabled="true">
10861101
<stringProp name="cacheKey">true</stringProp>
10871102
<stringProp name="filename"></stringProp>
10881103
<stringProp name="parameters"></stringProp>
@@ -1092,7 +1107,7 @@ for(loop=1;loop&lt;=PatientCount;loop++){
10921107
<hashTree/>
10931108
</hashTree>
10941109
</hashTree>
1095-
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="Already vaccinated">
1110+
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="Already vaccinated" enabled="true">
10961111
<stringProp name="IfController.condition">${__jexl3(&quot;${SessionStatus}&quot; == &quot;green Completed session&quot;)}</stringProp>
10971112
<boolProp name="IfController.evaluateAll">false</boolProp>
10981113
<boolProp name="IfController.useExpression">true</boolProp>
@@ -1178,13 +1193,13 @@ for(loop=1;loop&lt;=PatientCount;loop++){
11781193
<hashTree/>
11791194
</hashTree>
11801195
</hashTree>
1181-
<TestAction guiclass="TestActionGui" testclass="TestAction" testname="Start next thread for new patient">
1196+
<TestAction guiclass="TestActionGui" testclass="TestAction" testname="Start next thread for new patient" enabled="true">
11821197
<intProp name="ActionProcessor.action">3</intProp>
11831198
<intProp name="ActionProcessor.target">0</intProp>
11841199
<stringProp name="ActionProcessor.duration">0</stringProp>
11851200
</TestAction>
11861201
<hashTree>
1187-
<JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Already vaccinated">
1202+
<JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Already vaccinated" enabled="true">
11881203
<stringProp name="cacheKey">true</stringProp>
11891204
<stringProp name="filename"></stringProp>
11901205
<stringProp name="parameters"></stringProp>
@@ -1319,7 +1334,7 @@ vars.put(&quot;vaccineCount&quot;,vaccineCount.toString())
13191334
<hashTree/>
13201335
</hashTree>
13211336
</hashTree>
1322-
<ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="Vaccine loop">
1337+
<ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="Vaccine loop" enabled="true">
13231338
<stringProp name="ForeachController.inputVal">VaccinationPages</stringProp>
13241339
<stringProp name="ForeachController.returnVal">VaccinationPage</stringProp>
13251340
<boolProp name="ForeachController.useSeparator">true</boolProp>
@@ -2544,7 +2559,7 @@ if(vars.get(&quot;BatchId&quot;)==&quot;BatchId_NotFound&quot;){
25442559
</hashTree>
25452560
</hashTree>
25462561
</hashTree>
2547-
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="6.0 Logout">
2562+
<IfController guiclass="IfControllerPanel" testclass="IfController" testname="6.0 Logout" enabled="true">
25482563
<stringProp name="IfController.condition">${__groovy((vars.getIteration()) % (&quot;${VaccinationLoop}&quot;).toInteger() == 0)}</stringProp>
25492564
<boolProp name="IfController.evaluateAll">false</boolProp>
25502565
<boolProp name="IfController.useExpression">true</boolProp>

0 commit comments

Comments
 (0)