Revision: 4110
Author: pekka.klarck
Date: Thu Sep 23 07:16:08 2010
Log: Moved list_dir tests to own suite. This means that misc suite is no
more.
http://code.google.com/p/robotframework/source/detail?r=4110
Added:
/trunk/atest/robot/standard_libraries/operating_system/list_dir.txt
/trunk/atest/testdata/standard_libraries/operating_system/list_dir.txt
Deleted:
/trunk/atest/robot/standard_libraries/operating_system/misc.txt
/trunk/atest/testdata/standard_libraries/operating_system/misc.txt
=======================================
--- /dev/null
+++ /trunk/atest/robot/standard_libraries/operating_system/list_dir.txt Thu
Sep 23 07:16:08 2010
@@ -0,0 +1,28 @@
+*** Settings ***
+Suite Setup Run Tests ${EMPTY}
standard_libraries/operating_system/list_dir.txt
+Force Tags regression jybot pybot
+Resource atest_resource.txt
+
+*** Test Cases ***
+
+List Directory
+ ${tc} = Check testcase List Directory
+ ${dir} = Join Path ${CURDIR}/../../.. testdata standard_libraries
operating_system robot_temp_dir
+ Check Log Message ${tc.kws[3].msgs[0]} Listing contents of
directory '<a href="file://${dir}">${dir}</a>' HTML
+ Check Log Message ${tc.kws[3].msgs[1]} bar.txt\nfoo.txt
+ Check Log Message ${tc.kws[12].msgs[0]} Listing contents of
directory '<a href="file://${dir}">${dir}</a>' HTML
+ Check Log Message ${tc.kws[12].msgs[1]} foo.txt
+
+List Directory With Patterns
+ ${tc} = Check testcase List Directory With Patterns
+
+List Directory With Absolute
+ ${tc} = Check testcase List Directory With Absolute
+ ${dir} = Join Path ${CURDIR}/../../.. testdata standard_libraries
operating_system robot_temp_dir
+ Check Log Message ${tc.kws[4].msgs[0]} Listing contents of
directory '<a href="file://${dir}">${dir}</a>' HTML
+ Check Log Message ${tc.kws[4].msgs[1]} ${dir}${/}bar.txt\n
${dir}${/}foo.txt\n ${dir}${/}foodir
+ Check Log Message ${tc.kws[12].msgs[1]} Signature of 'List
Directory' keywords has changed. Please update how 'absolute' argumemt is
given. WARN
+
+List And Count Files And Directories In Directory
+ [Documentation] Tests 'List Files In Directory', 'List Directories In
Directory', 'Count Files In Directory', 'Count Directories In Directory'
and 'Count Items In Directory'
+ Check testcase List And Count Files And Directories In Directory
=======================================
--- /dev/null
+++ /trunk/atest/testdata/standard_libraries/operating_system/list_dir.txt
Thu Sep 23 07:16:08 2010
@@ -0,0 +1,111 @@
+*** Settings ***
+Suite Teardown Remove Temps
+Test Setup Remove Temps
+Library OperatingSystem
+
+*** Variables ***
+${TESTDIR} ${CURDIR}${/}robot_temp_dir
+
+*** Test Cases ***
+
+List Directory
+ [Documentation] This test also tests setting variables
+ Create Dir ${TESTDIR}
+ Create File ${TESTDIR}${/}foo.txt
+ Create File ${TESTDIR}${/}bar.txt
+ ${files} = List Directory ${TESTDIR}
+ Should Be True ${files} == ['bar.txt','foo.txt']
+ @{files2} = List Directory ${TESTDIR}
+ Should Be Equal @{files2}[0] bar.txt
+ Should Be Equal @{files2}[1] foo.txt
+ ${file} @{files3} = List Dir ${TESTDIR}
+ Should Be Equal ${file} bar.txt
+ Should Be Equal @{files3}[0] foo.txt
+ Remove File ${TESTDIR}${/}bar.txt
+ ${files4} = List Directory ${TESTDIR}
+ Should Be True ${files4} == ['foo.txt']
+ @{files5} = List Directory ${TESTDIR}
+ Should Be Equal @{files5}[0] foo.txt
+ ${file2} @{files6} = List Dir ${TESTDIR}
+ Should Be Equal ${file2} foo.txt
+ Should Be True @{files6} == []
+ Remove File ${TESTDIR}${/}foo.txt
+ ${files7} = List Directory ${TESTDIR}
+ Should Be True ${files7} == []
+ @{files8} = List Directory ${TESTDIR}
+ Should Be True @{files8} == []
+
+List Directory With Patterns
+ Comment Setup
+ Create Directory ${TESTDIR}
+ Create File ${TESTDIR}${/}foo.txt
+ Create File ${TESTDIR}${/}bar.txt
+ Create Directory ${TESTDIR}${/}foodir
+ Comment Actual test
+ ${names} = List Directory ${TESTDIR} ???.txt
+ Should Be True ${names} == ['bar.txt', 'foo.txt']
+ ${names} = List Directory ${TESTDIR} *oo*
+ Should Be True ${names} == ['foo.txt', 'foodir']
+
+List Directory With Absolute
+ [Documentation] This tests also List Files In Directory And List
Directories In Directory
+ Create Directory ${TESTDIR}
+ Create File ${TESTDIR}${/}foo.txt
+ Create File ${TESTDIR}${/}bar.txt
+ Create Directory ${TESTDIR}${/}foodir
+ ${names} = List Directory ${TESTDIR} ${EMPTY} absolute
+ Log ${names}
+ Should Be Equal ${names[0]} ${TESTDIR}${/}bar.txt
+ Should Be Equal ${names[1]} ${TESTDIR}${/}foo.txt
+ Should Be Equal ${names[2]} ${TESTDIR}${/}foodir
+ ${names} = List Files In Directory ${TESTDIR} ${EMPTY} whatever
+ Should Be Equal ${names[0]} ${TESTDIR}${/}bar.txt
+ Should Be Equal ${names[1]} ${TESTDIR}${/}foo.txt
+ ${names} = List Directories In Directory ${TESTDIR} ${EMPTY}
${EMPTY} deprecated absolute
+ Should Be Equal ${names[0]} ${TESTDIR}${/}foodir
+
+List And Count Files And Directories In Directory
+ [Documentation] Tests 'List Files In Directory', 'List Directories In
Directory', 'Count Files In Directory', 'Count Directories In Directory'
and 'Count Items In Directory'
+ Comment 0) Setup
+ Create Dir ${TESTDIR}
+ Create File ${TESTDIR}${/}foo.txt
+ Create File ${TESTDIR}${/}bar.txt
+ Create File ${TESTDIR}${/}zap.txt
+ Create Dir ${TESTDIR}${/}foodir
+ Create Dir ${TESTDIR}${/}bardir
+ Comment 1) List Files In Dir
+ ${files} = List Files In Directory ${TESTDIR}
+ ${bar_files} = List Files In Directory ${TESTDIR} bar*
+ Should Be True ${files} == ['bar.txt','foo.txt','zap.txt']
+ Should Be True ${bar_files} == ['bar.txt']
+ Comment 2) List Dirs In Dir
+ ${dirs} = List Directories In Directory ${TESTDIR}
+ ${foo_dirs} = List Directories In Directory ${TESTDIR} *o*
+ Should Be True ${dirs} == ['bardir', 'foodir']
+ Should Be True ${foo_dirs} == ['foodir']
+ ${file_count} = Count Files In Directory ${TESTDIR}
+ ${txt_file_count} = Count Files In Directory ${TESTDIR} *.txt
+ Should Be Equal ${file_count} ${3}
+ Should Be Equal ${file_count} ${txt_file_count}
+ Comment 4) Count Dirs In Dir
+ ${dir_count} = Count Directories In Directory ${TESTDIR}
+ ${dir_dir_count} = Count Directories In Directory ${TESTDIR} *dir
+ Should Be Equal ${dir_count} ${2}
+ Should Be Equal ${dir_count} ${dir_dir_count}
+ Comment 5) Count Items In Dir
+ ${count} = Count Items In Directory ${TESTDIR}
+ ${foo_count} = Count Items In Directory ${TESTDIR} foo*
+ Should Be Equal ${count} ${5}
+ Should Be Equal ${foo_count} ${2}
+ Comment 6) Misc tests
+ ${html_file_count} = Count Files In Directory ${CURDIR} *.html
+ ${html_dir_count} = Count Directories In Directory ${CURDIR} *.html
+ ${html_item_count} = Count Items In Directory ${CURDIR} *.html
+ Should Be True ${html_file_count} > 0
+ Should Be Equal ${html_dir_count} ${0}
+ Should Be Equal ${html_file_count} ${html_item_count}
+
+
+*** Keywords ***
+Remove Temps
+ Remove Dir ${TESTDIR} recursive
=======================================
--- /trunk/atest/robot/standard_libraries/operating_system/misc.txt Mon Aug
30 04:10:56 2010
+++ /dev/null
@@ -1,34 +0,0 @@
-*** Settings ***
-Suite Setup Run Tests ${EMPTY}
standard_libraries/operating_system/misc.txt
-Force Tags regression jybot pybot
-Resource atest_resource.txt
-
-*** Test Cases ***
-Get File Size
- ${tc} = Check testcase Get File Size
- ${path} = Join Path ${CURDIR}/../../.. testdata
standard_libraries operating_system robot_temp_file.txt
- Check Log Message ${tc.kws[1].msgs[0]} Size of file '<a
href="file://${path}">${path}</a>' is 0 bytes HTML
- Check Log Message ${tc.kws[4].msgs[0]} Size of file '<a
href="file://${path}">${path}</a>' is 1 byte HTML
- Check Log Message ${tc.kws[7].msgs[0]} Size of file '<a
href="file://${path}">${path}</a>' is 12 bytes HTML
-
-List Directory
- ${tc} = Check testcase List Directory
- ${dir} = Join Path ${CURDIR}/../../.. testdata standard_libraries
operating_system robot_temp_dir
- Check Log Message ${tc.kws[3].msgs[0]} Listing contents of
directory '<a href="file://${dir}">${dir}</a>' HTML
- Check Log Message ${tc.kws[3].msgs[1]} bar.txt\nfoo.txt
- Check Log Message ${tc.kws[12].msgs[0]} Listing contents of
directory '<a href="file://${dir}">${dir}</a>' HTML
- Check Log Message ${tc.kws[12].msgs[1]} foo.txt
-
-List Directory With Patterns
- ${tc} = Check testcase List Directory With Patterns
-
-List Directory With Absolute
- ${tc} = Check testcase List Directory With Absolute
- ${dir} = Join Path ${CURDIR}/../../.. testdata standard_libraries
operating_system robot_temp_dir
- Check Log Message ${tc.kws[4].msgs[0]} Listing contents of
directory '<a href="file://${dir}">${dir}</a>' HTML
- Check Log Message ${tc.kws[4].msgs[1]} ${dir}${/}bar.txt\n
${dir}${/}foo.txt\n ${dir}${/}foodir
- Check Log Message ${tc.kws[12].msgs[1]} Signature of 'List
Directory' keywords has changed. Please update how 'absolute' argumemt is
given. WARN
-
-List And Count Files And Directories In Directory
- [Documentation] Tests 'List Files In Directory', 'List Directories In
Directory', 'Count Files In Directory', 'Count Directories In Directory'
and 'Count Items In Directory'
- Check testcase List And Count Files And Directories In Directory
=======================================
--- /trunk/atest/testdata/standard_libraries/operating_system/misc.txt Mon
Aug 30 04:10:56 2010
+++ /dev/null
@@ -1,126 +0,0 @@
-*** Settings ***
-Suite Teardown Remove Temps
-Test Setup Remove Temps
-Library OperatingSystem
-
-*** Variables ***
-${TESTFILE} ${CURDIR}${/}robot_temp_file.txt
-${TESTDIR} ${CURDIR}${/}robot_temp_dir
-
-*** Test Cases ***
-Get File Size
- Create File ${TESTFILE}
- ${size} = Get File Size ${TESTFILE}
- Should Be Equal ${size} ${0}
- Create File ${TESTFILE} x
- ${size} = Get File Size ${TESTFILE}
- Should Be Equal ${size} ${1}
- Create File ${TESTFILE} some content
- ${size} = Get File Size ${TESTFILE}
- Should Be Equal ${size} ${12}
- ${size} = Get File Size ${CURDIR}/misc.txt
- Should Be True ${size} > 1000
-
-List Directory
- [Documentation] This test also tests setting variables
- Create Dir ${TESTDIR}
- Create File ${TESTDIR}${/}foo.txt
- Create File ${TESTDIR}${/}bar.txt
- ${files} = List Directory ${TESTDIR}
- Should Be True ${files} == ['bar.txt','foo.txt']
- @{files2} = List Directory ${TESTDIR}
- Should Be Equal @{files2}[0] bar.txt
- Should Be Equal @{files2}[1] foo.txt
- ${file} @{files3} = List Dir ${TESTDIR}
- Should Be Equal ${file} bar.txt
- Should Be Equal @{files3}[0] foo.txt
- Remove File ${TESTDIR}${/}bar.txt
- ${files4} = List Directory ${TESTDIR}
- Should Be True ${files4} == ['foo.txt']
- @{files5} = List Directory ${TESTDIR}
- Should Be Equal @{files5}[0] foo.txt
- ${file2} @{files6} = List Dir ${TESTDIR}
- Should Be Equal ${file2} foo.txt
- Should Be True @{files6} == []
- Remove File ${TESTDIR}${/}foo.txt
- ${files7} = List Directory ${TESTDIR}
- Should Be True ${files7} == []
- @{files8} = List Directory ${TESTDIR}
- Should Be True @{files8} == []
-
-List Directory With Patterns
- Comment Setup
- Create Directory ${TESTDIR}
- Create File ${TESTDIR}${/}foo.txt
- Create File ${TESTDIR}${/}bar.txt
- Create Directory ${TESTDIR}${/}foodir
- Comment Actual test
- ${names} = List Directory ${TESTDIR} ???.txt
- Should Be True ${names} == ['bar.txt', 'foo.txt']
- ${names} = List Directory ${TESTDIR} *oo*
- Should Be True ${names} == ['foo.txt', 'foodir']
-
-List Directory With Absolute
- [Documentation] This tests also List Files In Directory And List
Directories In Directory
- Create Directory ${TESTDIR}
- Create File ${TESTDIR}${/}foo.txt
- Create File ${TESTDIR}${/}bar.txt
- Create Directory ${TESTDIR}${/}foodir
- ${names} = List Directory ${TESTDIR} ${EMPTY} absolute
- Log ${names}
- Should Be Equal ${names[0]} ${TESTDIR}${/}bar.txt
- Should Be Equal ${names[1]} ${TESTDIR}${/}foo.txt
- Should Be Equal ${names[2]} ${TESTDIR}${/}foodir
- ${names} = List Files In Directory ${TESTDIR} ${EMPTY} whatever
- Should Be Equal ${names[0]} ${TESTDIR}${/}bar.txt
- Should Be Equal ${names[1]} ${TESTDIR}${/}foo.txt
- ${names} = List Directories In Directory ${TESTDIR} ${EMPTY}
${EMPTY} deprecated absolute
- Should Be Equal ${names[0]} ${TESTDIR}${/}foodir
-
-List And Count Files And Directories In Directory
- [Documentation] Tests 'List Files In Directory', 'List Directories In
Directory', 'Count Files In Directory', 'Count Directories In Directory'
and 'Count Items In Directory'
- Comment 0) Setup
- Create Dir ${TESTDIR}
- Create File ${TESTDIR}${/}foo.txt
- Create File ${TESTDIR}${/}bar.txt
- Create File ${TESTDIR}${/}zap.txt
- Create Dir ${TESTDIR}${/}foodir
- Create Dir ${TESTDIR}${/}bardir
- Comment 1) List Files In Dir
- ${files} = List Files In Directory ${TESTDIR}
- ${bar_files} = List Files In Directory ${TESTDIR} bar*
- Should Be True ${files} == ['bar.txt','foo.txt','zap.txt']
- Should Be True ${bar_files} == ['bar.txt']
- Comment 2) List Dirs In Dir
- ${dirs} = List Directories In Directory ${TESTDIR}
- ${foo_dirs} = List Directories In Directory ${TESTDIR} *o*
- Should Be True ${dirs} == ['bardir', 'foodir']
- Should Be True ${foo_dirs} == ['foodir']
- ${file_count} = Count Files In Directory ${TESTDIR}
- ${txt_file_count} = Count Files In Directory ${TESTDIR} *.txt
- Should Be Equal ${file_count} ${3}
- Should Be Equal ${file_count} ${txt_file_count}
- Comment 4) Count Dirs In Dir
- ${dir_count} = Count Directories In Directory ${TESTDIR}
- ${dir_dir_count} = Count Directories In Directory ${TESTDIR} *dir
- Should Be Equal ${dir_count} ${2}
- Should Be Equal ${dir_count} ${dir_dir_count}
- Comment 5) Count Items In Dir
- ${count} = Count Items In Directory ${TESTDIR}
- ${foo_count} = Count Items In Directory ${TESTDIR} foo*
- Should Be Equal ${count} ${5}
- Should Be Equal ${foo_count} ${2}
- Comment 6) Misc tests
- ${html_file_count} = Count Files In Directory ${CURDIR} *.html
- ${html_dir_count} = Count Directories In Directory ${CURDIR} *.html
- ${html_item_count} = Count Items In Directory ${CURDIR} *.html
- Should Be True ${html_file_count} > 0
- Should Be Equal ${html_dir_count} ${0}
- Should Be Equal ${html_file_count} ${html_item_count}
-
-
-*** Keywords ***
-Remove Temps
- Remove File ${TESTFILE}
- Remove Dir ${TESTDIR} recursive
-
