mstover1 2002/07/30 20:56:59
Modified: src_1/org/apache/jmeter/protocol/http/config UrlConfig.java
src_1/org/apache/jmeter/protocol/http/modifier
URLRewritingModifier.java
src_1/org/apache/jmeter/reporters ResultCollector.java
src_1/org/apache/jmeter/resources messages.properties
messages_ja.properties messages_no.properties
src_1/org/apache/jmeter/threads TestCompiler.java
src_1/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
Removed: src_1/org/apache/jmeter/visualizers
ViewResultsVisualizer.java
Log:
Can see POST data in View Results Tree visualizer
Removed old obsolete view results visualizer
Minor fix to URLRewriting Modifier
Removing excess memory usage from ResultCollector
Revision Changes Path
1.11 +20 -4
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/UrlConfig.java
Index: UrlConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/UrlConfig.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UrlConfig.java 29 Jul 2002 02:11:22 -0000 1.10
+++ UrlConfig.java 31 Jul 2002 03:56:58 -0000 1.11
@@ -138,7 +138,23 @@
*/
public void setPath(String path)
{
- setProperty(HTTPSampler.PATH, path);
+ if(HTTPSampler.GET.equals(getMethod()))
+ {
+ int index = path.indexOf("?");
+ if(index > -1)
+ {
+ setProperty(HTTPSampler.PATH,path.substring(0,index));
+ parseArguments(path.substring(index+1));
+ }
+ else
+ {
+ setProperty(HTTPSampler.PATH, path);
+ }
+ }
+ else
+ {
+ setProperty(HTTPSampler.PATH, path);
+ }
}
public void addArgument(String name,String value)
@@ -411,7 +427,7 @@
config.addArgument("param1","value1");
config.setPath("/index.html?p1=p2");
config.setDomain("www.apache.org");
-
assertEquals("http://www.apache.org/index.html?p1=p2¶m1=value1",config.getUrl().toString());
+
assertEquals("http://www.apache.org/index.html?param1=value1&p1=p2",config.getUrl().toString());
}
public void testMakingUrl3() throws Exception
1.4 +1 -1
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
Index: URLRewritingModifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URLRewritingModifier.java 26 Jul 2002 02:48:46 -0000 1.3
+++ URLRewritingModifier.java 31 Jul 2002 03:56:59 -0000 1.4
@@ -81,7 +81,7 @@
{
setProperty(ARGUMENT_NAME,argName);
try {
- case1 = compiler.compile(argName+"=([^\">& ]*)[&
\\n\\r\">]?$?");
+ case1 = compiler.compile(argName+"=([^\">& \n\r]*)[&
\\n\\r\">]?$?");
case2 =
compiler.compile("[Nn][Aa][Mm][Ee]=\""+argName+"\"[^>]+[vV][Aa][Ll][Uu][Ee]=\"(.*)\"");
case3 =
compiler.compile("[vV][Aa][Ll][Uu][Ee]=\"(.*)\"[^>]+[Nn][Aa][Mm][Ee]=\""+argName+"\"");
} catch(MalformedPatternException e) {
1.17 +3 -85
jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ResultCollector.java 29 Jun 2002 00:37:00 -0000 1.16
+++ ResultCollector.java 31 Jul 2002 03:56:59 -0000 1.17
@@ -104,7 +104,7 @@
/**
* !ToDo (Field description)
*/
- protected List results = Collections.synchronizedList(new ArrayList());
+ //protected List results = Collections.synchronizedList(new ArrayList());
private int current;
private DefaultConfigurationSerializer serializer;
private boolean inLoading = false;
@@ -314,7 +314,6 @@
*/
public void clear()
{
- results.clear();
current = -1;
if(getVisualizer() != null && getVisualizer() instanceof Clearable)
{
@@ -330,79 +329,7 @@
*/
public void setListener(Object l) { }
- /**
- * !ToDoo (Method description)
- *
- *@return !ToDo (Return description)
- */
- public String getSampleLabel()
- {
- try
- {
- return (String)getCurrentSample().getSampleLabel();
- }
- catch(NullPointerException e)
- {
- return "";
- }
- }
-
- /**
- * !ToDoo (Method description)
- *
- *@return !ToDo (Return description)
- */
- public SampleResult getCurrentSample()
- {
- if(current < results.size() && current >= 0)
- {
- SampleResult res = (SampleResult)results.get(current);
- return res;
- }
- else if(results.size() > 0)
- {
- return (SampleResult)results.get(results.size() - 1);
- }
- else
- {
- return null;
- }
- }
-
- /**
- * !ToDoo (Method description)
- *
- *@return !ToDo (Return description)
- */
- public String getTextResponse()
- {
- try
- {
- return new
String((byte[])getCurrentSample().getResponseData());
- }
- catch(NullPointerException e)
- {
- return "";
- }
- }
-
- /**
- * !ToDo (Method description)
- *
- *@return !ToDo (Return description)
- */
- public boolean next()
- {
- if(current < results.size() - 1)
- {
- current++;
- return true;
- }
- else
- {
- return false;
- }
- }
+
/**
* !ToDo (Method description)
@@ -425,15 +352,6 @@
*/
public void sampleOccurred(SampleEvent e)
{
- results.add(e.getResult());
- if(results.size() > 100)
- {
- results.remove(0);
- if(current > 0)
- {
- current--;
- }
- }
sendToVisualizer(e.getResult());
try
{
1.26 +2 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- messages.properties 18 Jul 2002 18:55:53 -0000 1.25
+++ messages.properties 31 Jul 2002 03:56:59 -0000 1.26
@@ -260,4 +260,5 @@
cut_paste_function=Copy and paste function string
choose_function=Choose a function
function_helper_title=Function Helper
-generate=Generate
\ No newline at end of file
+generate=Generate
+iteration_counter_arg_1=TRUE, for each user to have own counter, FALSE for a global
counter
\ No newline at end of file
1.26 +2 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- messages_ja.properties 18 Jul 2002 18:55:53 -0000 1.25
+++ messages_ja.properties 31 Jul 2002 03:56:59 -0000 1.26
@@ -261,4 +261,5 @@
cut_paste_function=Copy and paste function string
choose_function=Choose a function
function_helper_title=Function Helper
-generate=Generate
\ No newline at end of file
+generate=Generate
+iteration_counter_arg_1=TRUE, for each user to have own counter, FALSE for a global
counter
\ No newline at end of file
1.25 +2 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- messages_no.properties 18 Jul 2002 18:55:53 -0000 1.24
+++ messages_no.properties 31 Jul 2002 03:56:59 -0000 1.25
@@ -253,4 +253,5 @@
cut_paste_function=Copy and paste function string
choose_function=Choose a function
function_helper_title=Function Helper
-generate=Generate
\ No newline at end of file
+generate=Generate
+iteration_counter_arg_1=TRUE, for each user to have own counter, FALSE for a global
counter
\ No newline at end of file
1.10 +15 -9 jakarta-jmeter/src_1/org/apache/jmeter/threads/TestCompiler.java
Index: TestCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/threads/TestCompiler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestCompiler.java 30 Jul 2002 03:02:10 -0000 1.9
+++ TestCompiler.java 31 Jul 2002 03:56:59 -0000 1.10
@@ -176,9 +176,12 @@
while(iter.hasNext())
{
TestElement item = (TestElement)iter.next();
- if(hasFunctions(item))
+ synchronized(item)
{
- objectsWithFunctions.add(item);
+ if(hasFunctions(item))
+ {
+ objectsWithFunctions.add(item);
+ }
}
if(item != sam)
{
@@ -186,9 +189,12 @@
}
}
}
- if(hasFunctions(sam))
+ synchronized(sam)
{
- objectsWithFunctions.add(sam);
+ if(hasFunctions(sam))
+ {
+ objectsWithFunctions.add(sam);
+ }
}
samplerConfigs.put(sam, configs);
}
1.12 +32 -24
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ViewResultsFullVisualizer.java 30 Jul 2002 03:02:10 -0000 1.11
+++ ViewResultsFullVisualizer.java 31 Jul 2002 03:56:59 -0000 1.12
@@ -53,25 +53,31 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.visualizers;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
import java.io.UnsupportedEncodingException;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.tree.*;
-import junit.framework.*;
-import org.apache.jmeter.gui.*;
-import org.apache.jmeter.gui.tree.*;
-import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFull;
-import org.apache.jmeter.reporters.ResultCollector;
+
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTextArea;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeSelectionModel;
+
+import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.samplers.Sampler;
-import org.apache.log4j.*;
-import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
-import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.gui.util.VerticalLayout;
+import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
+import org.apache.log4j.Category;
/****************************************
* Allows the tester to view the textual response from sampling an Entry. This
@@ -82,7 +88,7 @@
*@created 2001/07/25
*@version $Revision$ $Date$
***************************************/
-public class ViewResultsFullVisualizer extends ViewResultsVisualizer implements
+public class ViewResultsFullVisualizer extends AbstractVisualizer implements
TreeSelectionListener
{
@@ -109,6 +115,7 @@
public ViewResultsFullVisualizer()
{
super();
+ init();
catClass.debug("Start : ViewResultsFullVisualizer1");
catClass.debug("End : ViewResultsFullVisualizer1");
}
@@ -223,8 +230,10 @@
gbc.weightx = 1.0;
// pad a bit from the display area
gbc.insets = new Insets(0, 10, 0, 0);
- gridBag.setConstraints(loadTime, gbc);
- resultPanel.add(loadTime);
+ JTextArea postData = new
JTextArea(res.getSamplerData().getProperty(HTTPSampler.ARGUMENTS).toString(),3,50);
+ resultPanel.add(postData,gbc.clone());
+ gbc.gridy++;
+ resultPanel.add(loadTime,gbc.clone());
// response code label
JLabel httpResponseCode = new JLabel();
String responseCode = res.getResponseCode();
@@ -252,7 +261,7 @@
httpResponseCode.setText(JMeterUtils.getResString("HTTP response code")+" : " +
responseCode);
gbc.gridx = 0;
- gbc.gridy = 1;
+ gbc.gridy++;
gridBag.setConstraints(httpResponseCode, gbc);
resultPanel.add(httpResponseCode);
// response message label
@@ -262,9 +271,10 @@
httpResponseMsg.setText("HTTP response message : " +
responseMsgStr);
gbc.gridx = 0;
- gbc.gridy = 2;
+ gbc.gridy++;
gridBag.setConstraints(httpResponseMsg, gbc);
resultPanel.add(httpResponseMsg);
+ gbc.gridy++;
// get the text response and image icon
// to determine which is NOT null
@@ -288,7 +298,6 @@
JTextArea textArea = new JTextArea();
textArea.setText(response);
gbc.gridx = 0;
- gbc.gridy = 4;
gridBag.setConstraints(textArea, gbc);
resultPanel.add(textArea);
}
@@ -297,7 +306,6 @@
JLabel image = new JLabel();
image.setIcon(icon);
gbc.gridx = 0;
- gbc.gridy = 4;
gridBag.setConstraints(image, gbc);
resultPanel.add(image);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
