ppf/new: Fixes in parsing tests.

Also add support for running certain tests - with the help of
unittest.TestSuite class.

diff --git a/ppf/new/tests/test_parsing.py b/ppf/new/tests/test_parsing.py
index 53f624c..371b3ce 100644 (file)
--- a/ppf/new/tests/test_parsing.py
+++ b/ppf/new/tests/test_parsing.py
@@ -59,9 +59,9 @@ class LibtorrentLogParserTest(unittest.TestCase):
         f.close()
 
         # Initialize message type counters.
-        self.statmsg_cnt = 0
-        self.pstatmsg_cnt = 0
-        self.verbmsg_cnt = 0
+        self.statmsg_count = 0
+        self.pstatmsg_count = 0
+        self.verbmsg_count = 0
 
         # Initialize internal call counts.
         self.bogus_line_num_calls = 0
@@ -125,10 +125,10 @@ class LibtorrentLogParserTest(unittest.TestCase):
         """Update message type counters according to msg."""
         if msg.__class__ == storage.StatusMessage:
             self.statmsg_count = self.statmsg_count + 1
-        elif msg.__class__ == storage.StatusMessage:
-            self.statmsg_count = self.statmsg_count + 1
-        elif msg.__class__ == storage.StatusMessage:
-            self.statmsg_count = self.statmsg_count + 1
+        elif msg.__class__ == storage.PeerStatusMessage:
+            self.pstatmsg_count = self.pstatmsg_count + 1
+        elif msg.__class__ == storage.VerboseMessage:
+            self.verbmsg_count = self.verbmsg_count + 1
 
     def test_non_existent_folder(self):
         """libtorrent log folder doesn't exist.
@@ -290,7 +290,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
 
         self.add_message_to_count(msg)
 
-        self.assertEqual(self.statmsg_cnt, 1)
+        self.assertEqual(self.verbmsg_count, 1)
 
     def test_get_none_message_in_verbose_log_files(self):
         """Verbose log files consist of bogus information (no messages).
@@ -307,7 +307,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
 
         self.add_message_to_count(msg)
 
-        self.assertEqual(self.verbmsg_cnt, 1)
+        self.assertEqual(self.statmsg_count, 1)
 
     def test_get_status_message(self):
         """Return a status message from status log file."""
@@ -318,7 +318,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
 
         self.add_message_to_count(msg)
 
-        self.assertEqual(self.statmsg_cnt, 1)
+        self.assertEqual(self.statmsg_count, 1)
 
     def test_get_status_messages(self):
         """Return multiple status messages from status log file."""
@@ -332,7 +332,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
         self.add_message_to_count(msg1)
         self.add_message_to_count(msg2)
 
-        self.assertEqual(self.statmsg_cnt, 2)
+        self.assertEqual(self.statmsg_count, 2)
 
     def test_get_status_messages_different_files(self):
         """Return multiple status messages from different log files."""
@@ -346,7 +346,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
         self.add_message_to_count(msg1)
         self.add_message_to_count(msg2)
 
-        self.assertEqual(self.statmsg_cnt, 2)
+        self.assertEqual(self.statmsg_count, 2)
 
     def test_get_peer_status_message(self):
         """Return a peer status message from status log file."""
@@ -357,7 +357,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
 
         self.add_message_to_count(msg)
 
-        self.assertEqual(self.pstatmsg_cnt, 1)
+        self.assertEqual(self.pstatmsg_count, 1)
 
     def test_get_peer_status_messages(self):
         """Return multiple peer status messages from status log file."""
@@ -371,7 +371,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
         self.add_message_to_count(msg1)
         self.add_message_to_count(msg2)
 
-        self.assertEqual(self.pstatmsg_cnt, 2)
+        self.assertEqual(self.pstatmsg_count, 2)
 
     def test_get_peer_status_messages_different_files(self):
         """Return multiple peer status messages from different log files."""
@@ -385,7 +385,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
         self.add_message_to_count(msg1)
         self.add_message_to_count(msg2)
 
-        self.assertEqual(self.pstatmsg_cnt, 2)
+        self.assertEqual(self.pstatmsg_count, 2)
 
     def test_get_verbose_message(self):
         """Return a verbose message from verbose log file."""
@@ -396,7 +396,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
 
         self.add_message_to_count(msg)
 
-        self.assertEqual(self.verbmsg_cnt, 1)
+        self.assertEqual(self.verbmsg_count, 1)
 
     def test_get_verbose_messages(self):
         """Return multiple verbose messages from verbose log file."""
@@ -410,7 +410,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
         self.add_message_to_count(msg1)
         self.add_message_to_count(msg2)
 
-        self.assertEqual(self.verbmsg_cnt, 2)
+        self.assertEqual(self.verbmsg_count, 2)
 
     def test_get_verbose_messages_different_files(self):
         """Return multiple verbose messages from different log files."""
@@ -424,7 +424,7 @@ class LibtorrentLogParserTest(unittest.TestCase):
         self.add_message_to_count(msg1)
         self.add_message_to_count(msg2)
 
-        self.assertEqual(self.verbmsg_cnt, 2)
+        self.assertEqual(self.verbmsg_count, 2)
 
     def test_get_mixed_messages_same_file(self):
         """Status file contains multiple messages of different types."""
@@ -441,9 +441,9 @@ class LibtorrentLogParserTest(unittest.TestCase):
         self.add_message_to_count(msg2)
         self.add_message_to_count(msg3)
 
-        value = (self.statmsg_cnt == 1 and self.pstatmsg_cnt == 1 and \
-                self.verbmsg_cnt == 1)
-        self.assertEqual(value, True)
+        self.assertEqual(self.statmsg_count, 1)
+        self.assertEqual(self.pstatmsg_count, 1)
+        self.assertEqual(self.verbmsg_count, 1)
 
     def test_get_mixed_messages_own_file(self):
         """Each log file contains a single type of messages."""
@@ -469,9 +469,9 @@ class LibtorrentLogParserTest(unittest.TestCase):
         self.add_message_to_count(msg5)
         self.add_message_to_count(msg6)
 
-        value = (self.statmsg_cnt == 2 and self.pstatmsg_cnt == 2 and \
-                self.verbmsg_cnt == 2)
-        self.assertEqual(value, True)
+        self.assertEqual(self.statmsg_count, 2)
+        self.assertEqual(self.pstatmsg_count, 2)
+        self.assertEqual(self.verbmsg_count, 2)
 
     def test_get_mixed_messages_different_files(self):
         """Log files contain different message types."""
@@ -497,9 +497,9 @@ class LibtorrentLogParserTest(unittest.TestCase):
         self.add_message_to_count(msg5)
         self.add_message_to_count(msg6)
 
-        value = (self.statmsg_cnt == 2 and self.pstatmsg_cnt == 2 and \
-                self.verbmsg_cnt == 2)
-        self.assertEqual(value, True)
+        self.assertEqual(self.statmsg_count, 2)
+        self.assertEqual(self.pstatmsg_count, 2)
+        self.assertEqual(self.verbmsg_count, 2)
 
 
 class TriblerLogParserTest(unittest.TestCase):
@@ -511,6 +511,13 @@ class TriblerLogParserTest(unittest.TestCase):
     def tearDown(self):
         pass
 
-
 if __name__ == "__main__":
+#    suite = unittest.TestSuite()
+#    suite.addTest(LibtorrentLogParserTest('test_get_status_message'))
+#    suite.addTest(LibtorrentLogParserTest('test_get_status_messages'))
+#    suite.addTest(LibtorrentLogParserTest('test_get_status_messages_different_files'))
+#    suite.addTest(LibtorrentLogParserTest('test_get_verbose_message'))
+#    suite.addTest(LibtorrentLogParserTest('test_get_verbose_messages'))
+#    suite.addTest(LibtorrentLogParserTest('test_get_verbose_messages_different_files'))
+#    unittest.TextTestRunner().run(suite)
     unittest.main()