Skip to content

Commit 1bdacbe

Browse files
hosuabyhosuaby
committed
REFACTOR: vertx tests
1 parent 4014d29 commit 1bdacbe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+184
-158
lines changed

‎vertx/feign-vertx/pom.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
</dependencyManagement>
4747

4848
<dependencies>
49+
50+
<!-- Feign -->
4951
<dependency>
5052
<groupId>io.github.openfeign</groupId>
5153
<artifactId>feign-core</artifactId>
@@ -65,5 +67,77 @@
6567
<version>${vertx.version}</version>
6668
<scope>provided</scope>
6769
</dependency>
70+
71+
<!-- Tests -->
72+
<dependency>
73+
<groupId>io.vertx</groupId>
74+
<artifactId>vertx-junit5</artifactId>
75+
<version>${vertx.version}</version>
76+
<scope>test</scope>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>org.assertj</groupId>
81+
<artifactId>assertj-core</artifactId>
82+
<scope>test</scope>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>io.github.openfeign</groupId>
87+
<artifactId>feign-jackson</artifactId>
88+
<scope>test</scope>
89+
</dependency>
90+
91+
<dependency>
92+
<groupId>com.fasterxml.jackson.core</groupId>
93+
<artifactId>jackson-annotations</artifactId>
94+
<scope>test</scope>
95+
</dependency>
96+
97+
<dependency>
98+
<groupId>com.fasterxml.jackson.datatype</groupId>
99+
<artifactId>jackson-datatype-jsr310</artifactId>
100+
<scope>test</scope>
101+
</dependency>
102+
103+
<dependency>
104+
<groupId>io.github.openfeign</groupId>
105+
<artifactId>feign-slf4j</artifactId>
106+
<scope>test</scope>
107+
</dependency>
108+
109+
<dependency>
110+
<groupId>org.slf4j</groupId>
111+
<artifactId>slf4j-log4j12</artifactId>
112+
<scope>test</scope>
113+
</dependency>
114+
115+
<dependency>
116+
<groupId>com.github.tomakehurst</groupId>
117+
<artifactId>wiremock-jre8</artifactId>
118+
<scope>test</scope>
119+
<exclusions>
120+
<exclusion>
121+
<groupId>org.junit</groupId>
122+
<artifactId>junit-bom</artifactId>
123+
</exclusion>
124+
</exclusions>
125+
</dependency>
68126
</dependencies>
127+
128+
<build>
129+
<plugins>
130+
<plugin>
131+
<groupId>org.apache.maven.plugins</groupId>
132+
<artifactId>maven-jar-plugin</artifactId>
133+
<executions>
134+
<execution>
135+
<goals>
136+
<goal>test-jar</goal>
137+
</goals>
138+
</execution>
139+
</executions>
140+
</plugin>
141+
</plugins>
142+
</build>
69143
</project>

‎vertx/tests-vertx5/src/test/java/feign/vertx/AbstractClientReconnectTest.java‎ renamed to ‎vertx/feign-vertx/src/test/java/feign/vertx/AbstractClientReconnectTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.assertj.core.api.Assertions.assertThat;
2121

2222
import com.github.tomakehurst.wiremock.WireMockServer;
23-
import feign.vertx.tests.testcase.HelloServiceAPI;
23+
import feign.vertx.testcase.HelloServiceAPI;
2424
import io.vertx.core.AsyncResult;
2525
import io.vertx.core.CompositeFuture;
2626
import io.vertx.core.Future;

‎vertx/tests-vertx5/src/test/java/feign/vertx/AbstractFeignVertxTest.java‎ renamed to ‎vertx/feign-vertx/src/test/java/feign/vertx/AbstractFeignVertxTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
1919

2020
import com.github.tomakehurst.wiremock.WireMockServer;
21-
import feign.vertx.tests.testcase.domain.OrderGenerator;
21+
import feign.vertx.testcase.domain.OrderGenerator;
2222
import io.vertx.junit5.VertxExtension;
2323
import org.junit.jupiter.api.AfterAll;
2424
import org.junit.jupiter.api.BeforeAll;

‎vertx/tests-vertx5/src/test/java/feign/vertx/ConnectionsLeakTests.java‎ renamed to ‎vertx/feign-vertx/src/test/java/feign/vertx/ConnectionsLeakTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import feign.VertxFeign;
2222
import feign.jackson.JacksonDecoder;
2323
import feign.jackson.JacksonEncoder;
24-
import feign.vertx.tests.testcase.HelloServiceAPI;
24+
import feign.vertx.testcase.HelloServiceAPI;
2525
import io.vertx.core.Future;
2626
import io.vertx.core.Vertx;
2727
import io.vertx.core.http.*;

‎vertx/tests-vertx5/src/test/java/feign/vertx/Http11ClientReconnectTest.java‎ renamed to ‎vertx/feign-vertx/src/test/java/feign/vertx/Http11ClientReconnectTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import feign.VertxFeign;
1919
import feign.jackson.JacksonDecoder;
2020
import feign.jackson.JacksonEncoder;
21-
import feign.vertx.tests.testcase.HelloServiceAPI;
21+
import feign.vertx.testcase.HelloServiceAPI;
2222
import io.vertx.core.Vertx;
2323
import io.vertx.core.http.PoolOptions;
2424
import io.vertx.ext.web.client.WebClient;

‎vertx/tests-vertx5/src/test/java/feign/vertx/Http2ClientReconnectTest.java‎ renamed to ‎vertx/feign-vertx/src/test/java/feign/vertx/Http2ClientReconnectTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import feign.VertxFeign;
1919
import feign.jackson.JacksonDecoder;
2020
import feign.jackson.JacksonEncoder;
21-
import feign.vertx.tests.testcase.HelloServiceAPI;
21+
import feign.vertx.testcase.HelloServiceAPI;
2222
import io.vertx.core.Vertx;
2323
import io.vertx.core.http.HttpVersion;
2424
import io.vertx.core.http.PoolOptions;

‎vertx/tests-vertx5/src/test/java/feign/vertx/QueryMapEncoderTest.java‎ renamed to ‎vertx/feign-vertx/src/test/java/feign/vertx/QueryMapEncoderTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
import feign.VertxFeign;
2323
import feign.jackson.JacksonDecoder;
2424
import feign.slf4j.Slf4jLogger;
25-
import feign.vertx.tests.TestUtils;
26-
import feign.vertx.tests.testcase.domain.Bill;
27-
import feign.vertx.tests.testcase.domain.Flavor;
28-
import feign.vertx.tests.testcase.domain.IceCreamOrder;
25+
import feign.vertx.testcase.domain.Bill;
26+
import feign.vertx.testcase.domain.Flavor;
27+
import feign.vertx.testcase.domain.IceCreamOrder;
2928
import io.vertx.core.Future;
3029
import io.vertx.core.Vertx;
3130
import io.vertx.ext.web.client.WebClient;

‎vertx/tests-vertx4/src/test/java/feign/vertx/RawContractTest.java‎ renamed to ‎vertx/feign-vertx/src/test/java/feign/vertx/RawContractTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
1616
package feign.vertx;
1717

1818
import static com.github.tomakehurst.wiremock.client.WireMock.*;
19-
import static feign.vertx.tests.testcase.domain.Flavor.FLAVORS_JSON;
19+
import static feign.vertx.testcase.domain.Flavor.FLAVORS_JSON;
2020
import static org.assertj.core.api.Assertions.assertThat;
2121

2222
import feign.Response;
2323
import feign.VertxFeign;
2424
import feign.jackson.JacksonDecoder;
2525
import feign.jackson.JacksonEncoder;
26-
import feign.vertx.tests.TestUtils;
27-
import feign.vertx.tests.testcase.RawServiceAPI;
28-
import feign.vertx.tests.testcase.domain.Bill;
26+
import feign.vertx.testcase.RawServiceAPI;
27+
import feign.vertx.testcase.domain.Bill;
2928
import io.vertx.core.Future;
3029
import io.vertx.core.Vertx;
3130
import io.vertx.ext.web.client.WebClient;

‎vertx/tests-vertx5/src/test/java/feign/vertx/RequestPreProcessorTest.java‎ renamed to ‎vertx/feign-vertx/src/test/java/feign/vertx/RequestPreProcessorTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
1616
package feign.vertx;
1717

1818
import static com.github.tomakehurst.wiremock.client.WireMock.*;
19-
import static feign.vertx.tests.testcase.domain.Flavor.FLAVORS_JSON;
19+
import static feign.vertx.testcase.domain.Flavor.FLAVORS_JSON;
2020
import static org.assertj.core.api.Assertions.assertThat;
2121

2222
import feign.Logger;
2323
import feign.VertxFeign;
2424
import feign.jackson.JacksonDecoder;
2525
import feign.slf4j.Slf4jLogger;
26-
import feign.vertx.tests.TestUtils;
27-
import feign.vertx.tests.testcase.IcecreamServiceApi;
28-
import feign.vertx.tests.testcase.domain.Flavor;
26+
import feign.vertx.testcase.IcecreamServiceApi;
27+
import feign.vertx.testcase.domain.Flavor;
2928
import io.vertx.core.Future;
3029
import io.vertx.core.Vertx;
3130
import io.vertx.ext.web.client.WebClient;

‎vertx/tests-vertx4/src/test/java/feign/vertx/RetryingTest.java‎ renamed to ‎vertx/feign-vertx/src/test/java/feign/vertx/RetryingTest.java‎

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

1818
import static com.github.tomakehurst.wiremock.client.WireMock.*;
1919
import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
20-
import static feign.vertx.tests.TestUtils.MAPPER;
21-
import static feign.vertx.tests.testcase.domain.Flavor.FLAVORS_JSON;
20+
import static feign.vertx.TestUtils.MAPPER;
21+
import static feign.vertx.testcase.domain.Flavor.FLAVORS_JSON;
2222
import static java.util.concurrent.TimeUnit.SECONDS;
2323
import static org.assertj.core.api.Assertions.assertThat;
2424

@@ -28,8 +28,8 @@
2828
import feign.VertxFeign;
2929
import feign.jackson.JacksonDecoder;
3030
import feign.slf4j.Slf4jLogger;
31-
import feign.vertx.tests.testcase.IcecreamServiceApi;
32-
import feign.vertx.tests.testcase.domain.Flavor;
31+
import feign.vertx.testcase.IcecreamServiceApi;
32+
import feign.vertx.testcase.domain.Flavor;
3333
import io.vertx.core.Future;
3434
import io.vertx.core.Vertx;
3535
import io.vertx.ext.web.client.WebClient;

0 commit comments

Comments
 (0)