svn commit: r513753 - /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Author: sebb
Date: Fri Mar 2 05:40:54 2007
New Revision: 513753
URL: http://svn.apache.org/viewvc?view=revrev=513753
Log:
Put more detail into the JMeterError throwable
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java?view=diffrev=513753r1=513752r2=513753
==
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Fri Mar 2 05:40:54 2007
@@ -95,11 +95,13 @@
Document d =
parseResponse(context.getPreviousResult());
getValuesForXPath(d,getXPathQuery(),vars, refName);
}catch(IOException e){// Should not happen
- log.error(error on
+XPATH_QUERY+(+getXPathQuery()+),e);
- throw new JMeterError(e);
+ final String errorMessage = error on
+XPATH_QUERY+(+getXPathQuery()+);
+ log.error(errorMessage,e);
+ throw new JMeterError(errorMessage,e);
} catch (ParserConfigurationException e) {// Should not happen
- log.error(error on
+XPATH_QUERY+(+getXPathQuery()+),e);
- throw new JMeterError(e);
+ final String errrorMessage = error on
+XPATH_QUERY+(+getXPathQuery()+);
+ log.error(errrorMessage,e);
+ throw new JMeterError(errrorMessage,e);
} catch (SAXException e) {// Can happen for bad input document
log.warn(error on
+XPATH_QUERY+(+getXPathQuery()+)+e.getLocalizedMessage());
} catch (TransformerException e) {// Can happen for incorrect
XPath expression
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513755 - /jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
Author: sebb
Date: Fri Mar 2 05:41:37 2007
New Revision: 513755
URL: http://svn.apache.org/viewvc?view=revrev=513755
Log:
Put more detail into the JMeterError throwable
Modified:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java?view=diffrev=513755r1=513754r2=513755
==
---
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
Fri Mar 2 05:41:37 2007
@@ -118,8 +118,9 @@
try {
return createMethod(getTypes()).invoke(invokee,
getArgs());
} catch (Exception e) {
- log.warn(Trouble functing method: +methodName+
invokee: +invokee.getClass().getName(), e);
- throw new org.apache.jorphan.util.JMeterError(e); //
JDK1.4
+ final String message = Trouble functing method:
+methodName+ invokee: +invokee.getClass().getName();
+ log.warn(message, e);
+ throw new
org.apache.jorphan.util.JMeterError(message,e); // JDK1.4
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513757 - /jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml
Author: sebb Date: Fri Mar 2 05:42:35 2007 New Revision: 513757 URL: http://svn.apache.org/viewvc?view=revrev=513757 Log: Document incorrect avg. Bytes value in 2.2 Modified: jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml?view=diffrev=513757r1=513756r2=513757 == --- jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml Fri Mar 2 05:42:35 2007 @@ -1814,7 +1814,7 @@ liError % - Percent of requests with errors/li liThroughput - Throughput measured in requests per second/minute/hour/li liKb/sec - The throughput measured in Kilobytes per second/li -liAvg. Bytes - average size of the sample response in bytes./li +liAvg. Bytes - average size of the sample response in bytes. (in JMeter 2.2 it wrongly showed the value in kB)/li /ul /description /component - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513784 - /jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
Author: sebb
Date: Fri Mar 2 06:36:54 2007
New Revision: 513784
URL: http://svn.apache.org/viewvc?view=revrev=513784
Log:
Reformat mangled comments
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java?view=diffrev=513784r1=513783r2=513784
==
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Property.java
Fri Mar 2 06:36:54 2007
@@ -31,14 +31,16 @@
/**
* Function to get a JMeter property, and optionally store it
*
- * Parameters: - property name - variable name (optional) - default value
- * (optional)
+ * Parameters:
+ * - property name
+ * - variable name (optional)
+ * - default value (optional)
*
+ * Returns:
+ * - the property value, but if not found:
+ * - the default value, but if not defined:
+ * - the property name itself
*
- * Returns: - the property value, but if not found - the default value, but if
- * not define - the property name itself
- *
- * @version $Revision$ Updated: $Date$
*/
public class Property extends AbstractFunction implements Serializable {
@@ -48,8 +50,8 @@
// Number of parameters expected - used to reject invalid calls
private static final int MIN_PARAMETER_COUNT = 1;
-
private static final int MAX_PARAMETER_COUNT = 3;
+
static {
desc.add(JMeterUtils.getResString(property_name_param));
desc.add(JMeterUtils.getResString(function_name_param));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513803 - in /jakarta/jmeter/branches/rel-2-2: src/core/org/apache/jmeter/resources/messages.properties test/src/org/apache/jmeter/functions/PackageTest.java xdocs/changes.xml xdocs/userma
Author: sebb
Date: Fri Mar 2 07:14:15 2007
New Revision: 513803
URL: http://svn.apache.org/viewvc?view=revrev=513803
Log:
Added __V variable function to resolve nested variable names
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/functions/PackageTest.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties?view=diffrev=513803r1=513802r2=513803
==
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
Fri Mar 2 07:14:15 2007
@@ -745,6 +745,7 @@
userpw=Password
value=Value
var_name=Reference Name
+variable_name_param=Name of variable (may include variable and function
references)
view_graph_tree_title=View Graph Tree
view_results_in_table=View Results in Table
view_results_tab_request=Request
Modified:
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/functions/PackageTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/functions/PackageTest.java?view=diffrev=513803r1=513802r2=513803
==
---
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/functions/PackageTest.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/functions/PackageTest.java
Fri Mar 2 07:14:15 2007
@@ -183,6 +183,9 @@
par3.addTest(new PackageTest(XPathThread2));
allsuites.addTest(par3);
+TestSuite variable = new TestSuite(Variable);
+random.addTest(new PackageTest(VariableTest1));
+allsuites.addTest(variable);
return allsuites;
}
@@ -809,4 +812,50 @@
//String s =
r.execute(null,null);
}
+
+public void VariableTest1() throws Exception {
+Variable r = new Variable();
+vars.put(A_1,a1);
+vars.put(A_2,a2);
+vars.put(one,1);
+vars.put(two,2);
+vars.put(V,A);
+Collection parms;
+String s;
+
+parms = MakeParams(V,null,null);
+r.setParameters(parms);
+s = r.execute(null,null);
+assertEquals(A,s);
+
+parms = MakeParams(X,null,null);
+r.setParameters(parms);
+s = r.execute(null,null);
+assertEquals(X,s);
+
+parms = MakeParams(A${X},null,null);
+r.setParameters(parms);
+s = r.execute(null,null);
+assertEquals(A${X},s);
+
+parms = MakeParams(A_1,null,null);
+r.setParameters(parms);
+s = r.execute(null,null);
+assertEquals(a1,s);
+
+parms = MakeParams(A_2,null,null);
+r.setParameters(parms);
+s = r.execute(null,null);
+assertEquals(a2,s);
+
+parms = MakeParams(A_${two},null,null);
+r.setParameters(parms);
+s = r.execute(null,null);
+assertEquals(a2,s);
+
+parms = MakeParams(${V}_${one},null,null);
+r.setParameters(parms);
+s = r.execute(null,null);
+assertEquals(a1,s);
+}
}
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diffrev=513803r1=513802r2=513803
==
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Fri Mar 2 07:14:15 2007
@@ -67,6 +67,7 @@
liChange to htmlparser 2.0/li
liUpdated to xstream 1.2.1/xpp3_min-1.1.3.4.O/li
liBug 39717 - use icons in the results tree instead of colors/li
+liAdded __V variable function to resolve nested variable names/li
/ul
h4Bug fixes:/h4
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml?view=diffrev=513803r1=513802r2=513803
==
--- jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml Fri Mar 2
07:14:15 2007
@@ -24,7 +24,7 @@
document prev=component_reference.html next=regular_expressions.html
date=2004/06/12
properties
- titleUser's Manual: Functions/title
+ titleUser's Manual: Functions and Variables/title
/properties
svn commit: r513807 - in /jakarta/jmeter/branches/rel-2-2: src/functions/org/apache/jmeter/functions/Variable.java xdocs/usermanual/functions.xml
Author: sebb
Date: Fri Mar 2 07:26:11 2007
New Revision: 513807
URL: http://svn.apache.org/viewvc?view=revrev=513807
Log:
Added __V variable function to resolve nested variable names
[Forgot to add new file last time; added example]
Added:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
Modified:
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml
Added:
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java?view=autorev=513807
==
---
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
(added)
+++
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/Variable.java
Fri Mar 2 07:26:11 2007
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.functions;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.jmeter.engine.util.CompoundVariable;
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.samplers.Sampler;
+import org.apache.jmeter.util.JMeterUtils;
+
+/**
+ * Function to get a JMeter Variable
+ *
+ * Parameters:
+ * - variable name
+ *
+ * Returns:
+ * - the variable value, but if not found
+ * - the variable name itself
+ *
+ * @version $Revision: 493781 $ Updated: $Date: 2007-01-07 17:52:05 +
(Sun, 07 Jan 2007) $
+ */
+public class Variable extends AbstractFunction implements Serializable {
+
+ private static final List desc = new LinkedList();
+
+ private static final String KEY = __V;
+
+ // Number of parameters expected - used to reject invalid calls
+ private static final int MIN_PARAMETER_COUNT = 1;
+ private static final int MAX_PARAMETER_COUNT = 1;
+
+ static {
+ desc.add(JMeterUtils.getResString(variable_name_param));
+ }
+
+ private Object[] values;
+
+ public Variable() {
+ }
+
+ public Object clone() {
+ return new Variable();
+ }
+
+ public synchronized String execute(SampleResult previousResult, Sampler
currentSampler)
+ throws InvalidVariableException {
+ String variableName = ((CompoundVariable) values[0]).execute();
+ String variableValue = getVariables().get(variableName);
+ return variableValue == null? variableName : variableValue;
+
+ }
+
+ public void setParameters(Collection parameters) throws
InvalidVariableException {
+
+ values = parameters.toArray();
+
+ if ((values.length MIN_PARAMETER_COUNT) || (values.length
MAX_PARAMETER_COUNT)) {
+ throw new InvalidVariableException(Parameter Count not
between + MIN_PARAMETER_COUNT +
+ + MAX_PARAMETER_COUNT);
+ }
+
+ }
+
+ public String getReferenceKey() {
+ return KEY;
+ }
+
+ public List getArgumentDesc() {
+ return desc;
+ }
+
+}
\ No newline at end of file
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml?view=diffrev=513807r1=513806r2=513807
==
--- jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml Fri Mar 2
07:26:11 2007
@@ -703,7 +703,14 @@
component index=sect-num;.5.19 name=__V
description
pThe V (variable) function returns the result of evaluating a
variable name expression.
+ This can be used to evaluate nested variable references (which are not
currently supported).
/p
+ pFor example, if one has variables A1,A2 and N=1:/p
+ ul
+ li${A1} - works OK/li
+ li${A${N}} - does not work
DO NOT REPLY [Bug 41707] - HTTP Proxy XML-RPC support
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=41707. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=41707 [EMAIL PROTECTED] changed: What|Removed |Added Attachment #19645|0 |1 is obsolete|| --- Additional Comments From [EMAIL PROTECTED] 2007-03-02 07:40 --- Created an attachment (id=19656) -- (http://issues.apache.org/bugzilla/attachment.cgi?id=19656action=view) HTTPSamplerBase supporting xml-rpc and other not-name=value postdata. This version should not affect any other classes using the parseArguments method, as last patch did. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41707] - HTTP Proxy XML-RPC support
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=41707. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=41707 [EMAIL PROTECTED] changed: What|Removed |Added Attachment #19646|0 |1 is obsolete|| Attachment #19647|0 |1 is obsolete|| --- Additional Comments From [EMAIL PROTECTED] 2007-03-02 07:41 --- Created an attachment (id=19657) -- (http://issues.apache.org/bugzilla/attachment.cgi?id=19657action=view) As commented by sebb, the fix should go into HttpRequestHdr.java instead of httpsamplerbase -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513875 - /jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
Author: sebb
Date: Fri Mar 2 10:15:38 2007
New Revision: 513875
URL: http://svn.apache.org/viewvc?view=revrev=513875
Log:
Add unit test helper methods
Modified:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java?view=diffrev=513875r1=513874r2=513875
==
---
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
Fri Mar 2 10:15:38 2007
@@ -172,6 +172,35 @@
return methodToInvoke;
}
+ /*
+* Check if a Functor method is valid.
+*
+* @deprecated ** for use by Unit test code only **
+*
+* @return true if method exists
+*/
+ public boolean checkMethod(Object _invokee){
+ Method m = null;
+ this.invokee=_invokee;
+ try {
+ m = createMethod(getTypes());
+ } catch (Exception e){
+ // ignored
+ }
+ return null != m;
+ }
+
+ public String toString(){
+ StringBuffer sb = new StringBuffer(100);
+ sb.append(method: );
+ sb.append(methodName);
+ if (invokee != null){
+ sb.append( invokee: );
+ sb.append(invokee.getClass().getName());
+ }
+ return sb.toString();
+ }
+
protected Class getPrimitive(Class t) {
if (t.equals(Integer.class)) {
return int.class;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513951 - in /jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui: NumberRenderer.java RateRenderer.java RendererUtils.java RightAlignRenderer.java
Author: sebb
Date: Fri Mar 2 13:10:10 2007
New Revision: 513951
URL: http://svn.apache.org/viewvc?view=revrev=513951
Log:
Initial version of JTable rendering utility classes
Added:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/NumberRenderer.java
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/RateRenderer.java
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/RendererUtils.java
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/RightAlignRenderer.java
Added:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/NumberRenderer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/NumberRenderer.java?view=autorev=513951
==
---
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/NumberRenderer.java
(added)
+++
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/NumberRenderer.java
Fri Mar 2 13:10:10 2007
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jorphan.gui;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+
+import javax.swing.JLabel;
+import javax.swing.table.DefaultTableCellRenderer;
+
+/**
+ * Renders numbers in a JTable with a specified format
+ */
+public class NumberRenderer extends DefaultTableCellRenderer {
+ protected final NumberFormat formatter;
+
+public NumberRenderer() {
+ super();
+ formatter = NumberFormat.getInstance();
+ setHorizontalAlignment(JLabel.RIGHT);
+}
+
+public NumberRenderer(String format) {
+ super();
+ formatter = new DecimalFormat(format);
+ setHorizontalAlignment(JLabel.RIGHT);
+}
+
+ public void setValue(Object value) {
+ setText((value == null) ? : formatter.format(value));
+ }
+}
\ No newline at end of file
Added:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/RateRenderer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/RateRenderer.java?view=autorev=513951
==
---
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/RateRenderer.java
(added)
+++
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/RateRenderer.java
Fri Mar 2 13:10:10 2007
@@ -0,0 +1,44 @@
+package org.apache.jorphan.gui;
+
+/**
+ * Renders a rate in a JTable.
+ *
+ * The output is in units appropriate to its dimension:
+ * p
+ * The number is represented in one of:
+ * - requests/second
+ * - requests/minute
+ * - requests/hour.
+ * p
+ * Examples: 34.2/sec 0.1/sec 43.0/hour 15.9/min
+ */
+public class RateRenderer extends NumberRenderer{
+
+ public RateRenderer(String format) {
+ super(format);
+ }
+
+ public void setValue(Object value) {
+ if (value == null || ! (value instanceof Double)) {
+ setText(#N/A); // TODO: should this just call super()?
+ return;
+ }
+ double rate = ((Double) value).doubleValue();
+ if (rate == Double.MAX_VALUE){
+ setText(#N/A); // TODO: should this just call super()?
+ return;
+ }
+
+ String unit = sec;
+
+ if (rate 1.0) {
+ rate *= 60.0;
+ unit = min;
+ }
+ if (rate 1.0) {
+ rate *= 60.0;
+ unit = hour;
+ }
+ setText(formatter.format(rate) + / + unit);
+ }
+}
\ No newline at end of file
Added:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/RendererUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/RendererUtils.java?view=autorev=513951
==
---
svn commit: r513955 - /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
Author: sebb
Date: Fri Mar 2 13:13:10 2007
New Revision: 513955
URL: http://svn.apache.org/viewvc?view=revrev=513955
Log:
Use new ObjectTableModel constructor;
add testFunctors() - unit test hook
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?view=diffrev=513955r1=513954r2=513955
==
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
Fri Mar 2 13:13:10 2007
@@ -90,7 +90,9 @@
*/
public TableVisualizer() {
super();
- model = new ObjectTableModel(COLUMNS, new Functor[] {
+ model = new ObjectTableModel(COLUMNS,
+ Sample.class, // The object used for
each row
+ new Functor[] {
new Functor(getCount), // $NON-NLS-1$
new Functor(getStartTimeFormatted, // $NON-NLS-1$
new Object[]{format}),
@@ -104,6 +106,12 @@
Long.class, String.class, String.class,
String.class, Long.class, Boolean.class, Integer.class });
init();
}
+
+ public static boolean testFunctors(){
+ TableVisualizer instance = new TableVisualizer();
+ return instance.model.checkFunctors(null);
+ }
+
public String getLabelResource() {
return view_results_in_table; // $NON-NLS-1$
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513957 - /jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/Calculator.java
Author: sebb
Date: Fri Mar 2 13:16:04 2007
New Revision: 513957
URL: http://svn.apache.org/viewvc?view=revrev=513957
Log:
Remove all String routines; formatting is now done by the Renderers
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/Calculator.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/Calculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/Calculator.java?view=diffrev=513957r1=513956r2=513957
==
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/Calculator.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/Calculator.java
Fri Mar 2 13:16:04 2007
@@ -18,8 +18,6 @@
package org.apache.jmeter.util;
-import java.text.DecimalFormat;
-
import org.apache.jmeter.samplers.SampleResult;
/**
@@ -31,12 +29,6 @@
*/
public class Calculator {
-private static DecimalFormat rateFormatter = new DecimalFormat(#.0);
-
-private static DecimalFormat errorFormatter = new DecimalFormat(#0.00%);
-
-private static DecimalFormat kbFormatter = new DecimalFormat(#0.00);
-
private double sum = 0;
private double sumOfSquares = 0;
@@ -58,7 +50,7 @@
private final String label;
public Calculator() {
-this.label = ;
+this();
}
public Calculator(String label) {
@@ -163,22 +155,6 @@
}
/**
- * Returns a String which represents the percentage of sample errors that
- * have occurred. (0.00% through 100.00%)
- *
- * @return a String which represents the percentage of sample errors that
- * have occurred.
- */
-public String getErrorPercentageString() {
-double myErrorPercentage = this.getErrorPercentage();
-if (myErrorPercentage 0) {
-myErrorPercentage = 0.0;
-}
-
-return (errorFormatter.format(myErrorPercentage));
-}
-
-/**
* Returns the throughput associated to this sampler in requests per
second.
* May be slightly skewed because it takes the timestamps of the first and
* last samples as the total time passed, and the test may actually have
@@ -192,41 +168,6 @@
}
/**
- * Returns a String that represents the throughput associated for this
- * sampler, in units appropriate to its dimension:
- * p
- * The number is represented in requests/second or requests/minute or
- * requests/hour.
- * p
- * Examples: 34.2/sec 0.1/sec 43.0/hour 15.9/min
- *
- * @return a String representation of the rate the samples are being taken
- * at.
- */
-public String getRateString() {
-double rate = getRate();
-
-if (rate == Double.MAX_VALUE) {
-return N/A;
-}
-
-String unit = sec;
-
-if (rate 1.0) {
-rate *= 60.0;
-unit = min;
-}
-if (rate 1.0) {
-rate *= 60.0;
-unit = hour;
-}
-
-String rval = rateFormatter.format(rate) + / + unit;
-
-return (rval);
-}
-
-/**
* calculates the average page size, which means divide the bytes by number
* of samples.
*
@@ -240,16 +181,6 @@
}
/**
- * formats the rate
- *
- * @return
- */
-public String getPageSizeString() {
-double rate = getPageSize() / 1024;
-return kbFormatter.format(rate);
-}
-
-/**
* Throughput in bytes / second
*
* @return
@@ -262,12 +193,12 @@
}
/**
- * formats the Page Size
+ * Throughput in kilobytes / second
*
* @return
*/
-public String getKBPerSecondString() {
-double rate = getBytesPerSecond() / 1024;
-return kbFormatter.format(rate);
+public double getKBPerSecond() {
+return getBytesPerSecond() / 1024;
}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41613] - getting SSL exception when sampling a second domain
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=41613. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=41613 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2007-03-02 13:25 --- This issue is resolved in the current nightly build. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r514013 - in /jakarta/jmeter/branches/rel-2-2: src/components/org/apache/jmeter/visualizers/ src/core/org/apache/jmeter/config/gui/ src/core/org/apache/jmeter/visualizers/ src/jorphan/org/
Author: sebb
Date: Fri Mar 2 15:34:47 2007
New Revision: 514013
URL: http://svn.apache.org/viewvc?view=revrev=514013
Log:
Remove formatting from Calculator classes
Add unit tests for Functor method calls
Added:
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jorphan/TestFunctorUsers.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SummaryReport.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/reflect/Functor.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?view=diffrev=514013r1=514012r2=514013
==
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
Fri Mar 2 15:34:47 2007
@@ -42,6 +42,7 @@
import javax.swing.JTable;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
+import javax.swing.table.TableCellRenderer;
import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.action.ActionRouter;
@@ -57,7 +58,10 @@
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.gui.JLabeledChoice;
import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.gui.NumberRenderer;
import org.apache.jorphan.gui.ObjectTableModel;
+import org.apache.jorphan.gui.RateRenderer;
+import org.apache.jorphan.gui.RendererUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.Functor;
import org.apache.log.Logger;
@@ -147,7 +151,9 @@
public StatGraphVisualizer() {
super();
- model = new ObjectTableModel(COLUMNS, new Functor[] {
+ model = new ObjectTableModel(COLUMNS,
+ SamplingStatCalculator.class,
+ new Functor[] {
new Functor(getLabel),
//$NON-NLS-1$
new Functor(getCount),
//$NON-NLS-1$
new Functor(getMeanAsNumber),
//$NON-NLS-1$
@@ -156,9 +162,9 @@
new Object[] { new Float(.900) }),
new Functor(getMin),
//$NON-NLS-1$
new Functor(getMax),
//$NON-NLS-1$
- new Functor(getErrorPercentageString),
//$NON-NLS-1$
- new Functor(getRateString),
//$NON-NLS-1$
- new Functor(getPageSizeString) },
//$NON-NLS-1$
+ new Functor(getErrorPercentage),
//$NON-NLS-1$
+ new Functor(getRate),
//$NON-NLS-1$
+ new Functor(getPageSize) },
//$NON-NLS-1$
new Functor[] { null, null, null, null, null,
null, null, null, null, null },
new Class[] { String.class, Long.class,
Long.class, Long.class, Long.class, Long.class,
Long.class, String.class, String.class,
String.class });
@@ -166,6 +172,26 @@
init();
}
+ // Column renderers
+ private static final TableCellRenderer[] RENDERERS =
+ new TableCellRenderer[]{
+ null, // Label
+ null, // count
+ null, // Mean
+ null, // median
+ null, // 90%
+ null,
