Revision: 02523f3a210b
Branch:   default
Author:   Pekka Klärck
Date:     Sun Nov 24 18:39:03 2013 UTC
Log:      fixed atests broken by new argument added to BuiltIn.Log
http://code.google.com/p/robotframework/source/detail?r=02523f3a210b

Modified:
 /atest/testdata/cli/dryrun/dryrun.txt
 /atest/testdata/cli/dryrun/more_tests.txt
 /atest/testdata/cli/dryrun/run_keyword_variants.txt
 /atest/testdata/cli/dryrun/run_keyword_variants_in_suite_teardown.txt
 /atest/testdata/core/invalid_syntax.html
 /atest/testdata/standard_libraries/builtin/run_keywords.txt

=======================================
--- /atest/testdata/cli/dryrun/dryrun.txt       Mon Oct 28 13:53:16 2013 UTC
+++ /atest/testdata/cli/dryrun/dryrun.txt       Sun Nov 24 18:39:03 2013 UTC
@@ -82,7 +82,7 @@
     [Documentation]  FAIL Several failures occurred:\n\n
... 1) Keyword 'BuiltIn.Should Be Equal' expected 2 to 4 arguments, got 1.\n\n
     ...  2) No keyword with name 'Invalid Syntax UK' found.\n\n
-    ...  3) Keyword 'BuiltIn.Log' expected 1 to 4 arguments, got 5.\n\n
+    ...  3) Keyword 'BuiltIn.Log' expected 1 to 5 arguments, got 6.\n\n
... 4) No keyword with name 'Yet another non-existing keyword' found.\n\n
     ...  5) No keyword with name 'Does not exist' found.
     Should Be Equal  1
@@ -114,6 +114,6 @@

 UK with multiple failures
     Invalid Syntax UK
-    Log  too  many  arguments  here  is
+    Log  too  many  arguments  here  we  have
     Yet another non-existing keyword

=======================================
--- /atest/testdata/cli/dryrun/more_tests.txt   Mon Oct 28 13:53:16 2013 UTC
+++ /atest/testdata/cli/dryrun/more_tests.txt   Sun Nov 24 18:39:03 2013 UTC
@@ -4,7 +4,7 @@

 *** Test Cases ***
 Some other test
- [Documentation] FAIL Keyword 'BuiltIn.Log' expected 1 to 4 arguments, got 0. + [Documentation] FAIL Keyword 'BuiltIn.Log' expected 1 to 5 arguments, got 0.
     Fail  Not actually executed so won't fail.
     Log

=======================================
--- /atest/testdata/cli/dryrun/run_keyword_variants.txt Mon Oct 28 13:53:16 2013 UTC +++ /atest/testdata/cli/dryrun/run_keyword_variants.txt Sun Nov 24 18:39:03 2013 UTC
@@ -1,10 +1,9 @@
 *** Variables ***
 ${existing} =  foo
-${LOG GOT WRONG ARGS} = Keyword 'BuiltIn.Log' expected 1 to 4 arguments, got +${LOG GOT WRONG ARGS} = Keyword 'BuiltIn.Log' expected 1 to 5 arguments, got
 ${UK GOT WRONG ARGS} =  Keyword 'UK' expected 0 arguments, got
 ${LOG KW} =  Log
 @{LOG THAT} =  Log  that  DEBUG
-@{FIVE} =    1    2    3    4    5

 *** Test Cases ***
 Run Keyword With Keyword with Invalid Number of Arguments
@@ -74,8 +73,8 @@
     Run Keywords  Log Many  this  is  valid  AND  No Operation

 Run Keywords With Arguments When One Keyword Fails
-    [Documentation]  FAIL  ${LOG GOT WRONG ARGS} 5.
-    Run Keywords  Log  valid  AND  Log  1  2  3  4  5
+    [Documentation]  FAIL  ${LOG GOT WRONG ARGS} 6.
+    Run Keywords  Log  valid  AND  Log  1  2  3  4  5  6

 Run Keywords With Arguments When Multiple Keyword Fails
     [Documentation]  FAIL  Several failures occurred:\n\n
@@ -117,33 +116,33 @@
     ...  1) ${LOG GOT WRONG ARGS} 0.\n\n
     ...  2) ${UK GOT WRONG ARGS} 1.\n\n
     ...  3) No keyword with name 'Non Existing' found.\n\n
-    ...  4) ${LOG GOT WRONG ARGS} 5.
+    ...  4) ${LOG GOT WRONG ARGS} 6.
     Run Keyword If    expression    No Operation    ELSE    UK
     RunKeywordIf      expression    Log             ELSE    No Operation
runkeywordif expression No operation ELSE UK not allowed - RUN_KEYWORD_IF expression Non Existing ELSE Log 1 2 3 4 5 + RUN_KEYWORD_IF expression Non Existing ELSE Log 1 2 3 4 5 6

 Run Keyword If with ELSE IF
     [Documentation]  FAIL  Several failures occurred:\n\n
     ...  1) ${LOG GOT WRONG ARGS} 0.\n\n
     ...  2) ${UK GOT WRONG ARGS} 1.\n\n
     ...  3) No keyword with name 'Non Existing' found.\n\n
-    ...  4) ${LOG GOT WRONG ARGS} 5.
+    ...  4) ${LOG GOT WRONG ARGS} 6.
     Run Keyword If    expr    No Operation    ELSE IF    expr    UK
Run Keyword If expr Log ELSE IF expr No Operation Run Keyword If expr No operation ELSE IF expr UK not allowed - Run Keyword If expr Non Existing ELSE IF expr Log 1 2 3 4 5 + Run Keyword If expr Non Existing ELSE IF expr Log 1 2 3 4 5 6

 Run Keyword If with ELSE IF and ELSE
     [Documentation]  FAIL  Several failures occurred:\n\n
     ...  1) ${LOG GOT WRONG ARGS} 0.\n\n
     ...  2) ${UK GOT WRONG ARGS} 2.\n\n
     ...  3) No keyword with name 'not found kw' found.\n\n
-    ...  4) ${LOG GOT WRONG ARGS} 5.
+    ...  4) ${LOG GOT WRONG ARGS} 6.
     Run Keyword If    expr    Log
     ...    ELSE IF    expr    UK    1    2
     ...    ELSE IF    expr    not found kw
-    ...    ELSE    Log    1    2    3    4    5
+    ...    ELSE    Log    1    2    3    4    5    6

 Run Keyword If with ELSE IF and ELSE without keywords
     [Documentation]  FAIL  Several failures occurred:\n\n
@@ -179,22 +178,22 @@
 Run Keyword If with escaped or non-caps ELSE IF and ELSE
     [Documentation]  FAIL  Several failures occurred:\n\n
     ...  1) ${LOG GOT WRONG ARGS} 6.\n\n
-    ...  2) ${LOG GOT WRONG ARGS} 5.
+    ...  2) ${LOG GOT WRONG ARGS} 7.
Run Keyword If expr Log \ELSE IF INFO and too many args
      Run Keyword If    expr    Log    \ELSE    DEBUG
      Run Keyword If    expr    Log    else if    WARN    html=yes
-     Run Keyword If    expr    Log    else    too    many    args    again
+ Run Keyword If expr Log else too many args again here is

 Run Keyword If with list variable in ELSE IF and ELSE
     [Documentation]  FAIL  Several failures occurred:\n\n
-    ...  1) ${LOG GOT WRONG ARGS} 5.\n\n
+    ...  1) ${LOG GOT WRONG ARGS} 6.\n\n
     ...  2) ${LOG GOT WRONG ARGS} 8.
     Run Keyword If    @{list}
     Run Keyword If    @{list}    ELSE      @{list}
     Run Keyword If    @{list}    ELSE IF   @{list}
     Run Keyword If    @{list}    ELSE IF   @{list}    ELSE    @{list}
Run Keyword If @{list} Not Considered Keyword ELSE @{list} XXX
-    Run Keyword If    @{list}    ELSE      Log   1    2    3    4    5
+    Run Keyword If    @{list}    ELSE      Log   1    2    3    4    5    6
Run Keyword If expr No Operation ELSE IF @{list} UK 1 Run Keyword If expr No Operation ELSE IF @{list} UK 1 2 ... ELSE IF expr Log 1 2 3 4 5 6 7 8
=======================================
--- /atest/testdata/cli/dryrun/run_keyword_variants_in_suite_teardown.txt Mon Oct 28 13:53:16 2013 UTC +++ /atest/testdata/cli/dryrun/run_keyword_variants_in_suite_teardown.txt Sun Nov 24 18:39:03 2013 UTC
@@ -7,18 +7,18 @@
     ...    Parent suite teardown failed:
     ...    Several failures occurred:
     ...
-    ...    1) Keyword 'BuiltIn.Log' expected 1 to 4 arguments, got 0.
+    ...    1) Keyword 'BuiltIn.Log' expected 1 to 5 arguments, got 0.
     ...
     ...    2) No keyword with name 'Non Existing' found.
     ...
-    ...    3) Keyword 'BuiltIn.Log' expected 1 to 4 arguments, got 5.
+    ...    3) Keyword 'BuiltIn.Log' expected 1 to 5 arguments, got 6.
     ...
-    ...    4) Keyword 'BuiltIn.Log' expected 1 to 4 arguments, got 0.
+    ...    4) Keyword 'BuiltIn.Log' expected 1 to 5 arguments, got 0.
     No Operation

 *** Keywords ***
 Run All Suite Teardown Related Run Keyword Variants
     Run Keyword If All Critical Tests Passed    Log
     Run Keyword If Any Critical Tests Failed    Non Existing
- Run Keyword If All Tests Passed Log too many args we have + Run Keyword If All Tests Passed Log too many args we have here
     Run Keyword If Any Tests Failed    Log
=======================================
--- /atest/testdata/core/invalid_syntax.html    Mon Oct 28 13:53:16 2013 UTC
+++ /atest/testdata/core/invalid_syntax.html    Sun Nov 24 18:39:03 2013 UTC
@@ -391,7 +391,7 @@
       <td>[ Document ]</td>
       <td>Note that doc and tags should be set ok.</td>
       <td>FAIL</td>
-      <td>Keyword 'BuiltIn.Log' expected 1 to 4 arguments, got 6.<br>
+      <td>Keyword 'BuiltIn.Log' expected 1 to 5 arguments, got 6.<br>
       </td>
       <td></td>
     </tr>
@@ -424,7 +424,7 @@
       <td>[ Document ]</td>
       <td>Note that doc and tags should be set ok.</td>
       <td>FAIL</td>
-      <td>Keyword 'BuiltIn.Log' expected 1 to 4 arguments, got 5.<br>
+      <td>Keyword 'BuiltIn.Log' expected 1 to 5 arguments, got 6.<br>
       </td>
       <td></td>
     </tr>
@@ -706,7 +706,7 @@
       <td>...</td>
       <td>we</td>
       <td>have</td>
-      <td></td>
+      <td>here</td>
     </tr>
     <tr>
       <td>UK With Invalid Metadata</td>
=======================================
--- /atest/testdata/standard_libraries/builtin/run_keywords.txt Thu Nov 14 13:35:59 2013 UTC +++ /atest/testdata/standard_libraries/builtin/run_keywords.txt Sun Nov 24 18:39:03 2013 UTC
@@ -44,7 +44,7 @@
     Run keywords  Passing  Non-Existing  Non-Existing But Not Executed

 Wrong number of arguments to keyword
- [Documentation] FAIL Keyword 'BuiltIn.Log' expected 1 to 4 arguments, got 0.${ATD ERR} + [Documentation] FAIL Keyword 'BuiltIn.Log' expected 1 to 5 arguments, got 0.${ATD ERR}
     Run keywords  Passing  Log  This isn't argument to Log keyword

 In test setup

--

--- 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