EFRS-1286: Fixed tests

Author: VolodymyrBushko

java/admin/src/main/resources/db/changelog/db.changelog-0.2.4.yaml

@@ -3,7 +3,7 @@ databaseChangeLog:
       id: expand-oauth_access_token-and-oauth_refresh_token-with-expiration-column
       author: Volodymyr Bushko
       changes:
-        # add an expiration column
+        # add an expiration column to the oauth_access_token & oauth_refresh_token tables
         - addColumn:
             tableName: oauth_access_token
             columns:
@@ -16,15 +16,15 @@ databaseChangeLog:
               - column:
                   name: expiration
                   type: timestamp
-        # set an oauth token expiration to avoid conflicts
+        # set the expiration columns in order to avoid conflicts
         - customChange: {
           "class": "com.exadel.frs.commonservice.system.liquibase.customchange.SetOAuthTokenExpirationCustomChange",
           "clientId": "${common-client.client-id}",
           "accessTokenValidity": "${common-client.access-token-validity}",
           "refreshTokenValidity": "${common-client.refresh-token-validity}",
           "authorizedGrantTypes": "${common-client.authorized-grant-types}"
         }
-        # add a non-null constraint to the expiration column
+        # add a not-null constraint to the expiration columns
         - addNotNullConstraint:
             tableName: oauth_access_token
             columnName: expiration

java/api/src/test/java/com/exadel/frs/core/trainservice/EmbeddedPostgreSQLTest.java

@@ -2,6 +2,8 @@
 
 import com.exadel.frs.core.trainservice.config.IntegrationTest;
 import io.zonky.test.db.AutoConfigureEmbeddedDatabase;
+import javax.annotation.PostConstruct;
+import javax.sql.DataSource;
 import liquibase.Contexts;
 import liquibase.LabelExpression;
 import liquibase.Liquibase;
@@ -10,12 +12,10 @@
 import liquibase.integration.spring.SpringResourceAccessor;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import javax.annotation.PostConstruct;
-import javax.sql.DataSource;
-
 @IntegrationTest
 @ExtendWith(SpringExtension.class)
 @AutoConfigureEmbeddedDatabase(beanName = "dsPg")
@@ -27,6 +27,9 @@ public class EmbeddedPostgreSQLTest {
     @Autowired
     ResourceLoader resourceLoader;
 
+    @Autowired
+    private Environment env;
+
     @PostConstruct
     public void initDatabase() {
         try {
@@ -35,10 +38,23 @@ public void initDatabase() {
                     new SpringResourceAccessor(resourceLoader),
                     DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(dataSource.getConnection()))
             );
+            setLiquibaseChangeLogParams(liquibase);
             liquibase.update(new Contexts(), new LabelExpression());
         } catch (Exception e) {
             //manage exception
             e.printStackTrace();
         }
     }
+
+    private void setLiquibaseChangeLogParams(final Liquibase liquibase) {
+        String clientId = env.getProperty("spring.liquibase.parameters.common-client.client-id", "CommonClientId");
+        String accessTokenValidity = env.getProperty("spring.liquibase.parameters.common-client.access-token-validity", "2400");
+        String refreshTokenValidity = env.getProperty("spring.liquibase.parameters.common-client.refresh-token-validity", "1209600");
+        String authorizedGrantTypes = env.getProperty("spring.liquibase.parameters.common-client.authorized-grant-types", "password,refresh_token");
+
+        liquibase.setChangeLogParameter("common-client.client-id", clientId);
+        liquibase.setChangeLogParameter("common-client.access-token-validity", accessTokenValidity);
+        liquibase.setChangeLogParameter("common-client.refresh-token-validity", refreshTokenValidity);
+        liquibase.setChangeLogParameter("common-client.authorized-grant-types", authorizedGrantTypes);
+    }
 }

java/api/src/test/resources/application.yml

@@ -5,6 +5,12 @@ spring:
     enabled: false
   liquibase:
     enabled: false
+    parameters:
+      common-client:
+        client-id: CommonClientId
+        access-token-validity: 2400
+        refresh-token-validity: 1209600
+        authorized-grant-types: password,refresh_token
   datasource-pg:
     driver-class-name: org.postgresql.Driver
     url: ${POSTGRES_URL:jdbc:postgresql://localhost:5432/frs_test}

java/api/src/test/resources/db/changelog/db.changelog-0.2.4.yaml

@@ -3,7 +3,7 @@ databaseChangeLog:
       id: expand-oauth_access_token-and-oauth_refresh_token-with-expiration-column
       author: Volodymyr Bushko
       changes:
-        # add an expiration column
+        # add an expiration column to the oauth_access_token & oauth_refresh_token tables
         - addColumn:
             tableName: oauth_access_token
             columns:
@@ -16,15 +16,15 @@ databaseChangeLog:
               - column:
                   name: expiration
                   type: timestamp
-        # set an oauth token expiration to avoid conflicts
+        # set the expiration columns in order to avoid conflicts
         - customChange: {
           "class": "com.exadel.frs.commonservice.system.liquibase.customchange.SetOAuthTokenExpirationCustomChange",
-          "clientId": "CommonClientId",
-          "accessTokenValidity": "2400",
-          "refreshTokenValidity": "1209600",
-          "authorizedGrantTypes": "password,refresh_token"
+          "clientId": "${common-client.client-id}",
+          "accessTokenValidity": "${common-client.access-token-validity}",
+          "refreshTokenValidity": "${common-client.refresh-token-validity}",
+          "authorizedGrantTypes": "${common-client.authorized-grant-types}"
         }
-        # add a non-null constraint to the expiration column
+        # add a not-null constraint to the expiration columns
         - addNotNullConstraint:
             tableName: oauth_access_token
             columnName: expiration