Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Review and rework #4

Merged
merged 13 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions config/data/jmeter/.performulator-simple.jmx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.6.3">
<hashTree>
<TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan">
<elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables">
<collectionProp name="Arguments.arguments"/>
</elementProp>
</TestPlan>
<hashTree>
<ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group">
<intProp name="ThreadGroup.num_threads">1</intProp>
<intProp name="ThreadGroup.ramp_time">1</intProp>
<boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
<stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller">
<stringProp name="LoopController.loops">1</stringProp>
<boolProp name="LoopController.continue_forever">false</boolProp>
</elementProp>
</ThreadGroup>
<hashTree>
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" enabled="false">
<stringProp name="HTTPSampler.domain">performulator.xceptance.com</stringProp>
<stringProp name="HTTPSampler.protocol">https</stringProp>
<stringProp name="HTTPSampler.path">/echo</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.use_keepalive">true</boolProp>
<boolProp name="HTTPSampler.postBodyRaw">false</boolProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables">
<collectionProp name="Arguments.arguments"/>
</elementProp>
</HTTPSamplerProxy>
<hashTree/>
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy">
<stringProp name="HTTPSampler.domain">performulator.xceptance.com</stringProp>
<stringProp name="HTTPSampler.protocol">https</stringProp>
<stringProp name="HTTPSampler.path">/echo</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.use_keepalive">true</boolProp>
<boolProp name="HTTPSampler.postBodyRaw">false</boolProp>
<elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables">
<collectionProp name="Arguments.arguments"/>
</elementProp>
</HTTPSamplerProxy>
<hashTree/>
</hashTree>
</hashTree>
</hashTree>
</jmeterTestPlan>
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<hashTree/>
</hashTree>
</hashTree>
<CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config">
<stringProp name="filename">\config\data\tests\csvtest.csv</stringProp>
<CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="true">
<stringProp name="filename">data/csvtest.csv</stringProp>
<stringProp name="fileEncoding"></stringProp>
<stringProp name="variableNames"></stringProp>
<boolProp name="ignoreFirstLine">false</boolProp>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1,395 changes: 1,395 additions & 0 deletions config/data/jmeter/PetStore-End-to-End-Flow.jmx

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions config/data/jmeter/data/products.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FISH
DOGS
CATS
REPTILES
BIRDS
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 4 additions & 3 deletions config/jmeter-default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
################################################################################

## The list of minimum default files needed to read in the jmx file
com.xceptance.xlt.default.jmeter.file = jmeter.properties
com.xceptance.xlt.default.jmeter.saveservice.file = saveservice.properties
com.xceptance.xlt.default.jmeter.upgrade.file = upgrade.properties
## The data is relative to the jmeter directory in config
com.xceptance.xlt.jmeter.default.properties = properties/jmeter.properties
com.xceptance.xlt.jmeter.saveservice.properties = properties/saveservice.properties
com.xceptance.xlt.jmeter.upgrade.properties = properties/upgrade.properties
29 changes: 15 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version>
<argLine>-Duser.language=de -Duser.region=DE</argLine>
</properties>

<build>
Expand All @@ -33,12 +34,12 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
</plugin>

<plugin>
<groupId>com.lazerycode.jmeter</groupId>
<artifactId>jmeter-maven-plugin</artifactId>
<version>2.9.0</version>
</plugin>
<groupId>com.lazerycode.jmeter</groupId>
<artifactId>jmeter-maven-plugin</artifactId>
<version>2.9.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -47,7 +48,7 @@
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>central</id>
Expand All @@ -65,7 +66,7 @@
</repositories>

<dependencies>

<dependency>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_java</artifactId>
Expand All @@ -77,19 +78,19 @@
<artifactId>ApacheJMeter_http</artifactId>
<version>5.6.3</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.1</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand All @@ -99,10 +100,10 @@
<dependency>
<groupId>com.xceptance</groupId>
<artifactId>xlt</artifactId>
<version>8.4.0</version>
<version>8.5.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
Expand All @@ -120,13 +121,13 @@
<artifactId>snakeyaml</artifactId>
<version>1.26</version>
</dependency>

<dependency>
<groupId>com.xceptance</groupId>
<artifactId>testsuite-foundation</artifactId>
<version>0.0.6</version>
</dependency>

<dependency>
<groupId>com.xceptance</groupId>
<artifactId>testsuite-addons</artifactId>
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/com/xceptance/loadtest/control/CustomTimer.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* Copyright (c) 2005-2025 Xceptance Software Technologies GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.xceptance.loadtest.control;

import com.xceptance.loadtest.api.data.CustomData;
Expand Down
Loading