WIP

Author: artem-v

tests/pom.xml

@@ -12,6 +12,23 @@
 
   <artifactId>scalecube-security-tests</artifactId>
 
-
+  <dependencies>
+    <dependency>
+      <groupId>io.scalecube</groupId>
+      <artifactId>scalecube-security-tokens</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <!-- Tests -->
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>vault</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.bettercloud</groupId>
+      <artifactId>vault-java-driver</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 </project>

tokens/src/test/java/io/scalecube/security/tokens/jwt/VaultEnvironment.java renamed to tests/src/test/java/io/scalecube/security/environment/VaultEnvironment.java

@@ -1,4 +1,4 @@
-package io.scalecube.security.tokens.jwt;
+package io.scalecube.security.environment;
 
 import com.bettercloud.vault.json.Json;
 import com.bettercloud.vault.rest.Rest;

tokens/src/test/java/io/scalecube/security/tokens/jwt/VaultIdentityTokenTests.java renamed to tests/src/test/java/io/scalecube/security/tokens/jwt/VaultIdentityTokenTests.java

@@ -8,11 +8,13 @@
 import static org.mockito.Mockito.when;
 
 import io.jsonwebtoken.Locator;
+import io.scalecube.security.environment.VaultEnvironment;
 import java.security.Key;
 import java.time.Duration;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -48,8 +50,8 @@ void testResolveTokenSuccessfully() throws Exception {
             .get(3, TimeUnit.SECONDS);
 
     assertNotNull(jwtToken, "jwtToken");
-    assertTrue(jwtToken.header().size() > 0, "jwtToken.header: " + jwtToken.header());
-    assertTrue(jwtToken.payload().size() > 0, "jwtToken.payload: " + jwtToken.payload());
+    Assertions.assertTrue(jwtToken.header().size() > 0, "jwtToken.header: " + jwtToken.header());
+    Assertions.assertTrue(jwtToken.payload().size() > 0, "jwtToken.payload: " + jwtToken.payload());
   }
 
   @Test

tokens/src/test/resources/log4j2-test.xml renamed to tests/src/test/resources/log4j2-test.xml

@@ -29,17 +29,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <!-- Tests -->
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>vault</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.bettercloud</groupId>
-      <artifactId>vault-java-driver</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>