Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: callback-dev@incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: filmaj@apache.org
To: callback-commits@incubator.apache.org
Subject: [2/2] spec commit: going along with what becky did for contacts test
 additions/rework, i made some of them a bit more atomic, fixed spacing,
 and added a complex test with chained contact methods.
Message-Id: <20120314222956.CE57671A6@tyr.zones.apache.org>
Date: Wed, 14 Mar 2012 22:29:56 +0000 (UTC)

going along with what becky did for contacts test additions/rework, i made some of them a bit more atomic, fixed spacing, and added a complex test with chained contact methods.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/dc895476
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/dc895476
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/dc895476

Branch: refs/heads/master
Commit: dc89547616a9bfd28d2229f7eb6eb6ffa62e2a04
Parents: b9ef279
Author: Fil Maj <maj.fil@gmail.com>
Authored: Wed Mar 14 00:22:32 2012 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Wed Mar 14 14:22:47 2012 -0700

----------------------------------------------------------------------
 autotest/tests/contacts.tests.js |  609 ++++++++++++++++++---------------
 1 files changed, 335 insertions(+), 274 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/dc895476/autotest/tests/contacts.tests.js
----------------------------------------------------------------------
diff --git a/autotest/tests/contacts.tests.js b/autotest/tests/contacts.tests.js
index c880e4b..faf72db 100644
--- a/autotest/tests/contacts.tests.js
+++ b/autotest/tests/contacts.tests.js
@@ -1,18 +1,28 @@
 // global to store a contact so it doesn't have to be created or retrieved multiple times
+// all of the setup/teardown test methods can reference the following variables to make sure to do the right cleanup
 var gContactObj = null;
 var gContactId = null;
 
+var removeContact = function(){
+    if (gContactObj) {
+        gContactObj.remove(function(){},function(){
+            console.log("[CONTACTS ERROR]: removeContact cleanup method failed to clean up test artifacts.");
+        });
+        gContactObj = null;
+    }
+};
+
 Tests.prototype.ContactsTests = function() {
-	module("Contacts (navigator.contacts)");
-	test("should exist", function() {
-  		expect(1);
-  		ok(navigator.contacts != null, "navigator.contacts should not be null.");
-	});	
-	test("should contain a find function", function() {
-		expect(2);
-		ok(typeof navigator.contacts.find != 'undefined' && navigator.contacts.find != null, "navigator.contacts.find should not be null.");
-		ok(typeof navigator.contacts.find == 'function', "navigator.contacts.find should be a function.");
-	});
+    module("Contacts (navigator.contacts)");
+    test("should exist", function() {
+        expect(1);
+        ok(navigator.contacts != null, "navigator.contacts should not be null.");
+    });
+    test("should contain a find function", function() {
+        expect(2);
+        ok(typeof navigator.contacts.find != 'undefined' && navigator.contacts.find != null, "navigator.contacts.find should not be null.");
+        ok(typeof navigator.contacts.find == 'function', "navigator.contacts.find should be a function.");
+    });
     test("contacts.find success callback should be called with an array", function() {
         expect(2);
         QUnit.stop(15000);
@@ -43,6 +53,7 @@ Tests.prototype.ContactsTests = function() {
         expect(2);
         QUnit.stop(Tests.TEST_TIMEOUT);
         var win = function(result) {
+            ok(false, "Success callback should not fire in this test, failed.");
             QUnit.start();
         };
         var fail = function(result) { 
@@ -54,152 +65,201 @@ Tests.prototype.ContactsTests = function() {
         obj.filter="";
         obj.multiple=true;
         navigator.contacts.find([], win, fail, obj);
-    }); 
-	test("should contain a create function", function() {
-		expect(2);
-		ok(typeof navigator.contacts.create != 'undefined' && navigator.contacts.create != null, "navigator.contacts.create should not be null.");
-		ok(typeof navigator.contacts.create == 'function', "navigator.contacts.create should be a function.");
-	});
-	test("contacts.create should return a Contact object", function() {
-		expect(9);
-         var bDay = new Date(1976, 7,4);
-		var obj = navigator.contacts.create({"displayName": "test name", "gender": "male", "note": "my note", "name": {"formatted": "Mr. Test Name"}, "emails": [{"value": "here@there.com"}, {"value": "there@here.com"}], "birthday": bDay});		
-		ok(obj != 'undefined' && obj != null, "navigator.contacts.create should return a Contact object.");
-		ok(obj.displayName == 'test name', "Contact should contain a displayName property.");
-		ok(obj.note == 'my note', "Contact should contain a note property.");
-		ok(obj.name.formatted == 'Mr. Test Name', "Contact should contain a name.formatted property.");
-		ok(obj.emails.length == 2, "Contact should contain and array of emails with 2 entries");
-		ok(obj.emails[0].value == 'here@there.com', "Contact.emails[1] should contain a value.");
-		ok(obj.emails[1].value == 'there@here.com', "Contact.emails[2] should contain a value.");	
-		ok(obj.nickname == null, "Contact object should not contain a nickname property.");
+    });
+    module("contacts.find with newly-created contact", {
+        setup:function() {},
+        teardown:removeContact
+    });
+    test("find a contact by name", function() {
+        expect(4);
+        QUnit.stop(7000);
+        // ----
+        // Helper save/create invocations+asserts
+        // ----
+        gContactObj = new Contact();
+        gContactObj.name.familyName = "Delete";
+        gContactObj.save(
+            function() {
+                ok(true, "Contact's save success callback needs to fire for this test to pass");
+                // ----
+                // Find asserts
+                // ---
+                var findWin = function(object) {
+                    var foundName = function(result) {
+                        var bFound = false;
+                        try {
+                            for (var i=0; i < result.length; i++) {
+                                if (result[i].name.familyName == "Delete") {
+                                    bFound = true;
+                                    break;
+                                }
+                            }
+                        } catch(e) {
+                            return false;
+                        } 
+                        return bFound;
+                    }         
+                    ok(object instanceof Array, "Object returned in contacts.find success callback should be instanceof array.");
+                    ok(object.length >= 1, "length of Object returned in contacts.find success callback should have length property >= 1");
+                    ok(foundName(object) == true, "returned contact array should contain a contact with familyName of 'Delete'.");
+                    QUnit.start();
+                };
+                var findFail = function() { 
+                    ok(false, "find method's error callback called, test failed.");
+                    QUnit.start(); 
+                };
+                var obj = new ContactFindOptions();
+                obj.filter="Delete";
+                obj.multiple=true;
+                navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], findWin, findFail, obj);
+        },
+        function(e){
+              ok(false, "Contact's save error callback fired; this test cannot continue");
+              QUnit.start();
+        });
+    });
+    module("Contacts (navigator.contacts)");
+    test("should contain a create function", function() {
+        expect(2);
+        ok(typeof navigator.contacts.create != 'undefined' && navigator.contacts.create != null, "navigator.contacts.create should not be null.");
+        ok(typeof navigator.contacts.create == 'function', "navigator.contacts.create should be a function.");
+    });
+    test("contacts.create should return a Contact object", function() {
+        expect(9);
+        var bDay = new Date(1976, 7,4);
+        var obj = navigator.contacts.create({"displayName": "test name", "gender": "male", "note": "my note", "name": {"formatted": "Mr. Test Name"}, "emails": [{"value": "here@there.com"}, {"value": "there@here.com"}], "birthday": bDay});		
+        ok(obj != 'undefined' && obj != null, "navigator.contacts.create should return a Contact object.");
+        ok(obj.displayName == 'test name', "Contact should contain a displayName property.");
+        ok(obj.note == 'my note', "Contact should contain a note property.");
+        ok(obj.name.formatted == 'Mr. Test Name', "Contact should contain a name.formatted property.");
+        ok(obj.emails.length == 2, "Contact should contain and array of emails with 2 entries");
+        ok(obj.emails[0].value == 'here@there.com', "Contact.emails[1] should contain a value.");
+        ok(obj.emails[1].value == 'there@here.com', "Contact.emails[2] should contain a value.");	
+        ok(obj.nickname == null, "Contact object should not contain a nickname property.");
         ok(obj.birthday instanceof Date && obj.birthday == bDay, "Contact should be a Date object equal to " + bDay);
-	});
-	module("Contact model");
-	test("should be able to define a Contact object", function() {
-		expect(15);
-		var contact = new Contact("a", "b", new ContactName("a", "b", "c", "d", "e", "f"), "c", [], [], [], [], [], "f", "i",  
-				[], [], []);
-		ok(contact != null, "new Contact() should not be null.");
-		ok(typeof contact.id != 'undefined' && contact.id != null && contact.id == "a", "new Contact() should include a 'id' property.");
-		ok(typeof contact.displayName != 'undefined' && contact.displayName != null && contact.displayName == "b", "new Contact() should include a 'displayName' property.");
-		ok(typeof contact.name != 'undefined' && contact.name != null && contact.name.formatted == "a", "new Contact() should include a 'name' property.");
-		ok(typeof contact.nickname != 'undefined' && contact.nickname != null && contact.nickname == "c", "new Contact() should include a 'nickname' property.");
-		ok(typeof contact.phoneNumbers != 'undefined' && contact.phoneNumbers != null, "new Contact() should include a 'phoneNumbers' property.");
-		ok(typeof contact.emails != 'undefined' && contact.emails != null, "new Contact() should include a 'emails' property.");
-		ok(typeof contact.addresses != 'undefined' && contact.addresses != null, "new Contact() should include a 'addresses' property.");
-		ok(typeof contact.ims != 'undefined' && contact.ims != null, "new Contact() should include a 'ims' property.");
-		ok(typeof contact.organizations != 'undefined' && contact.organizations != null, "new Contact() should include a 'organizations' property.");
-		ok(typeof contact.birthday != 'undefined' && contact.birthday != null && contact.birthday == "f", "new Contact() should include a 'birthday' property.");
-		ok(typeof contact.note != 'undefined' && contact.note != null && contact.note == "i", "new Contact() should include a 'note' property.");
-		ok(typeof contact.photos != 'undefined' && contact.photos != null, "new Contact() should include a 'photos' property.");
-		ok(typeof contact.categories != 'undefined' && contact.categories != null, "new Contact() should include a 'categories' property.");
-		ok(typeof contact.urls != 'undefined' && contact.urls != null, "new Contact() should include a 'urls' property.");
-	});	
-	test("should be able to define a ContactName object", function() {
-		expect(7);
-		var contactName = new ContactName("Dr. First Last Jr.", "Last", "First", "Middle", "Dr.", "Jr.");
-		ok(contactName != null, "new ContactName() should not be null.");
-		ok(typeof contactName.formatted != 'undefined' && contactName.formatted != null && contactName.formatted == "Dr. First Last Jr.", "new ContactName() should include a 'formatted' property.");
-		ok(typeof contactName.familyName != 'undefined' && contactName.familyName != null && contactName.familyName == "Last", "new ContactName() should include a 'familyName' property.");
-		ok(typeof contactName.givenName != 'undefined' && contactName.givenName != null && contactName.givenName == "First", "new ContactName() should include a 'givenName' property.");
-		ok(typeof contactName.middleName != 'undefined' && contactName.middleName != null && contactName.middleName == "Middle", "new ContactName() should include a 'middleName' property.");
-		ok(typeof contactName.honorificPrefix != 'undefined' && contactName.honorificPrefix != null && contactName.honorificPrefix == "Dr.", "new ContactName() should include a 'honorificPrefix' property.");
-		ok(typeof contactName.honorificSuffix != 'undefined' && contactName.honorificSuffix != null && contactName.honorificSuffix == "Jr.", "new ContactName() should include a 'honorificSuffix' property.");
-	});	
-	test("should be able to define a ContactField object", function() {
-		expect(4);
-		var contactField = new ContactField("home", "8005551212", true);
-		ok(contactField != null, "new ContactField() should not be null.");
-		ok(typeof contactField.type != 'undefined' && contactField.type != null && contactField.type == "home", "new ContactField() should include a 'type' property.");
-		ok(typeof contactField.value != 'undefined' && contactField.value != null && contactField.value == "8005551212", "new ContactField() should include a 'value' property.");
-		ok(typeof contactField.pref != 'undefined' && contactField.pref != null && contactField.pref == true, "new ContactField() should include a 'pref' property.");
-	});	
-	test("should be able to define a ContactAddress object", function() {
-		expect(9);
-		var contactAddress = new ContactAddress(true, "home", "a","b","c","d","e","f");
-		ok(contactAddress != null, "new ContactAddress() should not be null.");
+    });
+    module("Contact model");
+    test("should be able to define a Contact object", function() {
+        expect(15);
+        var contact = new Contact("a", "b", new ContactName("a", "b", "c", "d", "e", "f"), "c", [], [], [], [], [], "f", "i",  
+            [], [], []);
+        ok(contact != null, "new Contact() should not be null.");
+        ok(typeof contact.id != 'undefined' && contact.id != null && contact.id == "a", "new Contact() should include a 'id' property.");
+        ok(typeof contact.displayName != 'undefined' && contact.displayName != null && contact.displayName == "b", "new Contact() should include a 'displayName' property.");
+        ok(typeof contact.name != 'undefined' && contact.name != null && contact.name.formatted == "a", "new Contact() should include a 'name' property.");
+        ok(typeof contact.nickname != 'undefined' && contact.nickname != null && contact.nickname == "c", "new Contact() should include a 'nickname' property.");
+        ok(typeof contact.phoneNumbers != 'undefined' && contact.phoneNumbers != null, "new Contact() should include a 'phoneNumbers' property.");
+        ok(typeof contact.emails != 'undefined' && contact.emails != null, "new Contact() should include a 'emails' property.");
+        ok(typeof contact.addresses != 'undefined' && contact.addresses != null, "new Contact() should include a 'addresses' property.");
+        ok(typeof contact.ims != 'undefined' && contact.ims != null, "new Contact() should include a 'ims' property.");
+        ok(typeof contact.organizations != 'undefined' && contact.organizations != null, "new Contact() should include a 'organizations' property.");
+        ok(typeof contact.birthday != 'undefined' && contact.birthday != null && contact.birthday == "f", "new Contact() should include a 'birthday' property.");
+        ok(typeof contact.note != 'undefined' && contact.note != null && contact.note == "i", "new Contact() should include a 'note' property.");
+        ok(typeof contact.photos != 'undefined' && contact.photos != null, "new Contact() should include a 'photos' property.");
+        ok(typeof contact.categories != 'undefined' && contact.categories != null, "new Contact() should include a 'categories' property.");
+        ok(typeof contact.urls != 'undefined' && contact.urls != null, "new Contact() should include a 'urls' property.");
+    });	
+    test("should be able to define a ContactName object", function() {
+        expect(7);
+        var contactName = new ContactName("Dr. First Last Jr.", "Last", "First", "Middle", "Dr.", "Jr.");
+        ok(contactName != null, "new ContactName() should not be null.");
+        ok(typeof contactName.formatted != 'undefined' && contactName.formatted != null && contactName.formatted == "Dr. First Last Jr.", "new ContactName() should include a 'formatted' property.");
+        ok(typeof contactName.familyName != 'undefined' && contactName.familyName != null && contactName.familyName == "Last", "new ContactName() should include a 'familyName' property.");
+        ok(typeof contactName.givenName != 'undefined' && contactName.givenName != null && contactName.givenName == "First", "new ContactName() should include a 'givenName' property.");
+        ok(typeof contactName.middleName != 'undefined' && contactName.middleName != null && contactName.middleName == "Middle", "new ContactName() should include a 'middleName' property.");
+        ok(typeof contactName.honorificPrefix != 'undefined' && contactName.honorificPrefix != null && contactName.honorificPrefix == "Dr.", "new ContactName() should include a 'honorificPrefix' property.");
+        ok(typeof contactName.honorificSuffix != 'undefined' && contactName.honorificSuffix != null && contactName.honorificSuffix == "Jr.", "new ContactName() should include a 'honorificSuffix' property.");
+    });	
+    test("should be able to define a ContactField object", function() {
+        expect(4);
+        var contactField = new ContactField("home", "8005551212", true);
+        ok(contactField != null, "new ContactField() should not be null.");
+        ok(typeof contactField.type != 'undefined' && contactField.type != null && contactField.type == "home", "new ContactField() should include a 'type' property.");
+        ok(typeof contactField.value != 'undefined' && contactField.value != null && contactField.value == "8005551212", "new ContactField() should include a 'value' property.");
+        ok(typeof contactField.pref != 'undefined' && contactField.pref != null && contactField.pref == true, "new ContactField() should include a 'pref' property.");
+    });	
+    test("should be able to define a ContactAddress object", function() {
+        expect(9);
+        var contactAddress = new ContactAddress(true, "home", "a","b","c","d","e","f");
+        ok(contactAddress != null, "new ContactAddress() should not be null.");
         ok(typeof contactAddress.pref != 'undefined' && contactAddress.pref != null && contactAddress.pref == true, "new ContactAddress() should include a 'pref' property.");
         ok(typeof contactAddress.type != 'undefined' && contactAddress.type != null && contactAddress.type == "home", "new ContactAddress() should include a 'type' property.");
-		ok(typeof contactAddress.formatted != 'undefined' && contactAddress.formatted != null && contactAddress.formatted == "a", "new ContactAddress() should include a 'formatted' property.");
-		ok(typeof contactAddress.streetAddress != 'undefined' && contactAddress.streetAddress != null && contactAddress.streetAddress == "b", "new ContactAddress() should include a 'streetAddress' property.");
-		ok(typeof contactAddress.locality != 'undefined' && contactAddress.locality != null && contactAddress.locality == "c", "new ContactAddress() should include a 'locality' property.");
-		ok(typeof contactAddress.region != 'undefined' && contactAddress.region != null && contactAddress.region == "d", "new ContactAddress() should include a 'region' property.");
-		ok(typeof contactAddress.postalCode != 'undefined' && contactAddress.postalCode != null && contactAddress.postalCode == "e", "new ContactAddress() should include a 'postalCode' property.");
-		ok(typeof contactAddress.country != 'undefined' && contactAddress.country != null && contactAddress.country == "f", "new ContactAddress() should include a 'country' property.");
-	});	
-	test("should be able to define a ContactOrganization object", function() {
-		expect(6);
-		var contactOrg = new ContactOrganization(true, "home", "a","b","c","d","e","f","g");
-		ok(contactOrg != null, "new ContactOrganization() should not be null.");
+        ok(typeof contactAddress.formatted != 'undefined' && contactAddress.formatted != null && contactAddress.formatted == "a", "new ContactAddress() should include a 'formatted' property.");
+        ok(typeof contactAddress.streetAddress != 'undefined' && contactAddress.streetAddress != null && contactAddress.streetAddress == "b", "new ContactAddress() should include a 'streetAddress' property.");
+        ok(typeof contactAddress.locality != 'undefined' && contactAddress.locality != null && contactAddress.locality == "c", "new ContactAddress() should include a 'locality' property.");
+        ok(typeof contactAddress.region != 'undefined' && contactAddress.region != null && contactAddress.region == "d", "new ContactAddress() should include a 'region' property.");
+        ok(typeof contactAddress.postalCode != 'undefined' && contactAddress.postalCode != null && contactAddress.postalCode == "e", "new ContactAddress() should include a 'postalCode' property.");
+        ok(typeof contactAddress.country != 'undefined' && contactAddress.country != null && contactAddress.country == "f", "new ContactAddress() should include a 'country' property.");
+    });	
+    test("should be able to define a ContactOrganization object", function() {
+        expect(6);
+        var contactOrg = new ContactOrganization(true, "home", "a","b","c","d","e","f","g");
+        ok(contactOrg != null, "new ContactOrganization() should not be null.");
         ok(typeof contactOrg.pref != 'undefined' && contactOrg.pref != null && contactOrg.pref == true, "new ContactOrganization() should include a 'pref' property.");
         ok(typeof contactOrg.type != 'undefined' && contactOrg.type != null && contactOrg.type == "home", "new ContactOrganization() should include a 'type' property.");
-		ok(typeof contactOrg.name != 'undefined' && contactOrg.name != null && contactOrg.name == "a", "new ContactOrganization() should include a 'name' property.");
-		ok(typeof contactOrg.department != 'undefined' && contactOrg.department != null && contactOrg.department == "b", "new ContactOrganization() should include a 'department' property.");
-		ok(typeof contactOrg.title != 'undefined' && contactOrg.title != null && contactOrg.title == "c", "new ContactOrganization() should include a 'title' property.");
-	});	
-	test("should be able to define a ContactFindOptions object", function() {
-		expect(3);
-		var contactFindOptions = new ContactFindOptions("a", true, "b");
-		ok(contactFindOptions != null, "new ContactFindOptions() should not be null.");
-		ok(typeof contactFindOptions.filter != 'undefined' && contactFindOptions.filter != null && contactFindOptions.filter == "a", "new ContactFindOptions() should include a 'filter' property.");
-		ok(typeof contactFindOptions.multiple != 'undefined' && contactFindOptions.multiple != null && contactFindOptions.multiple == true, "new ContactFindOptions() should include a 'multiple' property.");
-	});	
-	module("Contact Object");
-	test("should contain a clone function", function() {
-		expect(2);
-		var contact = new Contact();
-		ok(typeof contact.clone != 'undefined' && contact.clone != null, "contact.clone should not be null.");
-		ok(typeof contact.clone == 'function', "contact.clone should be a function.");
-	});
-	test("clone function should make deep copy of Contact Object", function() {
-		expect(8);
-		var contact = new Contact();
-		contact.id=1;
-		contact.displayName="Test Name";
-		contact.nickname="Testy";
-		contact.gender="male";
-		contact.note="note to be cloned";
-		contact.name = new ContactName("Mr. Test Name");
-		
-		var clonedContact = contact.clone();
-		
-		ok(contact.id == 1, "contact.id should be 1.");
-		ok(clonedContact.id == null, "clonedContact.id should be null.");
-		ok(clonedContact.displayName == contact.displayName, "displayName's should be equal");
-		ok(clonedContact.nickname == contact.nickname, "nickname's should be equal");
-		ok(clonedContact.gender == contact.gender, "gender's should be equal");
-		ok(clonedContact.note == contact.note, "note's should be equal");
-		ok(clonedContact.name.formatted == contact.name.formatted, "name.formatted's should be equal");
-		ok(clonedContact.connected == contact.connected, "connected's should be equal (null)");
-	});
-	
-	test("should contain a save function", function() {
-		expect(2);
-		var contact = new Contact();
-		ok(typeof contact.save != 'undefined' && contact.save != null, "contact.save should not be null.");
-		ok(typeof contact.save == 'function', "contact.save should be a function.");
-	});
-    module('ContactError interface');
-    test("ContactError constants should be defined", function() {
-        expect(7);
-        equal(ContactError.UNKNOWN_ERROR, 0, "ContactError.UNKNOWN_ERROR should be defined");
-        equal(ContactError.INVALID_ARGUMENT_ERROR, 1, "ContactError.INVALID_ARGUMENT_ERROR should be defined");
-        equal(ContactError.TIMEOUT_ERROR, 2, "ContactError.TIMEOUT_ERROR should be defined");
-        equal(ContactError.PENDING_OPERATION_ERROR, 3, "ContactError.PENDING_OPERATION_ERROR should be defined");
-        equal(ContactError.IO_ERROR, 4, "ContactError.IO_ERROR should be defined");
-        equal(ContactError.NOT_SUPPORTED_ERROR, 5, "ContactError.NOT_SUPPORTED_ERROR should be defined");
-        equal(ContactError.PERMISSION_DENIED_ERROR, 20, "ContactError.PERMISSION_DENIED_ERROR should be defined");
+        ok(typeof contactOrg.name != 'undefined' && contactOrg.name != null && contactOrg.name == "a", "new ContactOrganization() should include a 'name' property.");
+        ok(typeof contactOrg.department != 'undefined' && contactOrg.department != null && contactOrg.department == "b", "new ContactOrganization() should include a 'department' property.");
+        ok(typeof contactOrg.title != 'undefined' && contactOrg.title != null && contactOrg.title == "c", "new ContactOrganization() should include a 'title' property.");
+    });	
+    test("should be able to define a ContactFindOptions object", function() {
+        expect(3);
+        var contactFindOptions = new ContactFindOptions("a", true, "b");
+        ok(contactFindOptions != null, "new ContactFindOptions() should not be null.");
+        ok(typeof contactFindOptions.filter != 'undefined' && contactFindOptions.filter != null && contactFindOptions.filter == "a", "new ContactFindOptions() should include a 'filter' property.");
+        ok(typeof contactFindOptions.multiple != 'undefined' && contactFindOptions.multiple != null && contactFindOptions.multiple == true, "new ContactFindOptions() should include a 'multiple' property.");
+    });	
+    module("Contact Object");
+    test("should contain a clone function", function() {
+        expect(2);
+        var contact = new Contact();
+        ok(typeof contact.clone != 'undefined' && contact.clone != null, "contact.clone should not be null.");
+        ok(typeof contact.clone == 'function', "contact.clone should be a function.");
+    });
+    test("clone function should make deep copy of Contact Object", function() {
+        expect(8);
+        var contact = new Contact();
+        contact.id=1;
+        contact.displayName="Test Name";
+        contact.nickname="Testy";
+        contact.gender="male";
+        contact.note="note to be cloned";
+        contact.name = new ContactName("Mr. Test Name");
+        
+        var clonedContact = contact.clone();
+        
+        ok(contact.id == 1, "contact.id should be 1.");
+        ok(clonedContact.id == null, "clonedContact.id should be null.");
+        ok(clonedContact.displayName == contact.displayName, "displayName's should be equal");
+        ok(clonedContact.nickname == contact.nickname, "nickname's should be equal");
+        ok(clonedContact.gender == contact.gender, "gender's should be equal");
+        ok(clonedContact.note == contact.note, "note's should be equal");
+        ok(clonedContact.name.formatted == contact.name.formatted, "name.formatted's should be equal");
+        ok(clonedContact.connected == contact.connected, "connected's should be equal (null)");
+    });
+    test("should contain a save function", function() {
+        expect(2);
+        var contact = new Contact();
+        ok(typeof contact.save != 'undefined' && contact.save != null, "contact.save should not be null.");
+        ok(typeof contact.save == 'function', "contact.save should be a function.");
+    });
+    test("should contain a remove function", function() {
+        expect(2);
+        var contact = new Contact();
+        ok(typeof contact.remove != 'undefined' && contact.remove != null, "contact.remove should not be null.");
+        ok(typeof contact.remove == 'function', "contact.remove should be a function.");
+    });
+    module('Contact.save method', {
+        setup:function(){},
+        teardown:function(){}
     });
     test("should be able to save a contact", function() {
-         QUnit.stop(Tests.TEST_TIMEOUT);
-         expect(9);
-         
-         var bDay = new Date(1976, 6,4);
-         var testContact = navigator.contacts.create({"gender": "male", "note": "my note", "name": {"familyName": "Delete", "givenName": "Test"}, "emails": [{"value": "here@there.com"}, {"value": "there@here.com"}], "birthday": bDay});	
-         
-         var saveSuccess = function(obj) {
-            gContactObj = obj; // save contact so can delete later
-         
+        QUnit.stop(Tests.TEST_TIMEOUT);
+        expect(9);
+
+        var bDay = new Date(1976, 6,4);
+        gContactObj = navigator.contacts.create({"gender": "male", "note": "my note", "name": {"familyName": "Delete", "givenName": "Test"}, "emails": [{"value": "here@there.com"}, {"value": "there@here.com"}], "birthday": bDay});	
+
+        var saveSuccess = function(obj) {
             ok(obj != 'undefined' && obj != null, "navigator.contacts.save should return a Contact object.");
             ok(obj.note == 'my note', "Contact should contain a note property.");
             ok(obj.name.familyName == 'Delete', "Contact familyName should equal 'Delete'.");
@@ -209,148 +269,149 @@ Tests.prototype.ContactsTests = function() {
             ok(obj.emails[1].value == 'there@here.com', "Contact.emails[2] should contain a value.");	
             ok(obj.birthday instanceof Date && obj.birthday.toDateString() == bDay.toDateString(), "Contact should be a date object equal to " + bDay.toDateString());
             ok(obj.addresses == null, "Contact should return null for addresses.");
-             QUnit.start();
-    
-         };
-         
-         testContact.save(saveSuccess, null);
-         QUnit.start();
-    });
-    test("find a contact by name", function() {
-        expect(3);
-        QUnit.stop(7000);
-        var win = function(object) {
-        	var foundName = function(result) {
-        		var bFound = false;
-        		try {
-        			for (var i=0; i < result.length; i++) {
-        				if (result[i].name.familyName == "Delete") {
-        					bFound = true;
-                            gContactObj = result[i]; // save contact for later tests
-        					break;
-        				}
-        			}
-        		}  catch(e) {
-        			return false;
-        		}
-        		return bFound;
-        	}
-			
-            ok(object instanceof Array, "Object returned in contacts.find success callback should be instanceof array.");
-            ok(object.length >= 1, "length of Object returned in contacts.find success callback should have length property >= 1");
-            ok(foundName(object) == true, "returned contact array should contain a contact with familyName of 'Delete'.");
             QUnit.start();
         };
-        var fail = function() { QUnit.start(); };
-        var obj = new ContactFindOptions();
-        obj.filter="Delete";
-        obj.multiple=true;
-        navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], win, fail, obj);
-    });
+
+        testContact.save(saveSuccess, function(e) {
+            ok(false, "save method error callback called, test failed.");
+            QUnit.start();
+        });
+     });
+    // HACK: there is a reliance between the previous and next test. This is bad form.
     test("update a contact", function() {
-         expect(6);
-         var bDay = new Date(1975, 5,4);
-         var noteText = "an UPDATED note";
-         
-         ok(gContactObj != null, "Should be a contact object to update");
-         QUnit.stop(7000);
-         var win = function(obj) {
+        expect(6);
+        QUnit.stop(7000);
+        ok(gContactObj != null, "Contact object from previous test should still exist for this update test to pass.");
+
+        var bDay = new Date(1975, 5,4);
+        var noteText = "an UPDATED note";
+
+        var win = function(obj) {
             ok(obj != 'undefined' && obj != null, "navigator.contacts.save should return a Contact object.");
             ok(obj.id == gContactObj.id, "Contact id should not have changed");
             ok(obj.note == noteText, "Contact should contain a note property.");
             ok(obj.birthday instanceof Date && obj.birthday.toDateString() == bDay.toDateString(), "Contact should be a date object equal to " + bDay.toDateString());
             ok(obj.emails.length == 1 && obj.emails[0].value == 'here@there.com', "Contact should contain only one email with value 'here@there.com'");
-            gContactObj = obj;
+            removeContact();         // Clean up contact object 
             QUnit.start();
-         };
-         var fail = function(obj) {
-            ok(1, "update Contact should not fail");
+        };
+        var fail = function(obj) {
+            removeContact(); // Clean up contact object
+            ok(false, "updating a Contact object then calling .save should not fail. Test failed.");
             QUnit.start();
-         }
-         
-         // remove an email
-         gContactObj.emails[1].value = "";
+        }
+
+        // remove an email
+        gContactObj.emails[1].value = "";
         // change birthday
-         gContactObj.birthday = bDay;
-         // update note
-         gContactObj.note = noteText;
-         gContactObj.save(win, fail);
-         
+        gContactObj.birthday = bDay;
+        // update note
+        gContactObj.note = noteText;
+        gContactObj.save(win, fail);
     });
-    
-    test("should contain a remove function", function() {
-         expect(2);
-         var contact = new Contact();
-         ok(typeof contact.remove != 'undefined' && contact.remove != null, "contact.remove should not be null.");
-         ok(typeof contact.remove == 'function', "contact.remove should be a function.");
+    module('Contact.remove method', {
+        setup:function(){},
+        teardown:removeContact
     });
-    
-	test("calling remove on a contact has an id of null should return ContactError.UNKNOWN_ERROR", function() {
-         QUnit.stop(Tests.TEST_TIMEOUT);
-         expect(2);
-         var win = function(result) {
-         };
-         var fail = function(result) {
-         ok(typeof result == 'object', "Object returned in contact.remove failure callback is of type 'object' (actually ContactError).");
-         ok(result.code == ContactError.UNKNOWN_ERROR, "Object returned in contacts.remove failure callback has a code property which equal to ContactError.UNKNOWN_ERROR.");
-         QUnit.start();
-         };
-         var rmContact = new Contact();
-         rmContact.remove(win, fail);
+    test("calling remove on a contact has an id of null should return ContactError.UNKNOWN_ERROR", function() {
+        QUnit.stop(Tests.TEST_TIMEOUT);
+        expect(2);
+        var win = function(result) {
+            ok(false, "Success callback should not be called when calling remove on a Contact object with no ID.");
+            QUnit.start();
+        };
+        var fail = function(result) {
+            ok(typeof result == 'object', "Object returned in contact.remove failure callback is of type 'object' (actually ContactError).");
+            ok(result.code == ContactError.UNKNOWN_ERROR, "Object returned in contacts.remove failure callback has a code property which equal to ContactError.UNKNOWN_ERROR.");
+            QUnit.start();
+        };
+        var rmContact = new Contact();
+        rmContact.remove(win, fail);
     });
-    
     test("calling remove on a contact that does not exist should return ContactError.UNKNOWN_ERROR", function() {
-         QUnit.stop(Tests.TEST_TIMEOUT);
-         expect(2);
-         var win = function(result) {
-         };
-         var fail = function(result) {
-         ok(typeof result == 'object', "Object returned in contact.remove failure callback is of type 'object' (actually ContactError).");
-         ok(result.code == ContactError.UNKNOWN_ERROR, "Object returned in contacts.remove failure callback has a code property which equal to ContactError.UNKNOWN_ERROR.");
-         QUnit.start();
-         };
-         // this is a bit risky as some devices may have contact ids that large
-         var contact = new Contact(999);
-         contact.remove(win, fail);		
+        QUnit.stop(Tests.TEST_TIMEOUT);
+        expect(2);
+
+        var win = function(result) {
+        ok(false, "success callback should never return in this case. Test failed!");
+        QUnit.start();
+        };
+        var fail = function(result) {
+        ok(typeof result == 'object', "Object returned in contact.remove failure callback is of type 'object' (actually ContactError).");
+        ok(result.code == ContactError.UNKNOWN_ERROR, "Object returned in contacts.remove failure callback has a code property which equal to ContactError.UNKNOWN_ERROR.");
+        QUnit.start();
+        };
+        // this is a bit risky as some devices may have contact ids that large
+        var contact = new Contact("this string is supposed to be a unique identifier that will never show up on a device");
+        contact.remove(win, fail);		
     });
-    
-    test("remove a contact", function() {
-         expect(2);
-        
-         ok(gContactObj != null, "Should be a contact object to delete");
-         QUnit.stop(7000);
-         var win = function() {
-            gContactObj = null;
-            ok(1,"Contact should have been removed");
-            QUnit.start();
-         };
-         var fail = function() {
+
+    module("Round trip Contact tests (creating + save + delete + find).", {
+        setup:function(){},
+        teardown:removeContact
+    });
+    test("Creating, saving, finding a contact should work, removing it should work, after which we should not be able to find it, and we should not be able to delete it again.", function() {
+        expect(9);
+        QUnit.stop(7000);
+
+        gContactObj = new Contact();
+        gContactObj.name.familyName = "DeleteMe";
+        gContactObj.save(function(c_obj) {
+            ok(true, "Contact creation + saving succeeded, proceeding with test.");
+            var findWin = function(cs) {
+                ok(true, "contacts.find success callback invoked, proceeding with test.");
+                equal(cs.length, 1, "contacts.find success callback should return only 1 item (no on has a contact with 'DeleteMe') as a family name.");
+                deepEqual(cs[0], gContactObj, "returned Contact object should equal the initially-created Contact object.");
+                gContactObj.remove(function() {
+                    ok(true, "Newly created contact's remove function success callback called, proceeding with test.");
+                    var findWinAgain = function(seas) {
+                        ok(true, "Calling find after deleting contact should e a success, proceeding.");
+                        equal(seas.length, 0, "find post-remove should return zero length array of results.");
+                        gContactObj.remove(function() {
+                            ok(false, "success callback called after non-existent Contact object called remove(). Test failed.");
+                            QUnit.start();
+                        }, function(e) {
+                            ok(true, "error callback called after non-existent Contact object called with remove().");
+                            equal(e.code, ContactError.UNKNOWN_ERROR, "error callback should be called with UNKNOWN_ERROR");
+                            QUnit.start();
+                        });
+                    };
+                    var findFailAgain = function(e) {
+                        ok(false, "find error callback invoked after delete, test failed.");
+                        QUnit.start();
+                    };
+                    var obj = new ContactFindOptions();
+                    obj.filter="DeleteMe";
+                    obj.multiple=true;
+                    navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], findWinAgain, findFailAgain, obj);
+                }, function(e) {
+                    ok(false, "Newly created contact's remove function invoked error callback. Test failed.");
+                    QUnit.start();
+                });
+            };
+            var findFail = function(e) {
+                ok(false, "Failure callback invoked in navigator.contacts.find call, test failed.");
+                QUnit.start();
+            };
+            var obj = new ContactFindOptions();
+            obj.filter="DeleteMe";
+            obj.multiple=true;
+            navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], findWin, findFail, obj);
+        }, function(e) {
+            ok(false, "Contact creation failed, error callback was invoked.");
             QUnit.start();
-         };
-         
-         if(gContactObj) {
-            gContactID = gContactObj.id; // save this so we can try to delete a contact that does not exist (below)
-            gContactObj.remove(win,fail);
-         }
-                  
-         
+        });
     });
-   
-    test("calling remove on a contact that was already removed should return ContactError.UNKNOWN_ERROR", function() {
-         QUnit.stop(Tests.TEST_TIMEOUT);
-         expect(2);
-         var win = function(result) {
-         };
-         var fail = function(result) {
-         ok(typeof result == 'object', "Object returned in contact.remove failure callback is of type 'object' (actually ContactError).");
-         ok(result.code == ContactError.UNKNOWN_ERROR, "Object returned in contacts.remove failure callback has a code property which equal to ContactError.UNKNOWN_ERROR.");
-         QUnit.start();
-         };
-         var badId = gContactId ? gContactId : 999;
-         var contact = new Contact(badId);
-         gContactId = null;
-         contact.remove(win, fail);		
+
+    module('ContactError interface');
+    test("ContactError constants should be defined", function() {
+        expect(7);
+        equal(ContactError.UNKNOWN_ERROR, 0, "ContactError.UNKNOWN_ERROR should be defined");
+        equal(ContactError.INVALID_ARGUMENT_ERROR, 1, "ContactError.INVALID_ARGUMENT_ERROR should be defined");
+        equal(ContactError.TIMEOUT_ERROR, 2, "ContactError.TIMEOUT_ERROR should be defined");
+        equal(ContactError.PENDING_OPERATION_ERROR, 3, "ContactError.PENDING_OPERATION_ERROR should be defined");
+        equal(ContactError.IO_ERROR, 4, "ContactError.IO_ERROR should be defined");
+        equal(ContactError.NOT_SUPPORTED_ERROR, 5, "ContactError.NOT_SUPPORTED_ERROR should be defined");
+        equal(ContactError.PERMISSION_DENIED_ERROR, 20, "ContactError.PERMISSION_DENIED_ERROR should be defined");
     });
-    
-    
 };