Merge pull request #5759 from openMF/FINERACT-2421/fix-shortname-collisions

FINERACT-2421: Fix shortName collisions in integration tests by routing all generation through uniqueRandomStringContainer

Author: galovics

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

@@ -77,7 +77,7 @@ public void testCreatePauseExtendsPeriods() {
         final List<WorkingCapitalLoanDelinquencyRangeScheduleData> periodsAfterActivation = getRangeSchedule(loanId);
         assertEquals(1, periodsAfterActivation.size(), "Expected 1 initial period after activation");
 
-        final LocalDate expectedPeriodToDate = periodsAfterActivation.get(0).getToDate();
+        final LocalDate expectedPeriodToDate = periodsAfterActivation.getFirst().getToDate();
         log.info("Initial period toDate: {}", expectedPeriodToDate);
 
         // when - create a 10-day pause starting from disbursement date
@@ -92,16 +92,16 @@ public void testCreatePauseExtendsPeriods() {
         final List<WorkingCapitalLoanDelinquencyRangeScheduleData> periodsAfterPause = getRangeSchedule(loanId);
         assertEquals(1, periodsAfterPause.size());
 
-        final LocalDate newToDate = periodsAfterPause.get(0).getToDate();
+        final LocalDate newToDate = periodsAfterPause.getFirst().getToDate();
         assertEquals(expectedPeriodToDate.plusDays(10), newToDate, "Period toDate should be extended by 10 days (the pause duration)");
 
         // and - GET returns the saved action
         final List<WorkingCapitalLoanDelinquencyActionData> actions = WorkingCapitalLoanDelinquencyActionHelper
                 .retrieveDelinquencyActions(loanId);
         assertEquals(1, actions.size());
-        assertEquals(WorkingCapitalLoanDelinquencyActionData.ActionEnum.PAUSE, actions.get(0).getAction());
-        assertEquals(pauseStart, actions.get(0).getStartDate());
-        assertEquals(pauseEnd, actions.get(0).getEndDate());
+        assertEquals(WorkingCapitalLoanDelinquencyActionData.ActionEnum.PAUSE, actions.getFirst().getAction());
+        assertEquals(pauseStart, actions.getFirst().getStartDate());
+        assertEquals(pauseEnd, actions.getFirst().getEndDate());
     }
 
     /**
@@ -382,15 +382,15 @@ public void testCreateAndRetrieveDelinquencyActionByExternalId() {
         final List<WorkingCapitalLoanDelinquencyActionData> actions = WorkingCapitalLoanDelinquencyActionHelper
                 .retrieveDelinquencyActionsByExternalId(externalId);
         assertEquals(1, actions.size());
-        assertEquals(WorkingCapitalLoanDelinquencyActionData.ActionEnum.PAUSE, actions.get(0).getAction());
-        assertEquals(pauseStart, actions.get(0).getStartDate());
-        assertEquals(pauseEnd, actions.get(0).getEndDate());
+        assertEquals(WorkingCapitalLoanDelinquencyActionData.ActionEnum.PAUSE, actions.getFirst().getAction());
+        assertEquals(pauseStart, actions.getFirst().getStartDate());
+        assertEquals(pauseEnd, actions.getFirst().getEndDate());
 
         // and - retrieve via loanId should return the same action (cross-check)
         final List<WorkingCapitalLoanDelinquencyActionData> actionsById = WorkingCapitalLoanDelinquencyActionHelper
                 .retrieveDelinquencyActions(loanId);
         assertEquals(1, actionsById.size());
-        assertEquals(actions.get(0).getId(), actionsById.get(0).getId());
+        assertEquals(actions.getFirst().getId(), actionsById.getFirst().getId());
     }
 
     /**
@@ -432,7 +432,7 @@ private Long createWorkingCapitalLoanDelinquencyBucket(final int frequencyDays)
 
     private Long createProduct(final Long delinquencyBucketId) {
         final String uniqueName = "WCL Product " + Utils.randomStringGenerator("", 8);
-        final String uniqueShortName = Utils.randomStringGenerator("", 4);
+        final String uniqueShortName = Utils.uniqueRandomStringGenerator("", 4);
         return productHelper.createWorkingCapitalLoanProduct(new WorkingCapitalLoanProductTestBuilder().withName(uniqueName)
                 .withShortName(uniqueShortName).withDelinquencyBucketId(delinquencyBucketId).build()).getResourceId();
     }

integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/helpers/FeignLoanHelper.java

@@ -34,6 +34,7 @@
 import org.apache.fineract.client.models.PostLoansOriginatorData;
 import org.apache.fineract.client.models.PostLoansRequest;
 import org.apache.fineract.client.models.PostLoansResponse;
+import org.apache.fineract.integrationtests.common.Utils;
 
 public class FeignLoanHelper {
 
@@ -46,7 +47,7 @@ public FeignLoanHelper(FineractFeignClient fineractClient) {
     public Long createSimpleLoanProduct() {
         PostLoanProductsRequest request = new PostLoanProductsRequest()//
                 .name("Simple Loan Product " + System.currentTimeMillis())//
-                .shortName(java.util.UUID.randomUUID().toString().substring(0, 4).toUpperCase())//
+                .shortName(Utils.uniqueRandomStringGenerator("", 4))//
                 .currencyCode("USD")//
                 .digitsAfterDecimal(2)//
                 .inMultiplesOf(1)//

integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignTrialBalanceSummaryReportTest.java

@@ -429,7 +429,7 @@ private Long createFlatFeeCharge(double amount) {
     private Long createLoanProduct() {
         return loanHelper.createLoanProduct(new PostLoanProductsRequest()//
                 .name("TrialBal Product " + System.currentTimeMillis())//
-                .shortName(UUID.randomUUID().toString().substring(0, 4).toUpperCase())//
+                .shortName(Utils.uniqueRandomStringGenerator("", 4))//
                 .currencyCode("USD")//
                 .digitsAfterDecimal(2)//
                 .inMultiplesOf(1)//