svn commit: r1811623 - in /jmeter/trunk: src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties src/core/org/apache/jmeter/resources/messages_fr.properties test/src/org/apache/jmeter/control/TestIfController.java

[ag...@apache.org]

Author: agomes
Date: Mon Oct  9 22:53:09 2017
New Revision: 1811623

URL: http://svn.apache.org/viewvc?rev=1811623&view=rev
Log:
Bug 61602 - Fix broken tests - part1

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
    jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties?rev=1811623&r1=1811622&r2=1811623&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties Mon Oct  9 22:53:09 2017
@@ -20,16 +20,16 @@ parameters.displayName=Param\u00E9trer l
 options.displayName=Options
 # fields
 startValue.displayName=Valeur initiale
-#startValue.shortDescription=The starting value for the counter. The counter will equal this value during the first iteration.
+startValue.shortDescription=Valeur initiale
 maxValue.displayName=Valeur maximum
-#maxValue.shortDescription=If the counter exceeds the maximum, then it is reset to the Starting value. Default is Long.MAX_VALUE (2^63-1)
+maxValue.shortDescription=Si le compteur d\u00e9passe la valeur maximale, alors r\u00E9initialise le compteur avec la valeur initiale. La valeur par d\u00e9faut est Long.MAX_VALUE (2^63-1)
 varName.displayName=Nom de r\u00E9f\u00E9rence
-#varName.shortDescription=This controls how you refer to this value in other elements
+varName.shortDescription=Nom de r\u00E9f\u00E9rence utilis\u00e9 dans les autres composants
 format.displayName=Format du nombre
-#format.shortDescription=Optional format, e.g. 000 will format as 001, 002, etc.
+format.shortDescription=Optionnel. Ex: 000 pour 001, 002, etc.
 increment.displayName=Incr\u00E9ment
-#increment.shortDescription=How much to increment the counter by after each iteration.
+increment.shortDescription=Valeur d'incr\u00e9mentation pour chaque it\u00e9ration
 perUser.displayName=Suivre le compteur ind\u00E9pendamment pour chaque unit\u00E9 de test
-#perUser.shortDescription=Is this a global counter, or does each user get their own counter? If unchecked, the counter is global (i.e., user #1 will get value "1", and user #2 will get value "2" on the first iteration).
+perUser.shortDescription=Si la valeur est false, le compteur est global
 resetPerTGIteration.displayName=R\u00E9initialiser le compteur \u00E0 chaque it\u00E9ration du groupe d'unit\u00E9s
-#resetPerTGIteration.shortDescription=This option is only available when counter is tracked per User, if checked, counter will be reset to Start value on each Thread Group iteration.
\ No newline at end of file
+resetPerTGIteration.shortDescription=Option disponible si Suivre le compteur ind\u00E9pendamment pour chaque unit\u00E9 de test est selectionn\u00e9

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=1811623&r1=1811622&r2=1811623&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Mon Oct  9 22:53:09 2017
@@ -209,6 +209,7 @@ cookie_manager_policy=Politique des cook
 cookie_manager_title=Gestionnaire de cookies HTTP
 cookie_options=Options
 cookies_stored=Cookies stock\u00E9s
+copy=Copier
 countlim=Limiter le nombre d'\u00E9l\u00E9ments retourn\u00E9s \u00E0
 critical_section_controller_label=Nom du verrou
 critical_section_controller_title=Contr\u00F4leur Section critique

Modified: jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java?rev=1811623&r1=1811622&r2=1811623&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java Mon Oct  9 22:53:09 2017
@@ -102,8 +102,8 @@ public class TestIfController extends JM
         ifCont2.setEvaluateAll(false);
 
         CounterConfig counterConfig = new CounterConfig();
-        counterConfig.setStart(1);
-        counterConfig.setIncrement(1);
+        counterConfig.setStartValue("1");
+        counterConfig.setIncrement("1");
         counterConfig.setVarName("VAR1");
 
         DebugSampler debugSampler2 = new DebugSampler();