REFACTOR: vertx tests

vertx/feign-vertx/pom.xml

@@ -46,6 +46,8 @@
   </dependencyManagement>
 
   <dependencies>
+
+    <!-- Feign -->
     <dependency>
       <groupId>io.github.openfeign</groupId>
       <artifactId>feign-core</artifactId>
@@ -65,5 +67,77 @@
       <version>${vertx.version}</version>
       <scope>provided</scope>
     </dependency>
+
+    <!-- Tests -->
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-junit5</artifactId>
+      <version>${vertx.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-jackson</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-slf4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.tomakehurst</groupId>
+      <artifactId>wiremock-jre8</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.junit</groupId>
+          <artifactId>junit-bom</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

vertx/tests-vertx5/src/test/java/feign/vertx/AbstractClientReconnectTest.java → vertx/feign-vertx/src/test/java/feign/vertx/AbstractClientReconnectTest.java

@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
-import feign.vertx.tests.testcase.HelloServiceAPI;
+import feign.vertx.testcase.HelloServiceAPI;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.CompositeFuture;
 import io.vertx.core.Future;

vertx/tests-vertx5/src/test/java/feign/vertx/AbstractFeignVertxTest.java → vertx/feign-vertx/src/test/java/feign/vertx/AbstractFeignVertxTest.java

@@ -18,7 +18,7 @@
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
-import feign.vertx.tests.testcase.domain.OrderGenerator;
+import feign.vertx.testcase.domain.OrderGenerator;
 import io.vertx.junit5.VertxExtension;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;

vertx/tests-vertx5/src/test/java/feign/vertx/ConnectionsLeakTests.java → vertx/feign-vertx/src/test/java/feign/vertx/ConnectionsLeakTests.java

@@ -21,7 +21,7 @@
 import feign.VertxFeign;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
-import feign.vertx.tests.testcase.HelloServiceAPI;
+import feign.vertx.testcase.HelloServiceAPI;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.*;

vertx/tests-vertx5/src/test/java/feign/vertx/Http11ClientReconnectTest.java → vertx/feign-vertx/src/test/java/feign/vertx/Http11ClientReconnectTest.java

@@ -18,7 +18,7 @@
 import feign.VertxFeign;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
-import feign.vertx.tests.testcase.HelloServiceAPI;
+import feign.vertx.testcase.HelloServiceAPI;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.PoolOptions;
 import io.vertx.ext.web.client.WebClient;

vertx/tests-vertx5/src/test/java/feign/vertx/Http2ClientReconnectTest.java → vertx/feign-vertx/src/test/java/feign/vertx/Http2ClientReconnectTest.java

@@ -18,7 +18,7 @@
 import feign.VertxFeign;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
-import feign.vertx.tests.testcase.HelloServiceAPI;
+import feign.vertx.testcase.HelloServiceAPI;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpVersion;
 import io.vertx.core.http.PoolOptions;

vertx/tests-vertx5/src/test/java/feign/vertx/QueryMapEncoderTest.java → vertx/feign-vertx/src/test/java/feign/vertx/QueryMapEncoderTest.java

@@ -22,10 +22,9 @@
 import feign.VertxFeign;
 import feign.jackson.JacksonDecoder;
 import feign.slf4j.Slf4jLogger;
-import feign.vertx.tests.TestUtils;
-import feign.vertx.tests.testcase.domain.Bill;
-import feign.vertx.tests.testcase.domain.Flavor;
-import feign.vertx.tests.testcase.domain.IceCreamOrder;
+import feign.vertx.testcase.domain.Bill;
+import feign.vertx.testcase.domain.Flavor;
+import feign.vertx.testcase.domain.IceCreamOrder;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.client.WebClient;

vertx/tests-vertx4/src/test/java/feign/vertx/RawContractTest.java → vertx/feign-vertx/src/test/java/feign/vertx/RawContractTest.java

@@ -16,16 +16,15 @@
 package feign.vertx;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static feign.vertx.tests.testcase.domain.Flavor.FLAVORS_JSON;
+import static feign.vertx.testcase.domain.Flavor.FLAVORS_JSON;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import feign.Response;
 import feign.VertxFeign;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
-import feign.vertx.tests.TestUtils;
-import feign.vertx.tests.testcase.RawServiceAPI;
-import feign.vertx.tests.testcase.domain.Bill;
+import feign.vertx.testcase.RawServiceAPI;
+import feign.vertx.testcase.domain.Bill;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.client.WebClient;

vertx/tests-vertx5/src/test/java/feign/vertx/RequestPreProcessorTest.java → vertx/feign-vertx/src/test/java/feign/vertx/RequestPreProcessorTest.java

@@ -16,16 +16,15 @@
 package feign.vertx;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static feign.vertx.tests.testcase.domain.Flavor.FLAVORS_JSON;
+import static feign.vertx.testcase.domain.Flavor.FLAVORS_JSON;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import feign.Logger;
 import feign.VertxFeign;
 import feign.jackson.JacksonDecoder;
 import feign.slf4j.Slf4jLogger;
-import feign.vertx.tests.TestUtils;
-import feign.vertx.tests.testcase.IcecreamServiceApi;
-import feign.vertx.tests.testcase.domain.Flavor;
+import feign.vertx.testcase.IcecreamServiceApi;
+import feign.vertx.testcase.domain.Flavor;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.client.WebClient;

vertx/tests-vertx4/src/test/java/feign/vertx/RetryingTest.java → vertx/feign-vertx/src/test/java/feign/vertx/RetryingTest.java

@@ -17,8 +17,8 @@
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
-import static feign.vertx.tests.TestUtils.MAPPER;
-import static feign.vertx.tests.testcase.domain.Flavor.FLAVORS_JSON;
+import static feign.vertx.TestUtils.MAPPER;
+import static feign.vertx.testcase.domain.Flavor.FLAVORS_JSON;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,8 +28,8 @@
 import feign.VertxFeign;
 import feign.jackson.JacksonDecoder;
 import feign.slf4j.Slf4jLogger;
-import feign.vertx.tests.testcase.IcecreamServiceApi;
-import feign.vertx.tests.testcase.domain.Flavor;
+import feign.vertx.testcase.IcecreamServiceApi;
+import feign.vertx.testcase.domain.Flavor;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.client.WebClient;

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/TestUtils.java → vertx/feign-vertx/src/test/java/feign/vertx/TestUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests;
+package feign.vertx;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

vertx/tests-vertx5/src/test/java/feign/vertx/TimeoutHandlingTest.java → vertx/feign-vertx/src/test/java/feign/vertx/TimeoutHandlingTest.java

@@ -16,16 +16,15 @@
 package feign.vertx;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static feign.vertx.tests.testcase.domain.Flavor.FLAVORS_JSON;
+import static feign.vertx.testcase.domain.Flavor.FLAVORS_JSON;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import feign.Logger;
 import feign.VertxFeign;
 import feign.jackson.JacksonDecoder;
 import feign.slf4j.Slf4jLogger;
-import feign.vertx.tests.TestUtils;
-import feign.vertx.tests.testcase.IcecreamServiceApi;
-import feign.vertx.tests.testcase.domain.Flavor;
+import feign.vertx.testcase.IcecreamServiceApi;
+import feign.vertx.testcase.domain.Flavor;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.client.WebClient;

vertx/tests-vertx4/src/test/java/feign/vertx/VertxHttpClientTest.java → vertx/feign-vertx/src/test/java/feign/vertx/VertxHttpClientTest.java

@@ -16,8 +16,8 @@
 package feign.vertx;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static feign.vertx.tests.testcase.domain.Flavor.FLAVORS_JSON;
-import static feign.vertx.tests.testcase.domain.Mixin.MIXINS_JSON;
+import static feign.vertx.testcase.domain.Flavor.FLAVORS_JSON;
+import static feign.vertx.testcase.domain.Mixin.MIXINS_JSON;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
@@ -27,13 +27,12 @@
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
 import feign.slf4j.Slf4jLogger;
-import feign.vertx.tests.TestUtils;
-import feign.vertx.tests.testcase.IcecreamServiceApi;
-import feign.vertx.tests.testcase.IcecreamServiceApiBroken;
-import feign.vertx.tests.testcase.domain.Bill;
-import feign.vertx.tests.testcase.domain.Flavor;
-import feign.vertx.tests.testcase.domain.IceCreamOrder;
-import feign.vertx.tests.testcase.domain.Mixin;
+import feign.vertx.testcase.IcecreamServiceApi;
+import feign.vertx.testcase.IcecreamServiceApiBroken;
+import feign.vertx.testcase.domain.Bill;
+import feign.vertx.testcase.domain.Flavor;
+import feign.vertx.testcase.domain.IceCreamOrder;
+import feign.vertx.testcase.domain.Mixin;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.client.WebClient;

vertx/tests-vertx5/src/test/java/feign/vertx/VertxHttpOptionsTest.java → vertx/feign-vertx/src/test/java/feign/vertx/VertxHttpOptionsTest.java

@@ -16,16 +16,15 @@
 package feign.vertx;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static feign.vertx.tests.testcase.domain.Flavor.FLAVORS_JSON;
+import static feign.vertx.testcase.domain.Flavor.FLAVORS_JSON;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import feign.Logger;
 import feign.VertxFeign;
 import feign.jackson.JacksonDecoder;
 import feign.slf4j.Slf4jLogger;
-import feign.vertx.tests.TestUtils;
-import feign.vertx.tests.testcase.IcecreamServiceApi;
-import feign.vertx.tests.testcase.domain.Flavor;
+import feign.vertx.testcase.IcecreamServiceApi;
+import feign.vertx.testcase.domain.Flavor;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpVersion;
 import io.vertx.core.http.PoolOptions;

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/testcase/HelloServiceAPI.java → vertx/feign-vertx/src/test/java/feign/vertx/testcase/HelloServiceAPI.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests.testcase;
+package feign.vertx.testcase;
 
 import feign.Headers;
 import feign.RequestLine;

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/testcase/IcecreamServiceApi.java → vertx/feign-vertx/src/test/java/feign/vertx/testcase/IcecreamServiceApi.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests.testcase;
+package feign.vertx.testcase;
 
 import feign.Headers;
 import feign.Param;
 import feign.RequestLine;
-import feign.vertx.tests.testcase.domain.Bill;
-import feign.vertx.tests.testcase.domain.Flavor;
-import feign.vertx.tests.testcase.domain.IceCreamOrder;
-import feign.vertx.tests.testcase.domain.Mixin;
+import feign.vertx.testcase.domain.Bill;
+import feign.vertx.testcase.domain.Flavor;
+import feign.vertx.testcase.domain.IceCreamOrder;
+import feign.vertx.testcase.domain.Mixin;
 import io.vertx.core.Future;
 import java.util.Collection;
 

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/testcase/IcecreamServiceApiBroken.java → vertx/feign-vertx/src/test/java/feign/vertx/testcase/IcecreamServiceApiBroken.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests.testcase;
+package feign.vertx.testcase;
 
 import feign.Headers;
 import feign.Param;
 import feign.RequestLine;
-import feign.vertx.tests.testcase.domain.Bill;
-import feign.vertx.tests.testcase.domain.Flavor;
-import feign.vertx.tests.testcase.domain.IceCreamOrder;
-import feign.vertx.tests.testcase.domain.Mixin;
+import feign.vertx.testcase.domain.Bill;
+import feign.vertx.testcase.domain.Flavor;
+import feign.vertx.testcase.domain.IceCreamOrder;
+import feign.vertx.testcase.domain.Mixin;
 import io.vertx.core.Future;
 import java.util.Collection;
 

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/testcase/RawServiceAPI.java → vertx/feign-vertx/src/test/java/feign/vertx/testcase/RawServiceAPI.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests.testcase;
+package feign.vertx.testcase;
 
 import feign.Headers;
 import feign.RequestLine;
 import feign.Response;
-import feign.vertx.tests.testcase.domain.Bill;
+import feign.vertx.testcase.domain.Bill;
 import io.vertx.core.Future;
 
 /**

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/testcase/domain/Bill.java → vertx/feign-vertx/src/test/java/feign/vertx/testcase/domain/Bill.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests.testcase.domain;
+package feign.vertx.testcase.domain;
 
 import java.util.Map;
 import java.util.Objects;

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/testcase/domain/Flavor.java → vertx/feign-vertx/src/test/java/feign/vertx/testcase/domain/Flavor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests.testcase.domain;
+package feign.vertx.testcase.domain;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/testcase/domain/IceCreamOrder.java → vertx/feign-vertx/src/test/java/feign/vertx/testcase/domain/IceCreamOrder.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests.testcase.domain;
+package feign.vertx.testcase.domain;
 
 import java.time.Instant;
 import java.util.*;

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/testcase/domain/Mixin.java → vertx/feign-vertx/src/test/java/feign/vertx/testcase/domain/Mixin.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests.testcase.domain;
+package feign.vertx.testcase.domain;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

vertx/tests-vertx-common/src/main/java/feign/vertx/tests/testcase/domain/OrderGenerator.java → vertx/feign-vertx/src/test/java/feign/vertx/testcase/domain/OrderGenerator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package feign.vertx.tests.testcase.domain;
+package feign.vertx.testcase.domain;
 
 import java.util.Random;
 import java.util.stream.IntStream;