[Spambayes-checkins] spambayes/spambayes/test test_sb_imapfilter.py, 1.10, 1.11

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27037/spambayes/test

Modified Files:
	test_sb_imapfilter.py 
Log Message:
Update tests.

Index: test_sb_imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/test/test_sb_imapfilter.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_sb_imapfilter.py	13 Jan 2005 21:48:15 -0000	1.10
--- test_sb_imapfilter.py	14 Dec 2005 07:36:33 -0000	1.11
***************
*** 20,24 ****
  from spambayes.Options import options
  from spambayes.classifier import Classifier
! from sb_imapfilter import run, BadIMAPResponseError
  from sb_imapfilter import IMAPSession, IMAPMessage, IMAPFolder, IMAPFilter
  
--- 20,24 ----
  from spambayes.Options import options
  from spambayes.classifier import Classifier
! from sb_imapfilter import run, BadIMAPResponseError, LoginFailure
  from sb_imapfilter import IMAPSession, IMAPMessage, IMAPFolder, IMAPFilter
  
***************
*** 342,346 ****
      def testBadLogin(self):
          print "\nYou should see a message indicating that login failed."
!         self.assertRaises(SystemExit, self.imap.login, IMAP_USERNAME,
                            "wrong password")
  
--- 342,346 ----
      def testBadLogin(self):
          print "\nYou should see a message indicating that login failed."
!         self.assertRaises(LoginFailure, self.imap.login, IMAP_USERNAME,
                            "wrong password")
  
***************
*** 612,616 ****
          self.assertEqual(response[0], "OK")
          self.msg.uid = response[1][0][7:-1]
!         self.msg.folder = IMAPFolder("Inbox", self.msg.imap_server)
  
          new_msg = self.msg.get_full_message()
--- 612,616 ----
          self.assertEqual(response[0], "OK")
          self.msg.uid = response[1][0][7:-1]
!         self.msg.folder = IMAPFolder("Inbox", self.msg.imap_server, None)
  
          new_msg = self.msg.get_full_message()
***************
*** 634,638 ****
          self.msg.imap_server.select()
          self.msg.uid = 103 # id of malformed message in dummy server
!         self.msg.folder = IMAPFolder("Inbox", self.msg.imap_server)
          print "\nWith email package versions less than 3.0, you should " \
                "see an error parsing the message."
--- 634,638 ----
          self.msg.imap_server.select()
          self.msg.uid = 103 # id of malformed message in dummy server
!         self.msg.folder = IMAPFolder("Inbox", self.msg.imap_server, None)
          print "\nWith email package versions less than 3.0, you should " \
                "see an error parsing the message."
***************
*** 661,669 ****
          BaseIMAPFilterTest.setUp(self)
          self.imap.login(IMAP_USERNAME, IMAP_PASSWORD)
!         self.folder = IMAPFolder("testfolder", self.imap)
  
      def test_cmp(self):
!         folder2 = IMAPFolder("testfolder", self.imap)
!         folder3 = IMAPFolder("testfolder2", self.imap)
          self.assertEqual(self.folder, folder2)
          self.assertNotEqual(self.folder, folder3)
--- 661,669 ----
          BaseIMAPFilterTest.setUp(self)
          self.imap.login(IMAP_USERNAME, IMAP_PASSWORD)
!         self.folder = IMAPFolder("testfolder", self.imap, None)
  
      def test_cmp(self):
!         folder2 = IMAPFolder("testfolder", self.imap, None)
!         folder3 = IMAPFolder("testfolder2", self.imap, None)
          self.assertEqual(self.folder, folder2)
          self.assertNotEqual(self.folder, folder3)
***************
*** 749,753 ****
          self.imap.login(IMAP_USERNAME, IMAP_PASSWORD)
          classifier = Classifier()
!         self.filter = IMAPFilter(classifier)
          options["imap", "ham_train_folders"] = ("ham_to_train",)
          options["imap", "spam_train_folders"] = ("spam_to_train",)
--- 749,753 ----
          self.imap.login(IMAP_USERNAME, IMAP_PASSWORD)
          classifier = Classifier()
!         self.filter = IMAPFilter(classifier, None)
          options["imap", "ham_train_folders"] = ("ham_to_train",)
          options["imap", "spam_train_folders"] = ("spam_to_train",)