Moved mock server JUnit 5 HTTPS extension and annotation to testutils package

m0nk3y2k4 · m0nk3y2k4 · commit e86fc93e4ec0 · 2020-08-08T17:07:39.000+02:00
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/APIConnectionTest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/APIConnectionTest.java
@@ -17,7 +17,7 @@
 import java.util.stream.Stream;
 
 import com.github.m0nk3y2k4.thetvdb.api.exception.APIException;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/APIRequestTest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/APIRequestTest.java
@@ -31,7 +31,7 @@
 import com.github.m0nk3y2k4.thetvdb.internal.exception.APINotAuthorizedException;
 import com.github.m0nk3y2k4.thetvdb.internal.exception.APIPreconditionException;
 import com.github.m0nk3y2k4.thetvdb.internal.util.http.HttpRequestMethod;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/DeleteRequestTest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/DeleteRequestTest.java
@@ -6,7 +6,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.m0nk3y2k4.thetvdb.internal.util.http.HttpRequestMethod;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.verify.VerificationTimes;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/GetRequestTest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/GetRequestTest.java
@@ -6,7 +6,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.m0nk3y2k4.thetvdb.internal.util.http.HttpRequestMethod;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.verify.VerificationTimes;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/HeadRequestTest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/HeadRequestTest.java
@@ -9,7 +9,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.m0nk3y2k4.thetvdb.internal.util.http.HttpRequestMethod;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.model.HttpStatusCode;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/PostRequestTest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/PostRequestTest.java
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.m0nk3y2k4.thetvdb.internal.exception.APIPreconditionException;
 import com.github.m0nk3y2k4.thetvdb.internal.util.http.HttpRequestMethod;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.verify.VerificationTimes;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/PutRequestTest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/connection/PutRequestTest.java
@@ -6,7 +6,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.m0nk3y2k4.thetvdb.internal.util.http.HttpRequestMethod;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.verify.VerificationTimes;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/AuthenticationAPITest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/AuthenticationAPITest.java
@@ -11,7 +11,7 @@
 import com.github.m0nk3y2k4.thetvdb.internal.connection.APIConnection;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.APISession.Status;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.RemoteAPI;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/EpisodesAPITest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/EpisodesAPITest.java
@@ -15,8 +15,8 @@
 
 import com.github.m0nk3y2k4.thetvdb.internal.connection.APIConnection;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.RemoteAPI;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.json.JSONTestUtil.JsonResource;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.parameterized.TestRemoteAPICall;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -45,7 +45,7 @@ private static Stream<Arguments> withValidParameters() {
         );
     }
 
-    @ParameterizedTest(name = "[{index}] Route EpisodesAPI.{0} invalid parameters rejected")
+    @ParameterizedTest(name = "[{index}] Route EpisodesAPI.{0} rejected")
     @MethodSource(value = "withInvalidParameters")
     void invokeRoute_withInvalidParameters_verifyParameterValidation(TestRemoteAPICall route, Supplier<RemoteAPI> remoteAPI) {
         assertThatIllegalArgumentException().isThrownBy(() -> route.invoke(new APIConnection("OIW8E4GT58H8E4W", remoteAPI)));
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/LanguagesAPITest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/LanguagesAPITest.java
@@ -17,8 +17,8 @@
 
 import com.github.m0nk3y2k4.thetvdb.internal.connection.APIConnection;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.RemoteAPI;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.json.JSONTestUtil.JsonResource;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.parameterized.TestRemoteAPICall;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -50,7 +50,7 @@ private static Stream<Arguments> withValidParameters() {
         );
     }
 
-    @ParameterizedTest(name = "[{index}] Route LanguagesAPI.{0} invalid parameters rejected")
+    @ParameterizedTest(name = "[{index}] Route LanguagesAPI.{0} rejected")
     @MethodSource(value = "withInvalidParameters")
     void invokeRoute_withInvalidParameters_verifyParameterValidation(TestRemoteAPICall route, Supplier<RemoteAPI> remoteAPI) {
         assertThatIllegalArgumentException().isThrownBy(() -> route.invoke(new APIConnection("946FG8I5P5E56E4", remoteAPI)));
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/SearchAPITest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/SearchAPITest.java
@@ -18,8 +18,8 @@
 
 import com.github.m0nk3y2k4.thetvdb.internal.connection.APIConnection;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.RemoteAPI;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.json.JSONTestUtil.JsonResource;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.parameterized.TestRemoteAPICall;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/SeriesAPITest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/SeriesAPITest.java
@@ -43,8 +43,8 @@
 import com.github.m0nk3y2k4.thetvdb.internal.api.impl.QueryParametersImpl;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.APIConnection;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.RemoteAPI;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.json.JSONTestUtil.JsonResource;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.parameterized.TestRemoteAPICall;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -126,7 +126,7 @@ private static Stream<Arguments> withValidParameters() {
         );
     }
 
-    @ParameterizedTest(name = "[{index}] Route SeriesAPI.{0} invalid parameters rejected")
+    @ParameterizedTest(name = "[{index}] Route SeriesAPI.{0} rejected")
     @MethodSource(value = "withInvalidParameters")
     void invokeRoute_withInvalidParameters_verifyParameterValidation(TestRemoteAPICall route, Supplier<RemoteAPI> remoteAPI) {
         assertThatIllegalArgumentException().isThrownBy(() -> route.invoke(new APIConnection("946FG8I5P5E56E4", remoteAPI)));
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/UpdatesAPITest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/UpdatesAPITest.java
@@ -22,8 +22,8 @@
 import com.github.m0nk3y2k4.thetvdb.internal.api.impl.QueryParametersImpl;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.APIConnection;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.RemoteAPI;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.json.JSONTestUtil;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.parameterized.TestRemoteAPICall;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -59,7 +59,7 @@ private static Stream<Arguments> withValidParameters() {
         );
     }
 
-    @ParameterizedTest(name = "[{index}] Route UpdatesAPI.{0} invalid parameters rejected")
+    @ParameterizedTest(name = "[{index}] Route UpdatesAPI.{0} rejected")
     @MethodSource(value = "withInvalidParameters")
     void invokeRoute_withInvalidParameters_verifyParameterValidation(TestRemoteAPICall route, Supplier<RemoteAPI> remoteAPI) {
         assertThatIllegalArgumentException().isThrownBy(() -> route.invoke(new APIConnection("7E58UZ8IE8T8U4", remoteAPI)));
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/UsersAPITest.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/internal/resource/impl/UsersAPITest.java
@@ -31,8 +31,8 @@
 
 import com.github.m0nk3y2k4.thetvdb.internal.connection.APIConnection;
 import com.github.m0nk3y2k4.thetvdb.internal.connection.RemoteAPI;
-import com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.json.JSONTestUtil;
+import com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer;
 import com.github.m0nk3y2k4.thetvdb.testutils.parameterized.TestRemoteAPICall;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -90,7 +90,7 @@ private static Stream<Arguments> withValidParameters() {
         );
     }
 
-    @ParameterizedTest(name = "[{index}] Route UsersAPI.{0} invalid parameters rejected")
+    @ParameterizedTest(name = "[{index}] Route UsersAPI.{0} rejected")
     @MethodSource(value = "withInvalidParameters")
     void invokeRoute_withInvalidParameters_verifyParameterValidation(TestRemoteAPICall route, Supplier<RemoteAPI> remoteAPI) {
         assertThatIllegalArgumentException().isThrownBy(() -> route.invoke(new APIConnection("97821R44O54ZT4W5", remoteAPI)));
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/testutils/junit/jupiter/HttpsMockServerExtension.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/testutils/junit/jupiter/HttpsMockServerExtension.java
@@ -1,11 +1,11 @@
-package com.github.m0nk3y2k4.thetvdb.junit.jupiter;
+package com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter;
 
-import static com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer.HOST;
-import static com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer.PORT;
-import static com.github.m0nk3y2k4.thetvdb.junit.jupiter.WithHttpsMockServer.PROTOCOL;
 import static com.github.m0nk3y2k4.thetvdb.testutils.MockServerUtil.createJWTResponse;
 import static com.github.m0nk3y2k4.thetvdb.testutils.MockServerUtil.createSuccessResponse;
 import static com.github.m0nk3y2k4.thetvdb.testutils.MockServerUtil.jsonSchemaFromResource;
+import static com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer.HOST;
+import static com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer.PORT;
+import static com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter.WithHttpsMockServer.PROTOCOL;
 import static org.mockserver.model.HttpRequest.request;
 
 import java.lang.reflect.ParameterizedType;
diff --git a/src/test/java/com/github/m0nk3y2k4/thetvdb/testutils/junit/jupiter/WithHttpsMockServer.java b/src/test/java/com/github/m0nk3y2k4/thetvdb/testutils/junit/jupiter/WithHttpsMockServer.java
@@ -1,4 +1,4 @@
-package com.github.m0nk3y2k4.thetvdb.junit.jupiter;
+package com.github.m0nk3y2k4.thetvdb.testutils.junit.jupiter;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
