[Happydoc-checkins] CVS: HappyDoc3/happydoclib/docset test_docset_MultiHTMLFile.py,1.6,1.7

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

Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset
In directory sc8-pr-cvs1:/tmp/cvs-serv1587/happydoclib/docset

Modified Files:
	test_docset_MultiHTMLFile.py 
Log Message:
Add a test for documenting HappyDoc.


Index: test_docset_MultiHTMLFile.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/test_docset_MultiHTMLFile.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_docset_MultiHTMLFile.py	8 Dec 2002 17:19:05 -0000	1.6
--- test_docset_MultiHTMLFile.py	15 Dec 2002 17:02:48 -0000	1.7
***************
*** 59,65 ****
  
  #
- # Import Local modules
  #
  import happydoclib
  from happydoclib.scanner import Scanner
  from docset_MultiHTMLFile import MultiHTMLFileDocSet
--- 59,65 ----
  
  #
  #
  import happydoclib
+ from happydoclib import tests
  from happydoclib.scanner import Scanner
  from docset_MultiHTMLFile import MultiHTMLFileDocSet
***************
*** 69,86 ****
  #
  
! class MultiHTMLFileDocSetRunTest(unittest.TestCase):
  
      TEST_OUTPUT_DIRECTORY_BASE = 'TestOutput'
  
-     def getOutputDirectory(self):
-         return os.path.join(self.TEST_OUTPUT_DIRECTORY_BASE, self._TestCase__testMethodName)
-     
-     def runHappyDoc(self, *args):
-         default_args = ( '-q', '-d', self.getOutputDirectory(), )
-         all_args = default_args + args
-         happydoc = happydoclib.HappyDoc(all_args)
-         happydoc.run()
-         return
- 
      def testAllExpectedFilesCreated(self):
          self.runHappyDoc( os.path.join('TestCases', 'testScanner') )
--- 69,76 ----
  #
  
! class MultiHTMLFileDocSetRunTest(tests.HappyDocRunTest):
  
      TEST_OUTPUT_DIRECTORY_BASE = 'TestOutput'
  
      def testAllExpectedFilesCreated(self):
          self.runHappyDoc( os.path.join('TestCases', 'testScanner') )
***************
*** 107,110 ****
--- 97,117 ----
                              '%s does not exist' % filename,
                              )
+         return
+ 
+     def testSelfDoc(self):
+         self.runHappyDoc( '-i', 'TestCases',
+                           '-i', 'TestOutput',
+                           os.getcwd(),
+                           )
+         
+         scanner = Scanner([self.getOutputDirectory()])
+         root = os.path.join( self.getOutputDirectory(), 'testScanner' )
+         expected_dirs = [ ('HappyDoc3', 'levelOne',),
+                           ('HappyDoc3', 'levelOne', 'levelTwo'),
+                           ]
+         expected_dirs = [ apply(os.path.join, (root,) + ed) for ed in expected_dirs ]
+         for dirname in expected_dirs:
+             if os.path.isdir(dirname):
+                 self.fail('%s should have been ignored' % dirname)
          return