sebb 2003/12/13 08:30:12
Modified: src/core/org/apache/jmeter/control LoopController.java
Log:
Put all Test code at the end; remove unnecessary (and incomplete) stand-alone test
code
Revision Changes Path
1.19 +16 -26
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LoopController.java 13 Dec 2003 01:19:30 -0000 1.18
+++ LoopController.java 13 Dec 2003 16:30:12 -0000 1.19
@@ -57,8 +57,7 @@
import java.io.Serializable;
-import junit.framework.TestSuite;
-
+import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.junit.stubs.TestSampler;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.TestElement;
@@ -191,7 +190,19 @@
return loopCount + 1;
}
- public static class Test extends junit.framework.TestCase
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.control.GenericController#reInitialize()
+ */
+ protected void reInitialize()
+ {
+ setFirst(true);
+ resetCurrent();
+ incrementLoopCount();
+ }
+
+///////////////////////// Start of Test code ///////////////////////////////
+
+ public static class Test extends JMeterTestCase
{
public Test(String name)
{
@@ -268,27 +279,6 @@
assertNotNull(loop.next());
}
}
- }
-
- public static void main(String args[])
- {
- junit.textui.TestRunner.run(suite());
- }
-
- public static TestSuite suite()
- {
- TestSuite suite = new TestSuite();
- suite.addTest(new Test("testProcessing"));
- return suite;
- }
- /* (non-Javadoc)
- * @see org.apache.jmeter.control.GenericController#reInitialize()
- */
- protected void reInitialize()
- {
- setFirst(true);
- resetCurrent();
- incrementLoopCount();
- }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
