Make reading of scenario steps more flexible #8980
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
A PR to allow scenario steps to be more flexible by supporting skipped step numbers and steps starting with a '0'. Key changes include:
- Updating tests in ScenarioTest.java to expect an increased number of steps.
- Refactoring Scenario.java#getSteps to filter, sort, and validate steps using a regex-based approach and a custom StepSorter.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| larva/src/test/java/org/frankframework/larva/ScenarioTest.java | Updated test assertions to reflect flexible step numbering and support for a '0'-prefixed step. |
| larva/src/main/java/org/frankframework/larva/Scenario.java | Refactored step filtering, sorting, and duplicate validation with regex matching and a custom comparator. |
| public int compare(String o1, String o2) { | ||
| int step1Nr = getStepNr(o1); | ||
| int step2Nr = getStepNr(o2); | ||
| return step1Nr - step2Nr; |
There was a problem hiding this comment.
[nitpick] Consider using Integer.compare(step1Nr, step2Nr) instead of subtraction for clarity and to avoid potential integer overflow in edge cases.
Suggested change
| return step1Nr - step2Nr; | |
| return Integer.compare(step1Nr, step2Nr); |
Copilot uses AI. Check for mistakes.
|
Nice, this will make it a lot easier to write and test Larva scenarios! |
philipsens
reviewed
May 14, 2025
philipsens
reviewed
May 14, 2025
|
evandongen
approved these changes
May 15, 2025
philipsens
approved these changes
May 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Scenario step numbers can now skip steps, so you can comment out a single step without having to renumber all following steps.
Step numbers can also start with a '0' to align step numbers nicely in the file.