You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by js...@apache.org on 2003/12/13 01:28:04 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/control LoopController.java GenericController.java
jsalvata 2003/12/12 16:28:04
Modified: src/core/org/apache/jmeter/control LoopController.java
GenericController.java
Log:
Have a 0-iteration loop behave as anyone would expect.
PR: 23006
Revision Changes Path
1.16 +10 -1 jakarta-jmeter/src/core/org/apache/jmeter/control/LoopController.java
Index: LoopController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/LoopController.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- LoopController.java 15 Sep 2003 23:13:16 -0000 1.15
+++ LoopController.java 13 Dec 2003 00:28:04 -0000 1.16
@@ -242,6 +242,15 @@
}
}
}
+
+ public void testLoopZeroTimes() throws Exception
+ {
+ LoopController loop = new LoopController();
+ loop.setLoops(0);
+ loop.addTestElement(new TestSampler("never run"));
+ loop.initialize();
+ assertNull(loop.next());
+ }
}
public static void main(String args[])
1.21 +2 -1 jakarta-jmeter/src/core/org/apache/jmeter/control/GenericController.java
Index: GenericController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/GenericController.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- GenericController.java 19 Oct 2003 22:22:22 -0000 1.20
+++ GenericController.java 13 Dec 2003 00:28:04 -0000 1.21
@@ -127,6 +127,7 @@
{
fireIterEvents();
log.debug("Calling next on: " + this.getClass().getName());
+ if (isDone()) return null;
Sampler returnValue = null;
TestElement currentElement = null;
try
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org