[Happydoc-checkins] CVS: HappyDoc/happydoclib happydocset.py,1.10,1.11

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

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

Modified Files:
	happydocset.py 
Log Message:
Update test based on new behavior of happydoclib.path.removePrefix().


Index: happydocset.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/happydocset.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** happydocset.py	24 Aug 2002 19:57:07 -0000	1.10
--- happydocset.py	8 Oct 2002 13:03:37 -0000	1.11
***************
*** 875,879 ****
      def testOutputDirectory(self):
          filename = 'TestCases/test.py'
!         test_output_dir = 'c:\\happydoc\\HappyDocTestOut'
          import happydoclib.formatter.formatter_Null
          docset = DocSet( formatterFactory=happydoclib.formatter.formatter_Null.NullFormatter,
--- 875,886 ----
      def testOutputDirectory(self):
          filename = 'TestCases/test.py'
!         if os.name == 'nt':    
!             test_output_dir = 'c:\\happydoc\\HappyDocTestOut'
!             test_base_dir = 'c:\\happydoc\\HappyDocTestIn'
!         else:
!             test_output_dir = '/happydoc/HappyDocTestOut'
!             test_base_dir = '/happydoc/HappyDocTestIn'
!         expected_filename = 'happydoc/HappyDocTestIn'
!             
          import happydoclib.formatter.formatter_Null
          docset = DocSet( formatterFactory=happydoclib.formatter.formatter_Null.NullFormatter,
***************
*** 882,896 ****
                           inputModuleNames=[ filename ],
                           outputBaseDirectory=test_output_dir,
                           statusMessageFunc=self.status_message_func,
                           )
          docset_base_dir = docset.getDocsetBaseDirectory()
!         assert docset_base_dir == test_output_dir, 'Docset directory %s does not match %s' % \
!             (docset_base_dir, test_output_dir)
!         output_base_dir = docset.getOutputBaseDirectory()
!         assert docset_base_dir == test_output_dir, 'Output directory %s does not match %s' % \
              (docset_base_dir, test_output_dir)
          docset_file_name = docset.getFilename()
!         assert docset_file_name == test_output_dir, 'File name %s does not match expected %s' % \
!                (docset_file_name, test_output_dir)
          return
  
--- 889,908 ----
                           inputModuleNames=[ filename ],
                           outputBaseDirectory=test_output_dir,
+                          docsetBaseDirectory=test_base_dir,
                           statusMessageFunc=self.status_message_func,
                           )
          docset_base_dir = docset.getDocsetBaseDirectory()
!         assert docset_base_dir == test_base_dir, 'Docset directory "%s" does not match %s' % \
              (docset_base_dir, test_output_dir)
+         
+         docset_output_dir = docset.getOutputBaseDirectory()
+         assert docset_output_dir == test_output_dir, 'Output directory "%s" does not match %s' % \
+                (docset_output_dir, test_output_dir)
+         
          docset_file_name = docset.getFilename()
!         self.failUnlessEqual(expected_filename, docset_file_name,
!                              'File name "%s" does not match expected %s' % \
!                              (docset_file_name, expected_filename)
!                              )
          return