sebb 2003/12/13 17:32:40
Modified: src/core/org/apache/jmeter/control IfController.java
Log:
Tidy up test code
Revision Changes Path
1.2 +4 -19
jakarta-jmeter/src/core/org/apache/jmeter/control/IfController.java
Index: IfController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/IfController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IfController.java 5 Sep 2003 23:18:02 -0000 1.1
+++ IfController.java 14 Dec 2003 01:32:40 -0000 1.2
@@ -1,7 +1,6 @@
package org.apache.jmeter.control;
import java.io.Serializable;
-import junit.framework.TestSuite;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.StringProperty;
@@ -9,7 +8,7 @@
import org.apache.log.Logger;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
-import org.apache.jmeter.control.GenericController;
+import org.apache.jmeter.junit.JMeterTestCase;
/**
*
@@ -153,26 +152,12 @@
}
}
- /**
- * Tester
- */
- public static void main(String args[]) {
- junit.textui.TestRunner.run(suite());
- }
-
- /**
- * For JUnit test
- */
- public static TestSuite suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new Test("testProcessing"));
- return suite;
- }
+////////////////////////////// Start of Test Code ///////////////////////////
/**
* JUnit test
*/
- public static class Test extends junit.framework.TestCase {
+ public static class Test extends JMeterTestCase {
public Test(String name) {
super(name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
