Revision: 4481
Author: jussi.ao.malinen
Date: Thu Dec 9 05:50:56 2010
Log: tests for set screenshot directory and fixed return value of set
screenshot directory to actually used value
http://code.google.com/p/robotframework/source/detail?r=4481
Added:
/trunk/atest/robot/standard_libraries/screenshot/set_screenshot_directory.txt
/trunk/atest/testdata/standard_libraries/screenshot/set_screenshot_directory.txt
Modified:
/trunk/src/robot/libraries/Screenshot.py
=======================================
--- /dev/null
+++
/trunk/atest/robot/standard_libraries/screenshot/set_screenshot_directory.txt
Thu Dec 9 05:50:56 2010
@@ -0,0 +1,8 @@
+*** Settings ***
+Suite Setup Run Tests ${EMPTY}
standard_libraries/screenshot/set_screenshot_directory.txt
+Force Tags regression pybot jybot
+Resource atest_resource.txt
+
+*** Test Cases ***
+Set Screenshot Directory
+ ${tc}= Check Test Case ${TESTNAME}
=======================================
--- /dev/null
+++
/trunk/atest/testdata/standard_libraries/screenshot/set_screenshot_directory.txt
Thu Dec 9 05:50:56 2010
@@ -0,0 +1,33 @@
+*** Settings ***
+Suite Setup: Clean Temp Files And Create Directory
+Test Setup: Save Start Time
+Test Teardown: Clean Temp Files
+Resource: screenshot_resource.txt
+
+*** Variables ***
+${SCREENSHOT DIR} = ${TEMPDIR}${/}robot_atest_screenshots
+${BASENAME} = ${SCREENSHOT DIR}${/}screenshot
+${FIRST_SCREENSHOT} = ${BASENAME}_1.jpg
+
+*** Test Cases ***
+Set Screenshot Directory
+ ${old} = Set Screenshot Directory ${SCREENSHOT DIR}
+ Paths Should Be Equal ${OUTPUT DIR} ${old}
+ Take Screenshot
+ Screenshot Should Exist ${FIRST SCREENSHOT}
+
+
+*** Keywords ***
+Clean Temp Files And Create Directory
+ Clean Temp Files
+ Create Directory ${SCREENSHOT DIR}
+
+Clean Temp Files
+ Remove Files ${OUTPUTDIR}/*.jpg
+ Remove Directory ${SCREENSHOT DIR} recursive=True
+
+Paths Should Be Equal
+ [Arguments] ${p1} ${p2}
+ ${path 1} Normalize Path ${p1}
+ ${path 2} Normalize Path ${p2}
+ Should Be Equal ${path1} ${path2}
=======================================
--- /trunk/src/robot/libraries/Screenshot.py Thu Dec 9 05:37:11 2010
+++ /trunk/src/robot/libraries/Screenshot.py Thu Dec 9 05:50:56 2010
@@ -133,7 +133,7 @@
path = self._norm_path(path)
if not os.path.isdir(path):
raise RuntimeError("Directory '%s' does not exist." % path)
- old = self._given_screenshot_dir
+ old = self._screenshot_dir
self._given_screenshot_dir = path
return old
