sebb 2005/03/20 14:05:46
Modified: src/core/org/apache/jmeter JMeter.java
Log:
Hack to allow automated non-GUI testing
Revision Changes Path
1.34 +15 -4 jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- JMeter.java 20 Mar 2005 22:02:52 -0000 1.33
+++ JMeter.java 20 Mar 2005 22:05:46 -0000 1.34
@@ -204,7 +204,11 @@
{
}
- /**
+ // Hack to allow automated tests to find when test has ended
+ transient boolean testEnded=false;
+ private JMeter parent;
+
+ /**
* Starts up JMeter in GUI mode
*/
public void startGui(CLOption testFile)
@@ -502,6 +506,7 @@
// is running in NonGui mode
System.setProperty("JMeter.NonGui","true");
JMeter driver = new JMeter();
+ driver.parent = this;
PluginManager.install(this, false);
if (testFile == null)
@@ -556,7 +561,7 @@
Summariser summer=new Summariser(summariserName);
tree.add(tree.getArray()[0], summer);
}
- tree.add(tree.getArray()[0], new ListenToTest());
+ tree.add(tree.getArray()[0], new ListenToTest(parent));
println("Created the tree successfully");
JMeterEngine engine = null;
if (!remoteStart)
@@ -660,7 +665,12 @@
private class ListenToTest implements TestListener, Runnable, Remoteable
{
int started = 0;
- public synchronized void testEnded(String host)
+ private JMeter _parent;
+ private ListenToTest(JMeter parent) {
+ _parent=parent;
+ }
+
+ public synchronized void testEnded(String host)
{
started--;
log.info("Remote host " + host + " finished");
@@ -706,8 +716,9 @@
// ignored
}
println("... end of run");
- System.exit(0);
+ _parent.testEnded=true;
}
+
/**
* @see TestListener#testIterationStart(LoopIterationEvent)
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
