Author: pekka.klarck
Date: Mon Apr 13 11:35:33 2009
New Revision: 1796
Modified:
trunk/atest/robot/core/same_test_multiple_times_in_suite.html
trunk/src/robot/running/model.py
Log:
rephrased warning when tests with same names executed in a suite based on
comment by Chris Prinos to r1778
Modified: trunk/atest/robot/core/same_test_multiple_times_in_suite.html
==============================================================================
--- trunk/atest/robot/core/same_test_multiple_times_in_suite.html
(original)
+++ trunk/atest/robot/core/same_test_multiple_times_in_suite.html Mon Apr
13 11:35:33 2009
@@ -54,7 +54,6 @@
}
</style>
<title>Robot Test Cases</title></head>
-
<body>
<h1>Robot Test Cases</h1>
<table border="1">
@@ -144,7 +143,9 @@
<td>SameTestwith Different CASE and s p a c e s</td>
-</tr><tr><td></td><td>...</td><td>Same Test In Data But Only One
Executed</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>There
Should Be Warning When Multiple Tests With Same Name Are
Executed</td><td>Check Log Message</td><td>${ERRORS.msgs[0]}</td><td>Test
case 'Same Test Multiple Times' in suite 'Same Test Multiple Times In
Suite' executed multiple times</td><td>WARN</td></tr><tr><td></td><td>Check
Log Message</td><td>${ERRORS.msgs[1]}</td><td>Test case 'Same Test Multiple
Times' in suite 'Same Test Multiple Times In Suite' executed multiple
times</td><td>WARN</td></tr><tr><td></td><td>Check Log
Message</td><td>${ERRORS.msgs[2]}</td><td>Test case 'SameTestwith Different
CASE And S P A C E S' in suite 'Same Test Multiple Times In Suite' executed
multiple
times</td><td>WARN</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>There
Should Be No Warning When There Are Multiple Tests With Same Name In Data
But Only One Is Executed</td><td>${tc} =</td><td>Check Test
Case</td><td>Same Test In Data But Only One
Executed</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>This is
executed!</td><td></td></tr><tr><td></td><td>Should Be Equal As
Integers</td><td>${ERRORS.msg_count}</td><td>3</td><td></td></tr>
+</tr><tr><td></td><td>...</td><td>Same Test In Data But Only One
Executed</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>There
Should Be Warning When Multiple Tests With Same Name Are
Executed</td><td>Check Log
Message</td><td>${ERRORS.msgs[0]}</td><td>Multiple test cases with
name 'Same Test Multiple Times' executed in test suite 'Same Test Multiple
Times In Suite'</td><td>WARN</td></tr><tr><td></td><td>Check Log
Message</td><td>${ERRORS.msgs[1]}</td><td>Multiple test cases with
name 'Same Test Multiple Times' executed in test suite 'Same Test Multiple
Times In Suite'</td><td>WARN</td></tr><tr><td></td><td>Check Log
Message</td><td>${ERRORS.msgs[2]}</td><td>Multiple
+test cases with name 'SameTestwith Different CASE And S P A C E S'
+executed in test suite 'Same Test Multiple Times In
Suite'</td><td>WARN</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>There
Should Be No Warning When There Are Multiple Tests With Same Name In Data
But Only One Is Executed</td><td>${tc} =</td><td>Check Test
Case</td><td>Same Test In Data But Only One
Executed</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>This is
executed!</td><td></td></tr><tr><td></td><td>Should Be Equal As
Integers</td><td>${ERRORS.msg_count}</td><td>3</td><td></td></tr>
</tbody>
</table>
<table border="1">
Modified: trunk/src/robot/running/model.py
==============================================================================
--- trunk/src/robot/running/model.py (original)
+++ trunk/src/robot/running/model.py Mon Apr 13 11:35:33 2009
@@ -77,8 +77,8 @@
for test in self.tests:
normname = utils.normalize(test.name)
if normname in executed_tests:
- LOGGER.warn("Test case '%s' in suite '%s' executed
multiple "
- "times"% (test.name, self.longname))
+ LOGGER.warn("Multiple test cases with name '%s' executed
in "
+ "test suite '%s'"% (test.name, self.longname))
executed_tests.append(normname)
test.run(output, self.namespace, child_err)
if self._exit_on_failure and not child_err and \
