Skip to content

Commit 21881e2

Browse files
simonnorris1simonnorris1
authored
bug fixes
1 parent 8b5bd46 commit 21881e2

File tree

1 file changed

+19
-61
lines changed

1 file changed

+19
-61
lines changed

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

Lines changed: 19 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments">
66
<collectionProp name="Arguments.arguments"/>
77
</elementProp>
8-
<boolProp name="TestPlan.functional_mode">false</boolProp>
9-
<boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
108
</TestPlan>
119
<hashTree>
1210
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header manager">
@@ -34,18 +32,7 @@
3432
</collectionProp>
3533
</HeaderManager>
3634
<hashTree/>
37-
<com.blazemeter.jmeter.RandomCSVDataSetConfig guiclass="com.blazemeter.jmeter.RandomCSVDataSetConfigGui" testclass="com.blazemeter.jmeter.RandomCSVDataSetConfig" testname="Cohort Data CSV Feeder" enabled="false">
38-
<stringProp name="filename">${InputFile}</stringProp>
39-
<stringProp name="fileEncoding">UTF-8</stringProp>
40-
<stringProp name="delimiter">,</stringProp>
41-
<stringProp name="variableNames"></stringProp>
42-
<boolProp name="randomOrder">false</boolProp>
43-
<boolProp name="ignoreFirstLine">true</boolProp>
44-
<boolProp name="rewindOnTheEndOfList">true</boolProp>
45-
<boolProp name="independentListPerThread">true</boolProp>
46-
</com.blazemeter.jmeter.RandomCSVDataSetConfig>
47-
<hashTree/>
48-
<CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
35+
<CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config">
4936
<stringProp name="delimiter">,</stringProp>
5037
<stringProp name="fileEncoding">UTF-8</stringProp>
5138
<stringProp name="filename">${BaseDirectory}${InputFile}</stringProp>
@@ -57,7 +44,7 @@
5744
<stringProp name="variableNames"></stringProp>
5845
</CSVDataSet>
5946
<hashTree/>
60-
<Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="false">
47+
<Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables">
6148
<collectionProp name="Arguments.arguments">
6249
<elementProp name="AuthToken" elementType="Argument">
6350
<stringProp name="Argument.name">AuthToken</stringProp>
@@ -107,7 +94,7 @@
10794
</collectionProp>
10895
</Arguments>
10996
<hashTree/>
110-
<Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables standalone">
97+
<Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables standalone" enabled="false">
11198
<collectionProp name="Arguments.arguments">
11299
<elementProp name="AuthToken" elementType="Argument">
113100
<stringProp name="Argument.name">AuthToken</stringProp>
@@ -354,7 +341,7 @@
354341
</RegexExtractor>
355342
<hashTree/>
356343
</hashTree>
357-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Sessions page" enabled="true">
344+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Sessions page">
358345
<stringProp name="HTTPSampler.path">sessions</stringProp>
359346
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
360347
<stringProp name="HTTPSampler.method">GET</stringProp>
@@ -393,7 +380,7 @@
393380
<stringProp name="scriptLanguage">groovy</stringProp>
394381
</JSR223PostProcessor>
395382
<hashTree/>
396-
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get all session ID&apos;s">
383+
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get all session ID&apos;s" enabled="true">
397384
<stringProp name="RegexExtractor.useHeaders">false</stringProp>
398385
<stringProp name="RegexExtractor.refname">SessionID</stringProp>
399386
<stringProp name="RegexExtractor.regex">sessions\/(.*?)&quot;[\s\S]{1,400}nhsuk-tag nhsuk-tag--white&quot;&gt;(.*?)&lt;</stringProp>
@@ -403,7 +390,7 @@
403390
<stringProp name="RegexExtractor.match_number">-1</stringProp>
404391
</RegexExtractor>
405392
<hashTree/>
406-
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get all vaccines">
393+
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get all vaccines" enabled="true">
407394
<stringProp name="RegexExtractor.useHeaders">false</stringProp>
408395
<stringProp name="RegexExtractor.refname">SessionVaccine</stringProp>
409396
<stringProp name="RegexExtractor.regex">sessions\/(.*?)&quot;[\s\S]{1,400}nhsuk-tag nhsuk-tag--white&quot;&gt;(.*?)&lt;</stringProp>
@@ -428,22 +415,22 @@ for(loop=1;loop&lt;=vaccineCount;loop++){
428415
if(vars.get(&quot;SessionVaccine_&quot; + loop)==&quot;Td/IPV&quot;){
429416
vars.put(&quot;SessionVaccine_&quot; + loop,&quot;MenACWY&quot;)
430417
}
431-
vars.put(&quot;VaccineSession_&quot; + vars.get(&quot;SessionVaccine_&quot; + loop),vars.get(&quot;SessionID_&quot; + loop))
432-
props.put(&quot;VaccineSession_&quot; + vars.get(&quot;SessionVaccine_&quot; + loop),vars.get(&quot;SessionID_&quot; + loop))
418+
vars.put(&quot;ConsentSession_&quot; + vars.get(&quot;SessionVaccine_&quot; + loop),vars.get(&quot;SessionID_&quot; + loop))
419+
props.put(&quot;ConsentSession_&quot; + vars.get(&quot;SessionVaccine_&quot; + loop),vars.get(&quot;SessionID_&quot; + loop))
433420
log.info(vars.get(&quot;SessionID_&quot; + loop))
434421
}
435422
}
436423
</stringProp>
437424
</JSR223Sampler>
438425
<hashTree/>
439-
<DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
426+
<DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler">
440427
<boolProp name="displayJMeterProperties">false</boolProp>
441428
<boolProp name="displayJMeterVariables">true</boolProp>
442429
<boolProp name="displaySystemProperties">false</boolProp>
443430
</DebugSampler>
444431
<hashTree/>
445432
</hashTree>
446-
<LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="vaccineLoop">
433+
<LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="vaccineLoop" enabled="true">
447434
<stringProp name="LoopController.loops">3</stringProp>
448435
</LoopController>
449436
<hashTree>
@@ -473,11 +460,11 @@ switch(loop){
473460
log.info(props.get(&quot;ConsentSession&quot;));</stringProp>
474461
</JSR223Sampler>
475462
<hashTree/>
476-
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Open Sessions List" enabled="true">
463+
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Open Sessions List">
477464
<boolProp name="TransactionController.includeTimers">false</boolProp>
478465
</TransactionController>
479466
<hashTree>
480-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Sessions list" enabled="true">
467+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Sessions list">
481468
<stringProp name="HTTPSampler.path">sessions</stringProp>
482469
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
483470
<stringProp name="HTTPSampler.method">GET</stringProp>
@@ -500,11 +487,11 @@ log.info(props.get(&quot;ConsentSession&quot;));</stringProp>
500487
<hashTree/>
501488
</hashTree>
502489
</hashTree>
503-
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Edit session" enabled="true">
490+
<TransactionController guiclass="TransactionControllerGui" testclass="TransactionController" testname="Edit session">
504491
<boolProp name="TransactionController.includeTimers">false</boolProp>
505492
</TransactionController>
506493
<hashTree>
507-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Session Edit ${ConsentSession}" enabled="true">
494+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Session Edit ${ConsentSession}">
508495
<boolProp name="HTTPSampler.image_parser">true</boolProp>
509496
<boolProp name="HTTPSampler.concurrentDwn">true</boolProp>
510497
<intProp name="HTTPSampler.concurrentPool">6</intProp>
@@ -556,7 +543,7 @@ log.info(props.get(&quot;ConsentSession&quot;));</stringProp>
556543
</ResponseAssertion>
557544
<hashTree/>
558545
</hashTree>
559-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Session Dates" enabled="true">
546+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Session Dates">
560547
<boolProp name="HTTPSampler.image_parser">true</boolProp>
561548
<boolProp name="HTTPSampler.concurrentDwn">true</boolProp>
562549
<intProp name="HTTPSampler.concurrentPool">6</intProp>
@@ -945,35 +932,6 @@ import java.time.temporal.ChronoUnit;
945932
import java.time.format.*;
946933

947934
BufferedReader reader;
948-
HashMap&lt;String, String&gt; cohortCodes = new HashMap&lt;String,String&gt;();
949-
950-
//Opens file to populate HashMap of URNs and Slug
951-
/*
952-
try {
953-
reader = new BufferedReader(new FileReader(vars.get(&quot;BaseDirectory&quot;) + vars.get(&quot;UrnMapping&quot;)));
954-
String line = reader.readLine();
955-
956-
line = reader.readLine();
957-
958-
while (line != null)
959-
{
960-
String[] lineSplit = line.split(&quot;,&quot;);
961-
962-
cohortCodes.put(lineSplit[1],lineSplit[0])
963-
964-
line = reader.readLine();
965-
}
966-
967-
reader.close();
968-
}
969-
catch (IOException e)
970-
{
971-
e.printStackTrace();
972-
}
973-
*/
974-
975-
//Uses HashMap above to cross reference URN code in feeder file to use a specific slug in URL
976-
//vars.put(&quot;ConsentSession&quot;, cohortCodes.get(vars.get(&quot;CHILD_SCHOOL_URN&quot;)));
977935

978936
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(&quot;dd/MM/yyyy&quot;);
979937

@@ -1006,7 +964,7 @@ props.put(&quot;Vaccinations&quot;,vars.get(&quot;Vaccinations&quot;))
1006964
<stringProp name="scriptLanguage">groovy</stringProp>
1007965
</JSR223Sampler>
1008966
<hashTree>
1009-
<JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor">
967+
<JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
1010968
<stringProp name="cacheKey">true</stringProp>
1011969
<stringProp name="filename"></stringProp>
1012970
<stringProp name="parameters"></stringProp>
@@ -1024,7 +982,7 @@ props.put(&quot;Vaccinations&quot;,vars.get(&quot;Vaccinations&quot;))
1024982
</ModuleController>
1025983
<hashTree/>
1026984
</hashTree>
1027-
<ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="false">
985+
<ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group">
1028986
<stringProp name="ThreadGroup.num_threads">${Threads}</stringProp>
1029987
<stringProp name="ThreadGroup.ramp_time">${RampUp}</stringProp>
1030988
<stringProp name="ThreadGroup.duration">${Duration}</stringProp>
@@ -1141,13 +1099,13 @@ vars.put(&quot;SchoolYear&quot;, String.valueOf(schoolYear));
11411099
</JSR223PostProcessor>
11421100
<hashTree/>
11431101
</hashTree>
1144-
<DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
1102+
<DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler">
11451103
<boolProp name="displayJMeterProperties">false</boolProp>
11461104
<boolProp name="displayJMeterVariables">true</boolProp>
11471105
<boolProp name="displaySystemProperties">false</boolProp>
11481106
</DebugSampler>
11491107
<hashTree/>
1150-
<ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Submit consents" enabled="true">
1108+
<ModuleController guiclass="ModuleControllerGui" testclass="ModuleController" testname="Submit consents">
11511109
<collectionProp name="ModuleController.node_path">
11521110
<stringProp name="764597751">Test Plan</stringProp>
11531111
<stringProp name="-111960216">Mavis_Parental</stringProp>

0 commit comments

Comments
 (0)