[RARSLAVE] Eliminate duplicates when finding deleteable files

[rarslave2.git] / rarslave-test.py

diff --git a/rarslave-test.py b/rarslave-test.py
index e2733ba..5790681 100644 (file)
--- a/rarslave-test.py
+++ b/rarslave-test.py
@@ -3,8 +3,7 @@
 
 import os, sys, unittest
 from rarslave import *
-from RarslaveLogger import RarslaveLogger
-from RarslaveLogger import RarslaveMessage
+from RarslaveLogger import RarslaveLogger,RarslaveMessage,MessageType
 
 class rarslavetest (unittest.TestCase):
 
@@ -54,29 +53,13 @@ class rarslavetest (unittest.TestCase):
        def testFindLikelyFilesBadDir (self):
                DIR = '/fake/dir'
 
-               self.assertRaises (ValueError, find_likely_files, "fake", DIR)
+               self.assertRaises (AssertionError, find_likely_files, "fake", DIR)
 
        def testFindAllPar2Files (self):
                DIR = '/fake/dir'
 
                self.assertRaises (ValueError, find_all_par2_files, DIR)
 
-       def testHasExtension1 (self):
-               FILE = 'some.file.part01.rar'
-
-               self.assertTrue (has_extension (FILE, 'rar'))
-               self.assertTrue (has_extension (FILE, '.rar'))
-               self.assertTrue (has_extension (FILE, 'part01.rar'))
-               self.assertTrue (has_extension (FILE, '.part01.rar'))
-
-       def testHasExtension2 (self):
-               FILE = 'some.file.part01.rar'
-
-               self.assertFalse (has_extension (FILE, 'zip'))
-               self.assertFalse (has_extension (FILE, '.zip'))
-               self.assertFalse (has_extension (FILE, '.part01'))
-               self.assertFalse (has_extension (FILE, 'part01'))
-
        def testIsNewRar (self):
                DIR = os.getcwd() + '/test_material/01/'
 
@@ -99,41 +82,20 @@ class rarslavetest (unittest.TestCase):
                STR1 = "Hello World"
                STR2 = "Goodbye, \nCruel World"
 
-               self.assertEquals (STR1, RarslaveMessage (STR1, True ).__repr__())
-               self.assertEquals (STR1, RarslaveMessage (STR1, False).__repr__())
-               self.assertEquals (STR2, RarslaveMessage (STR2, True ).__repr__())
-               self.assertEquals (STR2, RarslaveMessage (STR2, False).__repr__())
+               self.assertEquals (STR1, RarslaveMessage (STR1).__repr__())
+               self.assertEquals (STR1, RarslaveMessage (STR1, MessageType.Normal).__repr__())
+               self.assertEquals (STR2, RarslaveMessage (STR2, MessageType.Verbose).__repr__())
+               self.assertEquals (STR2, RarslaveMessage (STR2, MessageType.Debug).__repr__())
 
        def testisVerboseMessage (self):
                STR1 = "Hello World"
                STR2 = "Goodbye, \nCruel World"
 
-               self.assertTrue (RarslaveMessage (STR1, False).isVerbose())
-               self.assertTrue (RarslaveMessage (STR2, False).isVerbose())
-               self.assertFalse (RarslaveMessage (STR1, True).isVerbose())
-               self.assertFalse (RarslaveMessage (STR2, True).isVerbose())
-
-       ### RarslaveLogger tests
-
-       def testgetUniqueID (self):
-               generated = []
-
-               for i in xrange(100):
-                       id = self.logger.getUniqueID ()
-                       if id in generated:
-                               self.fail ("Already generated ID was generated again")
-
-                       generated.append (id)
-
-       def testisValidID (self):
-               id1 = self.logger.getUniqueID ()
-               id2 = self.logger.getUniqueID ()
-
-               self.assertFalse (self.logger.isValidID (-100))
-               self.assertFalse (self.logger.isValidID (1000))
-
-               self.assertTrue (self.logger.isValidID (id1))
-               self.assertTrue (self.logger.isValidID (id2))
+               self.assertTrue (RarslaveMessage (STR1, MessageType.Verbose).isVerbose())
+               self.assertTrue (RarslaveMessage (STR2, MessageType.Verbose).isVerbose())
+               self.assertFalse (RarslaveMessage (STR1).isVerbose())
+               self.assertFalse (RarslaveMessage (STR2, MessageType.Debug).isVerbose())
+               self.assertFalse (RarslaveMessage (STR2, MessageType.Normal).isVerbose())
 
 
 if __name__ == '__main__':