X-Git-Url: https://www.irasnyder.com/gitweb/?p=rarslave2.git;a=blobdiff_plain;f=rarslave-test.py;h=57906816de75ddd1692f0bf5e92a1dc8d92e4e53;hp=389dcf2bb4d41ca9e7588e25f395a30175599ed2;hb=ff34f5ee9df8449f200b68b9e62d302e87651cd3;hpb=e33dad4f4feea215742be92a5a5ed21832275f39

diff --git a/rarslave-test.py b/rarslave-test.py
index 389dcf2..5790681 100644
--- 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,19 +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())
+		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__':