Skip to content

Commit eb85faa

Browse files
Merge pull request #313 from abstracta/UPDATE_PARALLEL_CONTROLLER
Update parallel controller
2 parents bf2f3c2 + 8c3886f commit eb85faa

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
branch: master
4444
file_pattern: 'pom.xml */pom.xml README.md docs/index.md docs/guide/**'
4545
- name: package release
46-
run: mvn --batch-mode --no-transfer-progress -Dwebdriver.chrome.driver=/usr/bin/chromedriver clean install --settings .github/settings.xml
46+
run: mvn --batch-mode --no-transfer-progress clean install --settings .github/settings.xml
4747
env:
4848
BZ_TOKEN: ${{ secrets.BZ_TOKEN }}
4949
OCTOPERF_API_KEY: ${{ secrets.OCTOPERF_API_KEY }}

jmeter-java-dsl-parallel/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>com.blazemeter</groupId>
2525
<artifactId>jmeter-parallel</artifactId>
26-
<version>0.11</version>
26+
<version>0.12</version>
2727
<exclusions>
2828
<exclusion>
2929
<groupId>javax.servlet</groupId>

jmeter-java-dsl-parallel/src/test/java/us/abstracta/jmeter/javadsl/parallel/ParallelControllerTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static us.abstracta.jmeter.javadsl.JmeterDsl.testPlan;
66
import static us.abstracta.jmeter.javadsl.JmeterDsl.threadGroup;
77
import static us.abstracta.jmeter.javadsl.parallel.ParallelController.parallelController;
8+
import static org.assertj.core.api.Assertions.assertThat;
89

910
import java.util.concurrent.CyclicBarrier;
1011
import org.junit.jupiter.api.Nested;
@@ -13,6 +14,8 @@
1314
import us.abstracta.jmeter.javadsl.JmeterDslTest;
1415
import us.abstracta.jmeter.javadsl.codegeneration.MethodCallBuilderTest;
1516
import us.abstracta.jmeter.javadsl.core.DslTestPlan;
17+
import us.abstracta.jmeter.javadsl.core.TestPlanStats;
18+
1619

1720
public class ParallelControllerTest extends JmeterDslTest {
1821

@@ -21,7 +24,7 @@ public class ParallelControllerTest extends JmeterDslTest {
2124
public void shouldExecuteRequestsInParallelWhenRequestsInsideParallelController()
2225
throws Exception {
2326
CyclicBarrier barrier = new CyclicBarrier(2);
24-
testPlan(
27+
TestPlanStats stats = testPlan(
2528
threadGroup(1, 1,
2629
parallelController(
2730
httpSampler(wiremockUri)
@@ -31,6 +34,7 @@ public void shouldExecuteRequestsInParallelWhenRequestsInsideParallelController(
3134
)
3235
)
3336
).run();
37+
assertThat(stats.overall().samplesCount()).isEqualTo(2);
3438
}
3539

3640
@Nested

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<junit-platform.version>1.9.1</junit-platform.version>
4949
<assertj-core.version>3.23.1</assertj-core.version>
5050
<jackson.version>2.14.2</jackson.version>
51-
<selenium.version>4.18.0</selenium.version>
51+
<selenium.version>4.19.1</selenium.version>
5252
<!-- same version as JMeter dependency -->
5353
<slf4j.version>1.7.36</slf4j.version>
5454
<retrofit.version>2.9.0</retrofit.version>

0 commit comments

Comments
 (0)