From 0f73ae1eb7bd896a39393b4c0cfdcee334ec01cd Mon Sep 17 00:00:00 2001 From: Adam Saghy Date: Wed, 14 Jan 2026 11:00:05 +0100 Subject: [PATCH] FINERACT-2421: Move E2E init data into `runner` --- .../fineract/test/stepdef/loan/LoanStepDef.java | 15 ++++++++++++--- .../global/BusinessDateInitializerStep.java | 0 .../global/ChargeGlobalInitializerStep.java | 0 .../global/CobBusinessStepInitializerStep.java | 0 .../global/CodeGlobalInitializerStep.java | 0 .../global/CurrencyGlobalInitializerStep.java | 0 .../global/DatatablesGlobalInitializerStep.java | 0 .../global/DelinquencyGlobalInitializerStep.java | 0 ...ncialActivityMappingGlobalInitializerStep.java | 0 .../global/FundGlobalInitializerStep.java | 0 .../global/GLGlobalInitializerStep.java | 0 .../GlobalConfigurationGlobalInitializerStep.java | 0 .../global/LoanProductGlobalInitializerStep.java | 10 ---------- .../global/PaymentTypeGlobalInitializerStep.java | 0 .../global/SavingsProductGlobalInitializer.java | 0 .../global/SchedulerGlobalInitializerStep.java | 0 ...lobalConfigurationScenarioInitializerStep.java | 0 .../suite/ExternalEventSuiteInitializerStep.java | 0 .../suite/JobSuiteInitializerStep.java | 0 19 files changed, 12 insertions(+), 13 deletions(-) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/BusinessDateInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/ChargeGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/CobBusinessStepInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/CodeGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/CurrencyGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/DatatablesGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/DelinquencyGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/FinancialActivityMappingGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/FundGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/GlobalConfigurationGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java (99%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/PaymentTypeGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/SavingsProductGlobalInitializer.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/global/SchedulerGlobalInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/scenario/GlobalConfigurationScenarioInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/suite/ExternalEventSuiteInitializerStep.java (100%) rename {fineract-e2e-tests-core => fineract-e2e-tests-runner}/src/test/java/org/apache/fineract/test/initializer/suite/JobSuiteInitializerStep.java (100%) diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java index 5ce99831b..cf0bc2ac9 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java @@ -143,7 +143,6 @@ import org.apache.fineract.test.helper.BusinessDateHelper; import org.apache.fineract.test.helper.CodeHelper; import org.apache.fineract.test.helper.ErrorMessageHelper; import org.apache.fineract.test.helper.Utils; -import org.apache.fineract.test.initializer.global.LoanProductGlobalInitializerStep; import org.apache.fineract.test.messaging.EventAssertion; import org.apache.fineract.test.messaging.config.EventProperties; import org.apache.fineract.test.messaging.config.JobPollingProperties; @@ -3213,8 +3212,8 @@ public class LoanStepDef extends AbstractStepDef { if (transactionTypeToChange.equals(transactionTypeOriginal)) { futureInstallmentAllocationRule = futureInstallmentAllocationRuleNew; } - newPaymentAllocation.add(LoanProductGlobalInitializerStep.editPaymentAllocationFutureInstallment(transactionTypeOriginal, - futureInstallmentAllocationRule, paymentAllocationOrder)); + newPaymentAllocation.add(editPaymentAllocationFutureInstallment(transactionTypeOriginal, futureInstallmentAllocationRule, + paymentAllocationOrder)); }); PutLoanProductsProductIdRequest putLoanProductsProductIdRequest = new PutLoanProductsProductIdRequest() @@ -5907,4 +5906,14 @@ public class LoanStepDef extends AbstractStepDef { assertEquals(Integer.valueOf(numberOfRelations), relationshipOptional.size(), "Missed relationship for transaction"); } + + public static AdvancedPaymentData editPaymentAllocationFutureInstallment(String transactionType, String futureInstallmentAllocationRule, + List paymentAllocationOrder) { + AdvancedPaymentData advancedPaymentData = new AdvancedPaymentData(); + advancedPaymentData.setTransactionType(transactionType); + advancedPaymentData.setFutureInstallmentAllocationRule(futureInstallmentAllocationRule); + advancedPaymentData.setPaymentAllocationOrder(paymentAllocationOrder); + + return advancedPaymentData; + } } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/BusinessDateInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/BusinessDateInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/BusinessDateInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/BusinessDateInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/ChargeGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/ChargeGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/ChargeGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/ChargeGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/CobBusinessStepInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CobBusinessStepInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/CobBusinessStepInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CobBusinessStepInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/CodeGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CodeGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/CodeGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CodeGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/CurrencyGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CurrencyGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/CurrencyGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/CurrencyGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/DatatablesGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/DatatablesGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/DatatablesGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/DatatablesGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/DelinquencyGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/DelinquencyGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/DelinquencyGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/DelinquencyGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/FinancialActivityMappingGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/FinancialActivityMappingGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/FinancialActivityMappingGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/FinancialActivityMappingGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/FundGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/FundGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/FundGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/FundGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/GLGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/GlobalConfigurationGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/GlobalConfigurationGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/GlobalConfigurationGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/GlobalConfigurationGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java similarity index 99% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java index 63f471aa8..233e27215 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java +++ b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java @@ -4485,16 +4485,6 @@ public class LoanProductGlobalInitializerStep implements FineractGlobalInitializ return advancedPaymentData; } - public static AdvancedPaymentData editPaymentAllocationFutureInstallment(String transactionType, String futureInstallmentAllocationRule, - List paymentAllocationOrder) { - AdvancedPaymentData advancedPaymentData = new AdvancedPaymentData(); - advancedPaymentData.setTransactionType(transactionType); - advancedPaymentData.setFutureInstallmentAllocationRule(futureInstallmentAllocationRule); - advancedPaymentData.setPaymentAllocationOrder(paymentAllocationOrder); - - return advancedPaymentData; - } - private static CreditAllocationData createCreditAllocation(String transactionType, List creditAllocationRules) { CreditAllocationData creditAllocationData = new CreditAllocationData(); creditAllocationData.setTransactionType(transactionType); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/PaymentTypeGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/PaymentTypeGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/PaymentTypeGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/PaymentTypeGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/SavingsProductGlobalInitializer.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/SavingsProductGlobalInitializer.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/SavingsProductGlobalInitializer.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/SavingsProductGlobalInitializer.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/SchedulerGlobalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/SchedulerGlobalInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/SchedulerGlobalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/SchedulerGlobalInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/scenario/GlobalConfigurationScenarioInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/scenario/GlobalConfigurationScenarioInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/scenario/GlobalConfigurationScenarioInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/scenario/GlobalConfigurationScenarioInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/suite/ExternalEventSuiteInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/suite/ExternalEventSuiteInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/suite/ExternalEventSuiteInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/suite/ExternalEventSuiteInitializerStep.java diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/suite/JobSuiteInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/suite/JobSuiteInitializerStep.java similarity index 100% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/suite/JobSuiteInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/suite/JobSuiteInitializerStep.java