Unit testing now includes cyrus specific formatting

diff --git a/src/unit_tester.py b/src/unit_tester.py
index ea9747a..c8bf83d 100644 (file)
--- a/src/unit_tester.py
+++ b/src/unit_tester.py
@@ -29,6 +29,8 @@ class FileContentsParse(unittest.TestCase):
     dummy_filename = None
     # dummy file descriptor to be used for parsing the acls
     dummy_file = None
+    # dummy original user
+    dummy_user = None
 
     # wrong naming conventions are due to python unittest library requirement
     def setUp(self):
@@ -37,6 +39,7 @@ class FileContentsParse(unittest.TestCase):
         self.dummy_filename = "test_acls.dump"
         self.dummy_file = open(self.dummy_filename, "w")
         self.dummy_file.write("user.00schneider\t0 default 00schneider\tlrswipkxtecda\t\n"
+                              "user.mit^punkt.Gesendete Objekte\t0 default mit.punkt\tlrswipktecda\t\n"
                               "user.00schneider.ibx_poped\t0 default 00schneider\tlrswipkxtecda\t\n"
                               "user.00schneider.ibx_sub\t0 default 00schneider\tlrswpkxtecda\t\n"
                               "user.abrus\t0 default abrus\tlrswipkxtecda\t\n"
@@ -49,6 +52,7 @@ class FileContentsParse(unittest.TestCase):
                               "user.abrus.Notizen\t0 default abrus\tlrswipkxtecda\t\n"
                               "user.abrus.foobar\t0 default abrus\tlrswipkxtecda\t\n")
         self.dummy_file.close()        
+        self.dummy_user = "tester"
 
     # wrong naming conventions are due to python unittest library requirement
     def tearDown(self):
@@ -56,31 +60,40 @@ class FileContentsParse(unittest.TestCase):
         """Clean up the testing conditions"""
         os.unlink(self.dummy_filename)
 
-    def test_mboxlist_firstline(self):
+    def test_mboxlist_parsed_line1(self):
 
-        """Test whether first line was parsed correctly."""
-        parsed_acls = self.file_iter.load_mailbox_list(self.dummy_filename)
-        self.assertIn("user.00schneider", parsed_acls)
-        self.assertIn("00schneider", parsed_acls["user.00schneider"])
-        self.assertEqual(parsed_acls["user.00schneider"]["00schneider"], "lrswipkxtecda", "Wrong acls were parsed for a user.")
+        """Test whether a line was parsed correctly."""
+        self.file_iter.load_mailbox_list(self.dummy_filename, self.dummy_user)
+        self.assertIn("user^00schneider", self.file_iter.file_acls)
+        self.assertIn("00schneider", self.file_iter.file_acls["user^00schneider"])
+        self.assertEqual(self.file_iter.file_acls["user^00schneider"]["00schneider"], "lrswipkxtecda", "Wrong acls were parsed for a user.")
 
+    def test_mboxlist_parsed_line2(self):
+
+        """Test whether a line was parsed correctly."""
+        self.file_iter.load_mailbox_list(self.dummy_filename, self.dummy_user)
+        self.assertIn("user^mit^punkt^Gesendete Objekte", self.file_iter.file_acls)
+        self.assertIn("mit.punkt", self.file_iter.file_acls["user^mit^punkt^Gesendete Objekte"])
+        self.assertEqual(self.file_iter.file_acls["user^mit^punkt^Gesendete Objekte"]["mit.punkt"], "lrswipktecda", "Wrong acls were parsed for a user.")
+        
     def test_mboxlist_totals(self):
 
         """Test whether there are missing parsed lines, mailboxs, and users."""
-        parsed_acls = self.file_iter.load_mailbox_list(self.dummy_filename)
-        self.assertEqual(len(parsed_acls), 12)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 2)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
-        self.assertEqual(len(parsed_acls.popitem()[1]), 1)
+        self.file_iter.load_mailbox_list(self.dummy_filename, self.dummy_user)
+        self.assertEqual(len(self.file_iter.file_acls), 13)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 2)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
+        self.assertEqual(len(self.file_iter.file_acls.popitem()[1]), 1)
         
 
 if __name__ == '__main__':