[Happydoc-checkins] CVS: HappyDoc3/happydoclib/docset test_docset_MultiHTMLFile.py,1.4,1.5

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

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

Modified Files:
	test_docset_MultiHTMLFile.py 
Log Message:
Moved tests to test_scanner.py, since the tested feature moved into
the PackageTreeNode.


Index: test_docset_MultiHTMLFile.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/test_docset_MultiHTMLFile.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_docset_MultiHTMLFile.py	7 Dec 2002 17:03:40 -0000	1.4
--- test_docset_MultiHTMLFile.py	8 Dec 2002 17:03:28 -0000	1.5
***************
*** 199,206 ****
          self.failUnlessEqual(actual, expected)
          return
! 
! class MultiHTMLFileDocSetREADMETestCase(unittest.TestCase):
! 
!     def setUp(self):
          input_dir = os.path.join('TestCases', 'testScanner')
          output_dir = '/tmp/foo'
--- 199,205 ----
          self.failUnlessEqual(actual, expected)
          return
!     
!     def testNoPath(self):
!                    
          input_dir = os.path.join('TestCases', 'testScanner')
          output_dir = '/tmp/foo'
***************
*** 208,211 ****
--- 207,214 ----
          scanner = Scanner([input_dir])
  
+         trees = scanner.getPackageTrees()
+         expected_tree = trees[0]
+ 
+         module_two = expected_tree['levelOne']['levelTwo']['two.py']
  
          docset = MultiHTMLFileDocSet(scanner,
***************
*** 214,260 ****
                                       )
  
!         self.scanner = scanner
!         self.docset = docset
!         return
! 
!     def tearDown(self):
!         del self.scanner
!         del self.docset
!         return
!     
!     def testGetReadmeTextForDirectoryInit(self):
!         trees = self.scanner.getPackageTrees()
!         expected_tree = trees[0]['readme_from_init']
! 
!         actual, format = self.docset._getReadmeTextForDirectory(expected_tree)
! 
!         expected_format = 'StructuredText'
!         expected = 'This is the __init__.py file for readme_from_init.'
!         
!         self.failUnlessEqual(actual, expected)
!         return
!     
!     def testGetReadmeTextForDirectoryDotTxt(self):
!         trees = self.scanner.getPackageTrees()
!         expected_tree = trees[0]['readme_from_readme']
! 
!         actual, format = self.docset._getReadmeTextForDirectory(expected_tree)
! 
!         expected_format = 'StructuredText'
!         expected = 'This is the README.txt file for readme_from_readme.\n'
!         
!         self.failUnlessEqual(actual, expected)
!         return
!     
!     def testGetReadmeTextForDirectoryDotStx(self):
!         trees = self.scanner.getPackageTrees()
!         expected_tree = trees[0]['readme_from_stx']
! 
!         actual, format = self.docset._getReadmeTextForDirectory(expected_tree)
  
!         expected_format = 'StructuredText'
!         expected = 'This is the README.stx file for readme_from_stx.\n'
!         
!         self.failUnlessEqual(actual, expected)
          return
  
--- 217,226 ----
                                       )
  
!         actual = docset.getOutputFilenameForPackageTreeNode(
!             module_two,
!             includePath=0,
!             )
  
!         self.failUnlessEqual(actual, 'two.html')
          return