svn commit: r1815272 - /jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java

2017-11-14 Thread pmouawad
Author: pmouawad
Date: Tue Nov 14 21:43:25 2017
New Revision: 1815272

URL: http://svn.apache.org/viewvc?rev=1815272=rev
Log:
Improve Javadocs
Use isEmpty
Improve logging

Modified:

jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java

Modified: 
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java?rev=1815272=1815271=1815272=diff
==
--- 
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java
 (original)
+++ 
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java
 Tue Nov 14 21:43:25 2017
@@ -30,12 +30,12 @@ import org.apache.jmeter.samplers.Sample
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.JMeterUtils;
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * Provides a RandomFromMultiResult function which returns a random element 
from a multi valued extracted variable.
- * Those kind of variable are extracted by:
+ * Provides a RandomFromMultipleVars function which returns a random element 
from a multi valued extracted variable.
+ * Those kind of variables are extracted by:
  * - Regular Expression extractor
  * - JSON extractor
  * - CSS/JQuery extractor
@@ -61,6 +61,7 @@ public class RandomFromMultipleVars exte
  * No-arg constructor.
  */
 public RandomFromMultipleVars() {
+super();
 }
 
 /** {@inheritDoc} */
@@ -75,25 +76,25 @@ public class RandomFromMultipleVars exte
 if (vars != null) { // vars will be null on TestPlan
 List results = new ArrayList<>();
 String[] variables = 
variablesNamesSplitBySeparatorValue.split(SEPARATOR);
-for (String varName : variables) {
-if(!StringUtils.isEmpty(varName)) {
-extractVariableValuesToList(varName, vars, results);
+for (String currentVarName : variables) {
+if(!StringUtils.isEmpty(currentVarName)) {
+extractVariableValuesToList(currentVarName, vars, results);
 }
 }
 
-if(results.size() > 0) {
+if(!results.isEmpty()) {
 int randomIndex = ThreadLocalRandom.current().nextInt(0, 
results.size());
 outputValue = results.get(randomIndex);
 } else {
 if(log.isDebugEnabled()) {
-log.debug("RandomFromMultiResult didn't find _matchNr 
in variables :'"+variablesNamesSplitBySeparatorValue
-+"' using separator:'"+separator+"', will return 
empty value");
+log.debug("RandomFromMultiResult didn't find _matchNr 
in variables :'{}' using separator:'{}', will return empty value",
+variablesNamesSplitBySeparatorValue, separator);
 }
 }
 
 if (varName != null) {
 final String varTrim = varName.execute().trim();
-if (varTrim.length() > 0){ 
+if (!varTrim.isEmpty()){ 
 vars.put(varTrim, outputValue);
 }
 }
@@ -103,14 +104,14 @@ public class RandomFromMultipleVars exte
 }
 
 /**
+ * Get from vars the values of variableName (can be missing, contain 1 
value or contain multiple values (_matchNr))
+ * and stores them in results
  * @param variableName String
  * @param vars {@link JMeterVariables}
  * @param results {@link List} where results are stored
- * @throws NumberFormatException
  */
 private void extractVariableValuesToList(String variableName,
-JMeterVariables vars, List results)
-throws NumberFormatException {
+JMeterVariables vars, List results) {
 String matchNumberAsStr = vars.get(variableName+"_matchNr");
 int matchNumber = 0;
 if(!StringUtils.isEmpty(matchNumberAsStr)) {




svn commit: r1815270 - /jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java

2017-11-14 Thread pmouawad
Author: pmouawad
Date: Tue Nov 14 21:35:09 2017
New Revision: 1815270

URL: http://svn.apache.org/viewvc?rev=1815270=rev
Log:
Remove OOM catch
Comment empty block
Secure closing
Remove outdated TODO

Modified:
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1815270=1815269=1815270=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Tue 
Nov 14 21:35:09 2017
@@ -397,9 +397,8 @@ public class ResultCollector extends Abs
 }
 }
 }
-} catch (IOException | JMeterError | RuntimeException | 
OutOfMemoryError e) {
-// FIXME Why do we catch OOM ?
-log.warn("Problem reading JTL file: {}", file);
+} catch (IOException | JMeterError | RuntimeException e) {
+log.warn("Problem reading JTL file: {}", file, e);
 } finally {
 if (!parsedOK) {
 GuiPackage.showErrorMessage(
@@ -500,7 +499,7 @@ public class ResultCollector extends Abs
 if (len < MIN_XML_FILE_LEN) {
 return false;
 }
-raf.seek(len - TESTRESULTS_END.length() - 10);// TODO: may not 
work on all OSes?
+raf.seek(len - TESTRESULTS_END.length() - 10);
 String line;
 long pos = raf.getFilePointer();
 int end = 0;
@@ -531,10 +530,12 @@ public class ResultCollector extends Abs
 
 @Override
 public void sampleStarted(SampleEvent e) {
+// NOOP
 }
 
 @Override
 public void sampleStopped(SampleEvent e) {
+// NOOP
 }
 
 /**
@@ -600,11 +601,9 @@ public class ResultCollector extends Abs
  * Flush PrintWriter, called by Shutdown Hook to ensure no data is lost
  */
 private static void flushFileOutput() {
-String key;
-ResultCollector.FileEntry value;
 for(Map.Entry me : 
files.entrySet()) {
-key = me.getKey();
-value = me.getValue();
+String key = me.getKey();
+ResultCollector.FileEntry value = me.getValue();
 log.debug("Flushing: {}", key);
 value.pw.flush();
 if (value.pw.checkError()){
@@ -614,16 +613,18 @@ public class ResultCollector extends Abs
 }
 
 private void finalizeFileOutput() {
-String key;
-ResultCollector.FileEntry value;
 for(Map.Entry me : 
files.entrySet()) {
-key = me.getKey();
-value = me.getValue();
-log.debug("Closing: {}", key);
-writeFileEnd(value.pw, value.config);
-value.pw.close();
-if (value.pw.checkError()){
-log.warn("Problem detected during use of {}", key);
+String key = me.getKey();
+ResultCollector.FileEntry value = me.getValue();
+try {
+log.debug("Closing: {}", key);
+writeFileEnd(value.pw, value.config);
+value.pw.close();
+if (value.pw.checkError()){
+log.warn("Problem detected during use of {}", key);
+}
+} catch(Exception ex) {
+log.error("Error closing file {}", key, ex);
 }
 }
 files.clear();
@@ -655,5 +656,6 @@ public class ResultCollector extends Abs
 // can find the Clearable nodes - the userObject has to implement the 
interface.
 @Override
 public void clearData() {
+// NOOP
 }
 }




svn commit: r1815269 - in /jmeter/trunk: src/components/org/apache/jmeter/sampler/ src/core/org/apache/jmeter/resources/ src/core/org/apache/jmeter/threads/ xdocs/ xdocs/usermanual/

2017-11-14 Thread pmouawad
Author: pmouawad
Date: Tue Nov 14 21:23:28 2017
New Revision: 1815269

URL: http://svn.apache.org/viewvc?rev=1815269=rev
Log:
Bug 61762 - Start Next Thread Loop should be used everywhere
Bugzilla Id: 61762

Modified:
jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=1815269=1815268=1815269=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java 
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Tue 
Nov 14 21:23:28 2017
@@ -104,7 +104,7 @@ public class TestAction extends Abstract
 }
 } else if (action == RESTART_NEXT_LOOP) {
 log.info("Restarting next loop from element {}", getName());
-context.setRestartNextLoop(true);
+context.setStartNextThreadLoop(true);
 }
 
 return null; // This means no sample is saved

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1815269=1815268=1815269=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue 
Nov 14 21:23:28 2017
@@ -1175,7 +1175,7 @@ test=Test
 test_action_action=Action
 test_action_duration=Duration (milliseconds)
 test_action_pause=Pause
-test_action_restart_next_loop=Go to next loop iteration
+test_action_restart_next_loop=Start Next Thread Loop
 test_action_stop=Stop
 test_action_stop_now=Stop Now
 test_action_target=Target

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1815269=1815268=1815269=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Tue Nov 14 21:23:28 2017
@@ -1165,7 +1165,7 @@ test=Test
 test_action_action=Action \:
 test_action_duration=Dur\u00E9e (millisecondes) \:
 test_action_pause=Mettre en pause
-test_action_restart_next_loop=Passer \u00E0 l'it\u00E9ration suivante de la 
boucle
+test_action_restart_next_loop=D\u00E9marrer it\u00E9ration suivante
 test_action_stop=Arr\u00EAter
 test_action_stop_now=Arr\u00EAter imm\u00E9diatement
 test_action_target=Cible \:

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java?rev=1815269=1815268=1815269=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java Tue Nov 
14 21:23:28 2017
@@ -170,21 +170,47 @@ public class JMeterContext {
 }
 
 /**
- * if set to true a restart of the loop will occurs
+ * if set to true a restart of the loop will occur
  *
  * @param restartNextLoop
  *flag whether restart will occur
  */
-public void setRestartNextLoop(boolean restartNextLoop) {
+public void setStartNextThreadLoop(boolean restartNextLoop) {
 this.restartNextLoop = restartNextLoop;
 }
+
+/**
+ * if set to true current loop iteration will be interrupted 
and 
+ * JMeter will go to next iteration
+ *
+ * @param restartNextLoop
+ *flag whether restart will occur
+ */
+public boolean isStartNextThreadLoop() {
+return restartNextLoop;
+}
+
+/**
+ * if set to true current loop iteration will be interrupted 
and 
+ * JMeter will go to next iteration
+ *
+ * @param restartNextLoop
+ *flag whether restart will occur
+ * @deprecated use {@link JMeterContext#setStartNextThreadLoop(boolean)}
+ */
+@Deprecated
+public void setRestartNextLoop(boolean restartNextLoop) {
+setStartNextThreadLoop(restartNextLoop);
+}
 
 /**
  * a restart of the loop was required ?
  

svn commit: r1815266 - in /jmeter/trunk: src/core/org/apache/jmeter/util/ScopePanel.java xdocs/changes.xml

2017-11-14 Thread pmouawad
Author: pmouawad
Date: Tue Nov 14 21:11:24 2017
New Revision: 1815266

URL: http://svn.apache.org/viewvc?rev=1815266=rev
Log:
Bug 61758 - "Apply to:" field in Extractors, Assertions : When entering a 
JMeter Variable value, the radio box "JMeter Variable" should be selected by 
default
Bugzilla Id: 61758

Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java?rev=1815266=1815265=1815266=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java Tue Nov 14 
21:11:24 2017
@@ -21,6 +21,8 @@ package org.apache.jmeter.util;
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
@@ -35,7 +37,7 @@ import org.apache.jmeter.gui.util.Horizo
  * to apply the test element to the parent sample, the child samples or both.
  *
  */
-public class ScopePanel extends JPanel implements ActionListener {
+public class ScopePanel extends JPanel implements ActionListener, 
FocusListener {
 
 private static final long serialVersionUID = 240L;
 
@@ -102,6 +104,7 @@ public class ScopePanel extends JPanel i
 group.add(variableButton);
 buttonPanel.add(variableButton);
 buttonPanel.add(variableName);
+variableName.addFocusListener(this);
 }
 add(buttonPanel);
 }
@@ -179,4 +182,14 @@ public class ScopePanel extends JPanel i
 public String getVariable() {
 return variableName.getText();
 }
+
+@Override
+public void focusGained(FocusEvent focusEvent) {
+variableButton.setSelected(focusEvent.getSource() == variableName);
+}
+
+@Override
+public void focusLost(FocusEvent focusEvent) {
+// NOOP
+}
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1815266=1815265=1815266=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Nov 14 21:11:24 2017
@@ -117,6 +117,7 @@ Summary
 61645Response Assertion : Add ability to assert on Request 
Data
 61534Convert AssertionError to a failed assertion in the 
JSR223Assertion allowing users to use assert in their code
 61756Extractors : Improve label name "Reference name" to 
make it clear what it makes
+61758Apply to: field in Extractors, Assertions 
: When entering a value in JMeter Variable Name, the radio box 
JMeter Variable Name should be selected by default
 
 
 Functions




svn commit: r1815239 - in /jmeter/trunk: src/core/org/apache/jmeter/resources/messages.properties src/core/org/apache/jmeter/resources/messages_fr.properties xdocs/changes.xml xdocs/usermanual/compone

2017-11-14 Thread pmouawad
Author: pmouawad
Date: Tue Nov 14 18:01:25 2017
New Revision: 1815239

URL: http://svn.apache.org/viewvc?rev=1815239=rev
Log:
Bug 61756 - Extractors : Improve label name "Reference name" to make it clear 
what it makes
Bugzilla Id: 61756

Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1815239=1815238=1815239=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue 
Nov 14 18:01:25 2017
@@ -561,11 +561,11 @@ jsonpath_tester_field=JSON Path Expressi
 jsonpath_tester_button_test=Test
 jsonpath_render_no_text=No Text
 json_post_processor_title=JSON Extractor
-jsonpp_variable_names=Variable names
-jsonpp_json_path_expressions=JSON Path expressions
-jsonpp_default_values=Default Values
-jsonpp_match_numbers=Match No. (0 for Random)
-jsonpp_compute_concat=Compute concatenation var (suffix _ALL)
+jsonpp_variable_names=Names of created variables\:
+jsonpp_json_path_expressions=JSON Path expressions\:
+jsonpp_default_values=Default Values\:
+jsonpp_match_numbers=Match No. (0 for Random)\:
+jsonpp_compute_concat=Compute concatenation var (suffix _ALL)\:
 jsonpp_error_number_arguments_mismatch_error=Mismatch between number of 
variables, json expressions and default values
 junit_append_error=Append assertion errors
 junit_append_exception=Append runtime exceptions
@@ -815,7 +815,7 @@ realm=Realm
 record_controller_clear_samples=Clear all the recorded samples
 record_controller_title=Recording Controller
 redo=Redo
-ref_name_field=Reference Name\:
+ref_name_field=Name of created variable\:
 regex_extractor_title=Regular Expression Extractor
 regex_field=Regular Expression\:
 regex_params_names_field=Parameter names regexp group number
@@ -1165,7 +1165,7 @@ tcp_timeout=Timeout (milliseconds)\:
 teardown_on_shutdown=Run tearDown Thread Groups after shutdown of main threads
 template_choose=Select Template
 template_create_from=Create
-template_field=Template\:
+template_field=Template\ ($i$ where i is capturing group number, starts at 1):
 template_load?=Load template ?
 template_menu=Templates...
 template_merge_from=Merge

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1815239=1815238=1815239=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Tue Nov 14 18:01:25 2017
@@ -556,12 +556,12 @@ jsonpath_renderer=Testeur JSON Path
 jsonpath_tester_button_test=Tester
 jsonpath_tester_field=Expression JSON Path
 jsonpath_tester_title=Testeur JSON Path
-jsonpp_compute_concat=Calculer la variable de concat\u00E9nation (suffix _ALL)
-jsonpp_default_values=Valeur par d\u00E9fault
+jsonpp_compute_concat=Calculer la variable de concat\u00E9nation (suffix 
_ALL)\:
+jsonpp_default_values=Valeur par d\u00E9fault\:
 jsonpp_error_number_arguments_mismatch_error=D\u00E9calage entre nombre de 
variables, expressions et valeurs par d\u00E9faut
-jsonpp_json_path_expressions=Expressions JSON Path
-jsonpp_match_numbers=R\u00E9cup\u00E9rer la Ni\u00E8me corresp. (0 \: 
Al\u00E9atoire)
-jsonpp_variable_names=Noms des variables
+jsonpp_json_path_expressions=Expressions JSON Path\:
+jsonpp_match_numbers=R\u00E9cup\u00E9rer la Ni\u00E8me corresp. (0 \: 
Al\u00E9atoire)\:
+jsonpp_variable_names=Noms des variables cr\u00e9\u00e9es\:
 junit_append_error=Concat\u00E9ner les erreurs d'assertion
 junit_append_exception=Concat\u00E9ner les exceptions d'ex\u00E9cution
 junit_constructor_error=Impossible de cr\u00E9er une instance de la classe
@@ -805,7 +805,7 @@ realm=Univers (realm)
 record_controller_clear_samples=Supprimer tous les \u00E9chantillons
 record_controller_title=Contr\u00F4leur Enregistreur
 redo=R\u00E9tablir
-ref_name_field=Nom de r\u00E9f\u00E9rence \:
+ref_name_field=Nom de la variable cr\u00e9\u00e9e \:
 regex_extractor_title=Extracteur Expression r\u00E9guli\u00E8re
 regex_field=Expression r\u00E9guli\u00E8re \:
 regex_params_names_field=Num\u00E9ro du groupe de la Regex pour les noms des 
param\u00E8tres

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1815239=1815238=1815239=diff

svn commit: r1815243 - in /jmeter/trunk: src/core/org/apache/jmeter/resources/messages.properties src/core/org/apache/jmeter/resources/messages_fr.properties xdocs/usermanual/component_reference.xml

2017-11-14 Thread pmouawad
Author: pmouawad
Date: Tue Nov 14 18:19:47 2017
New Revision: 1815243

URL: http://svn.apache.org/viewvc?rev=1815243=rev
Log:
Use JMeter variable name to use instead of JMeter Variable.
People always put ${varName} instead of varName

Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1815243=1815242=1815243=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue 
Nov 14 18:19:47 2017
@@ -946,7 +946,7 @@ sample_scope=Apply to:
 sample_scope_all=Main sample and sub-samples
 sample_scope_children=Sub-samples only
 sample_scope_parent=Main sample only
-sample_scope_variable=JMeter Variable
+sample_scope_variable=JMeter Variable Name to use
 sampler_label=Label
 sampler_on_error_action=Action to be taken after a Sampler error
 sampler_on_error_continue=Continue

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1815243=1815242=1815243=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Tue Nov 14 18:19:47 2017
@@ -936,7 +936,7 @@ sample_scope=Appliquer sur
 sample_scope_all=L'\u00E9chantillon et ses ressources li\u00E9es
 sample_scope_children=Les ressources li\u00E9es
 sample_scope_parent=L'\u00E9chantillon
-sample_scope_variable=Une variable \:
+sample_scope_variable=Nom de la variable \u00e0 utiliser \:
 sample_timeout_memo=Interrompre l'\u00E9chantillon si le d\u00E9lai est 
d\u00E9pass\u00E9
 sample_timeout_timeout=D\u00E9lai d'attente avant interruption (en 
millisecondes) \: 
 sample_timeout_title=Compteur Interruption

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1815243=1815242=1815243=diff
==
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Tue Nov 14 18:19:47 
2017
@@ -4535,10 +4535,10 @@ These can be used anywhere within the ex
 This is for use with samplers that can generate sub-samples, 
 e.g. HTTP Sampler with embedded resources, Mail Reader or samples 
generated by the Transaction Controller.
 
-Main sample only - assertion only applies to the main 
sample
-Sub-samples only - assertion only applies to the 
sub-samples
-Main sample and sub-samples - assertion applies to 
both.
-JMeter Variable - assertion is to be applied to the 
contents of the named variable
+Main sample only - only applies to the main 
sample
+Sub-samples only - only applies to the 
sub-samples
+Main sample and sub-samples - applies to both.
+JMeter Variable Name to use - assertion is to be 
applied to the contents of the named variable
 
 
 Instructs JMeter which 
field of the Request or Response to test.
@@ -4630,7 +4630,7 @@ the size be equal to, greater than, less
 Main sample only - assertion only applies to the main 
sample
 Sub-samples only - assertion only applies to the 
sub-samples
 Main sample and sub-samples - assertion applies to 
both.
-JMeter Variable - assertion is to be applied to the 
contents of the named variable
+JMeter Variable Name to use - assertion is to be 
applied to the contents of the named variable
 
 
 The number of bytes to 
use in testing the size of the response (or value of the JMeter 
variable).
@@ -5655,7 +5655,7 @@ generate the template string, and store
 Main sample only - only applies to the main 
sample
 Sub-samples only - only applies to the 
sub-samples
 Main sample and sub-samples - applies to both.
-JMeter Variable - assertion is to be applied to the 
contents of the named variable
+JMeter Variable Name to use - extraction is to be 
applied to the contents of the named variable
 
 Matching is applied to all qualifying samples in turn.
 For example if there is a main sample and 3 sub-samples, each of which 
contains a single match for the regex,
@@ -5766,7 +5766,7 @@ extracting the node as text or attribute