Skip to content

Update parallel controller #313

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.

Sign up for GitHub

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

Merged
sebastianlorenzo88 merged 2 commits into from
Sep 23, 2025
+8 −4
Merged

Update parallel controller #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66a0f1d
Update parallel controller version and add test validation
sebastianlorenzo88 Sep 23, 2025
8c3886f
Update Selenium version
sebastianlorenzo88 Sep 23, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
branch: master
file_pattern: 'pom.xml */pom.xml README.md docs/index.md docs/guide/**'
- name: package release
run: mvn --batch-mode --no-transfer-progress -Dwebdriver.chrome.driver=/usr/bin/chromedriver clean install --settings .github/settings.xml
run: mvn --batch-mode --no-transfer-progress clean install --settings .github/settings.xml
env:
BZ_TOKEN: ${{ secrets.BZ_TOKEN }}
OCTOPERF_API_KEY: ${{ secrets.OCTOPERF_API_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion jmeter-java-dsl-parallel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>com.blazemeter</groupId>
<artifactId>jmeter-parallel</artifactId>
<version>0.11</version>
<version>0.12</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
Expand Down
6 changes: 5 additions & 1 deletion ...l-parallel/src/test/java/us/abstracta/jmeter/javadsl/parallel/ParallelControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import static us.abstracta.jmeter.javadsl.JmeterDsl.testPlan;
import static us.abstracta.jmeter.javadsl.JmeterDsl.threadGroup;
import static us.abstracta.jmeter.javadsl.parallel.ParallelController.parallelController;
import static org.assertj.core.api.Assertions.assertThat;

import java.util.concurrent.CyclicBarrier;
import org.junit.jupiter.api.Nested;
Expand All @@ -13,6 +14,8 @@
import us.abstracta.jmeter.javadsl.JmeterDslTest;
import us.abstracta.jmeter.javadsl.codegeneration.MethodCallBuilderTest;
import us.abstracta.jmeter.javadsl.core.DslTestPlan;
import us.abstracta.jmeter.javadsl.core.TestPlanStats;


public class ParallelControllerTest extends JmeterDslTest {

Expand All @@ -21,7 +24,7 @@ public class ParallelControllerTest extends JmeterDslTest {
public void shouldExecuteRequestsInParallelWhenRequestsInsideParallelController()
throws Exception {
CyclicBarrier barrier = new CyclicBarrier(2);
testPlan(
TestPlanStats stats = testPlan(
threadGroup(1, 1,
parallelController(
httpSampler(wiremockUri)
Expand All @@ -31,6 +34,7 @@ public void shouldExecuteRequestsInParallelWhenRequestsInsideParallelController(
)
)
).run();
assertThat(stats.overall().samplesCount()).isEqualTo(2);
}

@Nested
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<junit-platform.version>1.9.1</junit-platform.version>
<assertj-core.version>3.23.1</assertj-core.version>
<jackson.version>2.14.2</jackson.version>
<selenium.version>4.18.0</selenium.version>
<selenium.version>4.19.1</selenium.version>
<!-- same version as JMeter dependency -->
<slf4j.version>1.7.36</slf4j.version>
<retrofit.version>2.9.0</retrofit.version>
Expand Down