--- a/iro/test.py	Fri Oct 23 01:37:44 2009 +0200
+++ b/iro/test.py	Wed Oct 28 02:35:01 2009 +0100
@@ -2,6 +2,9 @@
 
 import unittest, ConfigParser
 import iro
+from job import MessageJob
+from joblist import Joblist
+from providerlist import Providerlist
 import threading, xmlrpclib
 from multiprocessing import Queue
 from multiprocessing.managers import BaseManager
@@ -35,7 +38,7 @@
     class MyManager(BaseManager):
         pass
     
-    MyManager.register('MessageJob', iro.MessageJob) 
+    MyManager.register('MessageJob', MessageJob) 
     manager = MyManager()
     manager.start()
     
@@ -53,8 +56,16 @@
 
     #Benutzerdatenbank erstellen
     queue = Queue()
-    provider={"sms":sip, "fax":sip, "mail":localhost}
-    jobqueue=iro.Jobs(manager,  queue, provider)
+    provider=Providerlist()
+    provider.add("sipgate", sip, ["sms", "fax", ])
+    provider.add("smstrade", smstrade, ["sms", ])
+    provider.add("geonet", None, ["sms", "fax", ])
+    provider.add("fax.de", None, ["sms", "fax", ])
+    provider.add("localhost", localhost, ["mail", ])
+    provider.setDefault("sms","smstrade")
+    provider.setDefault("fax","sipgate")
+    provider.setDefault("mail","localhost")
+    jobqueue=Joblist(manager,  queue, provider)
     userdb=iro.MyUserDB(userlist,jobqueue)
 
 
@@ -89,7 +100,7 @@
     def testsendSMS(self):
         servstr="https://test:test@localhost:8000"
         client=xmlrpclib.Server(servstr)
-        id=client.startSMS("test",["01234"] )
+        id=client.startSMS("test",["01234", ] )
         self.assertEqual(client.status(id),{id: {'status': ['init',{}], 'name':  'test'}} )
         
     def testTwoUser(self):
@@ -116,9 +127,19 @@
         servstr="https://test:test@localhost:8000"
         client=xmlrpclib.Server(servstr)       
         self.assertEqual(client.getProvider("sms"), ["fax.de","geonet", "sipgate", "smstrade"])
-        self.assertEqual(client.getProvider("fax").sort(), ["fax.de","geonet", "sipgate"])
-        self.assertEqual(client.getProvider("mail").sort(), ["localhost"])
-        self.assertRaises(iro.NotSupportedFeature, client.getProvider("temp"))
+        self.assertEqual(client.getProvider("fax"), ["fax.de","geonet", "sipgate"])
+        self.assertEqual(client.getProvider("mail"), ["localhost"])
+        
+        self.assertRaises(xmlrpclib.Fault,client.getProvider, "temp")
+    
+    def testGetDefault(self):
+        servstr="https://test:test@localhost:8000"
+        client=xmlrpclib.Server(servstr)       
+        self.assertEqual(client.getDefaultProvider("sms"), "smstrade")
+        self.assertEqual(client.getDefaultProvider("fax"),"sipgate")
+        self.assertEqual(client.getDefaultProvider("mail"), "localhost")       
+        
+        self.assertRaises(xmlrpclib.Fault,client.getDefaultProvider, "temp")        
 
     
 if __name__ == "__main__":