Skip to content

Commit 4cf50ac

Browse files
FINERACT-2421: Fix shortName collisions in integration tests by routing all generation through uniqueRandomStringContainer
1 parent 4a8bdc5 commit 4cf50ac

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ private Long createWorkingCapitalLoanDelinquencyBucket(final int frequencyDays)
432432

433433
private Long createProduct(final Long delinquencyBucketId) {
434434
final String uniqueName = "WCL Product " + Utils.randomStringGenerator("", 8);
435-
final String uniqueShortName = Utils.randomStringGenerator("", 4);
435+
final String uniqueShortName = Utils.uniqueRandomStringGenerator("", 4);
436436
return productHelper.createWorkingCapitalLoanProduct(new WorkingCapitalLoanProductTestBuilder().withName(uniqueName)
437437
.withShortName(uniqueShortName).withDelinquencyBucketId(delinquencyBucketId).build()).getResourceId();
438438
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.apache.fineract.client.models.PostLoansOriginatorData;
3535
import org.apache.fineract.client.models.PostLoansRequest;
3636
import org.apache.fineract.client.models.PostLoansResponse;
37+
import org.apache.fineract.integrationtests.common.Utils;
3738

3839
public class FeignLoanHelper {
3940

@@ -46,7 +47,7 @@ public FeignLoanHelper(FineractFeignClient fineractClient) {
4647
public Long createSimpleLoanProduct() {
4748
PostLoanProductsRequest request = new PostLoanProductsRequest()//
4849
.name("Simple Loan Product " + System.currentTimeMillis())//
49-
.shortName(java.util.UUID.randomUUID().toString().substring(0, 4).toUpperCase())//
50+
.shortName(Utils.uniqueRandomStringGenerator("", 4))//
5051
.currencyCode("USD")//
5152
.digitsAfterDecimal(2)//
5253
.inMultiplesOf(1)//

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ private Long createFlatFeeCharge(double amount) {
429429
private Long createLoanProduct() {
430430
return loanHelper.createLoanProduct(new PostLoanProductsRequest()//
431431
.name("TrialBal Product " + System.currentTimeMillis())//
432-
.shortName(UUID.randomUUID().toString().substring(0, 4).toUpperCase())//
432+
.shortName(Utils.uniqueRandomStringGenerator("", 4))//
433433
.currencyCode("USD")//
434434
.digitsAfterDecimal(2)//
435435
.inMultiplesOf(1)//

0 commit comments

Comments
 (0)