Skip to content

fix:ForEach Controller Start index for loop not using variable #6370

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
n3A87 wants to merge 5 commits into
base: master
Choose a base branch
from
+4 −0
Open

fix:ForEach Controller Start index for loop not using variable #6370

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
442b4aa
fix:ForEach Controller Start index for loop not using variable
n3A87 Oct 26, 2024
d7faa57
call getStartIndex() once
n3A87 Nov 26, 2024
e48d6f4
Merge branch 'apache:master' into master
n3A87 Nov 26, 2024
a7b2fb0
Merge branch 'master' of github.com:n3A87/jmeter
n3A87 Nov 26, 2024
0ecb2af
Merge branch 'apache:master' into master
n3A87 Dec 17, 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
3 changes: 3 additions & 0 deletions src/components/src/main/java/org/apache/jmeter/control/ForeachController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ private boolean endOfArguments() {
// Prevent entry if nothing to do
@Override
public Sampler next() {
if (loopCount < getStartIndex()) {
loopCount = getStartIndex();
}
Copy link
Copy Markdown
Collaborator

@vlsi vlsi Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a test case to cover the change?
It looks suspicious to call getStartIndex() twice as it might produce different results on every call.

Copy link
Copy Markdown
Author

@n3A87 n3A87 Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean you want me to add a unit test about the change? I have only verified that this change can solve the problem. #6180
image

Copy link
Copy Markdown
Collaborator

@vlsi vlsi Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean you want me to add a unit test about the change?

Yeah. We need to add tests to prevent accidental regressions.
Here's a sample:

jmeter/src/components/src/test/kotlin/org/apache/jmeter/threads/openmodel/OpenModelThreadGroupConfigElementTest.kt

Line 50 in c846e66

CounterConfig::class {

updateIterationIndex(getName(), loopCount);
try {
if (breakLoop || emptyList()) {
Expand Down