changeset f4f449b69910 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=f4f449b69910
description: Remove superfluous clear_contacts method
diffstat:
src/common/contacts.py | 3 ---
test/integration/test_gui_event_integration.py | 11 ++++-------
test/integration/test_roster.py | 18 +++++++-----------
3 files changed, 11 insertions(+), 21 deletions(-)
diffs (100 lines):
diff -r f20b43f02db2 -r f4f449b69910 src/common/contacts.py
--- a/src/common/contacts.py Mon Nov 09 22:03:14 2009 +0100
+++ b/src/common/contacts.py Mon Nov 09 23:03:16 2009 +0100
@@ -298,9 +298,6 @@
if len(self._contacts[account][contact.jid]) == 0:
del self._contacts[account][contact.jid]
- def clear_contacts(self, account):
- self._contacts[account] = {}
-
def remove_jid(self, account, jid, remove_meta=True):
'''Removes all contacts for a given jid'''
if account not in self._contacts:
diff -r f20b43f02db2 -r f4f449b69910
test/integration/test_gui_event_integration.py
--- a/test/integration/test_gui_event_integration.py Mon Nov 09 22:03:14
2009 +0100
+++ b/test/integration/test_gui_event_integration.py Mon Nov 09 23:03:16
2009 +0100
@@ -7,6 +7,7 @@
lib.setup_env()
from common import gajim
+from common import contacts as contacts_module
from gajim import Interface
from gajim_mocks import *
@@ -25,6 +26,9 @@
'''tests gajim.py's incredibly complex handle_event_notify'''
def setUp(self):
+
+ gajim.connections = {}
+ gajim.contacts = contacts_module.Contacts()
gajim.interface.roster = roster_window.RosterWindow()
for acc in contacts:
@@ -38,13 +42,6 @@
self.assertEqual(0, len(notify.notifications))
def tearDown(self):
- gajim.interface.roster.model.clear()
-
- for acc in contacts:
- gajim.contacts.clear_contacts(acc)
-
- del gajim.interface.roster
-
notify.notifications = []
def contact_comes_online(self, account, jid, resource, prio):
diff -r f20b43f02db2 -r f4f449b69910 test/integration/test_roster.py
--- a/test/integration/test_roster.py Mon Nov 09 22:03:14 2009 +0100
+++ b/test/integration/test_roster.py Mon Nov 09 23:03:16 2009 +0100
@@ -9,15 +9,16 @@
from gajim_mocks import *
from common import gajim
+from common import contacts as contacts_module
import roster_window
gajim.get_jid_from_account = lambda acc: 'myjid@' + acc
+
class TestRosterWindow(unittest.TestCase):
def setUp(self):
gajim.interface = MockInterface()
- self.roster = roster_window.RosterWindow()
self.C_NAME = roster_window.C_NAME
self.C_TYPE = roster_window.C_TYPE
@@ -26,13 +27,13 @@
# Add after creating RosterWindow
# We want to test the filling explicitly
+ gajim.contacts = contacts_module.Contacts()
+ gajim.connections = {}
+ self.roster = roster_window.RosterWindow()
+
for acc in contacts:
gajim.connections[acc] = MockConnection(acc)
-
- def tearDown(self):
- self.roster.model.clear()
- for acc in gajim.contacts.get_accounts():
- gajim.contacts.clear_contacts(acc)
+ gajim.contacts.add_account(acc)
### Custom assertions
def assert_all_contacts_are_in_roster(self, acc):
@@ -142,11 +143,6 @@
groups = contacts[acc][jid]['groups'] or
['General',]
- # cleanup
- self.roster.model.clear()
- for acc in contacts:
- gajim.contacts.clear_contacts(acc)
-
def test_fill_roster_model(self):
for acc in contacts:
self.roster.fill_contacts_and_groups_dicts(contacts[acc], acc)
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
