sebb 2003/12/13 17:33:10
Modified: src/components/org/apache/jmeter/control
InterleaveControl.java
Log:
Tidy up test code
Revision Changes Path
1.22 +17 -31
jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java
Index: InterleaveControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- InterleaveControl.java 19 Oct 2003 22:15:38 -0000 1.21
+++ InterleaveControl.java 14 Dec 2003 01:33:10 -0000 1.22
@@ -223,6 +223,22 @@
{
this.skipNext = skipNext;
}
+
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.control.GenericController#incrementCurrent()
+ */
+ protected void incrementCurrent()
+ {
+ if (currentReturnedAtLeastOne)
+ {
+ skipNext = true;
+ }
+ stillSame = false;
+ super.incrementCurrent();
+ }
+
+/////////////// Start of Test Code ////////////////////////////////
public static class Test extends JMeterTestCase
{
@@ -499,35 +515,5 @@
}
}
}
- }
-
- public static void main(String args[])
- {
- junit.textui.TestRunner.run(suite());
- }
-
- public static TestSuite suite()
- {
- TestSuite suite = new TestSuite();
- suite.addTest(new Test("testProcessing"));
- suite.addTest(new Test("testProcessing2"));
- suite.addTest(new Test("testProcessing3"));
- suite.addTest(new Test("testProcessing4"));
- suite.addTest(new Test("testProcessing5"));
- //suite.addTestSuite(Test.class);
- return suite;
- }
-
- /* (non-Javadoc)
- * @see org.apache.jmeter.control.GenericController#incrementCurrent()
- */
- protected void incrementCurrent()
- {
- if (currentReturnedAtLeastOne)
- {
- skipNext = true;
- }
- stillSame = false;
- super.incrementCurrent();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
