From e4a2bcb526963ed691e985911904192e092e6aab Mon Sep 17 00:00:00 2001
From: Sebastian Bazley <sebb@apache.org>
Date: Fri, 2 Feb 2007 10:11:09 +0000
Subject: [PATCH] Bug 41522 - Use JUnit sampler name in sample results

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@502561 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: d408115f4e598e4eecce31afa5fe394d9ace9484
---
 .../org/apache/jmeter/protocol/java/sampler/JUnitSampler.java   | 2 +-
 xdocs/changes.xml                                               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java b/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
index c457ce6e07..248af87c2f 100644
--- a/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
+++ b/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
@@ -331,7 +331,7 @@ public class JUnitSampler extends AbstractSampler {
         } else {
             rlabel = JUnitSampler.class.getName();
         }
-        sresult.setSampleLabel(rlabel);
+        sresult.setSampleLabel(getName());// Bug 41522 - don't use rlabel here
         sresult.setSamplerData(getClassname() + "." + getMethod());   
         // check to see if the test class is null. if it is, we create
         // a new instance. this should only happen at the start of a
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f2527e99d4..5a66c207f1 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -50,6 +50,7 @@ jmeterthread.reversePostProcessors=true
 <li>BeanShell Post-Processor no longer ignores samples with zero-length result data</li>
 <li>Use property jmeter.home (if present) to override user.dir when starting JMeter</li>
 <li>Bug 41457 - Add TCP Sampler option to not re-use connections</li>
+<li>Bug 41522 - Use JUnit sampler name in sample results</li>
 </ul>
 
 <h4>Bug fixes:</h4>