mstover1 2002/08/12 06:18:10
Modified: src/components/org/apache/jmeter/visualizers
AssertionVisualizer.java
src/core/org/apache/jmeter/threads TestCompiler.java
Log:
Assertion visualizer shows sampler data
Preventing samplers from interfering with one another in tests
Revision Changes Path
1.2 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
Index: AssertionVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AssertionVisualizer.java 11 Aug 2002 19:24:41 -0000 1.1
+++ AssertionVisualizer.java 12 Aug 2002 13:18:10 -0000 1.2
@@ -107,7 +107,7 @@
***************************************/
public void add(SampleResult sample)
{
- textArea.append((String)sample.getSampleLabel());
+ textArea.append(sample.getSamplerData().toString());
textArea.append(getAssertionResult(sample));
textArea.append("\n");
}
1.2 +14 -7
jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java
Index: TestCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestCompiler.java 11 Aug 2002 19:24:49 -0000 1.1
+++ TestCompiler.java 12 Aug 2002 13:18:10 -0000 1.2
@@ -17,12 +17,12 @@
import org.apache.jmeter.functions.Function;
import org.apache.jmeter.functions.InvalidVariableException;
import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
+import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.samplers.SampleListener;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.PerSampleClonable;
-import org.apache.jmeter.testelement.PerThreadClonable;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.timers.Timer;
import org.apache.jmeter.util.ListedHashTree;
@@ -183,7 +183,7 @@
objectsWithFunctions.add(item);
}
}
- if(item != sam)
+ if(!(item instanceof Sampler))
{
configs.add(item);
}
@@ -234,8 +234,14 @@
sampler.setName("sampler");
Arguments args = new Arguments();
args.addArgument("param1", "value1");
+ HTTPSampler sampler2 = new HTTPSampler();
+ sampler.setName("sampler2");
+ Arguments args2 = new Arguments();
+ args2.addArgument(new HTTPArgument("xml","<data>1234</data>"));
+ sampler2.setArguments(args2);
testing.add(controller, config1);
testing.add(controller, sampler);
+ testing.add(controller,sampler2);
testing.get(controller).add(sampler, args);
TestCompiler.initialize();
@@ -244,6 +250,7 @@
sampler =
(HTTPSampler)compiler.configureSampler(sampler).getSampler();
assertEquals(config1.getProperty(HTTPSampler.DOMAIN),
sampler.getDomain());
assertEquals(args.getArgument(0).getName(),
sampler.getArguments().getArgument(0).getName());
+ assertEquals(1,sampler.getArguments().getArguments().size());
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
