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.

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

Allow IdentificationTests to override the strategy used for resolving the expected form #555

Merged
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/test/java/emissary/test/core/junit5/IdentificationTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void testIdentificationPlace(String resource) {

try (InputStream doc = new ResourceReader().getResourceAsStream(resource)) {
byte[] data = IOUtils.toByteArray(doc);
String expectedAnswer = resource.replaceAll("^.*/([^/@]+)(@\\d+)?\\.dat$", "$1");
String expectedAnswer = resolveFormForResource(resource);
IBaseDataObject payload = DataObjectFactory.getInstance(data, resource, Form.UNKNOWN);
processPreHook(payload, resource);
place.agentProcessHeavyDuty(payload);
Expand All @@ -71,6 +71,16 @@ public void testIdentificationPlace(String resource) {
}
}

/**
* Resolves the expected form for the test resource.
*
* @param resource complete file path of the test resource
* @return form expected for the resource
*/
protected String resolveFormForResource(String resource) {
return resource.replaceAll("^.*/([^/@]+)(@\\d+)?\\.dat$", "$1");
}

protected void processPreHook(IBaseDataObject payload, String resource) {
// Nothing to do here
}
Expand Down
Loading