Changeset 19050 in josm for trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuth20AuthorizationTest.java

Timestamp:

2024-04-22T20:59:26+02:00 (6 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuth20AuthorizationTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuth20AuthorizationTest.java

@@ -17 +17 @@
 import java.util.stream.Stream;
 
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.github.tomakehurst.wiremock.extension.Parameters;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
-import com.github.tomakehurst.wiremock.http.FixedDelayDistribution;
-import com.github.tomakehurst.wiremock.http.HttpHeader;
-import com.github.tomakehurst.wiremock.http.HttpHeaders;
-import com.github.tomakehurst.wiremock.http.QueryParameter;
-import com.github.tomakehurst.wiremock.http.Request;
-import com.github.tomakehurst.wiremock.http.Response;
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
-import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
-import com.github.tomakehurst.wiremock.matching.AnythingPattern;
-import com.github.tomakehurst.wiremock.matching.EqualToPattern;
-import com.github.tomakehurst.wiremock.matching.StringValuePattern;
-import mockit.Mock;
-import mockit.MockUp;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -50 +32 @@
 import org.openstreetmap.josm.tools.Logging;
 
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformerV2;
+import com.github.tomakehurst.wiremock.http.FixedDelayDistribution;
+import com.github.tomakehurst.wiremock.http.HttpHeader;
+import com.github.tomakehurst.wiremock.http.HttpHeaders;
+import com.github.tomakehurst.wiremock.http.QueryParameter;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.Response;
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import com.github.tomakehurst.wiremock.matching.AnythingPattern;
+import com.github.tomakehurst.wiremock.matching.EqualToPattern;
+import com.github.tomakehurst.wiremock.matching.StringValuePattern;
+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
+import mockit.Mock;
+import mockit.MockUp;
+
 @BasicPreferences
 @HTTP
@@ -70 +70 @@
     }
 
-    private static class OAuthServerWireMock extends ResponseTransformer {
+    private static final class OAuthServerWireMock implements ResponseTransformerV2 {
         String stateToReturn;
         ConnectionProblems connectionProblems = ConnectionProblems.NONE;
+
         @Override
-        public Response transform(Request request, Response response, FileSource files, Parameters parameters) {
+        public Response transform(Response response, ServeEvent serveEvent) {
+            final var request = serveEvent.getRequest();
             try {
                 if (request.getUrl().startsWith("/oauth2/authorize")) {
@@ -158 +160 @@
     /**
      * Set up the default wiremock information
-     * @param wireMockRuntimeInfo The info to set up
      */
     @BeforeEach
-    void setupWireMock(WireMockRuntimeInfo wireMockRuntimeInfo) {
+    void setupWireMock() {
+        final WireMockRuntimeInfo wireMockRuntimeInfo = wml.getRuntimeInfo();
         Config.getPref().put("osm-server.url", wireMockRuntimeInfo.getHttpBaseUrl() + "/api/");
         new MockUp<JosmUrls>() {
@@ -195 +197 @@
 
     @Test
-    void testAuthorize(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
+    void testAuthorize() throws IOException {
         final AtomicReference<Optional<IOAuthToken>> consumer = new AtomicReference<>();
-        final HttpClient client = generateClient(wireMockRuntimeInfo, consumer);
+        final HttpClient client = generateClient(wml.getRuntimeInfo(), consumer);
         try {
             HttpClient.Response response = client.connect();
@@ -212 +214 @@
 
     @Test
-    void testAuthorizeBadState(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
+    void testAuthorizeBadState() throws IOException {
         oauthServer.stateToReturn = "Bad_State";
         final AtomicReference<Optional<IOAuthToken>> consumer = new AtomicReference<>();
-        final HttpClient client = generateClient(wireMockRuntimeInfo, consumer);
+        final HttpClient client = generateClient(wml.getRuntimeInfo(), consumer);
         try {
             HttpClient.Response response = client.connect();
@@ -228 +230 @@
 
     @Test
-    void testSocketTimeout(WireMockRuntimeInfo wireMockRuntimeInfo) throws Exception {
+    void testSocketTimeout() throws Exception {
         // 1s before timeout
         Config.getPref().putInt("socket.timeout.connect", 1);
@@ -235 +237 @@
 
         final AtomicReference<Optional<IOAuthToken>> consumer = new AtomicReference<>();
-        final HttpClient client = generateClient(wireMockRuntimeInfo, consumer)
+        final HttpClient client = generateClient(wml.getRuntimeInfo(), consumer)
                 .setConnectTimeout(15_000).setReadTimeout(30_000);
         try {