svn commit: r685366 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/control/gui/ src/core/org/apache/jmeter/gui/util/ src/core/org/apache/jmeter/threads/gui/ xdocs/

Tue, 12 Aug 2008 16:23:57 -0700 

Author: sebb
Date: Tue Aug 12 16:23:01 2008
New Revision: 685366

URL: http://svn.apache.org/viewvc?rev=685366&view=rev
Log:
Assertions run after PostProcessors; change order of pop-up menus accordingly

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java?rev=685366&r1=685365&r2=685366&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java 
(original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java 
Tue Aug 12 16:23:01 2008
@@ -88,8 +88,8 @@
         addMenu.add(MenuFactory.makeMenu(MenuFactory.CONFIG_ELEMENTS, 
ActionNames.ADD));
         addMenu.add(MenuFactory.makeMenu(MenuFactory.TIMERS, ActionNames.ADD));
         addMenu.add(MenuFactory.makeMenu(MenuFactory.PRE_PROCESSORS, 
ActionNames.ADD));
-        addMenu.add(MenuFactory.makeMenu(MenuFactory.ASSERTIONS, 
ActionNames.ADD));
         addMenu.add(MenuFactory.makeMenu(MenuFactory.POST_PROCESSORS, 
ActionNames.ADD));
+        addMenu.add(MenuFactory.makeMenu(MenuFactory.ASSERTIONS, 
ActionNames.ADD));
         addMenu.add(MenuFactory.makeMenu(MenuFactory.LISTENERS, 
ActionNames.ADD));
         pop.add(addMenu);
         MenuFactory.addPasteResetMenu(pop);

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java?rev=685366&r1=685365&r2=685366&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java 
(original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java 
Tue Aug 12 16:23:01 2008
@@ -88,8 +88,8 @@
                 MenuFactory.TIMERS,
                 MenuFactory.PRE_PROCESSORS,
                 MenuFactory.SAMPLERS,
-                MenuFactory.ASSERTIONS,
                 MenuFactory.POST_PROCESSORS,
+                MenuFactory.ASSERTIONS,
                 MenuFactory.LISTENERS,
                 },
                 JMeterUtils.getResString("add"), // $NON-NLS-1$

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=685366&r1=685365&r2=685366&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java 
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java 
Tue Aug 12 16:23:01 2008
@@ -93,8 +93,8 @@
         MenuFactory.TIMERS,
         MenuFactory.PRE_PROCESSORS,
         MenuFactory.SAMPLERS,
-        MenuFactory.ASSERTIONS,
         MenuFactory.POST_PROCESSORS,
+        MenuFactory.ASSERTIONS,
         MenuFactory.LISTENERS,
         };
 
@@ -105,8 +105,8 @@
         MenuFactory.CONFIG_ELEMENTS,
         MenuFactory.TIMERS,
         MenuFactory.PRE_PROCESSORS,
-        MenuFactory.ASSERTIONS,
         MenuFactory.POST_PROCESSORS,
+        MenuFactory.ASSERTIONS,
         MenuFactory.LISTENERS,
         };
 

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java?rev=685366&r1=685365&r2=685366&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java 
(original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java 
Tue Aug 12 16:23:01 2008
@@ -182,8 +182,8 @@
                 MenuFactory.TIMERS,
                 MenuFactory.PRE_PROCESSORS,
                 MenuFactory.SAMPLERS,
-                MenuFactory.ASSERTIONS,
                 MenuFactory.POST_PROCESSORS,
+                MenuFactory.ASSERTIONS,
                 MenuFactory.LISTENERS,
                 },
                 JMeterUtils.getResString("add"), // $NON-NLS-1$

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=685366&r1=685365&r2=685366&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Aug 12 16:23:01 2008
@@ -108,7 +108,8 @@
 
 <h3>Non-functional changes</h3>
 <ul>
-Introduce AbstractListenerGui class to make it easier to create Listeners with 
no visual output
+<li>Introduce AbstractListenerGui class to make it easier to create Listeners 
with no visual output</li>
+<li>Assertions run after PostProcessors; change order of pop-up menus 
accordingly</li>
 </ul>
 </section> 
 </body> 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to