Make tests run again.

Missed to reflect API changes in the tests.

test/integration/test_gui_event_integration.py

@@ -28,7 +28,7 @@ class TestStatusChange(unittest.TestCase):
 	def setUp(self):
 		
 		gajim.connections = {}
-		gajim.contacts = contacts_module.Contacts()
+		gajim.contacts = contacts_module.LegacyContactsAPI()
 		gajim.interface.roster = roster_window.RosterWindow()
 
 		for acc in contacts:

test/integration/test_roster.py

@@ -27,7 +27,7 @@ class TestRosterWindow(unittest.TestCase):
 
 		# Add after creating RosterWindow
 		# We want to test the filling explicitly
-		gajim.contacts = contacts_module.Contacts()
+		gajim.contacts = contacts_module.LegacyContactsAPI()
 		gajim.connections = {}
 		self.roster = roster_window.RosterWindow()
 		

test/runtests.py

@@ -39,9 +39,9 @@ modules = ( 'unit.test_xmpp_dispatcher_nb',
 				'unit.test_xmpp_transports_nb',
 				'unit.test_caps',
 				'unit.test_contacts',
-				'unit.test_gui_interface',
 				'unit.test_sessions',
 				'unit.test_account',
+				'unit.test_gui_interface',
 			 )
 #modules = ()
 

test/unit/test_contacts.py

@@ -6,7 +6,7 @@ import unittest
 import lib
 lib.setup_env()
 
-from common.contacts import CommonContact, Contact, GC_Contact, Contacts
+from common.contacts import CommonContact, Contact, GC_Contact, LegacyContactsAPI
 from common.xmpp import NS_MUC
 
 from common import caps
@@ -68,7 +68,7 @@ class TestGC_Contact(TestCommonContact):
 class TestContacts(unittest.TestCase):
 	
 	def setUp(self):
-		self.contacts = Contacts()
+		self.contacts = LegacyContactsAPI()
 		
 	def test_create_add_get_contact(self):
 		jid = 'test@gajim.org'

test/unit/test_gui_interface.py

@@ -1,3 +1,6 @@
+'''
+Some diverse tests covering functionality in the GUI Interface class.
+'''
 import unittest
 
 import lib
@@ -13,7 +16,7 @@ gajim.logger = MockLogger()
 
 from gui_interface import Interface
 
-class Test(unittest.TestCase):
+class TestInterface(unittest.TestCase):
 
 	def test_instantiation(self):
 		''' Test that we can proper initialize and do not fail on globals '''