utest and setup.py fixes after adding new output.console package

pekkaklarck · pekkaklarck · commit fbed636469a9 · 2015-06-10T20:17:45.000+03:00
diff --git a/setup.py b/setup.py
@@ -34,9 +34,9 @@
 new keywords from existing ones using the same syntax that is used for
 creating test cases.
 """.strip()
-PACKAGES = ['robot', 'robot.api', 'robot.conf',
-            'robot.htmldata', 'robot.libdocpkg', 'robot.libraries',
-            'robot.model', 'robot.output', 'robot.parsing',
+PACKAGES = ['robot', 'robot.api', 'robot.conf', 'robot.htmldata',
+            'robot.libdocpkg', 'robot.libraries', 'robot.model',
+            'robot.output', 'robot.output.console', 'robot.parsing',
             'robot.reporting', 'robot.result', 'robot.running',
             'robot.running.arguments', 'robot.running.timeouts',
             'robot.utils', 'robot.variables', 'robot.writer']
diff --git a/utest/output/test_console.py b/utest/output/test_console.py
@@ -2,7 +2,7 @@
 import sys
 
 from robot.utils.asserts import assert_equals
-from robot.output.monitor import CommandLineMonitor
+from robot.output.console.verbose import VerboseOutput
 
 # Overwrite IronPython's special utils.isatty with version using stream.isatty.
 # Otherwise our StreamStub.isatty would not really work.
@@ -15,9 +15,9 @@ class TestKeywordNotification(unittest.TestCase):
 
     def setUp(self, markers='AUTO', isatty=True):
         self.stream = StreamStub(isatty)
-        self.monitor = CommandLineMonitor(width=16, colors='off', markers=markers,
-                                          stdout=self.stream, stderr=self.stream)
-        self.monitor.start_test(Stub())
+        self.console = VerboseOutput(width=16, colors='off', markers=markers,
+                                     stdout=self.stream, stderr=self.stream)
+        self.console.start_test(Stub())
 
     def test_write_pass_marker(self):
         self._write_marker()
@@ -46,12 +46,12 @@ def test_more_markers_than_fit_into_status_area(self):
 
     def test_clear_markers_when_test_status_is_written(self):
         self._write_marker(count=5)
-        self.monitor.end_test(Stub())
-        self._verify('| PASS |\n%s\n' % ('-'*self.monitor._writer._width))
+        self.console.end_test(Stub())
+        self._verify('| PASS |\n%s\n' % ('-'*self.console._writer._width))
 
     def test_clear_markers_when_there_are_warnings(self):
         self._write_marker(count=5)
-        self.monitor.message(MessageStub())
+        self.console.message(MessageStub())
         self._verify(before='[ WARN ] Message\n')
         self._write_marker(count=2)
         self._verify(before='[ WARN ] Message\n', after='..')
@@ -76,8 +76,8 @@ def test_markers_auto_off(self):
 
     def _write_marker(self, status='PASS', count=1):
         for i in range(count):
-            self.monitor.start_keyword(Stub())
-            self.monitor.end_keyword(Stub(status=status))
+            self.console.start_keyword(Stub())
+            self.console.end_keyword(Stub(status=status))
 
     def _verify(self, after='', before=''):
         assert_equals(str(self.stream), '%sX :: D  %s' % (before, after))
diff --git a/utest/output/test_logger.py b/utest/output/test_logger.py
@@ -2,7 +2,8 @@
 
 from robot.utils.asserts import assert_equals, assert_true, assert_false
 
-from robot.output.logger import Logger, CommandLineMonitor
+from robot.output.logger import Logger
+from robot.output.console.verbose import VerboseOutput
 
 
 class MessageMock:
@@ -125,9 +126,9 @@ def end_keyword(self, keyword): self.ended_keyword = keyword
                 getattr(self.logger, stend + '_' + name)(name)
                 assert_equals(getattr(logger, stend + 'ed_' + name), name)
 
-    def test_console_logger_is_automatically_registered(self):
+    def test_verbosoe_console_output_is_automatically_registered(self):
         logger = Logger()
-        assert_true(logger._loggers.all_loggers()[0].start_suite.im_class is CommandLineMonitor)
+        assert_true(logger._loggers.all_loggers()[0].start_suite.im_class is VerboseOutput)
 
     def test_loggercollection_is_iterable(self):
         logger = Logger()
