Skip to content

Commit 0c353fc

Browse files
committed
Apply pull request suggestions
Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com>
1 parent 1027425 commit 0c353fc

2 files changed

Lines changed: 8 additions & 12 deletions

File tree

experimental/test/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<name>Serverless Workflow :: Experimental :: Test</name>
1010
<properties>
1111
<version.org.glassfish.jersey>4.0.2</version.org.glassfish.jersey>
12-
<version.com.squareup.okhttp3.mockwebserver>5.3.2</version.com.squareup.okhttp3.mockwebserver>
1312
</properties>
1413
<dependencies>
1514
<dependency>
@@ -62,8 +61,6 @@
6261
<dependency>
6362
<groupId>com.squareup.okhttp3</groupId>
6463
<artifactId>mockwebserver</artifactId>
65-
<version>${version.com.squareup.okhttp3.mockwebserver}</version>
66-
<scope>test</scope>
6764
</dependency>
6865
<dependency>
6966
<groupId>io.serverlessworkflow</groupId>

experimental/test/src/test/java/io/serverlessworkflow/fluent/test/FuncHttpTest.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.http;
1919
import static org.assertj.core.api.Assertions.assertThat;
20+
import static org.assertj.core.api.SoftAssertions.assertSoftly;
2021

2122
import io.serverlessworkflow.fluent.func.FuncWorkflowBuilder;
2223
import io.serverlessworkflow.impl.WorkflowApplication;
@@ -28,8 +29,6 @@
2829
import mockwebserver3.MockWebServer;
2930
import mockwebserver3.RecordedRequest;
3031
import okhttp3.Headers;
31-
import org.assertj.core.api.Assertions;
32-
import org.assertj.core.api.SoftAssertions;
3332
import org.junit.jupiter.api.AfterEach;
3433
import org.junit.jupiter.api.BeforeEach;
3534
import org.junit.jupiter.api.DisplayName;
@@ -80,7 +79,7 @@ void test_query_with_single_key_value() throws Exception {
8079

8180
RecordedRequest request = takeRequestOrFail();
8281

83-
SoftAssertions.assertSoftly(
82+
assertSoftly(
8483
softly -> {
8584
softly.assertThat(request.getUrl().toString()).contains("param1=value1");
8685
softly.assertThat(request.getMethod()).isEqualTo("GET");
@@ -107,7 +106,7 @@ void test_query_with_multiple_single_values() throws Exception {
107106
RecordedRequest request = takeRequestOrFail();
108107
String url = request.getUrl().toString();
109108

110-
SoftAssertions.assertSoftly(
109+
assertSoftly(
111110
softly -> {
112111
softly.assertThat(url).contains("param1=value1").isNotEmpty();
113112
softly.assertThat(url).contains("param2=value2").isNotEmpty();
@@ -134,7 +133,7 @@ void test_query_with_map() throws Exception {
134133
RecordedRequest request = takeRequestOrFail();
135134
String url = request.getUrl().toString();
136135

137-
SoftAssertions.assertSoftly(
136+
assertSoftly(
138137
softly -> {
139138
softly.assertThat(url).contains("userId=123");
140139
softly.assertThat(url).contains("userName=john");
@@ -159,7 +158,7 @@ void test_query_with_expression() throws Exception {
159158

160159
RecordedRequest request = takeRequestOrFail();
161160

162-
Assertions.assertThat(request.getUrl().toString()).contains("enabled=true");
161+
assertThat(request.getUrl().query()).contains("enabled=true");
163162
}
164163

165164
@Test
@@ -179,7 +178,7 @@ void test_query_with_empty_map() throws Exception {
179178

180179
RecordedRequest request = takeRequestOrFail();
181180

182-
SoftAssertions.assertSoftly(
181+
assertSoftly(
183182
softly -> {
184183
softly.assertThat(request.getUrl().encodedPath()).isEqualTo("/api/endpoint");
185184
softly.assertThat(request.getUrl().encodedQuery()).isNull();
@@ -203,7 +202,7 @@ void test_query_with_special_characters() throws Exception {
203202

204203
RecordedRequest request = takeRequestOrFail();
205204

206-
SoftAssertions.assertSoftly(
205+
assertSoftly(
207206
softly -> {
208207
softly.assertThat(request.getUrl().queryParameter("email")).isEqualTo("user@example.com");
209208
softly.assertThat(request.getUrl().encodedQuery()).contains("email=user%40example.com");
@@ -228,7 +227,7 @@ void test_query_map_multiple_values() throws Exception {
228227
RecordedRequest request = takeRequestOrFail();
229228
String url = request.getUrl().toString();
230229

231-
SoftAssertions.assertSoftly(
230+
assertSoftly(
232231
softly -> {
233232
softly.assertThat(url).contains("limit=50");
234233
softly.assertThat(url).contains("offset=0");

0 commit comments

Comments
 (0)