X-Git-Url: https://www.irasnyder.com/gitweb/?p=rarslave2.git;a=blobdiff_plain;f=rarslave-test.py;h=57906816de75ddd1692f0bf5e92a1dc8d92e4e53;hp=64d04f6ba6095c775b98d9cd1bd0411179d48767;hb=8a063b3c5c7910db244bdab28e0409cde2ff551c;hpb=5ec7a887a528ecf80185ef26a2d5b754cb05ef18

diff --git a/rarslave-test.py b/rarslave-test.py
index 64d04f6..5790681 100644
--- a/rarslave-test.py
+++ b/rarslave-test.py
@@ -3,6 +3,7 @@
 
 import os, sys, unittest
 from rarslave import *
+from RarslaveLogger import RarslaveLogger,RarslaveMessage,MessageType
 
 class rarslavetest (unittest.TestCase):
 
@@ -19,10 +20,10 @@ class rarslavetest (unittest.TestCase):
 		return True
 
 	def setUp (self):
-		pass
+		self.logger = RarslaveLogger ()
 
 	def tearDown (self):
-		pass
+		self.logger = None
 
 	def testGetBasenameNone (self):
 		QNAME = '[something] some names.txt'
@@ -51,32 +52,16 @@ 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 = '/home/irasnyd/downloads/test_material/01/'
+		DIR = os.getcwd() + '/test_material/01/'
 
 		self.assertTrue (is_newrar (os.listdir (DIR)))
 
@@ -91,6 +76,27 @@ class rarslavetest (unittest.TestCase):
 
 		self.assertListEquals (find_deleteable_files (FILESN + FILESY), FILESY)
 
+	### RarslaveMessage tests
+
+	def testRepr (self):
+		STR1 = "Hello World"
+		STR2 = "Goodbye, \nCruel World"
+
+		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, 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__':
 	unittest.main ()