Reporting the correct value to updateIterationIndex (undera#719)

Author: 3dgiordano

plugins/casutg/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>kg.apc</groupId>
     <artifactId>jmeter-plugins-casutg</artifactId>
-    <version>3.1</version>
+    <version>3.1.1</version>
 
     <name>Custom Thread Groups</name>
     <description>Custom Thread Groups</description>

plugins/casutg/src/main/java/com/blazemeter/jmeter/control/VirtualUserController.java

@@ -23,7 +23,7 @@ public class VirtualUserController extends GenericController implements Iteratin
 
     @Override
     public Sampler next() {
-        updateIterationIndex(owner.getName(), (int) iterationNo);
+        updateIterationIndex();
         try {
             if (breakLoop || owner.isLimitReached()) {
                 setDone(true);
@@ -33,7 +33,7 @@ public Sampler next() {
                 }
                 hasArrived = true;
                 incrementLoopCount();
-                updateIterationIndex(owner.getName(), (int) iterationNo);
+                updateIterationIndex();
                 if (owner instanceof ArrivalsThreadGroup) {
                     getOwnerAsArrivals().arrivalFact(JMeterContextService.getContext().getThread(), iterationNo);
                     if (!owner.isRunning()) {
@@ -44,10 +44,16 @@ public Sampler next() {
             }
             return super.next();
         } finally {
-            updateIterationIndex(owner.getName(), (int) iterationNo);
+            updateIterationIndex();
         }
     }
 
+    private void updateIterationIndex() {
+        // This controller increment prior sample and ThreadGroup controllers do the opposite
+        // We subtract one to JMeter IterationIndex to be aligned with TG (start with 0)
+        updateIterationIndex(owner.getName(), getIterCount() - 1);
+    }
+
     private boolean moveToPool(JMeterThread thread) {
         if (thread instanceof DynamicThread) {
             if (!owner.isLimitReached() && getOwnerAsArrivals().movedToPool((DynamicThread) thread)) {
@@ -114,7 +120,7 @@ public void setOwner(AbstractDynamicThreadGroup owner) {
 
     @Override
     protected int getIterCount() {
-        return (int) (iterationNo + 1);
+        return (int) (iterationNo);
     }
 
     public void startNextLoop() {