FINERACT-2070: e2e test framework update

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/AdvancePaymentsAdjustmentType.java

@@ -20,7 +20,10 @@
 
 public enum AdvancePaymentsAdjustmentType {
 
-    RESCHEDULE_NEXT_REPAYMENTS(1), REDUCE_NUMBER_OF_INSTALLMENTS(2), REDUCE_EMI_AMOUNT(3), ADJUST_LAST_UNPAID_PERIOD(4);
+    RESCHEDULE_NEXT_REPAYMENTS(1), //
+    REDUCE_NUMBER_OF_INSTALLMENTS(2), //
+    REDUCE_EMI_AMOUNT(3), //
+    ADJUST_LAST_UNPAID_PERIOD(4);//
 
     public final Integer value;
 

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/CobBusinessStep.java

@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.test.data;
+
+public enum CobBusinessStep {
+
+    APPLY_CHARGE_TO_OVERDUE_LOANS("APPLY_CHARGE_TO_OVERDUE_LOANS"), //
+    LOAN_DELINQUENCY_CLASSIFICATION("LOAN_DELINQUENCY_CLASSIFICATION"), //
+    CHECK_LOAN_REPAYMENT_DUE("CHECK_LOAN_REPAYMENT_DUE"), //
+    CHECK_LOAN_REPAYMENT_OVERDUE("CHECK_LOAN_REPAYMENT_OVERDUE"), //
+    UPDATE_LOAN_ARREARS_AGING("UPDATE_LOAN_ARREARS_AGING"), //
+    ADD_PERIODIC_ACCRUAL_ENTRIES("ADD_PERIODIC_ACCRUAL_ENTRIES"), //
+    EXTERNAL_ASSET_OWNER_TRANSFER("EXTERNAL_ASSET_OWNER_TRANSFER"), //
+    CHECK_DUE_INSTALLMENTS("CHECK_DUE_INSTALLMENTS"), //
+    ACCRUAL_ACTIVITY_POSTING("ACCRUAL_ACTIVITY_POSTING"), //
+    LOAN_INTEREST_RECALCULATION("LOAN_INTEREST_RECALCULATION");//
+
+    public final String value;
+
+    CobBusinessStep(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/LoanRescheduleErrorMessage.java

@@ -20,16 +20,29 @@
 
 public enum LoanRescheduleErrorMessage {
 
-    LOAN_CHARGED_OFF("Loan: %s reschedule installment is not allowed. Loan Account is Charged-off"), LOAN_LOCKED_BY_COB(
-            "Loan is locked by the COB job. Loan ID: %s");
+    LOAN_CHARGED_OFF("Loan: %s reschedule installment is not allowed. Loan Account is Charged-off"), //
+    LOAN_RESCHEDULE_DATE_NOT_IN_FUTURE("Loan Reschedule From date (%s) for Loan: %s should be in the future."), //
+    LOAN_LOCKED_BY_COB("Loan is locked by the COB job. Loan ID: %s");//
 
-    public final String value;
+    private final String messageTemplate;
 
-    LoanRescheduleErrorMessage(String value) {
-        this.value = value;
+    LoanRescheduleErrorMessage(String messageTemplate) {
+        this.messageTemplate = messageTemplate;
     }
 
     public String getValue(Object... params) {
-        return String.format(this.value, params);
+        if (params.length != getExpectedParameterCount()) {
+            throw new IllegalArgumentException("Expected " + getExpectedParameterCount() + " parameters, but got " + params.length);
+        }
+        return String.format(this.messageTemplate, params);
+    }
+
+    public int getExpectedParameterCount() {
+        // Count the number of placeholders (%s) in the message template
+        return (int) messageTemplate.chars().filter(ch -> ch == '%').count();
+    }
+
+    public String getMessageTemplate() {
+        return messageTemplate;
     }
 }

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/LoanStatus.java

@@ -23,8 +23,15 @@
 
 public enum LoanStatus {
 
-    NONE(0), SUBMITTED_AND_PENDING_APPROVAL(100), APPROVED(200), ACTIVE(300), CLOSED_OBLIGATIONS_MET(600), OVERPAID(
-            700), CLOSED_WRITTEN_OFF(601);
+    NONE(0), //
+    SUBMITTED_AND_PENDING_APPROVAL(100), //
+    APPROVED(200), //
+    ACTIVE(300), //
+    WITHDRAWN(400), //
+    REJECTED(500), //
+    CLOSED_OBLIGATIONS_MET(600), //
+    OVERPAID(700), //
+    CLOSED_WRITTEN_OFF(601);//
 
     public final Integer value;
 

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/TransactionType.java

@@ -20,9 +20,19 @@
 
 public enum TransactionType {
 
-    DISBURSEMENT("disbursement"), REPAYMENT("repayment"), DOWN_PAYMENT("downPayment"), GOODWILL_CREDIT("goodwillCredit"), PAYOUT_REFUND(
-            "payoutRefund"), REFUND_BY_CASH("refundByCash"), MERCHANT_ISSUED_REFUND("merchantIssuedRefund"), CREDIT_BALANCE_REFUND(
-                    "creditBalanceRefund"), CHARGEBACK("chargeback"), ACCRUAL("accrual"), CHARGE_OFF("chargeOff");
+    DISBURSEMENT("disbursement"), //
+    REPAYMENT("repayment"), //
+    DOWN_PAYMENT("downPayment"), //
+    GOODWILL_CREDIT("goodwillCredit"), //
+    PAYOUT_REFUND("payoutRefund"), //
+    REFUND_BY_CASH("refundByCash"), //
+    MERCHANT_ISSUED_REFUND("merchantIssuedRefund"), //
+    CREDIT_BALANCE_REFUND("creditBalanceRefund"), //
+    CHARGEBACK("chargeback"), //
+    ACCRUAL("accrual"), //
+    CHARGE_OFF("chargeOff"), //
+    CHARGE_ADJUSTMENT("chargeAdjustment"), //
+    INTEREST_PAYMENT_WAIVER("interestPaymentWaiver");//
 
     public final String value;
 

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/job/DefaultJob.java

@@ -25,7 +25,7 @@ public enum DefaultJob implements Job {
     INCREASE_BUSINESS_DAY("Increase Business Date by 1 day", "BDT_INC1"), //
     LOAN_DELINQUENCY_CLASSIFICATION("Loan Delinquency Classification", "LA_DECL"), //
     LOAN_COB("Loan COB", "LA_ECOB"), //
-    ;
+    ACCRUAL_ACTIVITY_POSTING("Accrual Activity Posting", "ACC_ACPO");
 
     private final String customName;
     private final String shortName;

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/loanproduct/DefaultLoanProduct.java

@@ -25,6 +25,8 @@ public enum DefaultLoanProduct implements LoanProduct {
     LP1_INTEREST_FLAT, //
     LP1_INTEREST_DECLINING_BALANCE_PERIOD_SAME_AS_PAYMENT, //
     LP1_INTEREST_DECLINING_BALANCE_PERIOD_DAILY, //
+    LP1_INTEREST_DECLINING_BALANCE_PERIOD_DAILY_ACCRUAL_ACTIVITY, //
+    LP1_INTEREST_DECLINING_BALANCE_DAILY_RECALCULATION_COMPOUNDING_NONE_ACCRUAL_ACTIVITY, //
     LP1_1MONTH_INTEREST_DECLINING_BALANCE_DAILY_RECALCULATION_COMPOUNDING_MONTHLY, //
     LP1_INTEREST_DECLINING_BALANCE_DAILY_RECALCULATION_COMPOUNDING_NONE, //
     LP1_INTEREST_DECLINING_BALANCE_DAILY_RECALCULATION_COMPOUNDING_NONE_RESCHEDULE_REDUCE_NR_INST, //
@@ -37,21 +39,37 @@ public enum DefaultLoanProduct implements LoanProduct {
     LP1_PAYMENT_STRATEGY_DUE_IN_ADVANCE_PENALTY_INTEREST_PRINCIPAL_FEE_INTEREST_FLAT, //
     LP1_INTEREST_FLAT_OVERDUE_FROM_AMOUNT, //
     LP1_INTEREST_FLAT_OVERDUE_FROM_AMOUNT_INTEREST, //
-    LP2_DOWNPAYMENT, LP2_DOWNPAYMENT_AUTO, //
+    LP2_DOWNPAYMENT, //
+    LP2_DOWNPAYMENT_AUTO, //
     LP2_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION, //
     LP2_DOWNPAYMENT_ADVANCED_PAYMENT_ALLOCATION, //
-    LP2_DOWNPAYMENT_INTEREST, LP2_DOWNPAYMENT_INTEREST_AUTO, //
-    LP2_ADV_CUST_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL, //
+    LP2_DOWNPAYMENT_INTEREST, //
+    LP2_DOWNPAYMENT_INTEREST_AUTO, //
     LP2_DOWNPAYMENT_ADV_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL, //
     LP2_DOWNPAYMENT_ADV_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_VERTICAL, //
     LP2_DOWNPAYMENT_ADV_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL_INSTALLMENT_LEVEL_DELINQUENCY, //
     LP2_DOWNPAYMENT_ADV_PMT_ALLOC_PROG_SCHEDULE_HOR_INST_LVL_DELINQUENCY_CREDIT_ALLOCATION, //
     LP2_DOWNPAYMENT_ADV_PMT_ALLOC_FIXED_LENGTH, //
-    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_TILL_PRECLOSE, //
-    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_TILL_REST_FREQUENCY, //
-    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_IR_DAILY_TILL_PRECLOSE_LAST_INSTALLMENT_STRATEGY, //
-    LP2_ADV_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL, //
-    ;
+    LP2_DOWNPAYMENT_AUTO_ADVANCED_PAYMENT_ALLOCATION_REPAYMENT_START_SUBMITTED, //
+    LP2_DOWNPAYMENT_INTEREST_FLAT_ADV_PMT_ALLOC, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_ACTUAL_ACTUAL, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_ACTUAL_ACTUAL_ACCRUAL_ACTIVITY, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE_PMT_ALLOC_1, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_SARP_TILL_PRECLOSE, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_REST_FREQUENCY_DATE, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_SARP_TILL_REST_FREQUENCY_DATE, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_ACTUAL_ACTUAL_INTEREST_REFUND_FULL, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_MULTIDISBURSE, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_MULTIDISBURSE_DOWNPAYMENT, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_DOWNPAYMENT, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_365_ACTUAL, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_ACTUAL_ACTUAL_INTEREST_REFUND, //
+    LP1_ADV_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL, //
+    LP2_ADV_CUSTOM_PMT_ALLOC_PROGRESSIVE_LOAN_SCHEDULE_HORIZONTAL, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_INTEREST_RECALCULATION_DAILY_TILL_PRECLOSE_WHOLE_TERM, //
+    LP2_ADV_PYMNT_INTEREST_DAILY_EMI_360_30_IR_DAILY_TILL_PRECLOSE_LAST_INSTALLMENT_STRATEGY;//
 
     @Override
     public String getName() {