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:54:23 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/control LoopController.java
jsalvata 2003/12/12 16:54:23
Modified: src/core/org/apache/jmeter/control LoopController.java
Log:
Removed unused misleading property.
Added a new very simple test case.
Revision Changes Path
1.17 +19 -23 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- LoopController.java 13 Dec 2003 00:28:04 -0000 1.16
+++ LoopController.java 13 Dec 2003 00:54:23 -0000 1.17
@@ -62,7 +62,6 @@
import org.apache.jmeter.junit.stubs.TestSampler;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.IntegerProperty;
import org.apache.jmeter.testelement.property.StringProperty;
//NOTUSED import org.apache.jorphan.logging.LoggingManager;
@@ -78,15 +77,17 @@
//NOTUSED private static Logger log = LoggingManager.getLoggerForClass();
private final static String LOOPS = "LoopController.loops";
- private final static String CONTINUE_FOREVER =
- "LoopController.continue_forever";
private int loopCount = 0;
public LoopController()
{
- setContinueForever(true);
}
+ /**
+ * Sets the number of iterations of the loop.
+ *
+ * @param loops number of iterations, -1 for infinite
+ */
public void setLoops(int loops)
{
setProperty(new IntegerProperty(LOOPS, loops));
@@ -114,16 +115,6 @@
return getPropertyAsString(LOOPS);
}
- public void setContinueForever(boolean forever)
- {
- setProperty(new BooleanProperty(CONTINUE_FOREVER, forever));
- }
-
- public boolean getContinueForever()
- {
- return getPropertyAsBoolean(CONTINUE_FOREVER);
- }
-
/* (non-Javadoc)
* @see org.apache.jmeter.control.Controller#isDone()
*/
@@ -152,14 +143,7 @@
reInitialize();
if (endOfLoop())
{
- if (!getContinueForever())
- {
- setDone(true);
- }
- else
- {
- resetLoopCount();
- }
+ resetLoopCount();
return null;
}
else
@@ -250,6 +234,18 @@
loop.addTestElement(new TestSampler("never run"));
loop.initialize();
assertNull(loop.next());
+ }
+
+ public void testInfinteLoop() throws Exception
+ {
+ LoopController loop = new LoopController();
+ loop.setLoops(-1);
+ loop.addTestElement(new TestSampler("never run"));
+ loop.initialize();
+ for (int i=0; i<10; i++)
+ {
+ assertNotNull(loop.next());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org