Skip to content

Commit 356b81c

Browse files
Refactors
Remove connection and write methods to use only constructor way Add enum for status code Change code builders to use common parameters types Update test Update doc
1 parent e267e4a commit 356b81c

File tree

15 files changed

+328
-534
lines changed

15 files changed

+328
-534
lines changed

docs/guide/protocols/websocket.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@ Following you can see a basic usage example of Web Socket protocol.
2828

2929
```java
3030
import static us.abstracta.jmeter.javadsl.JmeterDsl.*;
31-
import static us.abstracta.jmeter.javadsl.websocket.DslWebsocketSampler.webSocketSampler;
31+
import us.abstracta.jmeter.javadsl.websocket.DslWebsocketFactory;
3232
import us.abstracta.jmeter.javadsl.core.TestPlanStats;
3333

3434
public class Test {
3535
public static void main(String[] args) throws Exception {
3636
TestPlanStats stats = testPlan(
3737
threadGroup(1, 1,
38-
webSocketSampler().connect("wss://ws.postman-echo.com/raw"),
39-
webSocketSampler().write("Hello WebSocket!"),
40-
webSocketSampler().read()
38+
DslWebsocketFactory.websocketConnect("wss://ws.postman-echo.com/raw"),
39+
DslWebsocketFactory.websocketWrite("Hello WebSocket!"),
40+
DslWebsocketFactory.websocketRead()
4141
.children(
4242
responseAssertion()
4343
.equalsToStrings("Hello WebSocket!")
4444
),
45-
webSocketSampler().disconnect()
45+
DslWebsocketFactory.websocketDisconnect()
4646
)
4747
).run();
4848
}
@@ -53,16 +53,16 @@ public class Test {
5353
Only `ws://` and `wss://` protocols are supported. Using any other scheme will throw an `IllegalArgumentException`.
5454
:::
5555

56+
::: tip
5657
You can use a non blocking read if it is necessary in the following way
5758

5859
```java
59-
webSocketSampler().read().waitForResponse(false)
60+
DslWebsocketFactory.websocketRead().waitForResponse(false)
6061
```
6162

62-
::: warning
6363
In this case is not recommended to add an assertion due the response could be empty
6464
:::
6565

66-
::: tip
67-
Web Socket protocol only supports one connection at a time. If you want to change Web Socket server during execution you should add a disconnect sampler and then establish a new connection.
66+
::: warning
67+
Web Socket plugin only supports one connection for threads at a time. If you want to change Web Socket server during execution you should add a disconnect sampler and then establish a new connection.
6868
:::

jmeter-java-dsl-cli/src/main/java/us/abstracta/jmeter/javadsl/cli/Jmx2DslCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import us.abstracta.jmeter.javadsl.graphql.DslGraphqlSampler;
1212
import us.abstracta.jmeter.javadsl.jdbc.JdbcJmeterDsl;
1313
import us.abstracta.jmeter.javadsl.parallel.ParallelController;
14-
import us.abstracta.jmeter.javadsl.websocket.DslWebsocketSampler;
14+
import us.abstracta.jmeter.javadsl.websocket.DslWebsocketFactory;
1515
import us.abstracta.jmeter.javadsl.wrapper.WrapperJmeterDsl;
1616

1717
@Command(name = "jmx2dsl", header = "Converts a JMX file to DSL code",
@@ -49,7 +49,7 @@ public Integer call() throws Exception {
4949
addBuildersFrom(ElasticsearchBackendListener.class, "jmeter-java-dsl-elasticsearch-listener",
5050
codeGenerator);
5151
addBuildersFrom(DatadogBackendListener.class, "jmeter-java-dsl-datadog", codeGenerator);
52-
addBuildersFrom(DslWebsocketSampler.class, "jmeter-java-dsl-websocket", codeGenerator);
52+
addBuildersFrom(DslWebsocketFactory.class, "jmeter-java-dsl-websocket", codeGenerator);
5353
System.out.println(codeGenerator.generateCodeFromJmx(jmxFile));
5454
return 0;
5555
}

jmeter-java-dsl-websocket/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
</exclusion>
3434
</exclusions>
3535
</dependency>
36+
<dependency>
37+
<groupId>org.java-websocket</groupId>
38+
<artifactId>Java-WebSocket</artifactId>
39+
<version>1.6.0</version>
40+
<scope>test</scope>
41+
</dependency>
3642
</dependencies>
3743

3844
</project>

0 commit comments

Comments
 (0)