Revision: 4dc4924205ef
Author: Mikko Korpela <[email protected]>
Date: Mon Jun 20 22:57:34 2011
Log: fix rebot output tests -- summary removed
http://code.google.com/p/robotframework/source/detail?r=4dc4924205ef
Modified:
/atest/robot/cli/rebot/output_files.txt
/atest/robot/cli/rebot/timestamp_outputs.txt
=======================================
--- /atest/robot/cli/rebot/output_files.txt Mon Jun 13 22:19:42 2011
+++ /atest/robot/cli/rebot/output_files.txt Mon Jun 20 22:57:34 2011
@@ -1,50 +1,40 @@
*** Settings ***
-Test Setup Empty output directory
-Test Template Correct outputs should be created
-Force Tags pybot jybot regression
-Resource rebot_cli_resource.txt
+Test Setup Empty output directory
+Force Tags pybot jybot regression
+Test Template Correct outputs should be created
+Resource rebot_cli_resource.txt
*** Test Cases ***
-
Default outputs
- ${EMPTY} log.html report.html
+ ${EMPTY} log.html report.html
Output Only
- --output myoutput.xml --log none --report none myoutput.xml
+ --output myoutput.xml --log none --report none myoutput.xml
Report Only
- --output none --report myreport.html --log NONE myreport.html
+ --output none --report myreport.html --log NONE myreport.html
Log Only
- --output None --report NONE --log mylog.html -S none mylog.html
-
-Summary Only
- [Tags] to_be_clarified
- -o none --summary mysummary.html -l none -r NONE mysummary.html
+ --output None --report NONE --log mylog.html -S none mylog.html
All Outputs
- [Tags] to_be_clarified
- -o myoutput.xml -r myreport.html -l mylog.html -S mysummary.html
- ... mylog.html myoutput.xml myreport.html mysummary.html
+ -o myoutput.xml -r myreport.html -l mylog.html mylog.html
myoutput.xml myreport.html
Outputs Without Extensions
- [Tags] to_be_clarified
- --output xoutput --report xreport --log xlog --summary xsummary
- ... xlog.html xoutput.xml xreport.html xsummary.html
+ --output xoutput --report xreport --log xlog xlog.html xoutput.xml
xreport.html
Outputs Into Different Directories
- [Tags] to_be_clarified
[Template]
Set Runners
- Run ${REBOT} --outputdir ::invalid:: -o ${MYOUTDIR}${/}o${/}o.xml -r
${MYOUTDIR}${/}r${/}r.html -l ${MYOUTDIR}${/}l${/}l.html --summary
${MYOUTDIR}${/}s.htm ${MYINPUT}
+ Run ${REBOT} --outputdir ::invalid:: -o ${MYOUTDIR}${/}o${/}o.xml -r
${MYOUTDIR}${/}r${/}r.html -l ${MYOUTDIR}${/}l${/}l.html ${MYINPUT}
Directory Should Contain ${MYOUTDIR}${/}o o.xml
Directory Should Contain ${MYOUTDIR}${/}r r.html
Directory Should Contain ${MYOUTDIR}${/}l l.html
- Directory Should Contain ${MYOUTDIR} l o r s.htm
-
+ Directory Should Contain ${MYOUTDIR} l o r
*** Keywords ***
Correct outputs should be created
[Arguments] ${arguments} @{expected}
${outputs} = Run rebot and return outputs ${arguments}
Lists Should Be Equal ${outputs} ${expected}
+
=======================================
--- /atest/robot/cli/rebot/timestamp_outputs.txt Mon Jun 13 22:19:42 2011
+++ /atest/robot/cli/rebot/timestamp_outputs.txt Mon Jun 20 22:57:34 2011
@@ -1,21 +1,18 @@
*** Settings ***
-Test Setup Empty output directory
-Force Tags pybot jybot regression
-Resource rebot_cli_resource.txt
+Test Setup Empty output directory
+Force Tags pybot jybot regression
+Resource rebot_cli_resource.txt
*** Test Cases ***
-
Timestamped Outputs
@{files} = Run rebot and return outputs --TimeStampOutputs
Length Should Be ${files} 2
- :FOR ${file} IN @{files}
+ : FOR ${file} IN @{files}
\ Should Match Regexp ${file} (log|report)-20\\d{6}-\\d{6}\\.html
Timestamped Outputs With Custom Names
- [Tags] to_be_clarified
- @{files} = Run rebot and return outputs --timest -l l -r r.html -o o
-S s
- Length Should Be ${files} 4
- :FOR ${file} IN @{files}
+ @{files} = Run rebot and return outputs --timest -l l -r r.html -o o
+ Length Should Be ${files} 3
+ : FOR ${file} IN @{files}
\ Should Match Regexp ${file} (l|o|r|s)-20\\d{6}-\\d{6}\\.(html|xml)
-
