svn commit: r1816914 - in /jmeter/trunk: src/core/org/apache/jmeter/threads/TestCompiler.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Fri Dec  1 21:43:54 2017
New Revision: 1816914

URL: http://svn.apache.org/viewvc?rev=1816914&view=rev
Log:
Bug 61846 - Scoped Assertion should follow same order of evaluation as Post Processors 
Bugzilla Id: 61846

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java?rev=1816914&r1=1816913&r2=1816914&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java Fri Dec  1 21:43:54 2017
@@ -205,6 +205,7 @@ public class TestCompiler implements Has
             addDirectParentControllers(controllers, stack.get(i - 1));
             List<PreProcessor>  tempPre = new LinkedList<>();
             List<PostProcessor> tempPost = new LinkedList<>();
+            List<Assertion> tempAssertions = new LinkedList<>();
             for (Object item : testTree.list(stack.subList(0, i))) {
                 if (item instanceof ConfigTestElement) {
                     configs.add((ConfigTestElement) item);
@@ -216,7 +217,7 @@ public class TestCompiler implements Has
                     timers.add((Timer) item);
                 }
                 if (item instanceof Assertion) {
-                    assertions.add((Assertion) item);
+                    tempAssertions.add((Assertion) item);
                 }
                 if (item instanceof PostProcessor) {
                     tempPost.add((PostProcessor) item);
@@ -225,6 +226,7 @@ public class TestCompiler implements Has
                     tempPre.add((PreProcessor) item);
                 }
             }
+            assertions.addAll(0, tempAssertions);
             pres.addAll(0, tempPre);
             posts.addAll(0, tempPost);
         }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1816914&r1=1816913&r2=1816914&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Dec  1 21:43:54 2017
@@ -132,6 +132,7 @@ Summary
     <li><bug>61756</bug>Extractors : Improve label name "Reference name" to make it clear what it makes</li>
     <li><bug>61758</bug><code>Apply to:</code> field in Extractors, Assertions : When entering a value in <code>JMeter Variable Name</code>, the radio box <code>JMeter Variable Name</code> should be selected by default. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
     <li><bug>61845</bug>New Component JSON Assertion based on AtlanBH JSON Path Asserion donated to JMeter-Plugins and migrated into JMeter core by Artem Fedorov (artem at blazemeter.com)</li>
+    <li><bug>61846</bug>Scoped Assertion should follow same order of evaluation as Post Processors</li>
 </ul>
 
 <h3>Functions</h3>