CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

FINERACT-1724: Further fixes for the cucumber tests

Browse Source
This commit is contained in:
Arnold Galovics
2023-06-06 11:45:08 +02:00
committed by Arnold Gálovics
parent e865d31dd9
commit 2b9928bc7e
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java
+6
View File
@@ -114,6 +114,12 @@ public class ClasspathDuplicatesStepDefinitions implements En {
|| resourcePath.equals("META-INF/BC1024KE.DSA") || resourcePath.equals("META-INF/BC2048KE.SF")
|| resourcePath.equals("META-INF/BC1024KE.SF") || resourcePath.equals("OSGI-INF/bundle.info")
|| resourcePath.equals("META-INF/DUMMY.SF") || resourcePath.equals("META-INF/DUMMY.DSA")
|| resourcePath.equals("META-INF/validation-mapping-1.0.xsd") || resourcePath.equals("META-INF/validation-mapping-1.1.xsd")
|| resourcePath.equals("META-INF/validation-mapping-2.0.xsd") || resourcePath.equals("META-INF/validation-mapping-3.0.xsd")
|| resourcePath.equals("META-INF/validation-configuration-1.0.xsd")
|| resourcePath.equals("META-INF/validation-configuration-1.1.xsd")
|| resourcePath.equals("META-INF/validation-configuration-2.0.xsd")
|| resourcePath.equals("META-INF/validation-configuration-3.0.xsd")
// Spring Framework knows what they are do..
|| resourcePath.startsWith("META-INF/spring") || resourcePath.startsWith("META-INF/additional-spring")
|| resourcePath.startsWith("META-INF/terracotta")
fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/LiquibaseStepDefinitions.java
+5 -5
View File
@@ -19,11 +19,10 @@
package org.apache.fineract.infrastructure.core;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -119,15 +118,16 @@ public class LiquibaseStepDefinitions implements En {
Then("The tenant store upgrade fails with a schema upgrade needed", () -> {
assertThat(executionException).isNotNull();
verify(liquibaseFactory).create(eq(tenantStoreDataSource), any());
verify(liquibaseFactory).create(eq(tenantStoreDataSource), anyString(), anyString());
verifyNoMoreInteractions(liquibaseFactory);
verifyNoInteractions(initialTenantStoreLiquibase, tenantStoreLiquibase, initialTenantLiquibase, tenantLiquibase);
});
Then("The default tenant upgrade fails with a schema upgrade needed", () -> {
assertThat(executionException).isNotNull();
verify(liquibaseFactory, times(2)).create(eq(tenantStoreDataSource), any());
verify(liquibaseFactory).create(eq(defaultTenantDataSource), any());
verify(liquibaseFactory).create(eq(tenantStoreDataSource), anyString(), anyString());
verify(liquibaseFactory).create(eq(tenantStoreDataSource), anyString());
verify(liquibaseFactory).create(eq(defaultTenantDataSource), anyString(), anyString(), anyString());
verifyNoMoreInteractions(liquibaseFactory);
verify(initialTenantStoreLiquibase).changeLogSync();
verify(tenantStoreLiquibase).afterPropertiesSet();