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 2019/05/18 18:55:33 UTC
svn commit: r1859471 - in /jmeter/trunk:
src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
xdocs/changes.xml
Author: pmouawad
Date: Sat May 18 18:55:33 2019
New Revision: 1859471
URL: http://svn.apache.org/viewvc?rev=1859471&view=rev
Log:
Bug 63450 - HTTP(S) Test Script Recorder: Put number at end instead of beginning
Bugzilla Id: 63450
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java?rev=1859471&r1=1859470&r2=1859471&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java Sat May 18 18:55:33 2019
@@ -286,22 +286,22 @@ public class DefaultSamplerCreator exten
String prefix = request.getPrefix();
int httpSampleNameMode = request.getHttpSampleNameMode();
if (!HTTPConstants.CONNECT.equals(request.getMethod()) && isNumberRequests()) {
- if(!StringUtils.isEmpty(prefix)) {
- if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
- sampler.setName(prefix + incrementRequestNumberAndGet() + " " + sampler.getPath());
- } else if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
- sampler.setName(incrementRequestNumberAndGet() + " " + prefix);
+ if(StringUtils.isNotEmpty(prefix)) {
+ if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_PREFIX) {
+ sampler.setName(prefix + sampler.getPath()+ "-" + incrementRequestNumberAndGet());
+ } else if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_COMPLETE) {
+ sampler.setName(prefix + "-" + incrementRequestNumberAndGet());
} else {
log.debug("Sampler name naming mode not recognized");
}
} else {
- sampler.setName(incrementRequestNumberAndGet() + " " + sampler.getPath());
+ sampler.setName(sampler.getPath()+"-"+incrementRequestNumberAndGet());
}
} else {
- if(!StringUtils.isEmpty(prefix)) {
- if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
- sampler.setName(prefix+sampler.getPath());
- } else if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
+ if(StringUtils.isNotEmpty(prefix)) {
+ if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_PREFIX) {
+ sampler.setName(prefix + sampler.getPath());
+ } else if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_COMPLETE) {
sampler.setName(prefix);
} else {
log.debug("Sampler name naming mode not recognized");
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1859471&r1=1859470&r2=1859471&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat May 18 18:55:33 2019
@@ -75,6 +75,7 @@ to view the last major behaviors with th
<ch_section>Incompatible changes</ch_section>
<ul>
+ <li>HTTP(S) Test Script Recorder now appends number at end of names, while previously it added it at beginning. See <bugzilla>63450</bugzilla></li>
</ul>
<!-- =================== Improvements =================== -->
@@ -133,6 +134,7 @@ to view the last major behaviors with th
<ul>
<li><bug>63298</bug>HTTP Requests with encoded URLs are being sent in decoded format</li>
<li><bug>63364</bug>When setting <code>subresults.disable_renaming=true</code>, sub results are still renamed using their parent SampleLabel while they shouldn't. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
+ <li><bug>63450</bug>HTTP(S) Test Script Recorder: Put number at end instead of beginning</li>
</ul>
<h3>Other Samplers</h3>
Re: svn commit: r1859471 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
xdocs/changes.xml
Posted by Philippe Mouawad <ph...@gmail.com>.
Fixed.
Thanks
On Sun, May 19, 2019 at 3:23 PM Milamber <mi...@apache.org> wrote:
> Philippe,
>
> I think you have missing to update the bugzilla form 63450 with the
> related commits?
>
> Milamber
>
> On 18/05/2019 18:55, pmouawad@apache.org wrote:
> > Author: pmouawad
> > Date: Sat May 18 18:55:33 2019
> > New Revision: 1859471
> >
> > URL: http://svn.apache.org/viewvc?rev=1859471&view=rev
> > Log:
> > Bug 63450 - HTTP(S) Test Script Recorder: Put number at end instead of
> beginning
> > Bugzilla Id: 63450
> >
> > Modified:
> >
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
> > jmeter/trunk/xdocs/changes.xml
> >
> > Modified:
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
> > URL:
> http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java?rev=1859471&r1=1859470&r2=1859471&view=diff
> >
> ==============================================================================
> > ---
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
> (original)
> > +++
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
> Sat May 18 18:55:33 2019
> > @@ -286,22 +286,22 @@ public class DefaultSamplerCreator exten
> > String prefix = request.getPrefix();
> > int httpSampleNameMode = request.getHttpSampleNameMode();
> > if (!HTTPConstants.CONNECT.equals(request.getMethod()) &&
> isNumberRequests()) {
> > - if(!StringUtils.isEmpty(prefix)) {
> > - if
> (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
> > - sampler.setName(prefix + incrementRequestNumberAndGet()
> + " " + sampler.getPath());
> > - } else if
> (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
> > - sampler.setName(incrementRequestNumberAndGet() + "
> " + prefix);
> > + if(StringUtils.isNotEmpty(prefix)) {
> > + if (httpSampleNameMode ==
> SAMPLER_NAME_NAMING_MODE_PREFIX) {
> > + sampler.setName(prefix + sampler.getPath()+ "-" +
> incrementRequestNumberAndGet());
> > + } else if (httpSampleNameMode ==
> SAMPLER_NAME_NAMING_MODE_COMPLETE) {
> > + sampler.setName(prefix + "-" +
> incrementRequestNumberAndGet());
> > } else {
> > log.debug("Sampler name naming mode not
> recognized");
> > }
> > } else {
> > - sampler.setName(incrementRequestNumberAndGet() + " " +
> sampler.getPath());
> > +
> sampler.setName(sampler.getPath()+"-"+incrementRequestNumberAndGet());
> > }
> > } else {
> > - if(!StringUtils.isEmpty(prefix)) {
> > - if
> (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
> > - sampler.setName(prefix+sampler.getPath());
> > - } else if
> (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
> > + if(StringUtils.isNotEmpty(prefix)) {
> > + if (httpSampleNameMode ==
> SAMPLER_NAME_NAMING_MODE_PREFIX) {
> > + sampler.setName(prefix + sampler.getPath());
> > + } else if (httpSampleNameMode ==
> SAMPLER_NAME_NAMING_MODE_COMPLETE) {
> > sampler.setName(prefix);
> > } else {
> > log.debug("Sampler name naming mode not
> recognized");
> >
> > Modified: jmeter/trunk/xdocs/changes.xml
> > URL:
> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1859471&r1=1859470&r2=1859471&view=diff
> >
> ==============================================================================
> > --- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
> > +++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat May 18 18:55:33 2019
> > @@ -75,6 +75,7 @@ to view the last major behaviors with th
> >
> > <ch_section>Incompatible changes</ch_section>
> > <ul>
> > + <li>HTTP(S) Test Script Recorder now appends number at end of
> names, while previously it added it at beginning. See
> <bugzilla>63450</bugzilla></li>
> > </ul>
> > <!-- =================== Improvements =================== -->
> >
> > @@ -133,6 +134,7 @@ to view the last major behaviors with th
> > <ul>
> > <li><bug>63298</bug>HTTP Requests with encoded URLs are being sent
> in decoded format</li>
> > <li><bug>63364</bug>When setting
> <code>subresults.disable_renaming=true</code>, sub results are still
> renamed using their parent SampleLabel while they shouldn't. Contributed by
> Ubik Load Pack (support at ubikloadpack.com)</li>
> > + <li><bug>63450</bug>HTTP(S) Test Script Recorder: Put number at end
> instead of beginning</li>
> > </ul>
> >
> > <h3>Other Samplers</h3>
> >
> >
> >
>
>
--
Cordialement.
Philippe Mouawad.
Re: svn commit: r1859471 - in /jmeter/trunk:
src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
xdocs/changes.xml
Posted by Milamber <mi...@apache.org>.
Philippe,
I think you have missing to update the bugzilla form 63450 with the
related commits?
Milamber
On 18/05/2019 18:55, pmouawad@apache.org wrote:
> Author: pmouawad
> Date: Sat May 18 18:55:33 2019
> New Revision: 1859471
>
> URL: http://svn.apache.org/viewvc?rev=1859471&view=rev
> Log:
> Bug 63450 - HTTP(S) Test Script Recorder: Put number at end instead of beginning
> Bugzilla Id: 63450
>
> Modified:
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
> jmeter/trunk/xdocs/changes.xml
>
> Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java?rev=1859471&r1=1859470&r2=1859471&view=diff
> ==============================================================================
> --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java (original)
> +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java Sat May 18 18:55:33 2019
> @@ -286,22 +286,22 @@ public class DefaultSamplerCreator exten
> String prefix = request.getPrefix();
> int httpSampleNameMode = request.getHttpSampleNameMode();
> if (!HTTPConstants.CONNECT.equals(request.getMethod()) && isNumberRequests()) {
> - if(!StringUtils.isEmpty(prefix)) {
> - if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
> - sampler.setName(prefix + incrementRequestNumberAndGet() + " " + sampler.getPath());
> - } else if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
> - sampler.setName(incrementRequestNumberAndGet() + " " + prefix);
> + if(StringUtils.isNotEmpty(prefix)) {
> + if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_PREFIX) {
> + sampler.setName(prefix + sampler.getPath()+ "-" + incrementRequestNumberAndGet());
> + } else if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_COMPLETE) {
> + sampler.setName(prefix + "-" + incrementRequestNumberAndGet());
> } else {
> log.debug("Sampler name naming mode not recognized");
> }
> } else {
> - sampler.setName(incrementRequestNumberAndGet() + " " + sampler.getPath());
> + sampler.setName(sampler.getPath()+"-"+incrementRequestNumberAndGet());
> }
> } else {
> - if(!StringUtils.isEmpty(prefix)) {
> - if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
> - sampler.setName(prefix+sampler.getPath());
> - } else if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
> + if(StringUtils.isNotEmpty(prefix)) {
> + if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_PREFIX) {
> + sampler.setName(prefix + sampler.getPath());
> + } else if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_COMPLETE) {
> sampler.setName(prefix);
> } else {
> log.debug("Sampler name naming mode not recognized");
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1859471&r1=1859470&r2=1859471&view=diff
> ==============================================================================
> --- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
> +++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat May 18 18:55:33 2019
> @@ -75,6 +75,7 @@ to view the last major behaviors with th
>
> <ch_section>Incompatible changes</ch_section>
> <ul>
> + <li>HTTP(S) Test Script Recorder now appends number at end of names, while previously it added it at beginning. See <bugzilla>63450</bugzilla></li>
> </ul>
> <!-- =================== Improvements =================== -->
>
> @@ -133,6 +134,7 @@ to view the last major behaviors with th
> <ul>
> <li><bug>63298</bug>HTTP Requests with encoded URLs are being sent in decoded format</li>
> <li><bug>63364</bug>When setting <code>subresults.disable_renaming=true</code>, sub results are still renamed using their parent SampleLabel while they shouldn't. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
> + <li><bug>63450</bug>HTTP(S) Test Script Recorder: Put number at end instead of beginning</li>
> </ul>
>
> <h3>Other Samplers</h3>
>
>
>