Revision: 3120
Author: janne.t.harkonen
Date: Mon May  3 05:28:07 2010
Log: test for continuable failures in multiple nesting levels
http://code.google.com/p/robotframework/source/detail?r=3120

Modified:
 /trunk/atest/robot/running/continue_on_failure.txt
 /trunk/atest/testdata/running/continue_on_failure.txt

=======================================
--- /trunk/atest/robot/running/continue_on_failure.txt Mon May 3 00:10:07 2010 +++ /trunk/atest/robot/running/continue_on_failure.txt Mon May 3 05:28:07 2010
@@ -52,4 +52,3 @@
 Continue in suite setup
     ${suite}=  Get Test Suite  Continue On Failure In Suite Setup
Check Log Message ${suite.setup.kws[1].msgs[0]} This should be executed in Suite Setup
-
=======================================
--- /trunk/atest/testdata/running/continue_on_failure.txt Mon May 3 00:10:07 2010 +++ /trunk/atest/testdata/running/continue_on_failure.txt Mon May 3 05:28:07 2010
@@ -4,23 +4,24 @@


 *** Variables ***
-${APOCALYPSE ERROR MESSAGE} ContinuableApocalypseException: Can be continued\n\n
+${ERROR}  ContinuableApocalypseException: Can be continued
+${ERROR LINE}  ${ERROR}\n\n
 ${TEARDOWN ERROR}  Also teardown of the parent suite failed.
-${EXPECTED ERROR MESSAGE}  ${APOCALYPSE ERROR MESSAGE}${TEARDOWN ERROR}
+${ERROR LINE WITH TEARDOWN}  ${ERROR LINE}${TEARDOWN ERROR}


 *** Test Cases ***
 Continue in test
-    [Documentation]  FAIL  ${EXPECTED ERROR MESSAGE}
+    [Documentation]  FAIL  ${ERROR LINE WITH TEARDOWN}
     Raise Continuable Failure
     Log  This should be executed

 Continue in user keyword
-    [Documentation]  FAIL  ${EXPECTED ERROR MESSAGE}
+    [Documentation]  FAIL  ${ERROR LINE WITH TEARDOWN}
     Continuable Failure In User Keyword In Test Case

 Continue in test with several continuable failures
- [Documentation] FAIL Error 1: ${APOCALYPSE ERROR MESSAGE}Error 2: ${APOCALYPSE ERROR MESSAGE}Error 3: ${EXPECTED ERROR MESSAGE} + [Documentation] FAIL Error 1: ${ERROR LINE}Error 2: ${ERROR LINE}Error 3: ${ERROR LINE WITH TEARDOWN}
     Raise Continuable Failure
     Log  This should be executed
     Raise Continuable Failure
@@ -29,33 +30,37 @@
     Log  This too should also be executed

 Continue in user keyword with several continuable failures
- [Documentation] FAIL Error 1: ${APOCALYPSE ERROR MESSAGE}Error 2: ${APOCALYPSE ERROR MESSAGE}Error 3: ${EXPECTED ERROR MESSAGE} + [Documentation] FAIL Error 1: ${ERROR LINE}Error 2: ${ERROR LINE}Error 3: ${ERROR LINE WITH TEARDOWN}
     Several Continuable Failures In User Keyword In Test Case

 Continuable and regular failure
- [Documentation] FAIL Error 1: ${APOCALYPSE ERROR MESSAGE}Error 2: Stopping here!!\n\n${TEARDOWN ERROR} + [Documentation] FAIL Error 1: ${ERROR LINE}Error 2: Stopping here!!\n\n${TEARDOWN ERROR}
     Raise Continuable Failure
     Log  This should be executed
     Fail  Stopping here!!
     Log  This should not be executed

 Continue in nested user keyword
- [Documentation] FAIL Error 1: ${APOCALYPSE ERROR MESSAGE}Error 2: ${EXPECTED ERROR MESSAGE}
+    [Documentation]  FAIL Error 1: ${ERROR} in top level\n\n
+    ...  Error 2: ${ERROR}\n\n
+    ...  Error 3: ${ERROR}\n\n
+    ...  Error 4: ${ERROR}\n\n
+    ...  Error 5: ${ERROR} in top level after nesting\n\n${TEARDOWN ERROR}
     Continuable Failure In Nested UK

 Continuable and regular failure in nested UK
- [Documentation] FAIL Error 1: ${APOCALYPSE ERROR MESSAGE}Error 2: Stop!!\n\n${TEARDOWN ERROR} + [Documentation] FAIL Error 1: ${ERROR LINE}Error 2: Stop!!\n\n${TEARDOWN ERROR}
     Continuable and regular failure in nested UK
     Log  This should not be executed

 Continue in test setup
-    [Documentation]  FAIL  Setup failed:\n${EXPECTED ERROR MESSAGE}
+    [Documentation]  FAIL  Setup failed:\n${ERROR LINE WITH TEARDOWN}
     [setup]  Continuable Failure In User Keyword In Test Setup
     Log  This should not be executed

 Continue in test teardown
-    [Documentation]  FAIL  Teardown failed:\n${EXPECTED ERROR MESSAGE}
-    [teardown]  Continuable Failure In User Keyword In Test Teardown
+    [Documentation]  FAIL  Teardown failed:\n${ERROR LINE WITH TEARDOWN}
+    [Teardown]  Continuable Failure In User Keyword In Test Teardown
     No operation


@@ -73,9 +78,10 @@
     Log  This too should also be executed in ${where}

 Continuable Failure In Nested UK
-    Continuable Failure In User Keyword In Nested UK
+    Raise Continuable Failure  Can be continued in top level
     Log  This should be executed in Top Level UK
-    Raise Continuable Failure
+    Several Continuable Failures In User Keyword In Nested UK
+    Raise Continuable Failure  Can be continued in top level after nesting

 Continuable and regular failure in nested UK
     Continuable and regular failure

Reply via email to