Enhanced test infrastructure

Author: artem-v

tests/src/test/java/io/scalecube/security/environment/IntegrationEnvironmentFixture.java

@@ -0,0 +1,57 @@
+package io.scalecube.security.environment;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+
+public class IntegrationEnvironmentFixture
+    implements BeforeAllCallback, ExtensionContext.Store.CloseableResource, ParameterResolver {
+
+  private static final Map<Class<?>, Supplier<?>> PARAMETERS_TO_RESOLVE = new HashMap<>();
+
+  private static VaultEnvironment vaultEnvironment;
+
+  @Override
+  public void beforeAll(ExtensionContext context) {
+    context
+        .getRoot()
+        .getStore(Namespace.GLOBAL)
+        .getOrComputeIfAbsent(
+            this.getClass(),
+            key -> {
+              vaultEnvironment = VaultEnvironment.start();
+              return this;
+            });
+
+    PARAMETERS_TO_RESOLVE.put(VaultEnvironment.class, () -> vaultEnvironment);
+  }
+
+  @Override
+  public void close() {
+    if (vaultEnvironment != null) {
+      vaultEnvironment.close();
+    }
+  }
+
+  @Override
+  public boolean supportsParameter(
+      ParameterContext parameterContext, ExtensionContext extensionContext)
+      throws ParameterResolutionException {
+    Class<?> type = parameterContext.getParameter().getType();
+    return PARAMETERS_TO_RESOLVE.keySet().stream().anyMatch(type::isAssignableFrom);
+  }
+
+  @Override
+  public Object resolveParameter(
+      ParameterContext parameterContext, ExtensionContext extensionContext)
+      throws ParameterResolutionException {
+    Class<?> type = parameterContext.getParameter().getType();
+    return PARAMETERS_TO_RESOLVE.get(type).get();
+  }
+}

tests/src/test/java/io/scalecube/security/environment/VaultEnvironment.java

@@ -211,6 +211,13 @@ public static Throwable getRootCause(Throwable throwable) {
     return throwable;
   }
 
+  public String newServiceToken() {
+    String keyName = createIdentityKey(); // oidc/key
+    String roleName = createIdentityRole(keyName); // oidc/role
+    String clientToken = login(); // onboard entity with policy
+    return generateIdentityToken(clientToken, roleName);
+  }
+
   @Override
   public void close() {
     vault.stop();

tests/src/test/java/io/scalecube/security/tokens/jwt/JsonwebtokenResolverTests.java

@@ -12,33 +12,20 @@
 import static org.mockito.Mockito.when;
 
 import io.jsonwebtoken.Locator;
+import io.scalecube.security.environment.IntegrationEnvironmentFixture;
 import io.scalecube.security.environment.VaultEnvironment;
 import java.security.Key;
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(IntegrationEnvironmentFixture.class)
 public class JsonwebtokenResolverTests {
 
-  private static VaultEnvironment vaultEnvironment;
-
-  @BeforeAll
-  static void beforeAll() {
-    vaultEnvironment = VaultEnvironment.start();
-  }
-
-  @AfterAll
-  static void afterAll() {
-    if (vaultEnvironment != null) {
-      vaultEnvironment.close();
-    }
-  }
-
   @Test
-  void testResolveTokenSuccessfully() throws Exception {
-    final var token = generateToken();
+  void testResolveTokenSuccessfully(VaultEnvironment vaultEnvironment) throws Exception {
+    final var token = vaultEnvironment.newServiceToken();
 
     final var jwtToken =
         new JsonwebtokenResolver(
@@ -57,8 +44,8 @@ void testResolveTokenSuccessfully() throws Exception {
   }
 
   @Test
-  void testJwksKeyLocatorThrowsError() {
-    final var token = generateToken();
+  void testJwksKeyLocatorThrowsError(VaultEnvironment vaultEnvironment) {
+    final var token = vaultEnvironment.newServiceToken();
 
     Locator<Key> keyLocator = mock(Locator.class);
     when(keyLocator.locate(any())).thenThrow(new RuntimeException("Cannot get key"));
@@ -74,8 +61,8 @@ void testJwksKeyLocatorThrowsError() {
   }
 
   @Test
-  void testJwksKeyLocatorThrowsRetryableError() {
-    final var token = generateToken();
+  void testJwksKeyLocatorThrowsRetryableError(VaultEnvironment vaultEnvironment) {
+    final var token = vaultEnvironment.newServiceToken();
 
     Locator<Key> keyLocator = mock(Locator.class);
     when(keyLocator.locate(any())).thenThrow(new JwtUnavailableException("JWKS timeout"));
@@ -89,11 +76,4 @@ void testJwksKeyLocatorThrowsRetryableError() {
       assertThat(ex.getMessage(), startsWith("JWKS timeout"));
     }
   }
-
-  private static String generateToken() {
-    String keyName = vaultEnvironment.createIdentityKey(); // oidc/key
-    String roleName = vaultEnvironment.createIdentityRole(keyName); // oidc/role
-    String clientToken = vaultEnvironment.login(); // onboard entity with policy
-    return vaultEnvironment.generateIdentityToken(clientToken, roleName);
-  }
 }

tests/src/test/java/io/scalecube/security/vault/VaultServiceTokenTests.java

@@ -9,6 +9,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
+import io.scalecube.security.environment.IntegrationEnvironmentFixture;
 import io.scalecube.security.environment.VaultEnvironment;
 import io.scalecube.security.tokens.jwt.JsonwebtokenResolver;
 import io.scalecube.security.tokens.jwt.JwksKeyLocator;
@@ -19,28 +20,15 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(IntegrationEnvironmentFixture.class)
 public class VaultServiceTokenTests {
 
-  private static VaultEnvironment vaultEnvironment;
-
-  @BeforeAll
-  static void beforeAll() {
-    vaultEnvironment = VaultEnvironment.start();
-  }
-
-  @AfterAll
-  static void afterAll() {
-    if (vaultEnvironment != null) {
-      vaultEnvironment.close();
-    }
-  }
-
   @Test
-  void testGetServiceTokenUsingWrongCredentials() throws Exception {
+  void testGetServiceTokenUsingWrongCredentials(VaultEnvironment vaultEnvironment)
+      throws Exception {
     final var serviceTokenSupplier =
         new VaultServiceTokenSupplier.Builder()
             .vaultAddress(vaultEnvironment.vaultAddr())
@@ -60,7 +48,7 @@ void testGetServiceTokenUsingWrongCredentials() throws Exception {
   }
 
   @Test
-  void testGetNonExistingServiceToken() throws Exception {
+  void testGetNonExistingServiceToken(VaultEnvironment vaultEnvironment) throws Exception {
     final var nonExistingServiceRole = "non-existing-role-" + System.currentTimeMillis();
 
     final var serviceTokenSupplier =
@@ -82,7 +70,7 @@ void testGetNonExistingServiceToken() throws Exception {
   }
 
   @Test
-  void testGetServiceTokenByWrongServiceRole() throws Exception {
+  void testGetServiceTokenByWrongServiceRole(VaultEnvironment vaultEnvironment) throws Exception {
     final var now = System.currentTimeMillis();
     final var serviceRole1 = "role1-" + now;
     final var serviceRole2 = "role2-" + now;
@@ -124,7 +112,7 @@ void testGetServiceTokenByWrongServiceRole() throws Exception {
   }
 
   @Test
-  void testGetServiceTokenSuccessfully() throws Exception {
+  void testGetServiceTokenSuccessfully(VaultEnvironment vaultEnvironment) throws Exception {
     final var now = System.currentTimeMillis();
     final var serviceRole = "role-" + now;
     final var tags = Map.of("type", "ops", "ns", "develop");