You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/10/22 19:50:57 UTC
svn commit: r1812948 - in /jmeter/trunk:
src/components/org/apache/jmeter/assertions/
src/components/org/apache/jmeter/assertions/gui/
src/core/org/apache/jmeter/resources/ xdocs/
Author: pmouawad
Date: Sun Oct 22 19:50:57 2017
New Revision: 1812948
URL: http://svn.apache.org/viewvc?rev=1812948&view=rev
Log:
Bug 61645 - Response Assertion : Add ability to assert on Request Data
Bugzilla Id: 61645
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=1812948&r1=1812947&r2=1812948&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java Sun Oct 22 19:50:57 2017
@@ -65,6 +65,8 @@ public class ResponseAssertion extends A
private static final String RESPONSE_HEADERS = "Assertion.response_headers"; // $NON-NLS-1$
private static final String REQUEST_HEADERS = "Assertion.request_headers"; // $NON-NLS-1$
+
+ private static final String REQUEST_DATA = "Assertion.request_data"; // $NON-NLS-1$
private static final String ASSUME_SUCCESS = "Assertion.assume_success"; // $NON-NLS-1$
@@ -145,6 +147,10 @@ public class ResponseAssertion extends A
public void setTestFieldRequestHeaders() {
setTestField(REQUEST_HEADERS);
}
+
+ public void setTestFieldRequestData() {
+ setTestField(REQUEST_DATA);
+ }
public boolean isTestFieldURL(){
return SAMPLE_URL.equals(getTestField());
@@ -174,6 +180,10 @@ public class ResponseAssertion extends A
return REQUEST_HEADERS.equals(getTestField());
}
+ public boolean isTestFieldRequestData(){
+ return REQUEST_DATA.equals(getTestField());
+ }
+
private void setTestType(int testType) {
setProperty(new IntegerProperty(TEST_TYPE, testType));
}
@@ -304,6 +314,8 @@ public class ResponseAssertion extends A
toCheck = response.getResponseMessage();
} else if (isTestFieldRequestHeaders()) {
toCheck = response.getRequestHeaders();
+ } else if (isTestFieldRequestData()) {
+ toCheck = response.getSamplerData();
} else if (isTestFieldResponseHeaders()) {
toCheck = response.getResponseHeaders();
} else { // Assume it is the URL
@@ -413,6 +425,8 @@ public class ResponseAssertion extends A
sb.append("message");
} else if (isTestFieldRequestHeaders()) {
sb.append("request headers");
+ } else if (isTestFieldRequestData()) {
+ sb.append("request data");
} else if (isTestFieldResponseHeaders()) {
sb.append("headers");
} else if (isTestFieldResponseDataAsDocument()) {
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java?rev=1812948&r1=1812947&r2=1812948&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java Sun Oct 22 19:50:57 2017
@@ -82,6 +82,9 @@ public class AssertionGui extends Abstra
/** Radio button indicating that the request headers should be tested. */
private JRadioButton requestHeadersButton;
+
+ /** Radio button indicating that the request data should be tested. */
+ private JRadioButton requestDataButton;
/**
* Checkbox to indicate whether the response should be forced successful
@@ -177,6 +180,8 @@ public class AssertionGui extends Abstra
ra.setTestFieldResponseMessage();
} else if (requestHeadersButton.isSelected()) {
ra.setTestFieldRequestHeaders();
+ } else if (requestDataButton.isSelected()) {
+ ra.setTestFieldRequestData();
} else if (responseHeadersButton.isSelected()) {
ra.setTestFieldResponseHeaders();
} else { // Assume URL
@@ -223,6 +228,7 @@ public class AssertionGui extends Abstra
responseCodeButton.setSelected(false);
responseMessageButton.setSelected(false);
requestHeadersButton.setSelected(false);
+ requestDataButton.setSelected(false);
responseHeadersButton.setSelected(false);
assumeSuccess.setSelected(false);
@@ -270,6 +276,8 @@ public class AssertionGui extends Abstra
responseMessageButton.setSelected(true);
} else if (model.isTestFieldRequestHeaders()) {
requestHeadersButton.setSelected(true);
+ } else if (model.isTestFieldRequestData()) {
+ requestDataButton.setSelected(true);
} else if (model.isTestFieldResponseHeaders()) {
responseHeadersButton.setSelected(true);
} else // Assume it is the URL
@@ -323,6 +331,7 @@ public class AssertionGui extends Abstra
responseMessageButton = new JRadioButton(JMeterUtils.getResString("assertion_message_resp")); //$NON-NLS-1$
responseHeadersButton = new JRadioButton(JMeterUtils.getResString("assertion_headers")); //$NON-NLS-1$
requestHeadersButton = new JRadioButton(JMeterUtils.getResString("assertion_req_headers")); //$NON-NLS-1$
+ requestDataButton = new JRadioButton(JMeterUtils.getResString("assertion_req_data")); //$NON-NLS-1$
ButtonGroup group = new ButtonGroup();
group.add(responseStringButton);
@@ -332,6 +341,7 @@ public class AssertionGui extends Abstra
group.add(responseMessageButton);
group.add(requestHeadersButton);
group.add(responseHeadersButton);
+ group.add(requestDataButton);
responseStringButton.setSelected(true);
@@ -354,6 +364,9 @@ public class AssertionGui extends Abstra
addField(panel, urlButton, gbc);
addField(panel, responseAsDocumentButton, gbc);
addField(panel, assumeSuccess, gbc);
+
+ resetContraints(gbc);
+ addField(panel, requestDataButton, gbc);
return panel;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1812948&r1=1812947&r2=1812948&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun Oct 22 19:50:57 2017
@@ -120,6 +120,7 @@ assertion_pattern_match_rules=Pattern Ma
assertion_patterns_to_test=Patterns to Test
assertion_regex_empty_default_value=Use empty default value
assertion_req_headers=Request Headers
+assertion_req_data=Request Data
assertion_resp_field=Field to Test
assertion_resp_size_field=Response Size Field to Test
assertion_substring=Substring
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1812948&r1=1812947&r2=1812948&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Sun Oct 22 19:50:57 2017
@@ -115,6 +115,7 @@ assertion_pattern_match_rules=Type de co
assertion_patterns_to_test=Motifs \u00E0 tester
assertion_regex_empty_default_value=Utiliser la cha\u00EEne vide comme valeur par d\u00E9faut
assertion_req_headers=Ent\u00EAtes de requ\u00EAte
+assertion_req_data=Donn\u00E9es de requ\u00EAte
assertion_resp_field=Section \u00E0 tester
assertion_resp_size_field=Taille \u00E0 v\u00E9rifier sur
assertion_substring=Contient (texte brut)
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1812948&r1=1812947&r2=1812948&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Oct 22 19:50:57 2017
@@ -100,6 +100,7 @@ Summary
<ul>
<li><bug>60213</bug>Boundary based extractor</li>
<li><bug>61644</bug>HTTP Cache Manager: "Use Cache-Control/Expires header when processing GET requests" should be checked by default</li>
+ <li><bug>61645</bug>Response Assertion : Add ability to assert on Request Data</li>
</ul>
<h3>Functions</h3>