Index: trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuth20AuthorizationTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuth20AuthorizationTest.java	(revision 18664)
+++ trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuth20AuthorizationTest.java	(revision 18665)
@@ -3,6 +3,6 @@
 
 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,4 +10,5 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -166,5 +167,5 @@
     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,6 +182,7 @@
         }
         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,5 +192,5 @@
         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,5 +208,5 @@
             client.disconnect();
         }
-        assertNull(consumer.get());
+        assertFalse(consumer.get().isPresent());
     }
 }