Skip to content
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

Improved ExtractionTest Validation of Attachment and Extracted Children Expected vs Found Count #188

Merged
merged 6 commits into from
Sep 30, 2024
Merged

Improved ExtractionTest Validation of Attachment and Extracted Children Expected vs Found Count #188

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5695dda
Improved ExtractionTest Validation of Attachment and Extracted Childr…
Dec 16, 2021
9d132c8
Fixed issues with both Att and Extract Count. All possible cases shou…
Dec 30, 2021
8efa6fd
rebased and updates
sambish5 Sep 19, 2024
0e0e0c8
removing added test
sambish5 Sep 19, 2024
4e39266
change validation process to be less burdensome donwstream
sambish5 Sep 26, 2024
4cd331d
removing log messages
sambish5 Sep 27, 2024
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
44 changes: 32 additions & 12 deletions src/test/java/emissary/test/core/junit5/ExtractionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static Stream<? extends Arguments> data() {

/**
* Allow overriding the initial form in extensions to this test.
*
*
* By default, get the initial form from the filename in the form {@code [email protected]} where {@code INITIAL_FORM}
* will be the initial form.
*
Expand Down Expand Up @@ -173,8 +173,19 @@ protected void checkAnswers(Element el, IBaseDataObject payload, @Nullable List<
throws DataConversionException {

int numAtt = JDOMUtil.getChildIntValue(el, "numAttachments");
long numAttElements = el.getChildren().stream().filter(c -> c.getName().startsWith("att")).count();
// check attachments answer file count against payload count
if (numAtt > -1) {
assertEquals(numAtt, attachments != null ? attachments.size() : 0, "Number of attachments in " + tname);
assertEquals(numAtt, attachments != null ? attachments.size() : 0,
String.format("Expected <numAttachments> in %s not equal to number of att in payload.", tname));
} else if (numAtt == -1 && numAttElements > 0) {
assertEquals(numAttElements, attachments != null ? attachments.size() : 0,
String.format("Expected <att#> in %s not equal to number of att in payload.", tname));
} else {
if (attachments != null && !attachments.isEmpty()) {
fail(String.format("%d attachments in payload with no count in answer xml, add matching <numAttachments> count for %s",
attachments.size(), tname));
}
}

for (Element currentForm : el.getChildren("currentForm")) {
Expand Down Expand Up @@ -278,17 +289,23 @@ protected void checkAnswers(Element el, IBaseDataObject payload, @Nullable List<
assertNull(viewData, String.format("Alternate View '%s' is present, but should not be, in %s", viewName, tname));
}


// Check each extract
String extractCountStr = el.getChildTextTrim("extractCount");

int extractCount = JDOMUtil.getChildIntValue(el, "extractCount");
long numExtractElements =
el.getChildren().stream().filter(c -> c.getName().startsWith("extract") && !c.getName().startsWith("extractCount")).count();
if (payload.hasExtractedRecords()) {
List<IBaseDataObject> extractedChildren = payload.getExtractedRecords();
int foundCount = extractedChildren.size();

if (extractCountStr != null) {
assertEquals(Integer.parseInt(extractCountStr), foundCount,
String.format("Number of extracted children in '%s' is %s, not expected %s", tname, foundCount, extractCountStr));
// check extracted records answer file count against payload count
if (extractCount > -1) {
assertEquals(extractCount, foundCount,
sambish5 marked this conversation as resolved.
Show resolved Hide resolved
String.format("Expected <extractCount> in %s not equal to number of extracts in payload.", tname));
} else if (extractCount == -1 && numExtractElements > 0) {
assertEquals(numExtractElements, foundCount,
String.format("Expected <extract#> in %s not equal to number of extracts in payload.", tname));
} else {
fail(String.format("%d extracts in payload with no count in answer xml, add matching <extractCount> count for %s",
foundCount, tname));
}

int attNum = 1;
Expand All @@ -300,9 +317,12 @@ protected void checkAnswers(Element el, IBaseDataObject payload, @Nullable List<
attNum++;
}
} else {
if (extractCountStr != null) {
assertEquals(0, Integer.parseInt(extractCountStr),
String.format("No extracted children in '%s' when expecting %s", tname, extractCountStr));
if (extractCount > -1) {
assertEquals(0, extractCount,
String.format("No extracted children in '%s' when <extractCount> is %d", tname, extractCount));
} else if (numExtractElements > 0) {
assertEquals(0, numExtractElements,
String.format("No extracted children in '%s' when <extract#> is %d", tname, numExtractElements));
}
}
}
Expand Down