[robotframework] 5 new revisions pushed by [email protected] on 2013-05-06 11:21 GMT

Mon, 06 May 2013 04:22:21 -0700 

5 new revisions:

Revision: 0403877e7140
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 03:29:29 2013
Log:      Fixed typos in user guide...
http://code.google.com/p/robotframework/source/detail?r=0403877e7140

Revision: b5ff0515391c
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 03:48:33 2013
Log:      Updated documentation...
http://code.google.com/p/robotframework/source/detail?r=b5ff0515391c

Revision: 2f73ae0031d2
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 04:20:57 2013
Log:      Fine-tuned documentation of Exit For Loop and Continue For Loop
http://code.google.com/p/robotframework/source/detail?r=2f73ae0031d2

Revision: 0a7a31884b99
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 04:21:15 2013
Log:      Regen user guide
http://code.google.com/p/robotframework/source/detail?r=0a7a31884b99

Revision: d71023919674
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 04:21:31 2013
Log:      merge
http://code.google.com/p/robotframework/source/detail?r=d71023919674

==============================================================================
Revision: 0403877e7140
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 03:29:29 2013
Log:      Fixed typos in user guide

Update issue 1125

Fixed typos in user guide
http://code.google.com/p/robotframework/source/detail?r=0403877e7140

Modified:
 /doc/userguide/src/CreatingTestData/AdvancedFeatures.rst

=======================================
--- /doc/userguide/src/CreatingTestData/AdvancedFeatures.rst Fri May 3 07:11:54 2013 +++ /doc/userguide/src/CreatingTestData/AdvancedFeatures.rst Mon May 6 03:29:29 2013 
@@ -411,7 +411,7 @@
============ =============== ============== ================= ============= ======== Test Case Action Argument Argument Argument Argument ============ =============== ============== ================= ============= ======== 
-   Exit Example  {text}=          Set Variable    ${EMPTY}
+   Exit Example  ${text}=         Set Variable    ${EMPTY}
\ :FOR ${var} IN one two \ Run Keyword If '${var}' == 'two' Exit For Loop \ ${text}= Set Variable ${text}${var} 
@@ -438,14 +438,14 @@
================ =============== ============== ====================== ================= ======== ======== Test Case Action Argument Argument Argument Argument Argument ================ =============== ============== ====================== ================= ======== ======== 
-   Continue Example  {text}=          Set Variable    ${EMPTY}
+   Continue Example  ${text}=         Set Variable    ${EMPTY}
\ :FOR ${var} IN one two three \ Run Keyword If '${var}' == 'two' Continue For Loop \ ${text}= Set Variable ${text}${var} 
    \                 Should Be Equal  ${text}          onethree
================ =============== ============== ====================== ================= ======== ======== 

-.. note:: Continue for loop functionality is new in Robot Framework 2.8
+.. note:: Continue for loop functionality is new in Robot Framework 2.8.


 Removing unnecessary keywords from outputs

==============================================================================
Revision: b5ff0515391c
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 03:48:33 2013
Log:      Updated documentation

Update issue 1125

Updated documentation
http://code.google.com/p/robotframework/source/detail?r=b5ff0515391c

Modified:
 /src/robot/libraries/BuiltIn.py

=======================================
--- /src/robot/libraries/BuiltIn.py     Thu May  2 09:00:26 2013
+++ /src/robot/libraries/BuiltIn.py     Mon May  6 03:48:33 2013
@@ -343,16 +343,47 @@
         raise error

     def continue_for_loop(self):
+        """Continues executing the enclosing for loop.
+
+ This keyword can be used in a for loop or in a keyword that the for loop + uses. In both cases the test execution continues with the next iteration 
+        of the for loop. If executed outside of a for loop, the test fails.
+
+        Example:
+        | :FOR | ${var} | IN | @{SOME LIST} |
+ | | Run Keyword If | '${var}' == 'CONTINUE' | Continue For Loop | 
+        |      | Do Something   | ${var} |
+
+        To conditionally continue for loop, see `Continue For Loop If`.
+
+        New in Robot Framework 2.8.
+        """
error = AssertionError('Continue for loop without enclosing for loop.') 
         error.ROBOT_CONTINUE_FOR_LOOP = True
         raise error

     def continue_for_loop_if(self, condition):
+ """Continues to the next iteration of the enclosing loop if given condition is true. 
+
+ This keyword can be used directly in a for loop or in a keyword that + the for loop uses. In both cases the test executions continues with the + next iteration of the for loop. If executed outside of a for loop, the 
+        test fails.
+
+        To unconditionally continue for loop, see `Continue For Loop`.
+
+        Example:
+        | :FOR | ${var} | IN | @{SOME LIST} |
+        |      | Continue For Loop If | '${var}' == 'CONTINUE' |
+        |      | Do Something | ${var} |
+
+        New in Robot Framework 2.8.
+        """
         if self._is_true(condition):
             self.continue_for_loop()

     def exit_for_loop(self):
-        """Immediately stops executing the enclosing for loop.
+        """Stops executing the enclosing for loop.
This keyword can be used directly in a for loop or in a keyword that 
         the for loop uses. In both cases the test execution continues after
@@ -374,8 +405,7 @@
         raise error

     def exit_for_loop_if(self, condition):
-        """Immediately stops executing the enclosing for loop if given
-        condition is true.
+ """Stops executing the enclosing for loop if given condition is true.
This keyword can be used directly in a for loop or in a keyword that 
         the for loop uses. In both cases the test execution continues after

==============================================================================
Revision: 2f73ae0031d2
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 04:20:57 2013
Log:      Fine-tuned documentation of Exit For Loop and Continue For Loop
http://code.google.com/p/robotframework/source/detail?r=2f73ae0031d2

Modified:
 /doc/userguide/src/CreatingTestData/AdvancedFeatures.rst

=======================================
--- /doc/userguide/src/CreatingTestData/AdvancedFeatures.rst Mon May 6 03:29:29 2013 +++ /doc/userguide/src/CreatingTestData/AdvancedFeatures.rst Mon May 6 04:20:57 2013 
@@ -423,14 +423,19 @@
 `Stopping test execution`_ for examples how to do this in Python and Java
 libraries.

-.. note:: Exit for loop functionality is new in Robot Framework 2.5.2.
+To conditionally exit for loop, you can use :name:`Exit For Loop If` instead of `Run Keyword If`. See how to use it in the example of :name:`Continue For Loop If` below. 
+
+.. note::
+    Exit for loop functionality is new in Robot Framework 2.5.2.
+
+    Exit For Loop If keyword is new in Robot Framework 2.8.

 Continuing for loop
 '''''''''''''''''''
In addition to exiting a for loop mid-iteration, it is also possible to continue to the next iteration of the loop before all keywords in a for loop have been executed. `BuiltIn keyword`_ :name:`Continue For Loop` can be used to skip rest of the keywords in the enclosing for loop to move on to the next iteration of the loop.
-:name:`Continue For Loop` keyword can be used directly`in a for loop or in a keyword that the for loop uses. In both cases the test execution continues with the next iteration of the loop. If executed outside of a for loop, the test fails. +:name:`Continue For Loop` keyword can be used directly in a for loop or in a keyword that the for loop uses. In both cases the test execution continues with the next iteration of the loop. If executed outside of a for loop, the test fails. 

 .. table:: Continue for loop example
    :class: example
@@ -445,8 +450,23 @@
    \                 Should Be Equal  ${text}          onethree
================ =============== ============== ====================== ================= ======== ======== 

-.. note:: Continue for loop functionality is new in Robot Framework 2.8.
+To conditionally continue for loop, you can use :name:`Continue For Loop If` instead of `Run Keyword If`. 

+.. table:: Example of Continue For Loop If
+   :class: example
+
+ ================ =============== ==================== ================ ============= ======== ======== + Test Case Action Argument Argument Argument Argument Argument + ================ =============== ==================== ================ ============= ======== ======== 
+   Continue Example  ${text}=         Set Variable          ${EMPTY}
+ \ :FOR ${var} IN one two three + \ Continue For Loop If '${var}' == 'two + \ ${text}= Set Variable ${text}${var} 
+   \                 Should Be Equal  ${text}               onethree
+ ================ =============== ==================== ================ ============= ======== ======== 
+
+.. note::
+ Keywords Continue For Loop and Continue For Loop If are new in Robot Framework 2.8. 

 Removing unnecessary keywords from outputs
 ''''''''''''''''''''''''''''''''''''''''''

==============================================================================
Revision: 0a7a31884b99
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 04:21:15 2013
Log:      Regen user guide
http://code.google.com/p/robotframework/source/detail?r=0a7a31884b99

Modified:
 /doc/userguide/RobotFrameworkUserGuide.html

=======================================
--- /doc/userguide/RobotFrameworkUserGuide.html Fri May  3 07:12:00 2013
+++ /doc/userguide/RobotFrameworkUserGuide.html Mon May  6 04:21:15 2013
@@ -9391,7 +9391,7 @@
 </thead>
 <tbody valign="top">
 <tr><td>Exit Example</td>
-<td>{text}=</td>
+<td>${text}=</td>
 <td>Set Variable</td>
 <td>${EMPTY}</td>
 <td>&nbsp;</td>
@@ -9431,15 +9431,17 @@
raising an exception with <span class="code">ROBOT_EXIT_FOR_LOOP</span> attribute. Please see <a class="reference internal" href="#stopping-test-execution">Stopping test execution</a> for examples how to do this in Python and Java 
 libraries.</p>
+<p>To conditionally exit for loop, you can use <span class="name">Exit For Loop If</span> instead of <cite>Run Keyword If</cite>. See how to use it in the example of <span class="name">Continue For Loop If</span> below.</p> 
 <div class="note">
 <p class="first admonition-title">Note</p>
-<p class="last">Exit for loop functionality is new in Robot Framework 2.5.2.</p> 
+<p>Exit for loop functionality is new in Robot Framework 2.5.2.</p>
+<p class="last">Exit For Loop If keyword is new in Robot Framework 2.8.</p>
 </div>
 </div>
 <div class="section" id="continuing-for-loop">
 <h4><a class="toc-backref" href="#id500">Continuing for loop</a></h4>
<p>In addition to exiting a for loop mid-iteration, it is also possible to continue to the next iteration of the loop before all keywords in a for loop have been executed. <a class="reference internal" href="#builtin-library">BuiltIn keyword</a> <span class="name">Continue For Loop</span> can be used to skip rest of the keywords in the enclosing for loop to move on to the next iteration of the loop.</p> -<p><span class="name">Continue For Loop</span> keyword can be used directly`in a for loop or in a keyword that the for loop uses. In both cases the test execution continues with the next iteration of the loop. If executed outside of a for loop, the test fails.</p> +<p><span class="name">Continue For Loop</span> keyword can be used directly in a for loop or in a keyword that the for loop uses. In both cases the test execution continues with the next iteration of the loop. If executed outside of a for loop, the test fails.</p> 
 <table border="1" class="example docutils">
 <caption>Continue for loop example</caption>
 <colgroup>
@@ -9463,7 +9465,7 @@
 </thead>
 <tbody valign="top">
 <tr><td>Continue Example</td>
-<td>{text}=</td>
+<td>${text}=</td>
 <td>Set Variable</td>
 <td>${EMPTY}</td>
 <td>&nbsp;</td>
@@ -9486,6 +9488,71 @@
 <td>&nbsp;</td>
 <td>&nbsp;</td>
 </tr>
+<tr><td></td>
+<td>&nbsp;</td>
+<td>${text}=</td>
+<td>Set Variable</td>
+<td>${text}${var}</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+</tr>
+<tr><td></td>
+<td>Should Be Equal</td>
+<td>${text}</td>
+<td>onethree</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<p>To conditionally continue for loop, you can use <span class="name">Continue For Loop If</span> instead of <cite>Run Keyword If</cite>.</p> 
+<table border="1" class="example docutils">
+<caption>Example of Continue For Loop If</caption>
+<colgroup>
+<col width="17%" />
+<col width="16%" />
+<col width="21%" />
+<col width="17%" />
+<col width="14%" />
+<col width="8%" />
+<col width="8%" />
+</colgroup>
+<thead valign="bottom">
+<tr><th class="head">Test Case</th>
+<th class="head">Action</th>
+<th class="head">Argument</th>
+<th class="head">Argument</th>
+<th class="head">Argument</th>
+<th class="head">Argument</th>
+<th class="head">Argument</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr><td>Continue Example</td>
+<td>${text}=</td>
+<td>Set Variable</td>
+<td>${EMPTY}</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+</tr>
+<tr><td></td>
+<td>:FOR</td>
+<td>${var}</td>
+<td>IN</td>
+<td>one</td>
+<td>two</td>
+<td>three</td>
+</tr>
+<tr><td></td>
+<td>&nbsp;</td>
+<td>Continue For Loop If</td>
+<td>'${var}' == 'two</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+</tr>
 <tr><td></td>
 <td>&nbsp;</td>
 <td>${text}=</td>
@@ -9506,7 +9573,7 @@
 </table>
 <div class="note">
 <p class="first admonition-title">Note</p>
-<p class="last">Continue for loop functionality is new in Robot Framework 2.8</p> +<p class="last">Keywords Continue For Loop and Continue For Loop If are new in Robot Framework 2.8.</p> 
 </div>
 </div>
 <div class="section" id="removing-unnecessary-keywords-from-outputs">
@@ -16557,7 +16624,7 @@
 <div class="footer">
 <hr class="footer" />
<p>Generated by <a class="reference external" href="http://docutils.sourceforge.net/rst.html";>reStructuredText</a>. Syntax highlighting by <a class="reference external" href="http://pygments.org/";>Pygments</a>.</p> 
-<p>Generated on: 2013-05-03 14:11 UTC.
+<p>Generated on: 2013-05-06 11:20 UTC.
 </p>

 </div>

==============================================================================
Revision: d71023919674
Branch:   default
Author:   Tatu Kairi <[email protected]>
Date:     Mon May  6 04:21:31 2013
Log:      merge
http://code.google.com/p/robotframework/source/detail?r=d71023919674


--
--- You received this message because you are subscribed to the Google Groups "robotframework-commit" group. 
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to