Revision: 4215
Author: pekka.klarck
Date: Thu Sep 30 02:46:00 2010
Log: x
http://code.google.com/p/robotframework/source/detail?r=4215

Modified:
 /trunk/proto/atdd-tutorial-berlin-2010/atest/vacalc/date_validation.txt
 /trunk/proto/atdd-tutorial-berlin-2010/atest/vacalc/resource.txt

=======================================
--- /trunk/proto/atdd-tutorial-berlin-2010/atest/vacalc/date_validation.txt Thu Sep 30 02:39:39 2010 +++ /trunk/proto/atdd-tutorial-berlin-2010/atest/vacalc/date_validation.txt Thu Sep 30 02:46:00 2010
@@ -1,13 +1,13 @@
 ***Settings***
 Resource        resource.txt
 Test Template   Validate start date
-
+Suite Teardown  Close Vacalc

 *** Variables ***
 ${USER}  Mr. Roboto

-
 ***Test Cases***
+
 Valid date
     2010-09-29  Employee '${USER}' was added successfully.
     2010-9-9    Employee '${USER}' was added successfully.
@@ -35,9 +35,10 @@


 ***Keywords***
+
 Validate start date
     [Arguments]  ${date}  ${message}
     Start Vacalc with no employees
     Add employee  ${USER}  ${date}
     Status message should be  ${message}
-    Close Vacalc
+
=======================================
--- /trunk/proto/atdd-tutorial-berlin-2010/atest/vacalc/resource.txt Thu Sep 30 02:32:09 2010 +++ /trunk/proto/atdd-tutorial-berlin-2010/atest/vacalc/resource.txt Thu Sep 30 02:46:00 2010
@@ -8,7 +8,7 @@
 *** Keywords ***

 Start Vacalc
-    ${ctx} =  Run Keyword And Ignore Error  Get Current Context
+    Close Vacalc
     Set Environment Variable  VACALC_DB  ${DATABASE}
     Start Application  org.robotframework.vacalc.VacalcRunner
     Select Window  Vacation Calculator
@@ -18,7 +18,8 @@
     Start Vacalc

 Close Vacalc
-    Close Window  Vacation Calculator
+ ${status} ${title} = Run Keyword And Ignore Error Get Current Context
+    Run Keyword If  "${status}" == "PASS"  Close Window  ${title}

 Clear Database
     Remove File  ${DATABASE}

Reply via email to