[robotframework] 2 new revisions pushed by janne.t.harkonen on 2011-04-20 11:28 GMT

Wed, 20 Apr 2011 04:28:48 -0700 

2 new revisions:

Revision: f3c66a0fca39
Author:   Janne Härkönen <[email protected]>
Date:     Wed Apr 20 04:24:02 2011
Log:      BuiltIn: added helpers that do not log args...
http://code.google.com/p/robotframework/source/detail?r=f3c66a0fca39

Revision: 118eb0a221fc
Author:   Janne Härkönen <[email protected]>
Date:     Wed Apr 20 04:27:03 2011
Log:      Fixed depr BuiltIn test after intentional error message change
http://code.google.com/p/robotframework/source/detail?r=118eb0a221fc

==============================================================================
Revision: f3c66a0fca39
Author:   Janne Härkönen <[email protected]>
Date:     Wed Apr 20 04:24:02 2011
Log:      BuiltIn: added helpers that do not log args

There were some keyword that used should_(not)_be_equal in
a way where logging args made no sense.
http://code.google.com/p/robotframework/source/detail?r=f3c66a0fca39

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

=======================================
--- /src/robot/libraries/BuiltIn.py     Wed Apr 20 03:45:30 2011
+++ /src/robot/libraries/BuiltIn.py     Wed Apr 20 04:24:02 2011
@@ -200,7 +200,11 @@
         - Otherwise the error message is '`msg`: `first` != `second`'.
         """
         self._log_types(first, second)
- asserts.fail_unless_equal(first, second, msg, self._include_values(values)) 
+        self._should_be_equal(first, second, msg, values)
+
+    def _should_be_equal(self, first, second, msg, values):
+        asserts.fail_unless_equal(first, second, msg,
+                                  self._include_values(values))

     def _log_types(self, *args):
         msg = ["Argument types are:"] + [str(type(a)) for a in args]
@@ -218,6 +222,9 @@
         error message with `msg` and `values`.
         """
         self._log_types(first, second)
+        self._should_not_be_equal(first, second, msg, values)
+
+    def _should_not_be_equal(self, first, second, msg, values):
asserts.fail_if_equal(first, second, msg, self._include_values(values))
def should_not_be_equal_as_integers(self, first, second, msg=None, values=True): 
@@ -227,7 +234,7 @@
         error message with `msg` and `values`.
         """
first, second = [ self.convert_to_integer(i) for i in first, second ] 
-        self.should_not_be_equal(first, second, msg, values)
+        self._should_not_be_equal(first, second, msg, values)
def should_be_equal_as_integers(self, first, second, msg=None, values=True): 
         """Fails if objects are unequal after converting them to integers.
@@ -236,7 +243,7 @@
         error message with `msg` and `values`.
         """
first, second = [ self.convert_to_integer(i) for i in first, second ] 
-        self.should_be_equal(first, second, msg, values)
+        self._should_be_equal(first, second, msg, values)
def should_not_be_equal_as_numbers(self, first, second, msg=None, values=True): """Fails if objects are equal after converting them to real numbers. 
@@ -248,7 +255,7 @@
         """
         first = round(self.convert_to_number(first), 6)
         second = round(self.convert_to_number(second), 6)
-        self.should_not_be_equal(first, second, msg, values)
+        self._should_not_be_equal(first, second, msg, values)
def should_be_equal_as_numbers(self, first, second, msg=None, values=True): """Fails if objects are unequal after converting them to real numbers. 
@@ -260,7 +267,7 @@
         """
         first = round(self.convert_to_number(first), 6)
         second = round(self.convert_to_number(second), 6)
-        self.should_be_equal(first, second, msg, values)
+        self._should_be_equal(first, second, msg, values)
def should_not_be_equal_as_strings(self, first, second, msg=None, values=True): 
         """Fails if objects are equal after converting them to strings.
@@ -269,7 +276,7 @@
         error message with `msg` and `values`.
         """
first, second = [ self.convert_to_string(i) for i in first, second ] 
-        self.should_not_be_equal(first, second, msg, values)
+        self._should_not_be_equal(first, second, msg, values)
def should_be_equal_as_strings(self, first, second, msg=None, values=True): 
         """Fails if objects are unequal after converting them to strings.
@@ -278,7 +285,7 @@
         error message with `msg` and `values`.
         """
first, second = [ self.convert_to_string(i) for i in first, second ] 
-        self.should_be_equal(first, second, msg, values)
+        self._should_be_equal(first, second, msg, values)

     def should_not_start_with(self, str1, str2, msg=None, values=True):
         """Fails if the string `str1` starts with the string `str2`.

==============================================================================
Revision: 118eb0a221fc
Author:   Janne Härkönen <[email protected]>
Date:     Wed Apr 20 04:27:03 2011
Log:      Fixed depr BuiltIn test after intentional error message change
http://code.google.com/p/robotframework/source/detail?r=118eb0a221fc

Modified:
 /atest/testdata/standard_libraries/deprecated_builtin/verify.html

=======================================
--- /atest/testdata/standard_libraries/deprecated_builtin/verify.html Sat May 31 09:57:24 2008 +++ /atest/testdata/standard_libraries/deprecated_builtin/verify.html Wed Apr 20 04:27:03 2011 
@@ -17,6 +17,7 @@



+



@@ -77,7 +78,7 @@
 letter-spacing: 0.1em;
 }
 th { font-style: normal; } /* required for IE */
-  </style>
+  </style><title>Robot Test Cases</title>



@@ -113,8 +114,7 @@
- <title>Robot Test Cases</title><link type="text/css" href="resources/css/testdata.css" rel="stylesheet"></head> 
-<body>
+ <link type="text/css" href="resources/css/testdata.css" rel="stylesheet"></head><body> 



@@ -348,7 +348,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -366,7 +367,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -384,7 +386,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -402,7 +405,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -420,7 +424,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -728,7 +733,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -746,7 +752,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -764,7 +771,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -854,7 +862,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -872,7 +881,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -890,7 +900,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -912,16 +923,22 @@
     <tr>
       <td align="undefined" valign="undefined">${int0}</td>
       <td align="undefined" valign="undefined">${0}</td>
-      <td align="undefined" valign="undefined"></td>
-      <td align="undefined" valign="undefined"></td>
-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>
+      <td align="undefined" valign="undefined"><br>
+</td>
+      <td align="undefined" valign="undefined"><br>
+</td>
     </tr>
     <tr>
       <td align="undefined" valign="undefined">${int1}</td>
       <td align="undefined" valign="undefined">${1}</td>
-      <td align="undefined" valign="undefined"></td>
-      <td align="undefined" valign="undefined"></td>
-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>
+      <td align="undefined" valign="undefined"><br>
+</td>
+      <td align="undefined" valign="undefined"><br>
+</td>
     </tr>


@@ -1277,7 +1294,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1289,7 +1307,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1379,7 +1398,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1397,7 +1417,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1415,7 +1436,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1433,7 +1455,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1530,7 +1553,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1542,7 +1566,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1651,7 +1676,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1669,7 +1695,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1687,7 +1714,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1877,36 +1905,68 @@
- </td><td></td><td></td></tr><tr><td></td><td align="undefined" valign="undefined">Fail 
+      </td><td><br>
+</td><td><br>
+</td></tr><tr><td><br>
+</td><td align="undefined" valign="undefined">Fail
 If</td><td align="undefined" valign="undefined">0
-&gt; 1</td><td></td><td></td><td></td></tr><tr><td></td><td align="undefined" valign="undefined">Is False</td><td align="undefined" valign="undefined">${int0} -&lt; ${int1}</td><td></td><td></td><td></td></tr><tr><td align="undefined" valign="undefined">Fail 
+&gt; 1</td><td><br>
+</td><td><br>
+</td><td><br>
+</td></tr><tr><td><br>
+</td><td align="undefined" valign="undefined">Is False</td><td align="undefined" valign="undefined">${int0} 
+&lt; ${int1}</td><td><br>
+</td><td><br>
+</td><td><br>
+</td></tr><tr><td align="undefined" valign="undefined">Fail
If 2</td><td align="undefined" valign="undefined">[ Document ]</td><td align="undefined" valign="undefined">FAIL </td><td align="undefined" valign="undefined">My message
- </td><td></td><td></td></tr><tr><td></td><td align="undefined" valign="undefined">Fail If</td><td align="undefined" valign="undefined">True</td><td align="undefined" valign="undefined">My message</td><td></td><td></td></tr><tr><td align="undefined" valign="undefined">Fail 
+      </td><td><br>
+</td><td><br>
+</td></tr><tr><td><br>
+</td><td align="undefined" valign="undefined">Fail If</td><td align="undefined" valign="undefined">True</td><td align="undefined" valign="undefined">My message</td><td><br> 
+</td><td><br>
+</td></tr><tr><td align="undefined" valign="undefined">Fail
Unless 1</td><td align="undefined" valign="undefined">[ Document ]</td><td align="undefined" valign="undefined">FAIL </td><td align="undefined" valign="undefined">'1 != 1 and True or False' should be true
- </td><td></td><td></td></tr><tr><td></td><td align="undefined" valign="undefined">Fail 
+      </td><td><br>
+</td><td><br>
+</td></tr><tr><td><br>
+</td><td align="undefined" valign="undefined">Fail
 Unless</td><td align="undefined" valign="undefined">-1
-&lt;= ${str1} &lt;= 1</td><td></td></tr><tr><td></td><td align="undefined" valign="undefined">Is True</td><td align="undefined" valign="undefined">-${str1} -&lt; ${str0} &lt; ${str1}</td><td></td><td></td><td></td></tr><tr><td></td><td align="undefined" valign="undefined">Fail 
+&lt;= ${str1} &lt;= 1</td><td><br>
+</td></tr><tr><td><br>
+</td><td align="undefined" valign="undefined">Is True</td><td align="undefined" valign="undefined">-${str1} 
+&lt; ${str0} &lt; ${str1}</td><td><br>
+</td><td><br>
+</td><td><br>
+</td></tr><tr><td><br>
+</td><td align="undefined" valign="undefined">Fail
 Unless</td><td align="undefined" valign="undefined">1 !=
-1 and True or False</td><td></td><td></td><td></td></tr><tr><td align="undefined" valign="undefined">Fail 
+1 and True or False</td><td><br>
+</td><td><br>
+</td><td><br>
+</td></tr><tr><td align="undefined" valign="undefined">Fail
Unless 2</td><td align="undefined" valign="undefined">[ Document ]</td><td align="undefined" valign="undefined">FAIL </td><td align="undefined" valign="undefined">My error message
- </td><td></td><td></td></tr><tr><td></td><td align="undefined" valign="undefined">Fail Unless</td><td align="undefined" valign="undefined">False</td><td align="undefined" valign="undefined">My error message</td><td></td><td></td></tr><tr> 
+      </td><td><br>
+</td><td><br>
+</td></tr><tr><td><br>
+</td><td align="undefined" valign="undefined">Fail Unless</td><td align="undefined" valign="undefined">False</td><td align="undefined" valign="undefined">My error message</td><td><br> 
+</td><td><br>
+</td></tr><tr>



@@ -1967,7 +2027,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -1979,7 +2040,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2107,7 +2169,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2125,7 +2188,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2179,7 +2243,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2251,7 +2316,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2269,7 +2335,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2348,7 +2415,7 @@



-      <td align="undefined" valign="undefined">Error message: 1 != 1
+ <td align="undefined" valign="undefined">Error message: 1 (string) != 1 (number) 



@@ -2366,7 +2433,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2378,7 +2446,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2437,7 +2506,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2510,7 +2580,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2528,7 +2599,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2582,7 +2654,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2673,7 +2746,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2770,7 +2844,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2782,7 +2857,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2932,7 +3008,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -2950,7 +3027,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3004,7 +3082,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3076,7 +3155,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3094,7 +3174,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3148,7 +3229,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3338,7 +3420,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3350,7 +3433,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3477,7 +3561,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3495,7 +3580,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3549,7 +3635,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3621,7 +3708,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3639,7 +3727,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3736,7 +3825,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3748,7 +3838,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3875,7 +3966,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3893,7 +3985,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -3947,7 +4040,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4038,7 +4132,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4135,7 +4230,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4147,7 +4243,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4274,7 +4371,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4292,7 +4390,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4346,7 +4445,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4534,7 +4634,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4546,7 +4647,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4674,7 +4776,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4692,7 +4795,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4746,7 +4850,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4819,7 +4924,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4837,7 +4943,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4937,7 +5044,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -4949,7 +5057,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5076,7 +5185,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5094,7 +5204,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5148,7 +5259,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5242,7 +5354,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5340,7 +5453,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5352,7 +5466,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5479,7 +5594,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5497,7 +5613,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5551,7 +5668,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5740,7 +5858,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5752,7 +5871,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5849,7 +5969,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5861,7 +5982,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5897,7 +6019,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
+</td>



@@ -5945,7 +6068,8 @@



-      <td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined"><br>
***The diff for this file has been truncated for email.***

Reply via email to