Skip to content

Db contrib/waltz 7344 intermittent test failures #7353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+33 −38
Open

Db contrib/waltz 7344 intermittent test failures #7353

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa90bf1
collection comaprison assertion correction
mayank-d-gupta-db Sep 2, 2025
845c81c
Pull request #1: collection comaprison assertion correction
mayank-d-gupta-db Sep 9, 2025
d3b99f4
collection comaprison assertion correction
mayank-d-gupta-db Sep 2, 2025
24d0ed0
Merge branch 'db-feature/waltz-7344-intermittent-test-failures' of ht…
mayank-d-gupta-db Sep 10, 2025
18c1c95
Pull request #541: Db feature/waltz 7344 intermittent test failures
mayank-d-gupta-db Sep 12, 2025
648ef4c
Merge branch 'db-feature/waltz-7344-intermittent-test-failures' of ht…
mayank-d-gupta-db Sep 12, 2025
609e968
Merge remote-tracking branch 'origin/master' into db-feature/waltz-73…
mayank-d-gupta-db Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 33 additions & 38 deletions .../java/org/finos/waltz/integration_test/inmem/service/BulkMeasurableRatingServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.finos.waltz.integration_test.inmem.service;


import org.apache.commons.collections4.CollectionUtils;
import org.finos.waltz.common.CollectionUtilities;
import org.finos.waltz.data.measurable_category.MeasurableCategoryDao;
import org.finos.waltz.integration_test.inmem.BaseInMemoryIntegrationTest;
Expand All @@ -14,12 +15,7 @@
import org.finos.waltz.service.measurable.MeasurableService;
import org.finos.waltz.service.measurable_rating.BulkMeasurableItemParser;
import org.finos.waltz.service.measurable_rating.BulkMeasurableRatingService;
import org.finos.waltz.test_common.helpers.AppHelper;
import org.finos.waltz.test_common.helpers.MeasurableHelper;
import org.finos.waltz.test_common.helpers.MeasurableRatingHelper;
import org.finos.waltz.test_common.helpers.RatingSchemeHelper;
import org.finos.waltz.test_common.helpers.AllocationSchemeHelper;
import org.finos.waltz.test_common.helpers.UserHelper;
import org.finos.waltz.test_common.helpers.*;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -29,16 +25,12 @@

import static java.lang.String.format;
import static java.util.Collections.emptySet;
import static org.finos.waltz.common.CollectionUtilities.all;
import static org.finos.waltz.common.CollectionUtilities.first;
import static org.finos.waltz.common.CollectionUtilities.isEmpty;
import static org.finos.waltz.common.CollectionUtilities.*;
import static org.finos.waltz.common.ListUtilities.asList;
import static org.finos.waltz.common.ListUtilities.map;
import static org.finos.waltz.common.SetUtilities.asSet;
import static org.finos.waltz.test_common.helpers.NameHelper.mkName;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;

public class BulkMeasurableRatingServiceTest extends BaseInMemoryIntegrationTest {
@Autowired
Expand Down Expand Up @@ -155,16 +147,19 @@ public void previewComprehensive() {

assertNotNull(result, "Expected a result");
assertEquals(3, result.validatedItems().size(), "Only one parsed row expected");
assertEquals(
asList(ChangeOperation.ADD, ChangeOperation.UPDATE, ChangeOperation.NONE),
map(result.validatedItems(), BulkMeasurableRatingValidatedItem::changeOperation));
assertEquals(
asList(emptySet(), asSet(ValidationError.MULTIPLE_PRIMARY_FOUND), asSet(ValidationError.APPLICATION_NOT_FOUND)),
map(result.validatedItems(), BulkMeasurableRatingValidatedItem::errors));
assertTrue(
CollectionUtils.isEqualCollection(
asList(ChangeOperation.ADD, ChangeOperation.UPDATE, ChangeOperation.NONE),
map(result.validatedItems(), BulkMeasurableRatingValidatedItem::changeOperation)
));
assertTrue(
CollectionUtils.isEqualCollection(
asList(emptySet(), asSet(ValidationError.MULTIPLE_PRIMARY_FOUND), asSet(ValidationError.APPLICATION_NOT_FOUND)),
map(result.validatedItems(), BulkMeasurableRatingValidatedItem::errors)
));
}



@Test
public void previewUpdatesError() {
MeasurableCategory category = measurableCategoryDao.getById(setupCategory());
Expand All @@ -185,21 +180,21 @@ public void previewUpdatesError() {
assertNotNull(result, "Expected a result");

result
.validatedItems()
.forEach(d -> {
if (d.parsedItem().assetCode().equals("badApp")) {
assertTrue(d.errors().contains(ValidationError.APPLICATION_NOT_FOUND), "Should be complaining about the bad app (assetCode)");
}
if (d.parsedItem().taxonomyExternalId().equals("badMeasurable")) {
assertTrue(d.errors().contains(ValidationError.MEASURABLE_NOT_FOUND), "Should be complaining about the bad measurable ref (taxonomyExtId)");
}
if (d.parsedItem().ratingCode() == '_') {
assertTrue(d.errors().contains(ValidationError.RATING_NOT_FOUND), "Should be complaining about the bad rating code");
}
});
.validatedItems()
.forEach(d -> {
if (d.parsedItem().assetCode().equals("badApp")) {
assertTrue(d.errors().contains(ValidationError.APPLICATION_NOT_FOUND), "Should be complaining about the bad app (assetCode)");
}
if (d.parsedItem().taxonomyExternalId().equals("badMeasurable")) {
assertTrue(d.errors().contains(ValidationError.MEASURABLE_NOT_FOUND), "Should be complaining about the bad measurable ref (taxonomyExtId)");
}
if (d.parsedItem().ratingCode() == '_') {
assertTrue(d.errors().contains(ValidationError.RATING_NOT_FOUND), "Should be complaining about the bad rating code");
}
});

assertEquals(5, result.validatedItems().size(), "Expected 5 items");
assertTrue(CollectionUtilities.all(result.validatedItems(), d -> ! d.errors().isEmpty()));
assertTrue(CollectionUtilities.all(result.validatedItems(), d -> !d.errors().isEmpty()));
}

@Test
Expand All @@ -223,13 +218,13 @@ public void previewAllocationError() {
if (d.parsedItem().assetCode().equals("assetCode1")) {
assertTrue(d.errors().contains(ValidationError.ALLOCATION_EXCEEDING), "Should be complaining about the allocation exceeding");
}
if(d.parsedItem().allocation().equals("bad_scheme")) {
if (d.parsedItem().allocation().equals("bad_scheme")) {
assertTrue(d.errors().contains(ValidationError.ALLOCATION_SCHEME_NOT_FOUND), "Should be complaining about the bad allocation scheme");
}
});

assertEquals(3, result.validatedItems().size(), "Expected 3 items");
assertTrue(CollectionUtilities.all(result.validatedItems(), d -> ! d.errors().isEmpty()));
assertTrue(CollectionUtilities.all(result.validatedItems(), d -> !d.errors().isEmpty()));
}

// --- helpers -------------------
Expand All @@ -248,7 +243,7 @@ private String mkGoodTsv(String assetCode) {


private void assertTaxonomyExternalIdMatch(BulkMeasurableRatingValidationResult result,
List<String> taxonomyExternalId) {
List<String> taxonomyExternalId) {
assertEquals(
taxonomyExternalId,
map(result.validatedItems(), d -> d.parsedItem().taxonomyExternalId()),
Expand All @@ -275,9 +270,9 @@ private String mkBadRefsTsv(String goodApp,
}

private String mkBadAllocationRefsTsv(String goodApp,
String goodMeasurable,
String goodScheme,
char goodRating) {
String goodMeasurable,
String goodScheme,
char goodRating) {
return "assetCode\ttaxonomyExternalId\tratingCode\tisPrimary\tallocation\tscheme\tcomment\n" +
format("%s\t%s\t%s\ttrue\t100\t%s\tcomment\n", goodApp, goodMeasurable, goodRating, goodScheme) +
format("%s\t%s\t%s\ttrue\t10\t%s\tcomment\n", goodApp, goodMeasurable, goodRating, goodScheme) +
Expand Down
Loading