Bug 62914 - Add a hint in Thread Group UI about duration of test

Bugzilla Id: 62914 git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1846687 13f79535-47bb-0310-9956-ffa450edef68
joegana · Nov 15, 2018 · dbdf8cf · dbdf8cf
1 parent 95361b1
commit dbdf8cf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/core/org/apache/jmeter/resources/messages.properties b/src/core/org/apache/jmeter/resources/messages.properties
@@ -1242,6 +1242,7 @@ textbox_tooltip_cell=Double click to view/edit
 thread_delay_properties=Thread Delay Properties
 thread_dump=Create a thread dump
 thread_group_title=Thread Group
+thread_group_scheduler_warning=If Loop Count is not -1 or Forever, duration will be min(Duration, Loop Count * iteration duration) 
 thread_properties=Thread Properties
 threadgroup=Thread Group
 throughput_control_bynumber_label=Total Executions

diff --git a/src/core/org/apache/jmeter/resources/messages_fr.properties b/src/core/org/apache/jmeter/resources/messages_fr.properties
@@ -1231,6 +1231,7 @@ textbox_tooltip_cell=Double clic pour voir/editer
 thread_delay_properties=Propri\u00E9t\u00E9s de temporisation de l'unit\u00E9
 thread_dump=Cr\u00E9er une image des Threads de la JVM (thread dump)
 thread_group_title=Groupe d'unit\u00E9s
+thread_group_scheduler_warning=Si le nombre de boucles n'est pas -1 ou Infini, la dur\u00e9e sera min (Dur\u00e9e, Nombre d'it\u00e9rations * dur\u00e9e de l'it\u00e9ration).
 thread_properties=Propri\u00E9t\u00E9s du groupe d'unit\u00E9s
 threadgroup=Groupe d'unit\u00E9s
 throughput_control_bynumber_label=Ex\u00E9cutions totales

diff --git a/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java b/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
@@ -23,10 +23,12 @@
 import java.awt.event.ItemListener;
 
 import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import javax.swing.SwingConstants;
 
 import org.apache.jmeter.control.LoopController;
 import org.apache.jmeter.control.gui.LoopControlPanel;
@@ -45,7 +47,7 @@ public class ThreadGroupGui extends AbstractThreadGroupGui implements ItemListen
     private static final String THREAD_NAME = "Thread Field";
 
     private static final String RAMP_NAME = "Ramp Up Field";
-
+    
     private JTextField threadInput;
 
     private JTextField rampInput;
@@ -237,6 +239,11 @@ private void init() { // WARNING: called from ctor so must not be overridden (i.
         VerticalPanel mainPanel = new VerticalPanel();
         mainPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
                 JMeterUtils.getResString("scheduler_configuration"))); // $NON-NLS-1$
+
+        ImageIcon warningImg = JMeterUtils.getImage("warning.png");
+        JLabel warningLabel = new JLabel(JMeterUtils.getResString("thread_group_scheduler_warning"), 
+                warningImg, SwingConstants.CENTER); // $NON-NLS-1$
+        mainPanel.add(warningLabel);
         mainPanel.add(createDurationPanel());
         mainPanel.add(createDelayPanel());
         toggleSchedulerFields(false);

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
@@ -121,6 +121,7 @@ of previous time slot as a base. Starting with this version, each time slot is i
    <li><bug>62257</bug><pr>401</pr>Expand/Collapse short key <keysym>-</keysym> (minus sign) on numpad doesn't work. Contributed by Ori Marko (orimarko at gmail.com)</li>
    <li><bug>62752</bug>Add to Documentation: <code>ctx.getThreadNum()</code> is zero-based while <code>${__threadNum}</code> is one-based</li>
    <li><pr>411</pr>Use <code>SHA-1</code> instead of <code>SHA1</code> in <code>org.apache.jmeter.save.SaveService</code>. Contributed by Paco (paco.xu at daocloud.io)</li>
+   <li><bug>62914</bug>Add a hint in Thread Group UI about duration of test</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>