Author: pmouawad
Date: Thu Oct 20 11:17:25 2011
New Revision: 1186738
URL: http://svn.apache.org/viewvc?rev=1186738&view=rev
Log:
Bug 51861 - Improve HTTP Request GUI to better show parameters without name
(GWT RPC requests for example)
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1186738&r1=1186737&r2=1186738&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Thu Oct 20 11:17:25 2011
@@ -1042,6 +1042,14 @@ web_server=Web Server
web_server_client=Client implementation:
web_server_domain=Server Name or IP\:
web_server_port=Port Number\:
+web_parameters_lost_message=Switching to RAW Post body will convert
parameters\nto raw body and loose parameters table when you select \nanother
node or save test plan, do you confirm ?
+web_cannot_convert_parameters_to_raw=Cannot convert parameters to RAW Post
body \nbecause one of the parameters has a name
+web_cannot_switch_tab=You cannot switch because data cannot be converted\n to
target Tab data, empty data to switch
+confirm=Confirm
+post_as_parameters=Parameters
+post_as_rawbody=RAW Body
+post_body_raw=Raw Post Body
+post_body=Post Body
web_testing2_source_ip=Source IP address:
web_testing2_title=HTTP Request HTTPClient
web_testing_concurrent_download=Use concurrent pool. Size:
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java?rev=1186738&r1=1186737&r2=1186738&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
Thu Oct 20 11:17:25 2011
@@ -124,7 +124,7 @@ public class HttpDefaultsGui extends Abs
add(makeTitlePanel(), BorderLayout.NORTH);
- urlConfig = new UrlConfigGui(false);
+ urlConfig = new UrlConfigGui(false, true, false);
add(urlConfig, BorderLayout.CENTER);
// OPTIONAL TASKS
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java?rev=1186738&r1=1186737&r2=1186738&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
Thu Oct 20 11:17:25 2011
@@ -51,7 +51,7 @@ public class MultipartUrlConfigGui exten
}
public MultipartUrlConfigGui(boolean showSamplerFields, boolean
showImplementation) {
- super(showSamplerFields, showImplementation);
+ super(showSamplerFields, showImplementation, true);
init();
}
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=1186738&r1=1186737&r2=1186738&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Thu Oct 20 11:17:25 2011
@@ -27,12 +27,15 @@ import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
+import javax.swing.JTabbedPane;
import javax.swing.JTextField;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.apache.commons.lang.StringUtils;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.gui.util.HorizontalPanel;
@@ -43,9 +46,11 @@ import org.apache.jmeter.protocol.http.s
import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
+import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.JLabeledChoice;
+import org.apache.jorphan.gui.JLabeledTextArea;
/**
* Basic URL / HTTP Request configuration:
@@ -58,6 +63,10 @@ public class UrlConfigGui extends JPanel
private static final long serialVersionUID = 240L;
+ private static final int TAB_PARAMETERS = 0;
+
+ private static final int TAB_RAW_BODY = 1;
+
private HTTPArgumentsPanel argsPanel;
private JTextField domain;
@@ -101,17 +110,34 @@ public class UrlConfigGui extends JPanel
private final boolean showImplementation; // Set false for AJP
+ // Raw POST Body
+ private JLabeledTextArea postBodyContent;
+
+ // Tabbed pane that contains parameters and raw body
+ private ValidationTabbedPane postContentTabbedPane;
+
+ private boolean showRawBodyPane;
+
public UrlConfigGui() {
this(true);
}
- public UrlConfigGui(boolean value) {
- this(value, true);
+ /**
+ * @param showSamplerFields
+ */
+ public UrlConfigGui(boolean showSamplerFields) {
+ this(showSamplerFields, true, true);
}
- public UrlConfigGui(boolean showSamplerFields, boolean showImplementation)
{
+ /**
+ * @param showSamplerFields
+ * @param showImplementation Show HTTP Implementation
+ * @param showRawBodyPane
+ */
+ public UrlConfigGui(boolean showSamplerFields, boolean showImplementation,
boolean showRawBodyPane) {
notConfigOnly=showSamplerFields;
this.showImplementation = showImplementation;
+ this.showRawBodyPane = showRawBodyPane;
init();
}
@@ -139,6 +165,10 @@ public class UrlConfigGui extends JPanel
protocol.setText(""); // $NON-NLS-1$
contentEncoding.setText(""); // $NON-NLS-1$
argsPanel.clear();
+ if(showRawBodyPane) {
+ postBodyContent.setText("");// $NON-NLS-1$
+ }
+ postContentTabbedPane.setSelectedIndex(TAB_PARAMETERS, false);
}
public TestElement createTestElement() {
@@ -157,9 +187,18 @@ public class UrlConfigGui extends JPanel
* @param element
*/
public void modifyTestElement(TestElement element) {
- Arguments args = (Arguments) argsPanel.createTestElement();
-
- HTTPArgument.convertArgumentsToHTTP(args);
+ boolean useRaw =
postContentTabbedPane.getSelectedIndex()==TAB_RAW_BODY;
+ Arguments args;
+ if(useRaw) {
+ args = new Arguments();
+ HTTPArgument arg = new HTTPArgument("", postBodyContent.getText(),
true);
+ arg.setAlwaysEncoded(false);
+ args.addArgument(arg);
+ } else {
+ args = (Arguments) argsPanel.createTestElement();
+ HTTPArgument.convertArgumentsToHTTP(args);
+ }
+ element.setProperty(HTTPSamplerBase.POST_BODY_RAW, useRaw,
HTTPSamplerBase.POST_BODY_RAW_DEFAULT);
element.setProperty(new TestElementProperty(HTTPSamplerBase.ARGUMENTS,
args));
element.setProperty(HTTPSamplerBase.DOMAIN, domain.getText());
element.setProperty(HTTPSamplerBase.PORT, port.getText());
@@ -185,6 +224,24 @@ public class UrlConfigGui extends JPanel
}
}
+ // FIXME FACTOR WITH HTTPHC4Impl, HTTPHC3Impl
+ // Just append all the parameter values, and use that as the post body
+ /**
+ * Compute Post body from arguments
+ * @param arguments {@link Arguments}
+ * @return {@link String}
+ */
+ private static final String computePostBody(Arguments arguments) {
+ StringBuilder postBody = new StringBuilder();
+ PropertyIterator args = arguments.iterator();
+ while (args.hasNext()) {
+ HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ String value = arg.getValue();
+ postBody.append(value);
+ }
+ return postBody.toString();
+ }
+
/**
* Set the text, etc. in the UI.
*
@@ -193,7 +250,18 @@ public class UrlConfigGui extends JPanel
*/
public void configure(TestElement el) {
setName(el.getName());
- argsPanel.configure((TestElement)
el.getProperty(HTTPSamplerBase.ARGUMENTS).getObjectValue());
+ Arguments arguments = (Arguments)
el.getProperty(HTTPSamplerBase.ARGUMENTS).getObjectValue();
+
+ boolean useRaw =
el.getPropertyAsBoolean(HTTPSamplerBase.POST_BODY_RAW,
HTTPSamplerBase.POST_BODY_RAW_DEFAULT);
+ if(useRaw) {
+ String postBody = computePostBody(arguments);
+ postBodyContent.setText(postBody);
+ postContentTabbedPane.setSelectedIndex(TAB_RAW_BODY, false);
+ } else {
+ argsPanel.configure(arguments);
+ postContentTabbedPane.setSelectedIndex(TAB_PARAMETERS, false);
+ }
+
domain.setText(el.getPropertyAsString(HTTPSamplerBase.DOMAIN));
String portString = el.getPropertyAsString(HTTPSamplerBase.PORT);
@@ -504,12 +572,106 @@ public class UrlConfigGui extends JPanel
return panel;
}
- protected JPanel getParameterPanel() {
+ protected JTabbedPane getParameterPanel() {
+ postContentTabbedPane = new ValidationTabbedPane();
argsPanel = new HTTPArgumentsPanel();
-
- return argsPanel;
+
postContentTabbedPane.add(JMeterUtils.getResString("post_as_parameters"),
argsPanel);// $NON-NLS-1$
+ if(showRawBodyPane) {
+ postBodyContent = new
JLabeledTextArea(JMeterUtils.getResString("post_body_raw"));// $NON-NLS-1$
+ postContentTabbedPane.add(JMeterUtils.getResString("post_body"),
postBodyContent);// $NON-NLS-1$
+ }
+ return postContentTabbedPane;
}
+ /**
+ *
+ */
+ class ValidationTabbedPane extends JTabbedPane{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7014311238367882880L;
+
+ /* (non-Javadoc)
+ * @see javax.swing.JTabbedPane#setSelectedIndex(int)
+ */
+ @Override
+ public void setSelectedIndex(int index) {
+ setSelectedIndex(index, true);
+ }
+ /**
+ * Apply some check rules if check is true
+ */
+ public void setSelectedIndex(int index, boolean check) {
+ int oldSelectedIndex = getSelectedIndex();
+ if(!check || oldSelectedIndex==-1) {
+ super.setSelectedIndex(index);
+ }
+ else if(index != this.getSelectedIndex())
+ {
+ if(noData(getSelectedIndex())) {
+ // If there is no data, then switching between Parameters
and Raw should be
+ // allowed with no further user interaction.
+ argsPanel.clear();
+ postBodyContent.setText("");
+ super.setSelectedIndex(index);
+ }
+ else {
+ if(oldSelectedIndex == TAB_RAW_BODY) {
+ // If RAW data and Parameters match we allow switching
+
if(postBodyContent.getText().equals(computePostBody((Arguments)argsPanel.createTestElement()).trim()))
{
+ super.setSelectedIndex(index);
+ }
+ else {
+ // If there is data in the Raw panel, then the
user should be
+ // prevented from switching (that would be easy to
track).
+ JOptionPane.showConfirmDialog(this,
+
JMeterUtils.getResString("web_cannot_switch_tab"), // $NON-NLS-1$
+ JMeterUtils.getResString("warning"), //
$NON-NLS-1$
+ JOptionPane.DEFAULT_OPTION,
+ JOptionPane.ERROR_MESSAGE);
+ return;
+ }
+ }
+ else {
+ // If the Parameter data can be converted (i.e. no
names), we
+ // warn the user that the Parameter data will be lost.
+ if(canConvertParameters()) {
+ Object[] options = {
+ JMeterUtils.getResString("confirm"),
+ JMeterUtils.getResString("cancel")};
+ int n = JOptionPane.showOptionDialog(this,
+
JMeterUtils.getResString("web_parameters_lost_message"),
+ JMeterUtils.getResString("warning"),
+ JOptionPane.YES_NO_CANCEL_OPTION,
+ JOptionPane.QUESTION_MESSAGE,
+ null,
+ options,
+ options[1]);
+ if(n == JOptionPane.YES_OPTION) {
+ convertParametersToRaw();
+ super.setSelectedIndex(index);
+ }
+ else{
+ return;
+ }
+ }
+ else {
+ // If the Parameter data cannot be converted to
Raw, then the user should be
+ // prevented from doing so raise an error dialog
+ JOptionPane.showConfirmDialog(this,
+
JMeterUtils.getResString("web_cannot_convert_parameters_to_raw"), // $NON-NLS-1$
+ JMeterUtils.getResString("warning"), //
$NON-NLS-1$
+ JOptionPane.DEFAULT_OPTION,
+ JOptionPane.ERROR_MESSAGE);
+ return;
+ }
+ }
+ }
+ }
+ }
+ }
// autoRedirects and followRedirects cannot both be selected
public void stateChanged(ChangeEvent e) {
if (e.getSource() == autoRedirects){
@@ -523,4 +685,39 @@ public class UrlConfigGui extends JPanel
}
}
}
+
+
+ /**
+ * Convert Parameters to Raw Body
+ */
+ void convertParametersToRaw() {
+
postBodyContent.setText(computePostBody((Arguments)argsPanel.createTestElement()));
+ }
+
+ /**
+ *
+ * @return true if no argument has a name
+ */
+ boolean canConvertParameters() {
+ Arguments arguments = (Arguments)argsPanel.createTestElement();
+ for (int i = 0; i < arguments.getArgumentCount(); i++) {
+ if(!StringUtils.isEmpty(arguments.getArgument(i).getName())) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * @return true if neither Parameters tab nor Raw Body tab contain data
+ */
+ boolean noData(int oldSelectedIndex) {
+ if(oldSelectedIndex == TAB_RAW_BODY) {
+ return StringUtils.isEmpty(postBodyContent.getText().trim());
+ }
+ else {
+ Arguments element = (Arguments)argsPanel.createTestElement();
+ return StringUtils.isEmpty(computePostBody(element));
+ }
+ }
}
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1186738&r1=1186737&r2=1186738&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Thu Oct 20 11:17:25 2011
@@ -215,6 +215,10 @@ public abstract class HTTPSamplerBase ex
protected static final String NON_HTTP_RESPONSE_MESSAGE = "Non HTTP
response message";
+ public static final String POST_BODY_RAW = "HTTPSampler.postBodyRaw"; //
TODO - belongs elsewhere
+
+ public static final boolean POST_BODY_RAW_DEFAULT = false;
+
private static final String ARG_VAL_SEP = "="; // $NON-NLS-1$
private static final String QRY_SEP = "&"; // $NON-NLS-1$
@@ -307,16 +311,20 @@ public abstract class HTTPSamplerBase ex
* @return true if none of the parameters have a name specified
*/
public boolean getSendParameterValuesAsPostBody() {
- boolean noArgumentsHasName = true;
- PropertyIterator args = getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
- if(arg.getName() != null && arg.getName().length() > 0) {
- noArgumentsHasName = false;
- break;
+ if(getPostBodyRaw()) {
+ return true;
+ } else {
+ boolean noArgumentsHasName = true;
+ PropertyIterator args = getArguments().iterator();
+ while (args.hasNext()) {
+ HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ if(arg.getName() != null && arg.getName().length() > 0) {
+ noArgumentsHasName = false;
+ break;
+ }
}
+ return noArgumentsHasName;
}
- return noArgumentsHasName;
}
/**
@@ -700,6 +708,20 @@ public abstract class HTTPSamplerBase ex
return (Arguments) getProperty(ARGUMENTS).getObjectValue();
}
+ /**
+ * @param value Boolean that indicates body will be sent as is
+ */
+ public void setPostBodyRaw(boolean value) {
+ setProperty(POST_BODY_RAW, value, POST_BODY_RAW_DEFAULT);
+ }
+
+ /**
+ * @return boolean that indicates body will be sent as is
+ */
+ public boolean getPostBodyRaw() {
+ return getPropertyAsBoolean(POST_BODY_RAW, POST_BODY_RAW_DEFAULT);
+ }
+
public void setAuthManager(AuthManager value) {
AuthManager mgr = getAuthManager();
if (mgr != null) {
@@ -1694,7 +1716,7 @@ public abstract class HTTPSamplerBase ex
return base.sample(url, method, areFollowingRedirect, depth);
}
}
-
+
/**
* We search in URL and arguments
* TODO Can be enhanced
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1186738&r1=1186737&r2=1186738&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Oct 20 11:17:25 2011
@@ -174,6 +174,7 @@ Mirror server now uses default port 8081
<li>Bug 52019 - Add menu option to Start a test ignoring Pause Timers</li>
<li>Bug 52027 - Allow System or CrossPlatform LAF to be set from options
menu</li>
<li>Bug 52037 - Remember user-set LaF over restarts.</li>
+<li>Bug 51861 - Improve HTTP Request GUI to better show parameters without
name (GWT RPC requests for example) (UNDER DEVELOPMENT)</li>
</ul>
<h2>Non-functional changes</h2>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
