Revision: 3536
Author: jprantan
Date: Wed May 26 02:40:28 2010
Log: Updated error message.
http://code.google.com/p/robotframework/source/detail?r=3536
Modified:
/trunk/atest/robot/parsing/caching_libs_and_resources.txt
/trunk/atest/robot/parsing/data_formats/formats_resource.txt
/trunk/atest/robot/parsing/invalid.txt
/trunk/atest/robot/parsing/unicode_in_paths.txt
/trunk/src/robot/parsing/model.py
=======================================
--- /trunk/atest/robot/parsing/caching_libs_and_resources.txt Tue May 25
06:41:12 2010
+++ /trunk/atest/robot/parsing/caching_libs_and_resources.txt Wed May 26
02:40:28 2010
@@ -36,8 +36,8 @@
Comment Check that resources were parsed only once
Syslog File Should Contain In Order Parsing test data
directory '${dir}'
Syslog File Should Contain In Order Parsing
file '${dir}${/}01_tests.html'
- Syslog File Should Contain In Order Parsing data
source '${dir}${/}02_resource.html' failed: Test case file has no test case
table.
- Syslog File Should Contain In Order Parsing data
source '${dir}${/}03_resource.html' failed: Test case file has no test case
table.
+ Syslog File Should Contain In Order Parsing data
source '${dir}${/}02_resource.html' failed: File has no test case table.
+ Syslog File Should Contain In Order Parsing data
source '${dir}${/}03_resource.html' failed: File has no test case table.
Syslog File Should Contain In Order Parsing
file '${dir}${/}04_tests.html'
Syslog File Should Contain In Order Started test suite 'Resource
Parsing'
Syslog File Should Contain In Order Imported resource
file '${dir}${/}02_resource.html'
=======================================
--- /trunk/atest/robot/parsing/data_formats/formats_resource.txt Tue May 25
08:04:44 2010
+++ /trunk/atest/robot/parsing/data_formats/formats_resource.txt Wed May 26
02:40:28 2010
@@ -55,9 +55,9 @@
Should Be True ${SUITE.suites[1].suites} == ['Sub Suite1', 'Sub
Suite2']
Check Suite Contains Tests ${SUITE} @{SAMPLE_TESTS}
@{SUBSUITE_TESTS}
${invalid} = Join Path ${DATADIR} ${path} invalid.${type}
- Check Syslog Contains Parsing data source '${invalid}' failed: Test
case file has no test case table.
+ Check Syslog Contains Parsing data source '${invalid}' failed: File
has no test case table.
${empty} = Join Path ${DATADIR} ${path} empty.${type}
- Check Syslog Contains Parsing data source '${empty}' failed: Test
case file has no test case table.
+ Check Syslog Contains Parsing data source '${empty}' failed: File
has no test case table.
Check Suite With Init
[Arguments] ${suite}
=======================================
--- /trunk/atest/robot/parsing/invalid.txt Wed May 26 02:05:58 2010
+++ /trunk/atest/robot/parsing/invalid.txt Wed May 26 02:40:28 2010
@@ -6,7 +6,7 @@
${PARSING} parsing
${NO TESTS} ${PARSING}${/}notests
${EMPTY TC TABLE} = ${PARSING}${/}empty_testcase_table.txt
-${EMPTY TC TABLE MSG} = Test case file has no test case table.
+${EMPTY TC TABLE MSG} = File has no test case table.
*** Test Cases ***
@@ -17,7 +17,7 @@
Check Parsing Error malformed.html HTMLParseError:?.*
${HTMLDIR}${/}malformed.html
HTML File Not Containing Tests
- Check Parsing Error invalid.html Test case file has no test case
table. ${HTMLDIR}${/}invalid.html
+ Check Parsing Error invalid.html ${EMPTY TC TABLE MSG}
${HTMLDIR}${/}invalid.html
Empty Directory
Run Tests Without Processing Output ${EMPTY} ${NO TESTS}${/}empty
=======================================
--- /trunk/atest/robot/parsing/unicode_in_paths.txt Tue May 25 05:46:21 2010
+++ /trunk/atest/robot/parsing/unicode_in_paths.txt Wed May 26 02:40:28 2010
@@ -30,4 +30,4 @@
${path} = Normalize Path
${CURDIR}/../../testdata/parsing/unicode_paths/Työ/tyhjä.txt
${path} = Set Variable If
__import__('robot').utils.normalizing._CASE_INSENSITIVE_FILESYSTEM
... ${path.lower()} ${path}
- Check syslog contains Parsing data source '${path}' failed: Test case
file has no test case table.
+ Check syslog contains Parsing data source '${path}' failed: File has no
test case table.
=======================================
--- /trunk/src/robot/parsing/model.py Tue May 25 05:34:14 2010
+++ /trunk/src/robot/parsing/model.py Wed May 26 02:40:28 2010
@@ -70,7 +70,7 @@
def _validate(self):
if not self.testcase_table.is_started():
- raise DataError('Test case file has no test case table.')
+ raise DataError('File has no test case table.')
def __iter__(self):
for table in [self.setting_table, self.variable_table,
