Changeset 18665 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2023-02-16T16:01:49+01:00 (23 months ago)

Author:

taylor.smock

Message:

Fix several coverity issues

CID-1504572: Synchronization on java.util.concurrent objects

The lock wasn't necessary after moving from AtomicBoolean to
CountDownLatch

CID-1504570: Dereference null value -- the default getApiUrl return was null
CID-1504570: Explicit null dereferenced

Consumer<IOAuthToken> to Consumer<Optional<IOAuthToken>>

CID-1476014, CID-1476013, CID-1476011: Resource leak

These resource leaks are unlikely to happen outside of plugin code,
and are all related to StringSelection#getTransferData, which may
return a Closeable object, but is unlikely to be the Transferable
for any of the affected classes.

This also fixes some recently introduced SonarLint issues. It also suppresses
squid:S100 ("Method names should comply with a naming convention") for the MapCSS
Functions class, since the convention for that method names in that class is
^[a-zA-Z][a-zA-Z0-9_]*$

File:

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

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

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -10 +10 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -166 +167 @@
     void testAuthorize(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
         final OAuth20Authorization authorization = new OAuth20Authorization();
-        final AtomicReference<IOAuthToken> consumer = new AtomicReference<>();
+        final AtomicReference<Optional<IOAuthToken>> consumer = new AtomicReference<>();
         OAuth20Parameters parameters = (OAuth20Parameters) OAuthParameters.createDefault(OsmApi.getOsmApi().getBaseUrl(), OAuthVersion.OAuth20);
         RemoteControl.start();
@@ -181 +182 @@
         }
         assertNotNull(consumer.get());
-        assertEquals(OAuthVersion.OAuth20, consumer.get().getOAuthType());
-        OAuth20Token token = (OAuth20Token) consumer.get();
+        assertTrue(consumer.get().isPresent());
+        assertEquals(OAuthVersion.OAuth20, consumer.get().get().getOAuthType());
+        OAuth20Token token = (OAuth20Token) consumer.get().get();
         assertEquals("test_access_token", token.getBearerToken());
     }
@@ -190 +192 @@
         oauthServer.stateToReturn = "Bad_State";
         final OAuth20Authorization authorization = new OAuth20Authorization();
-        final AtomicReference<IOAuthToken> consumer = new AtomicReference<>();
+        final AtomicReference<Optional<IOAuthToken>> consumer = new AtomicReference<>();
         OAuth20Parameters parameters = (OAuth20Parameters) OAuthParameters.createDefault(OsmApi.getOsmApi().getBaseUrl(), OAuthVersion.OAuth20);
         RemoteControl.start();
@@ -206 +208 @@
             client.disconnect();
         }
-        assertNull(consumer.get());
+        assertFalse(consumer.get().isPresent());
     }
 }