Changeset 133:ab9d4da44176

Timestamp:

31/01/10 11:33:00 (2 years ago)

Author:

Mark Hammond <mhammond@…>

Branch:

default

Message:

update tests for new list return values

Files:

• imapclient/test/test_IMAPClient.py (modified) (6 diffs)

imapclient/test/test_IMAPClient.py

@@ -20 +20 @@
 
     def test_list_folders(self):
-        self.client._imap.list.return_value = ('OK', sentinel.folder_data)
+        self.client._imap._simple_command.return_value = ('OK', 'something')
+        self.client._imap._untagged_response.return_value = ('LIST', sentinel.folder_data)
         self.client._proc_folder_list = Mock(return_value=sentinel.folder_list)
 
         folders = self.client.list_folders(sentinel.dir, sentinel.pattern)
 
-        self.assert_(self.client._imap.list.call_args == ((sentinel.dir, sentinel.pattern), {}))
-        self.assert_(self.client._proc_folder_list.call_args == ((sentinel.folder_data,), {}))
+        self.assertEqual(self.client._imap._simple_command.call_args, (('LIST', sentinel.dir, sentinel.pattern), {}))
+        self.assertEqual(self.client._proc_folder_list.call_args, ((sentinel.folder_data,), {}))
         self.assert_(folders is sentinel.folder_list)
 
-        
     def test_list_sub_folders(self):
-        self.client._imap.lsub.return_value = ('OK', sentinel.folder_data)
+        self.client._imap._simple_command.return_value = ('OK', 'something')
+        self.client._imap._untagged_response.return_value = ('LSUB', sentinel.folder_data)
         self.client._proc_folder_list = Mock(return_value=sentinel.folder_list)
 
         folders = self.client.list_sub_folders(sentinel.dir, sentinel.pattern)
 
-        self.assert_(self.client._imap.lsub.call_args == ((sentinel.dir, sentinel.pattern), {}))
+        self.assert_(self.client._imap._simple_command.call_args == (('LSUB', sentinel.dir, sentinel.pattern), {}))
         self.assert_(self.client._proc_folder_list.call_args == ((sentinel.folder_data,), {}))
         self.assert_(folders is sentinel.folder_list)
@@ -42 +43 @@
 
     def test_list_folders_NO(self):
-        self.client._imap.list.return_value = ('NO', ['badness'])
+        self.client._imap._simple_command.return_value = ('NO', ['badness'])
         self.assertRaises(IMAPClient.Error, self.client.list_folders)
 
 
     def test_list_sub_folders_NO(self):
-        self.client._imap.list.return_value = ('NO', ['badness'])
+        self.client._imap._simple_command.return_value = ('NO', ['badness'])
         self.assertRaises(IMAPClient.Error, self.client.list_folders)
 
@@ -55 +56 @@
                                                  '(\\HasNoChildren) "/" "Foo Bar"',
                                                  ])
-        self.assert_(folders == ['A', 'Foo Bar'])
-
-
+        self.assertEqual(folders, [(['\\HasNoChildren'], '/', 'A',),
+                                   (['\\HasNoChildren'], '/', 'Foo Bar')])
 
 
@@ -65 +65 @@
                                                  '(\\HasNoChildren) "/" C',
                                                  ])
-        self.assert_(folders == ['A', 'B', 'C'], 'got %r' % folders)
+        self.assertEqual(folders, [(['\\HasNoChildren'], '/', 'A'),
+                                   (['\\HasNoChildren'], '/', 'B'),
+                                   (['\\HasNoChildren'], '/', 'C')])
 
 
@@ -73 +75 @@
                                                  '(\\HasNoChildren) "/" C',
                                                  ])
-        self.assert_(folders == ['Alpha', 'Foo Bar', 'C'], 'got %r' % folders)
+        self.assertEqual(folders, [(['\\HasNoChildren'], '/', 'Alpha'),
+                                   (['\\HasNoChildren'], '/', 'Foo Bar'),
+                                   (['\\HasNoChildren'], '/', 'C')])
 
 
@@ -80 +84 @@
                                                  '',
                                                  '(\\HasNoChildren \\UnMarked) "/" "INBOX"'])
-        self.assert_(folders == ['bang\xff', 'INBOX'], 'got %r' % folders)
+        self.assertEqual(folders, [(['\\NoInferiors', '\\UnMarked'], "/", 'bang\xff'),
+                                   (['\\HasNoChildren', '\\UnMarked'], "/", 'INBOX')])
 
 
     def test_quoted_specials(self):
-        folders = self.client._proc_folder_list(['(\\HasNoChildren) "/" "Test \"Folder\""',
-                                                 '(\\HasNoChildren) "/" "Left\"Right"',
-                                                r'(\\HasNoChildren) "/" "Left\\Right"',
+        folders = self.client._proc_folder_list([r'(\HasNoChildren) "/" "Test \"Folder\""',
+                                                 r'(\HasNoChildren) "/" "Left\"Right"',
+                                                 r'(\HasNoChildren) "/" "Left\\Right"',
                                                  ])
-        self.assert_(folders == ['Test "Folder"', 'Left\"Right', r'Left\Right'], 'got %r' % folders)
+        self.assertEqual(folders, [(['\\HasNoChildren'], '/', 'Test "Folder"'),
+                                   (['\\HasNoChildren'], '/', 'Left\"Right'),
+                                   (['\\HasNoChildren'], '/', r'Left\Right')])
 
     def test_blanks(self):