Skip to content

Commit acab580

Browse files
andimovandimov
committed
Merge remote-tracking branch 'origin/2.4-develop' into MCP-218
2 parents 32dc13e + 336eac0 commit acab580

File tree

1 file changed

+26
-36
lines changed

1 file changed

+26
-36
lines changed

‎setup/performance-toolkit/benchmark.jmx

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -78017,20 +78017,31 @@ vars.put("admin_user", adminUser);
7801778017
<TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Order" enabled="true"/>
7801878018
<hashTree>
7801978019
<BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
78020-
<stringProp name="TestPlan.comments">tool/fragments/ee/admin_create_order/admin_create_order.jmx</stringProp>
78020+
<stringProp name="TestPlan.comments">tool/fragments/ce/admin_create_order/admin_create_order.jmx</stringProp>
7802178021
<stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
7802278022
import java.util.Random;
7802378023
Random random = new Random();
78024+
7802478025
if (${seedForRandom} &gt; 0) {
7802578026
random.setSeed(${seedForRandom});
7802678027
}
78028+
78029+
number = random.nextInt(props.get("configurable_products_list").size());
78030+
configurableList = props.get("configurable_products_list").get(number);
78031+
vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
78032+
vars.put("configurable_product_1_name", configurableList.get("title"));
78033+
vars.put("configurable_product_1_id", configurableList.get("id"));
78034+
vars.put("configurable_product_1_sku", configurableList.get("sku"));
78035+
vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
78036+
vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
78037+
7802778038
number = random.nextInt(props.get("simple_products_list").size());
78028-
number1 = random.nextInt(props.get("simple_products_list").size());
7802978039
simpleList = props.get("simple_products_list").get(number);
7803078040
vars.put("simple_product_1_url_key", simpleList.get("url_key"));
7803178041
vars.put("simple_product_1_name", simpleList.get("title"));
7803278042
vars.put("simple_product_1_id", simpleList.get("id"));
7803378043

78044+
number1 = random.nextInt(props.get("configurable_products_list").size());
7803478045
do {
7803578046
number1 = random.nextInt(props.get("simple_products_list").size());
7803678047
} while(number == number1);
@@ -78039,15 +78050,6 @@ vars.put("simple_product_2_url_key", simpleList.get("url_key"));
7803978050
vars.put("simple_product_2_name", simpleList.get("title"));
7804078051
vars.put("simple_product_2_id", simpleList.get("id"));
7804178052

78042-
number = random.nextInt(props.get("configurable_products_list").size());
78043-
configurableList = props.get("configurable_products_list").get(number);
78044-
vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
78045-
vars.put("configurable_product_1_name", configurableList.get("title"));
78046-
vars.put("configurable_product_1_id", configurableList.get("id"));
78047-
vars.put("configurable_product_1_sku", configurableList.get("sku"));
78048-
vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
78049-
vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
78050-
7805178053

7805278054
customers_index = 0;
7805378055
if (!props.containsKey("customer_ids_index")) {
@@ -78770,13 +78772,6 @@ catch (java.lang.Exception e) {
7877078772
<stringProp name="Argument.metadata">=</stringProp>
7877178773
<boolProp name="HTTPArgument.use_equals">true</boolProp>
7877278774
</elementProp>
78773-
<elementProp name="giftwrapping[quote][863][design]" elementType="HTTPArgument">
78774-
<boolProp name="HTTPArgument.always_encode">true</boolProp>
78775-
<stringProp name="Argument.name">giftwrapping[quote][863][design]</stringProp>
78776-
<stringProp name="Argument.value"/>
78777-
<stringProp name="Argument.metadata">=</stringProp>
78778-
<boolProp name="HTTPArgument.use_equals">true</boolProp>
78779-
</elementProp>
7878078775
<elementProp name="order[comment][customer_note]" elementType="HTTPArgument">
7878178776
<boolProp name="HTTPArgument.always_encode">true</boolProp>
7878278777
<stringProp name="Argument.name">order[comment][customer_note]</stringProp>
@@ -102726,20 +102721,31 @@ vars.put("admin_user", adminUser);
102726102721
<TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Order" enabled="true"/>
102727102722
<hashTree>
102728102723
<BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
102729-
<stringProp name="TestPlan.comments">tool/fragments/ee/admin_create_order/admin_create_order.jmx</stringProp>
102724+
<stringProp name="TestPlan.comments">tool/fragments/ce/admin_create_order/admin_create_order.jmx</stringProp>
102730102725
<stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
102731102726
import java.util.Random;
102732102727
Random random = new Random();
102728+
102733102729
if (${seedForRandom} &gt; 0) {
102734102730
random.setSeed(${seedForRandom});
102735102731
}
102732+
102733+
number = random.nextInt(props.get("configurable_products_list").size());
102734+
configurableList = props.get("configurable_products_list").get(number);
102735+
vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
102736+
vars.put("configurable_product_1_name", configurableList.get("title"));
102737+
vars.put("configurable_product_1_id", configurableList.get("id"));
102738+
vars.put("configurable_product_1_sku", configurableList.get("sku"));
102739+
vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
102740+
vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
102741+
102736102742
number = random.nextInt(props.get("simple_products_list").size());
102737-
number1 = random.nextInt(props.get("simple_products_list").size());
102738102743
simpleList = props.get("simple_products_list").get(number);
102739102744
vars.put("simple_product_1_url_key", simpleList.get("url_key"));
102740102745
vars.put("simple_product_1_name", simpleList.get("title"));
102741102746
vars.put("simple_product_1_id", simpleList.get("id"));
102742102747

102748+
number1 = random.nextInt(props.get("configurable_products_list").size());
102743102749
do {
102744102750
number1 = random.nextInt(props.get("simple_products_list").size());
102745102751
} while(number == number1);
@@ -102748,15 +102754,6 @@ vars.put("simple_product_2_url_key", simpleList.get("url_key"));
102748102754
vars.put("simple_product_2_name", simpleList.get("title"));
102749102755
vars.put("simple_product_2_id", simpleList.get("id"));
102750102756

102751-
number = random.nextInt(props.get("configurable_products_list").size());
102752-
configurableList = props.get("configurable_products_list").get(number);
102753-
vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
102754-
vars.put("configurable_product_1_name", configurableList.get("title"));
102755-
vars.put("configurable_product_1_id", configurableList.get("id"));
102756-
vars.put("configurable_product_1_sku", configurableList.get("sku"));
102757-
vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
102758-
vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
102759-
102760102757

102761102758
customers_index = 0;
102762102759
if (!props.containsKey("customer_ids_index")) {
@@ -103479,13 +103476,6 @@ catch (java.lang.Exception e) {
103479103476
<stringProp name="Argument.metadata">=</stringProp>
103480103477
<boolProp name="HTTPArgument.use_equals">true</boolProp>
103481103478
</elementProp>
103482-
<elementProp name="giftwrapping[quote][863][design]" elementType="HTTPArgument">
103483-
<boolProp name="HTTPArgument.always_encode">true</boolProp>
103484-
<stringProp name="Argument.name">giftwrapping[quote][863][design]</stringProp>
103485-
<stringProp name="Argument.value"/>
103486-
<stringProp name="Argument.metadata">=</stringProp>
103487-
<boolProp name="HTTPArgument.use_equals">true</boolProp>
103488-
</elementProp>
103489103479
<elementProp name="order[comment][customer_note]" elementType="HTTPArgument">
103490103480
<boolProp name="HTTPArgument.always_encode">true</boolProp>
103491103481
<stringProp name="Argument.name">order[comment][customer_note]</stringProp>

0 commit comments

Comments
 (0)