From 79b226d3f87eb6a8f043a853d9db734b1d7e4722 Mon Sep 17 00:00:00 2001
From: Stephan Erb <steve-e@h3c.de>
Date: Sat, 5 Dec 2009 22:26:48 +0100
Subject: [PATCH] Make tests run again.

Missed to reflect API changes in the tests.
---
 test/integration/test_gui_event_integration.py | 2 +-
 test/integration/test_roster.py                | 2 +-
 test/runtests.py                               | 2 +-
 test/unit/test_contacts.py                     | 4 ++--
 test/unit/test_gui_interface.py                | 5 ++++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/integration/test_gui_event_integration.py b/test/integration/test_gui_event_integration.py
index 8759e2259..a1eadea60 100644
--- a/test/integration/test_gui_event_integration.py
+++ b/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:
diff --git a/test/integration/test_roster.py b/test/integration/test_roster.py
index acb91b71c..0be85aa11 100644
--- a/test/integration/test_roster.py
+++ b/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()
 		
diff --git a/test/runtests.py b/test/runtests.py
index 4f8ebea30..2f1256f7f 100755
--- a/test/runtests.py
+++ b/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 = ()
 
diff --git a/test/unit/test_contacts.py b/test/unit/test_contacts.py
index 3cd4d5110..4cda25619 100644
--- a/test/unit/test_contacts.py
+++ b/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'
diff --git a/test/unit/test_gui_interface.py b/test/unit/test_gui_interface.py
index 57b91ad4b..d4f1ef4a4 100644
--- a/test/unit/test_gui_interface.py
+++ b/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 '''