3 new revisions:
Revision: b634c5b54f9c
Author: Pekka Klärck
Date: Thu Jun 16 13:23:30 2011
Log: Testing that paths are not case normalized....
http://code.google.com/p/robotframework/source/detail?r=b634c5b54f9c
Revision: 90143c9c6adb
Author: Pekka Klärck
Date: Thu Jun 16 13:36:16 2011
Log: fixed tests after data change + some cleanup
http://code.google.com/p/robotframework/source/detail?r=90143c9c6adb
Revision: 478f9ae64fd5
Author: Pekka Klärck
Date: Thu Jun 16 13:36:38 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=478f9ae64fd5
==============================================================================
Revision: b634c5b54f9c
Author: Pekka Klärck
Date: Thu Jun 16 13:23:30 2011
Log: Testing that paths are not case normalized.
Not all possible places are covered but knowing the implementation
this ought to be more than enough.
Update issue 307
Status: Done
Test done. Closing.
http://code.google.com/p/robotframework/source/detail?r=b634c5b54f9c
Added:
/atest/robot/parsing/paths_are_not_case_normalized.txt
=======================================
--- /dev/null
+++ /atest/robot/parsing/paths_are_not_case_normalized.txt Thu Jun 16
13:23:30 2011
@@ -0,0 +1,15 @@
+*** Settings ***
+Force Tags regression pybot jybot
+Suite Setup Run tests -l LOG -r RaP
misc/multiple_suites/suiTe_8.html
+Resource atest_resource.txt
+
+*** Test Cases ***
+Suite name is not case normalized
+ Should Be Equal ${SUITE.name} suiTe 8
+
+Suite source should not be case normalized
+ Should End With ${SUITE.source} multiple_suites${/}suiTe_8.html
+
+Outputs are not case normalized
+ Check stdout contains ${/}LOG.html
+ Check stdout contains ${/}RaP.html
==============================================================================
Revision: 90143c9c6adb
Author: Pekka Klärck
Date: Thu Jun 16 13:36:16 2011
Log: fixed tests after data change + some cleanup
http://code.google.com/p/robotframework/source/detail?r=90143c9c6adb
Modified:
/atest/robot/core/filter_by_names.txt
/atest/robot/core/suite_execution_order.txt
=======================================
--- /atest/robot/core/filter_by_names.txt Thu Jun 16 07:09:15 2011
+++ /atest/robot/core/filter_by_names.txt Thu Jun 16 13:36:16 2011
@@ -48,17 +48,16 @@
Correct Files Processed With --suite Matches Files
[Documentation] Testing that only files matching to --suite are
processed Using data from previous test case.
- ${syslog} = Get Syslog
${suitedir} = Join Path ${DATADIR} ${TESTDATA_SUITES}
${subsuitedir} = Join Path ${suitedir} subsuites
- Contains ${syslog} Parsing test data directory '${suitedir}'
- Contains ${syslog} Ignoring file or directory 'fourth.html'
- Contains ${syslog} Ignoring file or directory 'tsuite3.html'
- Contains ${syslog} Parsing test data directory '${subsuitedir}'
- Contains ${syslog} Ignoring file or directory 'sub1.html'
- Contains ${syslog} Ignoring file or directory 'sub2.html'
- Contains ${syslog} Parsing file '${suitedir}${/}tsuite1.html
- Contains ${syslog} Parsing file '${suitedir}${/}tsuite2.html
+ Check syslog contains Parsing test data directory '${suitedir}'
+ Check Syslog Contains Ignoring file or directory 'fourth.html'
+ Check Syslog Contains Ignoring file or directory 'tsuite3.html'
+ Check Syslog Contains Parsing test data directory '${subsuitedir}'
+ Check Syslog Contains Ignoring file or directory 'sub1.html'
+ Check Syslog Contains Ignoring file or directory 'sub2.html'
+ Check Syslog Contains Parsing file '${suitedir}${/}tsuite1.html
+ Check Syslog Contains Parsing file '${suitedir}${/}tsuite2.html
Suite With No Matching Args
Run Failing Test --suite notexists ${TESTDATA_SUITES}
${SUITE_ERROR_MESSAGE}
@@ -74,17 +73,16 @@
Correct Files Processed When --suite Matches Directory
[Documentation] Testing that only files matching to --suite are
processed. This time --suite matches directory so all suites under it
should be processed. Using data from previous test case.
- ${syslog} = Get Syslog
${suitedir} = Join Path ${DATADIR} ${TESTDATA_SUITES}
${subsuitedir} = Join Path ${suitedir} subsuites
- Contains ${syslog} Parsing test data directory '${suitedir}'
- Contains ${syslog} Ignoring file or directory 'fourth.html'
- Contains ${syslog} Ignoring file or directory 'tsuite1.html'
- Contains ${syslog} Ignoring file or directory 'tsuite2.html'
- Contains ${syslog} Ignoring file or directory 'tsuite3.html'
- Contains ${syslog} Parsing test data directory '${subsuitedir}'
- Contains ${syslog} Parsing file '${subsuitedir}${/}sub1.html'
- Contains ${syslog} Parsing file '${subsuitedir}${/}sub2.html'
+ Check Syslog Contains Parsing test data directory '${suitedir}'
+ Check Syslog Contains Ignoring file or directory 'fourth.html'
+ Check Syslog Contains Ignoring file or directory 'tsuite1.html'
+ Check Syslog Contains Ignoring file or directory 'tsuite2.html'
+ Check Syslog Contains Ignoring file or directory 'tsuite3.html'
+ Check Syslog Contains Parsing test data directory '${subsuitedir}'
+ Check Syslog Contains Parsing file '${subsuitedir}${/}sub1.html'
+ Check Syslog Contains Parsing file '${subsuitedir}${/}sub2.html'
Suite Under Subdirectory Using Pattern
Run And Check Suites Within Subdirs --suite subQUEST
['Sub1', 'Sub2'] SubSuite1 First SubSuite2 First
@@ -110,9 +108,9 @@
Run And Check Suites And Tests --suite suites.fourth --suite tsuite1
-s Subsuites.Sub1 --test *first* --exclude none
['Fourth','Subsuites','Tsuite1'] Suite4 First Suite1 First SubSuite1
First
Filter Suite When Suites Are Ordered With Prefix
- Run Suites --suite Suite2 ${DATADIR}/misc/multiple_suites
+ Run Suites --suite ?Sui*2? ${DATADIR}/misc/multiple_suites
Should Be True ${SUITE.suites} == ['Sub.Suite.1']
- Should Be True ${SUITE.suites[0].suites} == ['Suite2']
+ Should Be True ${SUITE.suites[0].suites} == ['.Sui.te.2.']
*** Keywords ***
Run And Check Tests
@@ -135,7 +133,6 @@
Run Suites
[Arguments] ${params} ${testdata}=${TESTDATA_SUITES}
- Set Suite Variable $SUITE ${None}
Run Tests ${params} ${ESCAPES} ${testdata}
Stderr Should Be Empty
@@ -143,5 +140,5 @@
[Arguments] ${params} ${testdata} ${error_msg}
Run Tests Without Processing Output ${params} ${ESCAPES} ${testdata}
${stderr} = Get Stderr
- Fail Unless Ends ${stderr.strip()} ${error_msg}
-
+ Should End With ${stderr.strip()} ${error_msg}
+
=======================================
--- /atest/robot/core/suite_execution_order.txt Thu Jun 16 07:14:16 2011
+++ /atest/robot/core/suite_execution_order.txt Thu Jun 16 13:36:16 2011
@@ -10,4 +10,4 @@
... 'Suite First', 'Sub.Suite.1', 'Suite3', 'Suite4', 'Suite5',
... 'Suite10', 'Suite 6', 'SUite7', 'suiTe 8', 'Suite 9 Name'
Should Be Equal As Strings ${SUITE.suites} [${exp}]
- Should Be Equal As Strings ${SUITE.suites[1].suites}
['Suite4', 'Suite2']
+ Should Be Equal As Strings ${SUITE.suites[1].suites}
['Suite4', '.Sui.te.2.']
==============================================================================
Revision: 478f9ae64fd5
Author: Pekka Klärck
Date: Thu Jun 16 13:36:38 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=478f9ae64fd5
