Fix JVM specific test failure due to different JVM gc() dynamics

Signed-off-by: Marko Strukelj <marko.strukelj@gmail.com>

Author: mstruk

oauth-common/src/main/java/io/strimzi/kafka/oauth/services/Sessions.java

@@ -73,7 +73,7 @@ public void removeAllWithMatchingAccessToken(String accessToken) {
             if (accessToken.equals(token.value())) {
                 activeSessions.remove(token);
                 if (log.isDebugEnabled()) {
-                    log.debug("Removed invalid sessions from sessions map (userId: {}, session: {}, token: {}). Will not refresh its grants any more.",
+                    log.debug("Removed invalid session from sessions map (userId: {}, session: {}, token: {})",
                             token.principalName(), token.getSessionId(), mask(token.value()));
                 }
             }

testsuite/common/src/main/java/io/strimzi/testsuite/oauth/common/TestContainersWatcher.java

@@ -15,6 +15,9 @@
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -86,6 +89,14 @@ protected void outputLogs() {
         environment.getContainerByServiceName("hydra-jwt_1").ifPresent(c -> System.out.println("\n\n'hydra-jwt' log:\n\n" + c.getLogs() + "\n"));
         environment.getContainerByServiceName("hydra-import_1").ifPresent(c -> System.out.println("\n\n'hydra-import' log:\n\n" + c.getLogs() + "\n"));
         environment.getContainerByServiceName("hydra-jwt-import_1").ifPresent(c -> System.out.println("\n\n'hydra-jwt-import' log:\n\n" + c.getLogs() + "\n"));
+        File testLog = new File("target/test.log");
+        if (testLog.isFile()) {
+            try {
+                System.out.println("\n\n'mockoauth-tests' test.log:\n\n" + new String(Files.readAllBytes(testLog.toPath()), StandardCharsets.ISO_8859_1) + "\n");
+            } catch (IOException e) {
+                System.out.println("Failed to read file: " + testLog.getAbsolutePath());
+            }
+        }
     }
 
     public void collectLogsOnExit() {

testsuite/mockoauth-tests/src/test/java/io/strimzi/testsuite/oauth/mockoauth/KeycloakAuthorizerTest.java

@@ -46,6 +46,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -168,7 +169,7 @@ void doGrants401Test() throws IOException, InterruptedException, TimeoutExceptio
             lines = waitFor(logReader, "Done refreshing grants");
             Assert.assertTrue("Failed to fetch", checkLogForRegex(lines, "Failed to fetch grants .* status 401"));
             Assert.assertTrue("Removed user from grants cache", checkLogForRegex(lines, "Removed user from grants cache: alice"));
-            Assert.assertTrue("Removed invalid sessions", checkLogForRegex(lines, "Removed invalid sessions from sessions map \\(userId: alice"));
+            Assert.assertTrue("Removed invalid session", checkLogForRegex(lines, "Removed invalid session from sessions map \\(userId: alice"));
 
         } finally {
             changeAuthServerMode("grants", "MODE_200");
@@ -518,6 +519,9 @@ void doConfigTests() throws IOException {
     void doGrantsGCTests() throws Exception {
         logStart("KeycloakAuthorizerTest :: Grants Garbage Collection Tests");
 
+        // Hold on to the created principals to prevent JVM gc() clearing the sessions
+        List<OAuthKafkaPrincipal> principals = new LinkedList<>();
+
         // make sure the token endpoint works fine
         changeAuthServerMode("token", "MODE_200");
 
@@ -558,7 +562,7 @@ void doGrantsGCTests() throws Exception {
 
             LOG.info("Authenticate (validate) as gcUser1");
             OAuthKafkaPrincipal principal = authenticate(authHandler, tokenInfo);
-
+            principals.add(principal);
 
             // authorization
 
@@ -590,6 +594,7 @@ void doGrantsGCTests() throws Exception {
 
             LOG.info("Authenticate (validate) gcUser2");
             principal = authenticate(authHandler, tokenInfo);
+            principals.add(principal);
 
             LOG.info("Waiting for: active users count: 2, grantsCache size before: 1, grantsCache size after: 1"); // Make sure to not repeat the below condition in the string here
             // wait for cgGrants run on 2 users