You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2016/10/22 14:39:08 UTC

svn commit: r1766198 - /jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java

Author: fschumacher
Date: Sat Oct 22 14:39:08 2016
New Revision: 1766198

URL: http://svn.apache.org/viewvc?rev=1766198&view=rev
Log:
Rename local variable to make intent clearer

Bugzilla Id: 60222

Modified:
    jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java

Modified: jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java?rev=1766198&r1=1766197&r2=1766198&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java Sat Oct 22 14:39:08 2016
@@ -119,10 +119,10 @@ public class TestSaveService extends JMe
         
         boolean failed = false;
 
-        final FileStats orig;
+        final FileStats origStats;
         try (FileReader fileReader = new FileReader(testFile);
                 BufferedReader bufferedReader = new BufferedReader(fileReader)) {
-            orig = computeFileStats(bufferedReader);
+            origStats = computeFileStats(bufferedReader);
         }
 
         ByteArrayOutputStream out = new ByteArrayOutputStream(1000000);
@@ -133,24 +133,24 @@ public class TestSaveService extends JMe
             out.close(); // Make sure all the data is flushed out
         }
 
-        final FileStats output;
+        final FileStats outputStats;
         try (ByteArrayInputStream ins = new ByteArrayInputStream(out.toByteArray());
                 Reader insReader = new InputStreamReader(ins);
                 BufferedReader bufferedReader = new BufferedReader(insReader)) {
-            output = computeFileStats(bufferedReader);
+            outputStats = computeFileStats(bufferedReader);
         }
         // We only check the length of the result. Comparing the
         // actual result (out.toByteArray==original) will usually
         // fail, because the order of the properties within each
         // test element may change. Comparing the lengths should be
         // enough to detect most problem cases...
-        if ((checkSize && !orig.isSameSize(output)) || !orig.hasSameLinesCount(output)) {
+        if ((checkSize && !origStats.isSameSize(outputStats)) || !origStats.hasSameLinesCount(outputStats)) {
             failed = true;
             System.out.println();
             System.out.println("Loading file testfiles/" + fileName + " and "
-                    + "saving it back changes its size from " + orig.size + " to " + output.size + ".");
-            if (!orig.hasSameLinesCount(output)) {
-                System.out.println("Number of lines changes from " + orig.lines + " to " + output.lines);
+                    + "saving it back changes its size from " + origStats.size + " to " + outputStats.size + ".");
+            if (!origStats.hasSameLinesCount(outputStats)) {
+                System.out.println("Number of lines changes from " + origStats.lines + " to " + outputStats.lines);
             }
             if (saveOut) {
                 final File outFile = findTestFile("testfiles/" + fileName + ".out");