You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2021/09/21 10:35:31 UTC

[jmeter] branch master updated (605ea41 -> 462aaeb)

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.


    from 605ea41  Use better name for private functions param
     new 4d518ff  timeShift function docs update.
     new 462aaeb  Add more details to documentation for timeShift function

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 xdocs/changes.xml              | 2 ++
 xdocs/usermanual/functions.xml | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

[jmeter] 01/02: timeShift function docs update.

Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 4d518fffa6545ce918e20c8542301066af85287c
Author: Mariusz <ma...@gmail.com>
AuthorDate: Sun Sep 19 15:17:24 2021 +0200

    timeShift function docs update.
---
 xdocs/usermanual/functions.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xdocs/usermanual/functions.xml b/xdocs/usermanual/functions.xml
index e537789..68b7ff2 100644
--- a/xdocs/usermanual/functions.xml
+++ b/xdocs/usermanual/functions.xml
@@ -1575,13 +1575,14 @@ returns:
     </description>
 <properties>
         <property name="Format" required="No">
-        The format to be passed to DateTimeFormatter.
+        The format to be passed to DateTimeFormatter (for input data parsing and output formating).
         See <a href="https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html">DateTimeFormatter</a>
         If omitted, the function uses milliseconds since epoch format.
         </property>
         <property name="Date to shift" required="No">
         Indicate the date in the format set by the parameter <code>Format</code> to shift.
-        If omitted, the date is set to <em>now</em>.
+        If omitted, the date is set to <em>ZonedDateTime.now</em> with system zone <em>ZoneId.systemDefault()</em>.
+        <note>If <code>Format</code> is empty then this parameter must be long value (look at examples).</note>
         </property>
         <property name="value to shift" required="No">
         Indicate the specified amount of seconds, minutes, hours or days to shift according to a textual
@@ -1607,6 +1608,8 @@ returns:
 <p>Examples:
 <source>${__timeShift(dd/MM/yyyy,21/01/2018,P2D,,)}</source> returns <code>23/01/2018</code>
 <source>${__timeShift(dd MMMM yyyy,21 février 2018,P2D,fr_FR,)}</source> returns <code>23 février 2018</code>
+<source>${__timeShift(,10000,PT10S,,)}</source> returns <code>20000</code> = 10sec input + 10sec shift
+<source>${__timeShift(,,PT10S,,)}</source> returns <code>1632158276770</code> = 1632158266770 ms (now) + 10sec shift
 </p>
 </component>
 <component index="&sect-num;.5.34" name="__digest">

[jmeter] 02/02: Add more details to documentation for timeShift function

Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 462aaeba1de76d92d0ebd1d69c03b1a8c369ecf6
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Tue Sep 21 12:34:49 2021 +0200

    Add more details to documentation for timeShift function
    
    Contributed by Mariusz (mawasak at gmail.com)
    
    Closes #672
---
 xdocs/changes.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index deda11c..a7152b7 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -175,6 +175,7 @@ Summary
      Contributed by Rithvik Patibandla (rithvikp98 at gmail.com)</li>
   <li><bug>65456</bug>Updated commons-jexl 3 to 3.2.1 (from 3.1). Contributed by Ori Marko (orimarko at gmail.com>)</li>
   <li><pr>654</pr>Try do give better feedback while loading keystores</li>
+  <li><pr>672</pr>Add more details to documentation for timeShift function. Contributed by Mariusz (mawasak at gmail.com)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
@@ -261,6 +262,7 @@ Summary
   <li>Till Neunast (github.com/tilln)</li>
   <li>Baptiste Gaillard (baptiste.gaillard at gmail.com)</li>
   <li>Rithvik Patibandla (rithvikp98 at gmail.com)</li>
+  <li>Mariusz (mawasak at gmail.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>