From: Ed Page <eopage@byu.net>
Date: Wed, 16 Dec 2009 00:53:26 +0000 (-0600)
Subject: Fixing some of the unit tests
X-Git-Url: http://git.maemo.org/git/?p=theonering;a=commitdiff_plain;h=09224beb362e3fe36a21e3573831bc8ceb693fa7

Fixing some of the unit tests
---

diff --git a/tests/test_addressbook.py b/tests/test_addressbook.py
index 00ca028..318126d 100644
--- a/tests/test_addressbook.py
+++ b/tests/test_addressbook.py
@@ -72,7 +72,13 @@ def test_one_contact_no_details():
 	assert len(callbackData) == 0, "%r" % callbackData
 
 	contacts = list(book.get_contacts())
-	assert len(contacts) == 1
+	assert len(contacts) == 0, "%r" % contacts
+
+	book.update()
+	assert len(callbackData) == 1, "%r" % callbackData
+	del callbackData[:]
+	contacts = list(book.get_contacts())
+	assert len(contacts) == 1, "%r" % contacts
 	id = contacts[0]
 	name = book.get_contact_name(id)
 	assert name == backend.contactsData[id]["name"]
@@ -108,7 +114,13 @@ def test_one_contact_with_details():
 	assert len(callbackData) == 0, "%r" % callbackData
 
 	contacts = list(book.get_contacts())
-	assert len(contacts) == 1
+	assert len(contacts) == 0, "%r" % contacts
+
+	book.update()
+	assert len(callbackData) == 1, "%r" % callbackData
+	del callbackData[:]
+	contacts = list(book.get_contacts())
+	assert len(contacts) == 1, "%r" % contacts
 	id = contacts[0]
 	name = book.get_contact_name(id)
 	assert name == backend.contactsData[id]["name"]
@@ -151,6 +163,10 @@ def test_adding_a_contact():
 	assert len(callbackData) == 0, "%r" % callbackData
 
 	book.update()
+	assert len(callbackData) == 1, "%r" % callbackData
+	del callbackData[:]
+
+	book.update()
 	assert len(callbackData) == 0, "%r" % callbackData
 
 	book.update(force=True)
@@ -190,6 +206,10 @@ def test_removing_a_contact():
 	assert len(callbackData) == 0, "%r" % callbackData
 
 	book.update()
+	assert len(callbackData) == 1, "%r" % callbackData
+	del callbackData[:]
+
+	book.update()
 	assert len(callbackData) == 0, "%r" % callbackData
 
 	book.update(force=True)
diff --git a/tests/test_gv_backend.py b/tests/test_gv_backend.py
index 4ee29d0..3b5c1a7 100644
--- a/tests/test_gv_backend.py
+++ b/tests/test_gv_backend.py
@@ -30,6 +30,15 @@ def generate_mock(cookiesSucceed, username, password):
 				):
 				return ""
 
+			def load_cookies(self, *args):
+				pass
+
+			def save_cookies(self, *args):
+				pass
+
+			def clear_cookies(self, *args):
+				pass
+
 	return MockModule
 
 
@@ -43,7 +52,7 @@ def test_not_logged_in():
 		assert not backend.login("bad_name", "bad_password")
 		backend.logout()
 		with test_utils.expected(RuntimeError):
-			backend.dial("5551234567")
+			backend.call("5551234567")
 		with test_utils.expected(RuntimeError):
 			backend.send_sms("5551234567", "Hello World")
 		assert backend.get_account_number() == "", "%s" % backend.get_account_number()