[Happydoc-checkins] CVS: HappyDoc3/happydoclib happydocstring.py,1.1.1.1,1.2

[Doug H. <dou...@us...>]

Update of /cvsroot/happydoc/HappyDoc3/happydoclib
In directory usw-pr-cvs1:/tmp/cvs-serv2962/happydoclib

Modified Files:
	happydocstring.py 
Log Message:
Fix up tests to work with Proctor instead of using StreamFlushTest.


Index: happydocstring.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/happydocstring.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** happydocstring.py	17 Nov 2002 00:26:19 -0000	1.1.1.1
--- happydocstring.py	17 Nov 2002 15:01:36 -0000	1.2
***************
*** 184,189 ****
  class DocStringConverterTest(unittest.TestCase):
  
!     def __init__(self, methodName, outputDir=''):
!         
          import happydoclib.docstring
          self._hddocstring = happydoclib.docstring
--- 184,188 ----
  class DocStringConverterTest(unittest.TestCase):
  
!     def setUp(self):
          import happydoclib.docstring
          self._hddocstring = happydoclib.docstring
***************
*** 216,224 ****
          if debug:
              print '\n[[%s]]' % converted_text
!         if converted_text != expectedText:
!             print '[INPUT[%s]INPUT]' % inputText
!             print '[EXPECTED[%s]EXPECTED]' % expectedText
!             print '[CONVERTED[%s]CONVERTED]' % converted_text
!         self._compareText(expectedText, converted_text)
          return
  
--- 215,226 ----
          if debug:
              print '\n[[%s]]' % converted_text
!         try:
!             self._compareText(expectedText, converted_text)
!         except AssertionError, msg:
!             import sys
!             sys.stderr.write('[INPUT[%s]INPUT]\n' % inputText)
!             sys.stderr.write('[EXPECTED[%s]EXPECTED]\n' % expectedText)
!             sys.stderr.write('[CONVERTED[%s]CONVERTED]\n' % converted_text)
!             raise
          return