Revision: 4331b7db0509
Author: Janne Härkönen <[email protected]>
Date: Thu May 5 02:14:29 2011
Log: screenshot: deprecate obsoleted keywords.
Added also tests for deprecation warnings.
Update issue 733
http://code.google.com/p/robotframework/source/detail?r=4331b7db0509
Modified:
/atest/robot/standard_libraries/screenshot/screenshot.txt
/src/robot/libraries/Screenshot.py
=======================================
--- /atest/robot/standard_libraries/screenshot/screenshot.txt Wed May 4
22:15:22 2011
+++ /atest/robot/standard_libraries/screenshot/screenshot.txt Thu May 5
02:14:29 2011
@@ -4,6 +4,18 @@
Resource atest_resource.txt
*** Test Cases ***
+Save Screenshot is Deprecated
+ ${tc}= Check Test Case Save Screenshot To Default Dir Twice
+ Should Contain ${tc.kws[0].msgs[0].message} deprecated
+
+Save Screenshot To is Deprecated
+ ${tc}= Check Test Case Save Screenshot To Overwrite Should Succeed
+ Should Contain ${tc.kws[0].msgs[0].message} deprecated
+
+Log Screenshot is Deprecated
+ ${tc}= Check Test Case Log Screenshot With Defaults
+ Should Contain ${tc.kws[0].msgs[0].message} deprecated
+
Save Screenshot To Default Dir Twice
Check Test Case ${TESTNAME}
@@ -24,19 +36,19 @@
Log Screenshot With Defaults
${test} = Check Test Case ${TESTNAME}
- Message Should Contain ${test.kws[0].msgs[0]} <img
src="screenshot_1.jpg" width="100%" />
+ Message Should Contain ${test.kws[0].msgs[1]} <img
src="screenshot_1.jpg" width="100%" />
Log Screenshot With Filename Defined
${test} = Check Test Case ${TESTNAME}
- Message Should Contain ${test.kws[0].msgs[0]} <img src="image_1.jpg"
width="100%" />
+ Message Should Contain ${test.kws[0].msgs[1]} <img src="image_1.jpg"
width="100%" />
Log Screenshot With Filename And Path Defined
${test} = Check Test Case ${TESTNAME}
- Message Should Contain ${test.kws[0].msgs[0]} <img src="image_1.jpg"
width="100%" />
+ Message Should Contain ${test.kws[0].msgs[1]} <img src="image_1.jpg"
width="100%" />
Log Screenshot With Filename, Path And Width Defined
${test} = Check Test Case ${TESTNAME}
- Check Link In Log ${test.kws[0].msgs[0]} image_1.jpg 50%
+ Check Link In Log ${test.kws[0].msgs[1]} image_1.jpg 50%
Set Screenshot Directories With Default Path Should Be Deprecated
Check Test Case ${TESTNAME}
@@ -44,12 +56,12 @@
Set Screenshot Directories With Default Path and Log Path Defined Should
Be Deprecated
${test} = Check Test Case ${TESTNAME}
- Check Link In Log ${test.kws[1].msgs[0]} screenshot_1.jpg
+ Check Link In Log ${test.kws[1].msgs[1]} screenshot_1.jpg
Check Syslog Contains 'Screenshot.Set Screenshot Directories' is
deprecated. Use `Set Screenshot Directory` keyword instead.
Log Screenshot With Initializing The Screenshot Library
${test} = Check Test Case ${TESTNAME}
- Check Link In Log ${test.kws[0].msgs[0]} screenshot_1.jpg
+ Check Link In Log ${test.kws[0].msgs[1]} screenshot_1.jpg
*** Keywords ***
Check Link In Log
=======================================
--- /src/robot/libraries/Screenshot.py Wed May 4 22:15:22 2011
+++ /src/robot/libraries/Screenshot.py Thu May 5 02:14:29 2011
@@ -147,35 +147,20 @@
self.set_screenshot_directory(default_directory)
def save_screenshot_to(self, path):
- """Saves a screenshot to the specified file.
-
- *This keyword is obsolete.* Use `Take Screenshot` or `Take
Screenshot
- Without Embedding` instead. This keyword will be deprecated in
Robot
- Framework 2.6 and removed later.
- """
+ """*DEPRECATED* Use `Take Screenshot` or `Take Screenshot Without
Embedding` instead."""
path = self._screenshot_to_file(path)
self._link_screenshot(path)
return path
def save_screenshot(self, basename="screenshot", directory=None):
- """Saves a screenshot with a generated unique name.
-
- *This keyword is obsolete.* Use `Take Screenshot` or `Take
Screenshot
- Without Embedding` instead. This keyword will be deprecated in
Robot
- Framework 2.6 and removed later.
- """
+ """*DEPRECATED* Use `Take Screenshot` or `Take Screenshot Without
Embedding` instead."""
path = self._save_screenshot(basename, directory)
self._link_screenshot(path)
return path
def log_screenshot(self, basename='screenshot', directory=None,
width='100%'):
- """Takes a screenshot and logs it to Robot Framework's log file.
-
- *This keyword is obsolete.* Use `Take Screenshot` or `Take
Screenshot
- Without Embedding` instead. This keyword will be deprecated in
Robot
- Framework 2.6 and removed later.
- """
+ """*DEPRECATED* Use `Take Screenshot` or `Take Screenshot Without
Embedding` instead."""
path = self._save_screenshot(basename, directory)
self._embed_screenshot(path, width)
return path
