[jmeter] branch master updated: Bug 63364 - When setting "subresults.disable_renaming=true", sub results are still renamed using their parent SampleLabel while they shouldn't

[pmouawad]

This is an automated email from the ASF dual-hosted git repository.

pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f25fa3  Bug 63364 - When setting "subresults.disable_renaming=true", 
sub results are still renamed using their parent SampleLabel while they 
shouldn't
     new 875b2db  Merge branch 'master' of https://github.com/apache/jmeter
3f25fa3 is described below

commit 3f25fa39a324695b133b3ed1b232a6562b664f59
Author: pmouawad <p.moua...@ubik-ingenierie.com>
AuthorDate: Thu Jul 18 09:24:19 2019 +0200

    Bug 63364 - When setting "subresults.disable_renaming=true", sub results
    are still renamed using their parent SampleLabel while they shouldn't
    
    Improve failure messages
---
 .../jmeter/protocol/http/sampler/SamplingNamingTest.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/test/src/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java 
b/test/src/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
index c371886..bc11bc7 100644
--- a/test/src/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
+++ b/test/src/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
@@ -52,17 +52,17 @@ public class SamplingNamingTest extends JMeterTestCase 
implements JMeterSerialTe
     public void testBug63364() {
         TestPlan plan = new TestPlan();
         SampleResult[] subResults = doSample(implementation);
-        Assert.assertTrue("We have at least one sample 
result",subResults.length>0);
+        Assert.assertTrue("We should have at least one sample result, we had 
none",subResults.length>0);
         for (int i = 0; i < subResults.length; i++) {
-            assertEquals(LABEL+"-"+i, subResults[i].getSampleLabel());
+            assertEquals("Expected sample label to be "+LABEL+"-"+i, 
LABEL+"-"+i, subResults[i].getSampleLabel());
         }
         final boolean prevValue = TestPlan.getFunctionalMode();
         plan.setFunctionalMode(true);
         try {
             subResults = doSample(implementation);
-            Assert.assertTrue("We have at least one sample 
result",subResults.length>0);
+            Assert.assertTrue("We should have at least one sample result, we 
had none",subResults.length>0);
             for (int i = 0; i < subResults.length; i++) {
-                
Assert.assertTrue(subResults[i].getSampleLabel().startsWith(JMETER_HOME_PAGE));
+                Assert.assertTrue("Expected sample label to start with 
"+JMETER_HOME_PAGE, 
subResults[i].getSampleLabel().startsWith(JMETER_HOME_PAGE));
             }
         } finally {
             plan.setFunctionalMode(prevValue);
@@ -85,7 +85,7 @@ public class SamplingNamingTest extends JMeterTestCase 
implements JMeterSerialTe
         // We intentionally keep only resources which start with 
JMETER_HOME_PAGE
         httpSamplerProxy.setEmbeddedUrlRE(JMETER_HOME_PAGE+".*");
         SampleResult result = httpSamplerProxy.sample();
-        assertEquals(LABEL, result.getSampleLabel());
+        assertEquals("Expected sample label to be "+LABEL, LABEL, 
result.getSampleLabel());
         SampleResult[] subResults = result.getSubResults();
         return subResults;
     }