[Docstring-checkins] CVS: dps/test test_utils.py,1.2,1.3

[David G. <go...@us...>]

Update of /cvsroot/docstring/dps/test
In directory usw-pr-cvs1:/tmp/cvs-serv12603/dps/test

Modified Files:
	test_utils.py 
Log Message:
updated

Index: test_utils.py
===================================================================
RCS file: /cvsroot/docstring/dps/test/test_utils.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_utils.py	2001/11/15 02:58:43	1.2
--- test_utils.py	2002/02/06 03:11:35	1.3
***************
*** 11,15 ****
  """
  
! import unittest, StringIO
  from DPSTestSupport import utils
  try:
--- 11,15 ----
  """
  
! import unittest, StringIO, sys
  from DPSTestSupport import utils
  try:
***************
*** 23,27 ****
  
      stream = StringIO.StringIO()
!     reporter = utils.Reporter(1, 3, stream)
  
      def setUp(self):
--- 23,27 ----
  
      stream = StringIO.StringIO()
!     reporter = utils.Reporter(2, 4, stream, 1)
  
      def setUp(self):
***************
*** 30,36 ****
  
      def test_level0(self):
!         sw = self.reporter.system_warning(0, 'a little reminder')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="0">
      <paragraph>
          a little reminder
--- 30,46 ----
  
      def test_level0(self):
!         sw = self.reporter.system_warning(0, 'debug output')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="0" type="DEBUG">
!     <paragraph>
!         debug output
! """)
!         self.assertEquals(self.stream.getvalue(),
!                           'Reporter: DEBUG [level 0] debug output\n')
! 
!     def test_level1(self):
!         sw = self.reporter.system_warning(1, 'a little reminder')
!         self.assertEquals(sw.pformat(), """\
! <system_warning level="1" type="INFO">
      <paragraph>
          a little reminder
***************
*** 38,65 ****
          self.assertEquals(self.stream.getvalue(), '')
  
!     def test_level1(self):
!         sw = self.reporter.system_warning(1, 'a warning')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="1">
      <paragraph>
          a warning
  """)
          self.assertEquals(self.stream.getvalue(),
!                           'Warning: [level 1] a warning\n')
  
!     def test_level2(self):
!         sw = self.reporter.system_warning(2, 'an error')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="2">
      <paragraph>
          an error
  """)
          self.assertEquals(self.stream.getvalue(),
!                           'Warning: [level 2] an error\n')
  
!     def test_level3(self):
!         self.assertRaises(utils.SystemWarning, self.reporter.system_warning, 3,
                            'a severe error, raises an exception')
!         self.assertEquals(self.stream.getvalue(), '')
  
  
--- 48,76 ----
          self.assertEquals(self.stream.getvalue(), '')
  
!     def test_level2(self):
!         sw = self.reporter.system_warning(2, 'a warning')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="2" type="WARNING">
      <paragraph>
          a warning
  """)
          self.assertEquals(self.stream.getvalue(),
!                           'Reporter: WARNING [level 2] a warning\n')
  
!     def test_level3(self):
!         sw = self.reporter.system_warning(3, 'an error')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="3" type="ERROR">
      <paragraph>
          an error
  """)
          self.assertEquals(self.stream.getvalue(),
!                           'Reporter: ERROR [level 3] an error\n')
  
!     def test_level4(self):
!         self.assertRaises(utils.SystemWarning, self.reporter.system_warning, 4,
                            'a severe error, raises an exception')
!         self.assertEquals(self.stream.getvalue(), 'Reporter: SEVERE [level 4] '
!                           'a severe error, raises an exception\n')
  
  
***************
*** 67,71 ****
  
      stream = StringIO.StringIO()
!     reporter = utils.Reporter(4, 4, stream)
  
      def setUp(self):
--- 78,82 ----
  
      stream = StringIO.StringIO()
!     reporter = utils.Reporter(5, 5, stream, 0)
  
      def setUp(self):
***************
*** 73,81 ****
          self.stream.truncate()
  
!     def test_information(self):
!         sw = self.reporter.information('an informational message')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="0">
      <paragraph>
          an informational message
  """)
--- 84,101 ----
          self.stream.truncate()
  
!     def test_debug(self):
!         sw = self.reporter.debug('a debug message')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="0" type="DEBUG">
      <paragraph>
+         a debug message
+ """)
+         self.assertEquals(self.stream.getvalue(), '')
+ 
+     def test_info(self):
+         sw = self.reporter.info('an informational message')
+         self.assertEquals(sw.pformat(), """\
+ <system_warning level="1" type="INFO">
+     <paragraph>
          an informational message
  """)
***************
*** 85,89 ****
          sw = self.reporter.warning('a warning')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="1">
      <paragraph>
          a warning
--- 105,109 ----
          sw = self.reporter.warning('a warning')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="2" type="WARNING">
      <paragraph>
          a warning
***************
*** 94,98 ****
          sw = self.reporter.error('an error')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="2">
      <paragraph>
          an error
--- 114,118 ----
          sw = self.reporter.error('an error')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="3" type="ERROR">
      <paragraph>
          an error
***************
*** 103,111 ****
          sw = self.reporter.severe('a severe error')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="3">
      <paragraph>
          a severe error
  """)
          self.assertEquals(self.stream.getvalue(), '')
  
  
--- 123,209 ----
          sw = self.reporter.severe('a severe error')
          self.assertEquals(sw.pformat(), """\
! <system_warning level="4" type="SEVERE">
      <paragraph>
          a severe error
  """)
          self.assertEquals(self.stream.getvalue(), '')
+ 
+ 
+ class ReporterCategoryTests(unittest.TestCase):
+ 
+     stream = StringIO.StringIO()
+ 
+     def setUp(self):
+         self.stream.seek(0)
+         self.stream.truncate()
+         self.reporter = utils.Reporter(2, 4, self.stream, 1)
+         self.reporter.setcategory('lemon', 1, 3, self.stream, 0)
+ 
+     def test_getset(self):
+         self.reporter.setcategory('test', 5, 5, None, 0)
+         self.assertEquals(self.reporter.getcategory('other'),
+                           (1, 2, 4, self.stream))
+         self.assertEquals(self.reporter.getcategory('test'),
+                           (0, 5, 5, sys.stderr))
+         self.assertEquals(self.reporter.getcategory('test.dummy'),
+                           (0, 5, 5, sys.stderr))
+         self.reporter.setcategory('test.dummy.spam', 1, 2, self.stream, 1)
+         self.assertEquals(self.reporter.getcategory('test.dummy.spam'),
+                           (1, 1, 2, self.stream))
+         self.assertEquals(self.reporter.getcategory('test.dummy'),
+                           (0, 5, 5, sys.stderr))
+         self.assertEquals(self.reporter.getcategory('test.dummy.spam.eggs'),
+                           (1, 1, 2, self.stream))
+         self.reporter.unsetcategory('test.dummy.spam')
+         self.assertEquals(self.reporter.getcategory('test.dummy.spam.eggs'),
+                           (0, 5, 5, sys.stderr))
+ 
+     def test_debug(self):
+         sw = self.reporter.debug('debug output', category='lemon.curry')
+         self.assertEquals(self.stream.getvalue(), '')
+         sw = self.reporter.debug('debug output')
+         self.assertEquals(self.stream.getvalue(),
+                           'Reporter: DEBUG [level 0] debug output\n')
+ 
+     def test_info(self):
+         sw = self.reporter.info('some info')
+         self.assertEquals(self.stream.getvalue(), '')
+         sw = self.reporter.info('some info', category='lemon.curry')
+         self.assertEquals(
+               self.stream.getvalue(),
+               'Reporter "lemon.curry": INFO [level 1] some info\n')
+ 
+     def test_warning(self):
+         sw = self.reporter.warning('a warning')
+         self.assertEquals(self.stream.getvalue(),
+                           'Reporter: WARNING [level 2] a warning\n')
+         sw = self.reporter.warning('a warning', category='lemon.curry')
+         self.assertEquals(self.stream.getvalue(), """\
+ Reporter: WARNING [level 2] a warning
+ Reporter "lemon.curry": WARNING [level 2] a warning
+ """)
+ 
+     def test_error(self):
+         sw = self.reporter.error('an error')
+         self.assertEquals(self.stream.getvalue(),
+                           'Reporter: ERROR [level 3] an error\n')
+         self.assertRaises(utils.SystemWarning, self.reporter.error,
+                           'an error', category='lemon.curry')
+         self.assertEquals(self.stream.getvalue(), """\
+ Reporter: ERROR [level 3] an error
+ Reporter "lemon.curry": ERROR [level 3] an error
+ """)
+ 
+     def test_severe(self):
+         self.assertRaises(utils.SystemWarning, self.reporter.severe,
+                           'a severe error')
+         self.assertEquals(self.stream.getvalue(),
+                           'Reporter: SEVERE [level 4] a severe error\n')
+         self.assertRaises(utils.SystemWarning, self.reporter.severe,
+                           'a severe error', category='lemon.curry')
+         self.assertEquals(self.stream.getvalue(), """\
+ Reporter: SEVERE [level 4] a severe error
+ Reporter "lemon.curry": SEVERE [level 4] a severe error
+ """)