Revision: 4121
Author: janne.t.harkonen
Date: Fri Sep 24 00:42:21 2010
Log: renamed class
http://code.google.com/p/robotframework/source/detail?r=4121
Modified:
/trunk/src/robot/output/logger.py
/trunk/utest/output/test_logger.py
=======================================
--- /trunk/src/robot/output/logger.py Tue Aug 31 02:27:07 2010
+++ /trunk/src/robot/output/logger.py Fri Sep 24 00:42:21 2010
@@ -22,7 +22,7 @@
from monitor import CommandLineMonitor
-class _Logger(AbstractLogger):
+class Logger(AbstractLogger):
"""A global logger proxy to which new loggers may be registered.
Whenever something is written to LOGGER in code, all registered
loggers are
@@ -150,4 +150,4 @@
'start_keyword', 'end_keyword']
-LOGGER = _Logger()
+LOGGER = Logger()
=======================================
--- /trunk/utest/output/test_logger.py Fri Sep 24 00:42:15 2010
+++ /trunk/utest/output/test_logger.py Fri Sep 24 00:42:21 2010
@@ -2,7 +2,7 @@
from robot.utils.asserts import assert_equals, assert_true, assert_false
-from robot.output.logger import _Logger, CommandLineMonitor
+from robot.output.logger import Logger, CommandLineMonitor
class MessageMock:
@@ -38,7 +38,7 @@
class TestLogger(unittest.TestCase):
def setUp(self):
- self.logger = _Logger()
+ self.logger = Logger()
self.logger.disable_automatic_console_logger()
def test_write_to_one_logger(self):
@@ -112,14 +112,14 @@
assert_false(hasattr(logger, 'msg'))
def test_start_and_end_suite_test_and_keyword(self):
- class Logger:
+ class MyLogger:
def start_suite(self, suite): self.started_suite = suite
def end_suite(self, suite): self.ended_suite = suite
def start_test(self, test): self.started_test = test
def end_test(self, test): self.ended_test = test
def start_keyword(self, keyword): self.started_keyword =
keyword
def end_keyword(self, keyword): self.ended_keyword = keyword
- logger = Logger()
+ logger = MyLogger()
self.logger.register_logger(logger)
for name in 'suite', 'test', 'keyword':
for stend in 'start', 'end':
@@ -127,16 +127,16 @@
assert_equals(getattr(logger, stend + 'ed_' + name), name)
def test_console_logger_is_automatically_registered(self):
- logger = _Logger()
+ logger = Logger()
assert_true(logger._loggers[0].start_suite.im_class is
CommandLineMonitor)
def test_automatic_console_logger_can_be_disabled(self):
- logger = _Logger()
+ logger = Logger()
logger.disable_automatic_console_logger()
assert_equals(logger._loggers, [])
def
test_automatic_console_logger_can_be_disabled_after_registering_logger(self):
- logger = _Logger()
+ logger = Logger()
mock = LoggerMock()
logger.register_logger(mock)
logger.disable_automatic_console_logger()
@@ -144,7 +144,7 @@
assert_true(logger._loggers[0].message.im_class is LoggerMock)
def test_disabling_automatic_logger_multiple_times_has_no_effect(self):
- logger = _Logger()
+ logger = Logger()
logger.disable_automatic_console_logger()
assert_equals(len(logger._loggers), 0)
logger.disable_automatic_console_logger()
@@ -155,7 +155,7 @@
assert_equals(len(logger._loggers), 1)
def
test_registering_console_logger_disables_automatic_console_logger(self):
- logger = _Logger()
+ logger = Logger()
logger.register_console_logger(width=42)
assert_equals(len(logger._loggers), 1)
assert_equals(logger._loggers[0].start_suite.im_self._width, 42)
