[patch] Fix that takes into account your notes

ISSUE_51861-5.patch (text/plain), 12.29 KB, created by Philippe Mouawad on 2011-09-27 19:36:35 UTC

(hide)

Description: Fix that takes into account your notes

Filename:

MIME Type:

Creator: Philippe Mouawad

Created: 2011-09-27 19:36:35 UTC

Size: 12.29 KB

patch

obsolete

>Index: src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java >=================================================================== >--- src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (revision 1176336) >+++ src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (working copy) >@@ -27,12 +27,15 @@ > 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.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,12 @@ > > private static final long serialVersionUID = 240L; > >+ private static final int TAB_PARAMETERS = 0; >+ private static final int TAB_RAW_BODY = 1; >+ public static final String POST_BODY_RAW = "HTTPSampler.postBodyRaw"; // TODO - belongs elsewhere >+ >+ private static final boolean POST_BODY_RAW_DEFAULT = false; >+ > private HTTPArgumentsPanel argsPanel; > > private JTextField domain; >@@ -101,6 +112,12 @@ > > 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; >+ > public UrlConfigGui() { > this(true); > } >@@ -139,6 +156,8 @@ > protocol.setText(""); // $NON-NLS-1$ > contentEncoding.setText(""); // $NON-NLS-1$ > argsPanel.clear(); >+ postBodyContent.setText("");// $NON-NLS-1$ >+ postContentTabbedPane.setSelectedIndex(TAB_PARAMETERS, false); > } > > public TestElement createTestElement() { >@@ -157,9 +176,18 @@ > * @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(POST_BODY_RAW, useRaw, 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 +213,24 @@ > } > } > >+ // 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 +239,18 @@ > */ > 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(POST_BODY_RAW, 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 +561,104 @@ > return panel; > } > >- protected JPanel getParameterPanel() { >+ protected JTabbedPane getParameterPanel() { >+ postContentTabbedPane = new ValidationTabbedPane(); > argsPanel = new HTTPArgumentsPanel(); >- >- return argsPanel; >+ postBodyContent = new JLabeledTextArea(JMeterUtils.getResString("post_body_raw"));// $NON-NLS-1$ >+ postContentTabbedPane.add(JMeterUtils.getResString("post_as_parameters"), argsPanel);// $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 +672,39 @@ > } > } > } >+ >+ >+ /** >+ * 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)); >+ } >+ } > } >Index: src/core/org/apache/jmeter/resources/messages.properties >=================================================================== >--- src/core/org/apache/jmeter/resources/messages.properties (revision 1176336) >+++ src/core/org/apache/jmeter/resources/messages.properties (working copy) >@@ -1030,6 +1030,14 @@ > 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: View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]