svn commit: r1851979 - in /jmeter/trunk: src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java src/core/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Wed Jan 23 20:52:34 2019
New Revision: 1851979

URL: http://svn.apache.org/viewvc?rev=1851979&view=rev
Log:
Bug 63105 - Export Transactions for Report: fix 2 bugs
Bugzilla Id: 63105

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java?rev=1851979&r1=1851978&r2=1851979&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java Wed Jan 23 20:52:34 2019
@@ -37,6 +37,7 @@ import javax.swing.SwingUtilities;
 
 import org.apache.jmeter.control.TransactionController;
 import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.action.impl.DefaultTreeNodeNamingPolicy;
 import org.apache.jmeter.gui.plugin.MenuCreator;
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 import org.apache.jmeter.gui.util.EscapeDialog;
@@ -62,7 +63,7 @@ public class ExportTransactionAndSampler
     
     private static final String TRANSACTIONS_REGEX_PATTERN = 
             JMeterUtils.getPropDefault("jmeter.reportgenerator.exported_transactions_pattern", 
-                    "[a-zA-Z0-9_\\-{}\\$\\.]*[-_][0-9]*");
+                    "[a-zA-Z0-9_ \\-{}\\$\\.]*["+DefaultTreeNodeNamingPolicy.TRANSACTION_CHILDREN_SEPARATOR+"][0-9]*");
     
     private static final Pattern TRANSACTIONS_REGEX = 
             Pattern.compile(TRANSACTIONS_REGEX_PATTERN);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java?rev=1851979&r1=1851978&r2=1851979&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/impl/DefaultTreeNodeNamingPolicy.java Wed Jan 23 20:52:34 2019
@@ -32,9 +32,9 @@ import org.apache.jmeter.util.JMeterUtil
  * @since 3.2
  */
 public class DefaultTreeNodeNamingPolicy implements TreeNodeNamingPolicy {
+    public static final char TRANSACTION_CHILDREN_SEPARATOR = '-';
     private static final String PREFIX = JMeterUtils.getPropDefault("naming_policy.prefix", ""); 
     private static final String SUFFIX = JMeterUtils.getPropDefault("naming_policy.suffix", ""); 
-    private int numberOfChildren;
     private int index;
     private DecimalFormat formatter;
 
@@ -46,7 +46,7 @@ public class DefaultTreeNodeNamingPolicy
     public void rename(JMeterTreeNode parentNode, JMeterTreeNode childNode, int iterationIndex) {
         if(childNode.getUserObject() instanceof TransactionController ||
                 childNode.getUserObject() instanceof Sampler) {
-            childNode.setName(parentNode.getName()+"-"+formatter.format(index));
+            childNode.setName(parentNode.getName()+TRANSACTION_CHILDREN_SEPARATOR+formatter.format(index));
             index++;
         }
     }
@@ -56,7 +56,7 @@ public class DefaultTreeNodeNamingPolicy
      */
     @Override
     public void resetState(JMeterTreeNode rootNode) {
-        this.numberOfChildren = rootNode.getChildCount();
+        int numberOfChildren = rootNode.getChildCount();
         this.index = 0;
         int numberOfDigits = String.valueOf(numberOfChildren).length();
         StringBuilder formatSB = new StringBuilder(numberOfDigits);

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1851979&r1=1851978&r2=1851979&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Jan 23 20:52:34 2019
@@ -257,6 +257,7 @@ See <bugzilla>63094</bugzilla>
     <li><bug>62889</bug>Format JSON Arrays when displayed with JSON Path Tester.</li>
     <li><bug>62900</bug>ObjectProperty#getStringValue() can throw NullPointerException</li>
     <li><bug>63099</bug>Escape commata in function helper dialog only outside of variable replacement structures.</li>
+    <li><bug>63105</bug>Export Transactions for Report: fix 2 bugs</li>
 </ul>
 
  <!--  =================== Thanks =================== -->