Revision: 4126
Author: janne.t.harkonen
Date: Fri Sep 24 00:56:58 2010
Log: better method names
http://code.google.com/p/robotframework/source/detail?r=4126
Modified:
/trunk/src/robot/output/logger.py
/trunk/utest/output/test_logger.py
=======================================
--- /trunk/src/robot/output/logger.py Fri Sep 24 00:42:43 2010
+++ /trunk/src/robot/output/logger.py Fri Sep 24 00:56:58 2010
@@ -46,7 +46,7 @@
def disable_automatic_console_logger(self):
if not self._console_logger_disabled:
self._console_logger_disabled = True
- self._loggers.remove_first_regular_logger()
+ return self._loggers.remove_first_regular_logger()
def register_logger(self, *loggers):
for log in loggers:
@@ -92,14 +92,14 @@
def message(self, msg):
"""Messages about what the framework is doing, warnings,
errors, ..."""
- for logger in self._loggers.get_loggers():
+ for logger in self._loggers.all_loggers():
logger.message(msg)
if self._message_cache is not None:
self._message_cache.append(msg)
def log_message(self, msg):
"""Log messages written (mainly) by libraries"""
- for logger in self._loggers.get_loggers():
+ for logger in self._loggers.all_loggers():
logger.log_message(msg)
if msg.level == 'WARN':
msg.linkable = True
@@ -111,37 +111,37 @@
def output_file(self, name, path):
"""Finished output, report, log, summary or debug file (incl.
split)"""
- for logger in self._loggers.get_loggers():
+ for logger in self._loggers.all_loggers():
logger.output_file(name, path)
def close(self):
- for logger in self._loggers.get_loggers():
+ for logger in self._loggers.all_loggers():
logger.close()
self._loggers = LoggerCollection()
self._message_cache = []
def start_suite(self, suite):
- for logger in self._loggers.get_starting_loggers():
+ for logger in self._loggers.starting_loggers():
logger.start_suite(suite)
def end_suite(self, suite):
- for logger in self._loggers.get_ending_loggers():
+ for logger in self._loggers.ending_loggers():
logger.end_suite(suite)
def start_test(self, test):
- for logger in self._loggers.get_starting_loggers():
+ for logger in self._loggers.starting_loggers():
logger.start_test(test)
def end_test(self, test):
- for logger in self._loggers.get_ending_loggers():
+ for logger in self._loggers.ending_loggers():
logger.end_test(test)
def start_keyword(self, keyword):
- for logger in self._loggers.get_starting_loggers():
+ for logger in self._loggers.starting_loggers():
logger.start_keyword(keyword)
def end_keyword(self, keyword):
- for logger in self._loggers.get_ending_loggers():
+ for logger in self._loggers.ending_loggers():
logger.end_keyword(keyword)
@@ -169,13 +169,13 @@
in self._context_changing_loggers
if proxy.logger is not logger]
- def get_starting_loggers(self):
- return self.get_loggers()
-
- def get_ending_loggers(self):
+ def starting_loggers(self):
+ return self.all_loggers()
+
+ def ending_loggers(self):
return self._regular_loggers + self._context_changing_loggers
- def get_loggers(self):
+ def all_loggers(self):
return self._context_changing_loggers + self._regular_loggers
=======================================
--- /trunk/utest/output/test_logger.py Fri Sep 24 00:42:43 2010
+++ /trunk/utest/output/test_logger.py Fri Sep 24 00:56:58 2010
@@ -90,11 +90,11 @@
logger2 = LoggerMock2(('Hello, world!', 'INFO'))
self.logger.register_logger(logger, logger2)
self.logger.close()
- assert_equals(self.logger._loggers.get_loggers(), [])
+ assert_equals(self.logger._loggers.all_loggers(), [])
def test_registering_file_logger_with_none_path_does_nothing(self):
self.logger.register_file_logger('None')
- assert_equals(self.logger._loggers.get_loggers(), [])
+ assert_equals(self.logger._loggers.all_loggers(), [])
def test_cached_messages_are_given_to_registered_writers(self):
self.logger.write('This is a cached message', 'INFO')
@@ -128,12 +128,12 @@
def test_console_logger_is_automatically_registered(self):
logger = Logger()
- assert_true(logger._loggers.get_loggers()[0].start_suite.im_class
is CommandLineMonitor)
+ assert_true(logger._loggers.all_loggers()[0].start_suite.im_class
is CommandLineMonitor)
def test_automatic_console_logger_can_be_disabled(self):
logger = Logger()
logger.disable_automatic_console_logger()
- assert_equals(logger._loggers.get_loggers(), [])
+ assert_equals(logger._loggers.all_loggers(), [])
def
test_automatic_console_logger_can_be_disabled_after_registering_logger(self):
logger = Logger()
@@ -141,7 +141,7 @@
logger.register_logger(mock)
logger.disable_automatic_console_logger()
self._number_of_registered_loggers_should_be(1, logger)
- assert_true(logger._loggers.get_loggers()[0].message.im_class is
LoggerMock)
+ assert_true(logger._loggers.all_loggers()[0].message.im_class is
LoggerMock)
def test_disabling_automatic_logger_multiple_times_has_no_effect(self):
logger = Logger()
@@ -158,7 +158,7 @@
logger = Logger()
logger.register_console_logger(width=42)
self._number_of_registered_loggers_should_be(1, logger)
-
assert_equals(logger._loggers.get_loggers()[0].start_suite.im_self._width,
42)
+
assert_equals(logger._loggers.all_loggers()[0].start_suite.im_self._width,
42)
def test_unregister_logger(self):
logger1, logger2, logger3 = LoggerMock(), LoggerMock(),
LoggerMock()
@@ -223,7 +223,7 @@
def _number_of_registered_loggers_should_be(self, number, logger=None):
logger = logger or self.logger
- assert_equals(len(logger._loggers.get_loggers()), number)
+ assert_equals(len(logger._loggers.all_loggers()), number)
if __name__ == "__main__":
