You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/05/20 01:17:41 UTC
cvs commit: jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test JavaTest.java
sebb 2005/05/19 16:17:41
Modified: src/protocol/java/org/apache/jmeter/protocol/java/test
JavaTest.java
Log:
Set sample label from test element name unless label parameter is set
Revision Changes Path
1.13 +9 -6 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
Index: JavaTest.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaTest.java 6 Oct 2004 14:43:57 -0000 1.12
+++ JavaTest.java 19 May 2005 23:17:41 -0000 1.13
@@ -25,6 +25,7 @@
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.testelement.TestElement;
/**
* The <code>JavaTest</code> class is a simple sampler which
@@ -96,7 +97,7 @@
private String label;
/** The default value of the Label parameter. */
- private static final String LABEL_DEFAULT = "JavaTest";
+ //private static final String LABEL_DEFAULT = "JavaTest";
/** The name used to store the Label parameter. */
private static final String LABEL_NAME = "Label";
@@ -187,7 +188,9 @@
SUCCESS_DEFAULT).equalsIgnoreCase(
"OK");
- label = context.getParameter(LABEL_NAME, LABEL_DEFAULT);
+ label = context.getParameter(LABEL_NAME,"");
+ if (label.length() == 0)
+ label=context.getParameter(TestElement.NAME); // default to name of element
samplerData =
context.getParameter(SAMPLER_DATA_NAME, SAMPLER_DATA_DEFAULT);
@@ -230,7 +233,7 @@
Arguments params = new Arguments();
params.addArgument(SLEEP_NAME, String.valueOf(DEFAULT_SLEEP_TIME));
params.addArgument(MASK_NAME, DEFAULT_MASK_STRING);
- params.addArgument(LABEL_NAME, LABEL_DEFAULT);
+ params.addArgument(LABEL_NAME, "");
params.addArgument(RESPONSE_CODE_NAME, RESPONSE_CODE_DEFAULT);
params.addArgument(RESPONSE_MESSAGE_NAME, RESPONSE_MESSAGE_DEFAULT);
params.addArgument(SUCCESS_NAME, SUCCESS_DEFAULT);
@@ -248,7 +251,7 @@
* The following fields are always set:
* - responseCode (default "")
* - responseMessage (default "")
- * - label (default "JavaTest")
+ * - label (set from LABEL_NAME parameter if it exists, else element name)
* - success (default true)
* </pre>
* The following fields are set from the user-defined
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org