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

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

commit 7f5a8b3d850c9ac580ab0fffb146cb2792dc2ae3
Author: Graham Russell <[email protected]>
AuthorDate: Thu Aug 15 10:42:01 2019 +0100

    Improve clarity and StringBuilder usage in CompareAssertion
    
    Part of #479 on github
---
 .../apache/jmeter/assertions/CompareAssertion.java | 34 ++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git 
a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
 
b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
index 6c63b55..2781779 100644
--- 
a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
+++ 
b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java
@@ -71,7 +71,6 @@ public class CompareAssertion extends AbstractTestElement 
implements Assertion,
         long prevTime = -1;
         SampleResult prevResult = null;
         boolean success = true;
-        StringBuilder buf = new StringBuilder();
         for (SampleResult sResult : responses) {
             long currentTime = sResult.getTime();
             if (prevTime != -1) {
@@ -83,14 +82,14 @@ public class CompareAssertion extends AbstractTestElement 
implements Assertion,
                 prevTime = currentTime;
             } else {
                 result.setFailure(true);
-                buf.setLength(0);
-                appendResultDetails(buf, prevResult);
-                
buf.append(JMeterUtils.getResString("comparison_response_time")).append(prevTime);
 //$NON-NLS-1$
-                result.addToBaseResult(buf.toString());
-                buf.setLength(0);
-                appendResultDetails(buf, sResult);
-                
buf.append(JMeterUtils.getResString("comparison_response_time")).append(currentTime);
 //$NON-NLS-1$
-                result.addToSecondaryResult(buf.toString());
+                StringBuilder sb = new StringBuilder();
+                appendResultDetails(sb, prevResult);
+                
sb.append(JMeterUtils.getResString("comparison_response_time")).append(prevTime);
 //$NON-NLS-1$
+                result.addToBaseResult(sb.toString());
+                sb.setLength(0);
+                appendResultDetails(sb, sResult);
+                
sb.append(JMeterUtils.getResString("comparison_response_time")).append(currentTime);
 //$NON-NLS-1$
+                result.addToSecondaryResult(sb.toString());
                 result.setFailureMessage(
                         JMeterUtils.getResString("comparison_differ_time") + 
//$NON-NLS-1$
                                 compareTime +
@@ -107,7 +106,6 @@ public class CompareAssertion extends AbstractTestElement 
implements Assertion,
         String prevContent = null;
         SampleResult prevResult = null;
         boolean success = true;
-        StringBuilder buf = new StringBuilder();
         for (SampleResult sResult : responses) {
             String currentContent = sResult.getResponseDataAsString();
             currentContent = filterString(currentContent);
@@ -119,14 +117,14 @@ public class CompareAssertion extends AbstractTestElement 
implements Assertion,
                 prevContent = currentContent;
             } else {
                 result.setFailure(true);
-                buf.setLength(0);
-                appendResultDetails(buf, prevResult);
-                buf.append(prevContent);
-                result.addToBaseResult(buf.toString());
-                buf.setLength(0);
-                appendResultDetails(buf, sResult);
-                buf.append(currentContent);
-                result.addToSecondaryResult(buf.toString());
+                StringBuilder sb = new StringBuilder();
+                appendResultDetails(sb, prevResult);
+                sb.append(prevContent);
+                result.addToBaseResult(sb.toString());
+                sb.setLength(0);
+                appendResultDetails(sb, sResult);
+                sb.append(currentContent);
+                result.addToSecondaryResult(sb.toString());
                 
result.setFailureMessage(JMeterUtils.getResString("comparison_differ_content"));
 //$NON-NLS-1$
                 break;
             }

Reply via email to