Skip to content

Commit d05eaeb

Browse files
FINERACT-2471: Fix force withdrawal test isolation
Align default global config expectations with DB defaults, restore force-withdrawal configs after the integration test, and ignore IDE-generated .apt_generated artifacts to avoid accidental CI noise. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 3ed212a commit d05eaeb

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ licenses
2727
**/images/diag-*.svg
2828

2929
fineract-provider/src/main/generated/
30+
**/.apt_generated/
3031

3132
**/out/
3233
gradleExp/

integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountForceWithdrawalTest.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
import io.restassured.builder.RequestSpecBuilder;
2222
import io.restassured.builder.ResponseSpecBuilder;
2323
import io.restassured.http.ContentType;
24-
import io.restassured.response.Response;
2524
import io.restassured.specification.RequestSpecification;
2625
import io.restassured.specification.ResponseSpecification;
2726
import java.io.IOException;
28-
import java.util.HashMap;
2927
import org.apache.fineract.client.models.GlobalConfigurationPropertyData;
3028
import org.apache.fineract.client.models.PostSavingsAccountTransactionsRequest;
3129
import org.apache.fineract.client.models.PostSavingsAccountTransactionsResponse;
@@ -35,10 +33,11 @@
3533
import org.apache.fineract.integrationtests.common.Utils;
3634
import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
3735
import org.apache.fineract.integrationtests.common.savings.SavingsProductHelper;
36+
import org.apache.fineract.infrastructure.configuration.api.GlobalConfigurationConstants;
3837
import org.junit.jupiter.api.AfterEach;
39-
import org.junit.jupiter.api.Assertions;
4038
import org.junit.jupiter.api.BeforeEach;
4139
import org.junit.jupiter.api.Test;
40+
import org.junit.jupiter.api.Assertions;
4241

4342
public class SavingsAccountForceWithdrawalTest {
4443

@@ -62,13 +61,13 @@ public void setup() {
6261

6362
@Test
6463
public void testForceWithdrawal() throws IOException {
65-
globalConfigurationHelper.updateGlobalConfiguration("allow-force-withdrawal-on-savings-account",
64+
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.FORCE_WITHDRAWAL_ON_SAVINGS_ACCOUNT,
6665
new PutGlobalConfigurationsRequest().enabled(true));
67-
globalConfigurationHelper.updateGlobalConfiguration("force-withdrawal-on-savings-account-limit",
66+
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.FORCE_WITHDRAWAL_ON_SAVINGS_ACCOUNT_LIMIT,
6867
new PutGlobalConfigurationsRequest().value(5000L).enabled(true));
6968

7069
GlobalConfigurationPropertyData config = globalConfigurationHelper
71-
.getGlobalConfigurationByName("force-withdrawal-on-savings-account-limit");
70+
.getGlobalConfigurationByName(GlobalConfigurationConstants.FORCE_WITHDRAWAL_ON_SAVINGS_ACCOUNT_LIMIT);
7271
Assertions.assertEquals(5000L, config.getValue());
7372

7473
final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
@@ -103,9 +102,9 @@ private Integer createSavingsProductDailyPosting() {
103102

104103
@AfterEach
105104
public void tearDown() {
106-
globalConfigurationHelper.updateGlobalConfiguration("allow-force-withdrawal-on-savings-account",
107-
new PutGlobalConfigurationsRequest().enabled(true));
108-
globalConfigurationHelper.updateGlobalConfiguration("force-withdrawal-on-savings-account-limit",
109-
new PutGlobalConfigurationsRequest().value(0L));
105+
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.FORCE_WITHDRAWAL_ON_SAVINGS_ACCOUNT,
106+
new PutGlobalConfigurationsRequest().enabled(false));
107+
globalConfigurationHelper.updateGlobalConfiguration(GlobalConfigurationConstants.FORCE_WITHDRAWAL_ON_SAVINGS_ACCOUNT_LIMIT,
108+
new PutGlobalConfigurationsRequest().value(0L).enabled(false));
110109
}
111110
}

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,14 +597,14 @@ private static ArrayList<HashMap> getAllDefaultGlobalConfigurations() {
597597
HashMap<String, Object> forceWithdrawalOnSavingsAccount = new HashMap<>();
598598
forceWithdrawalOnSavingsAccount.put("name", GlobalConfigurationConstants.FORCE_WITHDRAWAL_ON_SAVINGS_ACCOUNT);
599599
forceWithdrawalOnSavingsAccount.put("value", 0L);
600-
forceWithdrawalOnSavingsAccount.put("enabled", true);
600+
forceWithdrawalOnSavingsAccount.put("enabled", false);
601601
forceWithdrawalOnSavingsAccount.put("trapDoor", false);
602602
defaults.add(forceWithdrawalOnSavingsAccount);
603603

604604
HashMap<String, Object> forceWithdrawalOnSavingsAccountLimit = new HashMap<>();
605605
forceWithdrawalOnSavingsAccountLimit.put("name", GlobalConfigurationConstants.FORCE_WITHDRAWAL_ON_SAVINGS_ACCOUNT_LIMIT);
606606
forceWithdrawalOnSavingsAccountLimit.put("value", 0L);
607-
forceWithdrawalOnSavingsAccountLimit.put("enabled", true);
607+
forceWithdrawalOnSavingsAccountLimit.put("enabled", false);
608608
forceWithdrawalOnSavingsAccountLimit.put("trapDoor", false);
609609
defaults.add(forceWithdrawalOnSavingsAccountLimit);
610610

0 commit comments

Comments
 (0)