[robotframework commit] r1720 - Tests for Get Count and enhanced tests for Should (Not) Contain X Times (issue 277)

[codesite-noreply]

Author: pekka.klarck
Date: Tue Apr  7 08:12:44 2009
New Revision: 1720
Modified:
   trunk/atest/robot/standard_libraries/builtin/verify.html
   trunk/atest/testdata/standard_libraries/builtin/verify.html

Log:
Tests for Get Count and enhanced tests for Should (Not) Contain X Times  
(issue 277)

Modified: trunk/atest/robot/standard_libraries/builtin/verify.html
==============================================================================
--- trunk/atest/robot/standard_libraries/builtin/verify.html    (original)
+++ trunk/atest/robot/standard_libraries/builtin/verify.html	Tue Apr  7  
08:12:44 2009
@@ -438,7 +438,7 @@



-      <td>${LIST}</td>
+      <td></td>



@@ -446,7 +446,7 @@



-      <td>a</td>
+      <td></td>



@@ -454,7 +454,7 @@



-      <td>b</td>
+      <td></td>



@@ -462,7 +462,7 @@



-      <td>c</td>
+      <td></td>



@@ -470,7 +470,7 @@



-      <td>b</td>
+      <td></td>



@@ -3222,7 +3222,7 @@



-     
<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Should&nbsp;Match  
Regexp Returns Match And Groups</td><td>Check  
testcase</td><td>Should&nbsp;Match Regexp Returns Match And  
Groups</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Get  
Length</td><td>${tc} =</td><td>Check Test Case</td><td>Get  
Length</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[0].kws[1].msgs[0]}</td><td>Length is  
0</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[1].kws[1].msgs[0]}</td><td>Length is  
1</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[2].kws[1].msgs[0]}</td><td>Length is  
2</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[3].kws[1].msgs[0]}</td><td>Length is  
3</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[4].kws[1].msgs[0]}</td><td>Length is  
11</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[5].kws[1].msgs[0]}</td><td>Length is  
0</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Length  
Should Be</td><td>Check Test Case</td><td>Length Should  
Be</td><td></td><td></td></tr><tr><td>Length Should Be With Non Default  
Message</td><td>Check Test Case</td><td>Length Should Be With Non Default  
Message</td><td></td><td></td></tr><tr><td>Length Should Be With Invalid  
Length</td><td>Check Test Case</td><td>Length Should Be With Invalid  
Length</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Should  
Be Empty</td><td>Check testcase</td><td>Should Be  
Empty</td><td></td><td></td></tr><tr><td>Should Be Empty With Non Default  
Message</td><td>Check testcase</td><td>Should Be Empty With Non Default  
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
+     
<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Should&nbsp;Match  
Regexp Returns Match And Groups</td><td>Check  
testcase</td><td>Should&nbsp;Match Regexp Returns Match And  
Groups</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Get  
Length</td><td>${tc} =</td><td>Check Test Case</td><td>Get  
Length</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[0].kws[0].msgs[0]}</td><td>Length is  
0</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[1].kws[0].msgs[0]}</td><td>Length is  
1</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[2].kws[0].msgs[0]}</td><td>Length is  
2</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[3].kws[0].msgs[0]}</td><td>Length is  
3</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[4].kws[0].msgs[0]}</td><td>Length is  
11</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[5].kws[0].msgs[0]}</td><td>Length is  
0</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Length  
Should Be</td><td>Check Test Case</td><td>Length Should  
Be</td><td></td><td></td></tr><tr><td>Length Should Be With Non Default  
Message</td><td>Check Test Case</td><td>Length Should Be With Non Default  
Message</td><td></td><td></td></tr><tr><td>Length Should Be With Invalid  
Length</td><td>Check Test Case</td><td>Length Should Be With Invalid  
Length</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Should  
Be Empty</td><td>Check testcase</td><td>Should Be  
Empty</td><td></td><td></td></tr><tr><td>Should Be Empty With Non Default  
Message</td><td>Check testcase</td><td>Should Be Empty With Non Default  
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>



@@ -3286,7 +3286,7 @@



-    </tr><tr><td>Should Not Be Empty With Non Default  
Message</td><td>Check testcase</td><td>Should Not Be Empty With Non Default  
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Length  
With Length Method</td><td>Check testcase</td><td>Length With Length  
Method</td><td></td><td></td></tr><tr><td>Length With Size  
Method</td><td>Check testcase</td><td>Length With Size  
Method</td><td></td><td></td></tr><tr><td>Length With Length  
Attribute</td><td>Check testcase</td><td>Length With Length  
Attribute</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Length  
Of Java Types</td><td>[ Documentation ]</td><td>Tests that it's possible to  
get &nbsp;the lenght of&nbsp;</td><td>String, Vector, Hashtable and  
array</td><td></td></tr><tr><td></td><td>[ Tags  
]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>Check  
testcase</td><td>Length Of Java  
Types</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Should  
Contain X Times With String</td><td>Check testcase</td><td>Should Contain X  
Times With String</td><td></td><td></td></tr><tr><td>Should Contain X Times  
With List</td><td>Check testcase</td><td>Should Contain X Times With  
List</td><td></td><td></td></tr><tr><td>Should Contain X Times With  
Tuple</td><td>Check testcase</td><td>Should Contain X Times With  
Tuple</td><td></td><td></td></tr><tr><td>Should Contain X With Java Array  
and  
Vector</td><td>[Tags]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>Check  
testcase</td><td>Should Contain X With Java Array and  
Vector</td><td></td><td></td></tr><tr><td>Should Contain X With Invalid  
Item</td><td>Check testcase</td><td>Should Contain X With Invalid  
Item</td><td></td><td></td></tr><tr><td>Should Contain X Times With Invalid  
count</td><td>Check testcase</td><td>Should Contain X Times With Invalid  
count</td><td></td><td></td></tr><tr><td>Should Contain X Times Failing  
With Default Message</td><td>Check testcase</td><td>Should Contain X Times  
Failing With Default Message</td><td></td><td></td></tr><tr><td>Should  
Contain X Times Failing With Defined Message</td><td>Check  
testcase</td><td>Should Contain X Times Failing With Defined  
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Should  
Not Contain X Times With String</td><td>Check testcase</td><td>Should Not  
Contain X Times With String</td><td></td><td></td></tr><tr><td>Should Not  
Contain X Times With List</td><td>Check testcase</td><td>Should Not Contain  
X Times With List</td><td></td><td></td></tr><tr><td>Should Not Contain X  
Times With Tuple</td><td>Check testcase</td><td>Should Not Contain X Times  
With Tuple</td><td></td><td></td></tr><tr><td>Should Not Contain X Times  
With Invalid Item</td><td>Check testcase</td><td>Should Not Contain X Times  
With Invalid Item</td><td></td><td></td></tr><tr><td>Should Not Contain X  
Times With Invalid count</td><td>Check testcase</td><td>Should Not Contain  
X Times With Invalid count</td><td></td><td></td></tr><tr><td>Should Not  
Contain X Times Failing With Default Message</td><td>Check  
testcase</td><td>Should Not Contain X Times Failing With Default  
Message</td><td></td><td></td></tr><tr><td>Should Not Contain X Times  
Failing With Defined Message</td><td>Check testcase</td><td>Should Not  
Contain X Times Failing With Defined  
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr>
+    </tr><tr><td>Should Not Be Empty With Non Default  
Message</td><td>Check testcase</td><td>Should Not Be Empty With Non Default  
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Length  
With Length Method</td><td>Check testcase</td><td>Length With Length  
Method</td><td></td><td></td></tr><tr><td>Length With Size  
Method</td><td>Check testcase</td><td>Length With Size  
Method</td><td></td><td></td></tr><tr><td>Length With Length  
Attribute</td><td>Check testcase</td><td>Length With Length  
Attribute</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Length  
Of Java Types</td><td>[ Documentation ]</td><td>Tests that it's possible to  
get &nbsp;the lenght of&nbsp;</td><td>String, Vector, Hashtable and  
array</td><td></td></tr><tr><td></td><td>[ Tags  
]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>Check  
testcase</td><td>Length Of Java  
Types</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Should  
Contain X Times With String</td><td>${tc} =</td><td>Check  
testcase</td><td>Should Contain X Times With  
String</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[0].msgs[0]}</td><td>Item found from the first item  
2 times</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[1].msgs[0]}</td><td>Item found from the first item  
1 time</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[3].msgs[0]}</td><td>Item found from the first item  
0 times</td><td></td></tr><tr><td>Should Contain X Times With  
List</td><td>${tc} =</td><td>Check testcase</td><td>Should Contain X Times  
With List</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[0].msgs[0]}</td><td>Item found from the first item  
1 time</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[1].msgs[0]}</td><td>Item found from the first item  
2 times</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[3].msgs[0]}</td><td>Item found from the first item  
0 times</td><td></td></tr><tr><td>Should Contain X Times With  
Tuple</td><td>Check testcase</td><td>Should Contain X Times With  
Tuple</td><td></td><td></td></tr><tr><td>Should Contain X With Java Array  
and  
Vector</td><td>[Tags]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>Check  
testcase</td><td>Should Contain X With Java Array and  
Vector</td><td></td><td></td></tr><tr><td>Should Contain X With Invalid  
Item</td><td>Check testcase</td><td>Should Contain X With Invalid  
Item</td><td></td><td></td></tr><tr><td>Should Contain X Times With Invalid  
count</td><td>Check testcase</td><td>Should Contain X Times With Invalid  
count</td><td></td><td></td></tr><tr><td>Should Contain X Times Failing  
With Default Message</td><td>Check testcase</td><td>Should Contain X Times  
Failing With Default Message</td><td></td><td></td></tr><tr><td>Should  
Contain X Times Failing With Defined Message</td><td>Check  
testcase</td><td>Should Contain X Times Failing With Defined  
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Should  
Not Contain X Times With String</td><td>${tc} =</td><td>Check  
testcase</td><td>Should Not Contain X Times With  
String</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[0].msgs[0]}</td><td>Item found from the first item  
1 time</td><td></td></tr><tr><td>Should Not Contain X Times With  
List</td><td>Check testcase</td><td>Should Not Contain X Times With  
List</td><td></td><td></td></tr><tr><td>Should Not Contain X Times With  
Tuple</td><td>Check testcase</td><td>Should Not Contain X Times With  
Tuple</td><td></td><td></td></tr><tr><td>Should Not Contain X Times With  
Invalid Item</td><td>Check testcase</td><td>Should Not Contain X Times With  
Invalid Item</td><td></td><td></td></tr><tr><td>Should Not Contain X Times  
With Invalid count</td><td>Check testcase</td><td>Should Not Contain X  
Times With Invalid count</td><td></td><td></td></tr><tr><td>Should Not  
Contain X Times Failing With Default Message</td><td>Check  
testcase</td><td>Should Not Contain X Times Failing With Default  
Message</td><td></td><td></td></tr><tr><td>Should Not Contain X Times  
Failing With Defined Message</td><td>${tc} =</td><td>Check  
testcase</td><td>Should Not Contain X Times Failing With Defined  
Message</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[0].msgs[0]}</td><td>Item found from the first item  
2  
times</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Get  
Count</td><td>[Documentation]</td><td>This keyword is also tested by Should  
(Not) Contain X Times keywords that use this keyword  
internally</td><td></td><td></td></tr><tr><td></td><td>${tc}  
=</td><td>Check testcase</td><td>Get  
Count</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[0].kws[0].msgs[0]}</td><td>Item found from the  
first item 2 times</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[1].kws[0].msgs[0]}</td><td>Item found from the  
first item 1 time</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[2].kws[0].msgs[0]}</td><td>Item found from the  
first item 1 time</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[3].kws[0].msgs[0]}</td><td>Item found from the  
first item 50 times</td><td></td></tr><tr><td></td><td>Check Log  
Message</td><td>${tc.kws[4].kws[0].msgs[0]}</td><td>Item found from the  
first item&nbsp;0 times</td><td></td></tr>




Modified: trunk/atest/testdata/standard_libraries/builtin/verify.html
==============================================================================
--- trunk/atest/testdata/standard_libraries/builtin/verify.html (original)
+++ trunk/atest/testdata/standard_libraries/builtin/verify.html	Tue Apr  7  
08:12:44 2009
@@ -109,9 +109,9 @@
 <td>${LIST}</td>
 <td>a</td>
 <td>b</td>
-<td>c</td>
+<td>cee</td>
 <td>b</td>
-</tr>
+</tr><tr><td>...</td><td>${42}</td><td></td><td></td><td></td></tr>
 </tbody>
 </table>
 <table border="1">
@@ -2023,11 +2023,11 @@
 <td>2</td>
 <td></td>
 </tr>
-<tr>
+<tr><td></td><td>Should Contain X  
Times</td><td>hello</td><td>ello</td><td>1</td><td></td></tr><tr><td></td><td>Should  
Contain X  
Times</td><td>hello</td><td>hello</td><td>1</td><td></td></tr><tr><td></td><td>Should  
Contain X Times</td><td>hello</td><td>x</td><td>0</td><td></td></tr><tr>
 <td>Should Contain X Times With List</td>
 <td>Should Contain X Times</td>
 <td>${LIST}</td>
-<td>a</td>
+<td>cee</td>
 <td>1</td>
 <td></td>
 </tr>
@@ -2039,7 +2039,7 @@
 <td>2</td>
 <td></td>
 </tr>
-<tr><td>Should Contain X Times With Tuple</td><td>Should Contain X  
Times</td><td>${TUPLE3}</td><td>a</td><td>1</td><td></td></tr><tr><td>Should  
Contain X With Java Array and Vector</td><td>Should Contain X  
Times</td><td>${ARRAY3}</td><td>a</td><td>1</td><td></td></tr><tr><td></td><td>Should  
Contain X  
Times</td><td>${VECTOR3}</td><td>a</td><td>1</td><td></td></tr><tr><td>Should  
Contain X With Invalid Item</td><td>[Documentation]</td><td>FAIL  
STARTS:</td><td>Converting '10' to list failed: TypeError:  
</td><td></td><td></td></tr><tr><td></td><td>Should Contain X  
Times</td><td>${10}</td><td>a</td><td>1</td><td></td></tr><tr><td>Should  
Contain X Times With Invalid count</td><td>[Documentation]</td><td>FAIL  
STARTS:</td><td>'invalid' cannot be converted to an integer: ValueError:  
</td><td></td><td></td></tr><tr><td></td><td>Should Contain X  
Times</td><td>hello</td><td>l</td><td>invalid</td><td></td></tr><tr>
+<tr><td></td><td>Should Contain X  
Times</td><td>${LIST}</td><td>${42}</td><td>1</td><td></td></tr><tr><td></td><td>Should  
Contain X  
Times</td><td>${LIST}</td><td>42</td><td>0</td><td></td></tr><tr><td>Should  
Contain X Times With Tuple</td><td>Should Contain X  
Times</td><td>${TUPLE3}</td><td>a</td><td>1</td><td></td></tr><tr><td>Should  
Contain X With Java Array and Vector</td><td>Should Contain X  
Times</td><td>${ARRAY3}</td><td>a</td><td>1</td><td></td></tr><tr><td></td><td>Should  
Contain X  
Times</td><td>${VECTOR3}</td><td>a</td><td>1</td><td></td></tr><tr><td>Should  
Contain X With Invalid Item</td><td>[Documentation]</td><td>FAIL  
STARTS:</td><td>Converting '10' to list failed: TypeError:  
</td><td></td><td></td></tr><tr><td></td><td>Should Contain X  
Times</td><td>${10}</td><td>a</td><td>1</td><td></td></tr><tr><td>Should  
Contain X Times With Invalid count</td><td>[Documentation]</td><td>FAIL  
STARTS:</td><td>'invalid' cannot be converted to an integer: ValueError:  
</td><td></td><td></td></tr><tr><td></td><td>Should Contain X  
Times</td><td>hello</td><td>l</td><td>invalid</td><td></td></tr><tr>
 <td>Should Contain X Times Failing With Default Message</td>
 <td>[Documentation]</td>
 <td>FAIL</td>
@@ -2067,7 +2067,7 @@
 <td></td>
 <td>Should Contain X Times</td>
 <td>hello</td>
-<td>l</td>
+<td>nonex</td>
 <td>3</td>
 <td>My message</td>
 </tr>
@@ -2080,7 +2080,7 @@
 <td>2</td>
 <td></td>
 </tr>
-<tr>
+<tr><td></td><td>Should Not Contain X  
Times</td><td>hello</td><td>nonex</td><td>100</td><td></td></tr><tr>
 <td>Should Not Contain X Times With List</td>
 <td>Should Not Contain X Times</td>
 <td>${LIST}</td>
@@ -2103,7 +2103,7 @@
 <td>My message</td>
 <td></td>
 <td></td>
-</tr><tr><td></td><td>Should Not Contain X  
Times</td><td>${LIST}</td><td>b</td><td>2</td><td>My  
message</td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+</tr><tr><td></td><td>Should Not Contain X  
Times</td><td>${LIST}</td><td>b</td><td>2</td><td>My  
message</td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Get  
Count</td><td>[Documentation]</td><td>This keyword is already tested pretty  
well by Should (Not) Contain X Times keywords that use this one as a  
helper. </td><td>FAIL STARTS: Converting 'None' to list failed:  
TypeError:</td><td></td><td></td></tr><tr><td></td><td>Verify Get  
Count</td><td>Hello,  
world!</td><td>o</td><td>2</td><td></td></tr><tr><td></td><td>Verify Get  
Count</td><td>${LIST}</td><td>cee</td><td>1</td><td></td></tr><tr><td></td><td>Verify  
Get  
Count</td><td>${TUPLE3}</td><td>a</td><td>1</td><td></td></tr><tr><td></td><td>Verify  
Get Count</td><td>${SPACE * 100}</td><td>${SPACE *  
2}</td><td>50</td><td></td></tr><tr><td></td><td>Verify Get  
Count</td><td>Hello, world!</td><td>no match  
here</td><td>0</td><td></td></tr><tr><td></td><td>Get  
Count</td><td>${None}</td><td>x</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td></tr>


 </tbody>
@@ -2126,13 +2126,7 @@
 <td>${exp}</td>
 <td></td>
 </tr>
-<tr>
-<td></td>
-<td>Log</td>
-<td>${item}</td>
-<td></td>
-<td></td>
-</tr>
+
 <tr>
 <td></td>
 <td>${length} =</td>
@@ -2154,14 +2148,14 @@
 <td>${exp}</td>
 <td></td>
 </tr>
-<tr>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
+<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Verify Get  
Count</td><td>[Arguments]</td><td>${item1}</td><td>${item2}</td><td>${exp}</td></tr><tr>
 <td></td>
+<td>${count} =</td><td>Get Count</td>
+
+<td>${item1}</td><td>${item2}</td>
+
 </tr>
-<tr>
+<tr><td></td><td>${exp} =</td><td>Convert To  
Integer</td><td>${exp}</td><td></td></tr><tr><td></td><td>Should Be  
Equal</td><td>${count}</td><td>${exp}</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
 <td align="undefined" valign="undefined">Verify
 Length Of Java Type</td>
 <td>[Arguments]</td>