[Happydoc-checkins] CVS: HappyDoc test_happydoc.py,1.79,1.80

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

Update of /cvsroot/happydoc/HappyDoc
In directory usw-pr-cvs1:/tmp/cvs-serv8594

Modified Files:
	test_happydoc.py 
Log Message:
Code formatting changes.
Renamed a few test methods.
Brought a few old tests back-online in different form.


Index: test_happydoc.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/test_happydoc.py,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** test_happydoc.py	2002/02/03 18:51:28	1.79
--- test_happydoc.py	2002/02/03 21:44:45	1.80
***************
*** 203,206 ****
--- 203,212 ----
          return
      
+     def testSelfHTMLCompact(self):
+         assert (not self.runHappyDoc( (os.path.join('TestCases', 'test.py'),),
+                                       extraArgs=('formatter_compactHTML=yes',))
+                 ), 'Full self documentation with compact output test failed.'
+         return
+     
      def testHTMLSingleFile(self):
          assert (not self.runHappyDoc( (os.path.join('TestCases', 'test.py'),),
***************
*** 255,259 ****
  
      def testImportsFromPackages(self):
!         assert (not self.runHappyDoc( (os.path.join('TestCases', 'test_import_packages_basic'),),
                                        )
                  ), 'Import from packages test failed.'
--- 261,266 ----
  
      def testImportsFromPackages(self):
!         assert (not self.runHappyDoc( (os.path.join('TestCases',
!                                                     'test_import_packages_basic'),),
                                        )
                  ), 'Import from packages test failed.'
***************
*** 261,265 ****
  
      def testBasicImportsFromPackagesIgnorePackages(self):
!         assert (not self.runHappyDoc( (os.path.join('TestCases', 'test_import_packages'),),
                                        extraArgs=('docset_usePackages=0',),
                                        )
--- 268,273 ----
  
      def testBasicImportsFromPackagesIgnorePackages(self):
!         assert (not self.runHappyDoc( (os.path.join('TestCases',
!                                                     'test_import_packages'),),
                                        extraArgs=('docset_usePackages=0',),
                                        )
***************
*** 268,272 ****
  
      def testOutputWithPrefix(self):
!         assert (not self.runHappyDoc( (os.path.join('TestCases', 'test_import_packages_basic'),),
                                        extraArgs=('-p',
                                                   '',
--- 276,281 ----
  
      def testOutputWithPrefix(self):
!         assert (not self.runHappyDoc( (os.path.join('TestCases',
!                                                     'test_import_packages_basic'),),
                                        extraArgs=('-p',
                                                   '',
***************
*** 280,289 ****
      ##
      
- #     def testSelfDia(self):
- #         assert (not self.runHappyDoc( ('../HappyDoc',),
- #                                       extraArgs=('--dia',))
- #                 ), 'Full self documentation test in dia format failed.'
- #         return
-    
      def testSelfHTML(self):
          assert (not self.runHappyDoc( (os.path.join(os.pardir, 'HappyDoc'),),
--- 289,292 ----
***************
*** 292,302 ****
          return
      
! #     def testSelfHTMLCompact(self):
! #         assert (not self.runHappyDoc( ('../HappyDoc',),
! #                                       extraArgs=('formatter_compactHTML=yes',))
! #                 ), 'Full self documentation with compact output test failed.'
! #         return
!     
!     def testSelfDocBookSingleFile(self):
          assert (not self.runHappyDoc( (os.path.join(os.pardir, 'HappyDoc'),),
                                        extraArgs=('-F',
--- 295,299 ----
          return
      
!     def testSelfSGMLDocBookSingleFile(self):
          assert (not self.runHappyDoc( (os.path.join(os.pardir, 'HappyDoc'),),
                                        extraArgs=('-F',
***************
*** 307,311 ****
          return
      
!     def testSelfDocBookSSingleFile(self):
          assert (not self.runHappyDoc( (os.path.join(os.pardir, 'HappyDoc'),),
                                        extraArgs=('-F',
--- 304,308 ----
          return
      
!     def testSelfDocBookXSingleFile(self):
          assert (not self.runHappyDoc( (os.path.join(os.pardir, 'HappyDoc'),),
                                        extraArgs=('-F',
***************
*** 315,333 ****
                  ), 'Full self documentation in DocBookS format output test failed.'
          return
- 
- #     def testSelfDocBookXML(self):
- #         assert (not self.runHappyDoc( ('../HappyDoc',),
- #                                       extraArgs=('-F',
- #                                                  'docbookx',
- #                                                  '-T',
- #                                                  'mstruct'))
- #                 ), 'Full self documentation in DocBookX format output test failed.'
- #         return 
-     
- #     def testSelfPlainText(self):
- #         assert (not self.runHappyDoc( ('../HappyDoc',),
- #                                       extraArgs=('-F', 'Text'))
- #                 ), 'Full self documentation-as-text test failed.'
- #         return
      
  
--- 312,315 ----
***************
*** 382,386 ****
  
      def testPluginLoader(self):
!         self.externalApp(os.path.join(os.curdir, 'TestCases', 'test_plugin_loader', 'runtest.py'))
          return
  
--- 364,370 ----
  
      def testPluginLoader(self):
!         self.externalApp(os.path.join(os.curdir, 'TestCases',
!                                       'test_plugin_loader',
!                                       'runtest.py'))
          return
  
***************
*** 436,440 ****
          
  def ZopeTestFactory(**nargs):
!     nargs['workingDir'] = nargs.get('workingDir', os.path.join(os.pardir, 'Zope-2-CVS-src'))
      return apply(ZopeTest, (), nargs)
  
--- 420,425 ----
          
  def ZopeTestFactory(**nargs):
!     nargs['workingDir'] = nargs.get('workingDir', os.path.join(os.pardir,
!                                                                'Zope-2-CVS-src'))
      return apply(ZopeTest, (), nargs)
  
***************
*** 454,458 ****
      def checkBugReport(self, bugId):
          print '\n%s: %s' % (bugId, os.getcwd())
!         assert not self.runHappyDoc( (os.path.join(os.curdir, 'TestCases', 'test_bug%s.py' % bugId), ),
                                       extraArgs=('-p', '-'),
                                       ), 'Check for bug %s failed.' % bugId
--- 439,444 ----
      def checkBugReport(self, bugId):
          print '\n%s: %s' % (bugId, os.getcwd())
!         assert not self.runHappyDoc( (os.path.join(os.curdir, 'TestCases',
!                                                    'test_bug%s.py' % bugId), ),
                                       extraArgs=('-p', '-'),
                                       ), 'Check for bug %s failed.' % bugId