Revision: 4e3bbfd4354f
Branch: default
Author: Mikko Korpela <[email protected]>
Date: Tue Mar 12 04:45:32 2013
Log: Remove deprecated screenshot keywords and related tests
http://code.google.com/p/robotframework/source/detail?r=4e3bbfd4354f
Deleted:
/atest/robot/standard_libraries/screenshot/screenshot.txt
/atest/testdata/standard_libraries/screenshot/screenshot.txt
Modified:
/src/robot/libraries/Screenshot.py
=======================================
--- /atest/robot/standard_libraries/screenshot/screenshot.txt Fri Nov 16
08:21:39 2012
+++ /dev/null
@@ -1,65 +0,0 @@
-*** Settings ***
-Suite Setup Run if dependencies are available -l log.html -L debug
standard_libraries/screenshot/screenshot.txt
-Force Tags pybot jybot regression
-Resource screenshot_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}
-
-Save Screenshot To Default Dir With File Name
- Check Test Case ${TESTNAME}
-
-Save Screenshot With File Name and Path Defined
- Check Test Case ${TESTNAME}
-
-Save Screenshot To Non Existing Path
- Check Test Case ${TESTNAME}
-
-Save Screenshot To Overwrite Should Succeed
- Check Test Case ${TESTNAME}
-
-Save Screenshot To With Non Existing Path
- Check Test Case ${TESTNAME}
-
-Log Screenshot With Defaults
- ${test} = Check Test Case ${TESTNAME}
- Message Should Contain ${test.kws[0].msgs[2]} <img
src="screenshot_1.jpg" width="100%">
-
-Log Screenshot With Filename Defined
- ${test} = Check Test Case ${TESTNAME}
- Message Should Contain ${test.kws[0].msgs[2]} <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[2]} <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[2]} image_1.jpg 50%
-
-Log Screenshot With Initializing The Screenshot Library
- ${test} = Check Test Case ${TESTNAME}
- Check Link In Log ${test.kws[0].msgs[2]} screenshot_1.jpg
-
-*** Keywords ***
-Check Link In Log
- [Arguments] ${message} ${path} ${width}=100%
- Check Log Message ${message} <a href="${path}"><img src="${path}"
width="${width}"></a> HTML
-
-Message Should contain
- [Arguments] ${message} ${expected}
- Should Contain ${message.message.rstrip().lower()}
${expected.replace('\\','/').lower()}
-
=======================================
--- /atest/testdata/standard_libraries/screenshot/screenshot.txt Thu May 5
02:18:41 2011
+++ /dev/null
@@ -1,63 +0,0 @@
-*** Settings ***
-Suite Setup Remove Files @{SCREENSHOTS}
-Test Setup Save Start Time
-Test Teardown Remove Files @{SCREENSHOTS}
-Resource screenshot_resource.txt
-Library Screenshot ${OUTPUTDIR} WITH NAME Screenshot2
-
-*** Variables ***
-@{SCREENSHOTS} ${OUTPUTDIR}${/}screenshot_1.jpg
${OUTPUTDIR}${/}screenshot_2.jpg
-... ${OUTPUTDIR}${/}mybase_1.jpg ${CURDIR}${/}mybase_1.jpg
${CURDIR}${/}screenshot.jpeg
-... ${OUTPUTDIR}${/}image_1.jpg ${OUTPUTDIR}${/}image_1.jpg
-... ${OUTPUTDIR}${/}image_2.jpg ${OUTPUTDIR}${/}screenshot_1.jpg
-... ${OUTPUTDIR}${/}screenshot_2.jpg ${OUTPUTDIR}${/}screenshot_3.jpg
-
-*** Test Cases ***
-Save Screenshot To Default Dir Twice
- Screenshot.Save Screenshot
- Screenshot Should Exist ${OUTPUTDIR}${/}screenshot_1.jpg
- Screenshot.Save Screenshot
- Screenshot Should Exist ${OUTPUTDIR}${/}screenshot_2.jpg
-
-Save Screenshot To Default Dir With File Name
- Screenshot.Save Screenshot mybase
- Screenshot Should Exist ${OUTPUTDIR}${/}mybase_1.jpg
-
-Save Screenshot With File Name and Path Defined
- Screenshot.Save Screenshot mybase ${CURDIR}/./
- Screenshot Should Exist ${CURDIR}/mybase_1.jpg
-
-Save Screenshot To Non Existing Path
- [Documentation] FAIL Directory '${CURDIR}${/}non-existing' where to
save the screenshot does not exist
- Screenshot.Save Screenshot mybase ${CURDIR}/non-existing
-
-Save Screenshot To Overwrite Should Succeed
- Screenshot.Save Screenshot To ${CURDIR}/screenshot.jpeg
- Screenshot Should Exist ${CURDIR}${/}screenshot.jpeg
- Save Start Time
- Screenshot.Save Screenshot To ${CURDIR}${/}screenshot.jpeg
- Screenshot Should Exist ${CURDIR}${/}screenshot.jpeg
-
-Save Screenshot To With Non Existing Path
- [Documentation] FAIL Directory '${CURDIR}${/}non-existing' where to
save the screenshot does not exist
- Screenshot.Save Screenshot To ${CURDIR}${/}non-existing${/}ne.jpg
-
-Log Screenshot With Defaults
- Screenshot.Log Screenshot
- Screenshot Should Exist ${OUTPUTDIR}${/}screenshot_1.jpg
-
-Log Screenshot With Filename Defined
- Screenshot.Log Screenshot image
- Screenshot Should Exist ${OUTPUTDIR}${/}image_1.jpg
-
-Log Screenshot With Filename And Path Defined
- Screenshot.Log Screenshot image ${OUTPUTDIR}
- Screenshot Should Exist ${OUTPUTDIR}${/}image_1.jpg
-
-Log Screenshot With Filename, Path And Width Defined
- Screenshot.Log Screenshot image ${OUTPUTDIR} width=50%
- Screenshot Should Exist ${OUTPUTDIR}${/}image_1.jpg
-
-Log Screenshot With Initializing The Screenshot Library
- Screenshot2.Log Screenshot
- Screenshot Should Exist ${OUTPUTDIR}${/}screenshot_1.jpg
=======================================
--- /src/robot/libraries/Screenshot.py Mon Dec 10 08:10:45 2012
+++ /src/robot/libraries/Screenshot.py Tue Mar 12 04:45:32 2013
@@ -158,25 +158,6 @@
self._given_screenshot_dir = path
return old
- def save_screenshot_to(self, path):
- """*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):
- """*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%'):
- """*DEPRECATED* Use `Take Screenshot` or `Take Screenshot Without
Embedding` instead."""
- path = self._save_screenshot(basename, directory)
- self._embed_screenshot(path, width)
- return path
-
def take_screenshot(self, name="screenshot", width="800px"):
"""Takes a screenshot in JPEG format and embeds it into the log
file.
--
---
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.
