More profile tests created.

Author: Tom Galloway

market/profile.py

@@ -37,22 +37,30 @@ def update(self, user_info):
 
     def add_social_account(self, account_type, username, proof=None):
         s = self.profile.SocialAccount()
-        for social_account in self.profile.social:
-            if social_account.type == s.SocialType.Value(account_type.upper()):
-                self.profile.social.remove(social_account)
-        s.type = s.SocialType.Value(account_type.upper())
-        s.username = username
-        if proof:
-            s.proof_url = proof
-        self.profile.social.extend([s])
+        try:
+            self._remove_social_if_found(account_type)
+            s.type = s.SocialType.Value(account_type.upper())
+            s.username = username
+            if proof:
+                s.proof_url = proof
+            self.profile.social.extend([s])
+        except ValueError:
+            return
         self.db.set_proto(self.profile.SerializeToString())
 
     def remove_social_account(self, account_type):
+        try:
+            self._remove_social_if_found(account_type)
+        except ValueError:
+            return
+        self.db.set_proto(self.profile.SerializeToString())
+
+    def _remove_social_if_found(self, account_type):
         s = self.profile.SocialAccount()
+        st = s.SocialType.Value(account_type.upper())
         for social_account in self.profile.social:
-            if social_account.type == s.SocialType.Value(account_type.upper()):
+            if social_account.type == st:
                 self.profile.social.remove(social_account)
-        self.db.set_proto(self.profile.SerializeToString())
 
     def add_pgp_key(self, public_key, signature, guid):
         """

market/tests/test_profile.py

@@ -20,6 +20,10 @@ def createTestUser(self):
         u.name = "test_name"
         u.location = 2
         u.about = "hello world"
+        s = u.SocialAccount()
+        s.username = "test_fb_username"
+        s.type = s.SocialType.Value("FACEBOOK")
+        u.social.extend([s])
         self.db.ProfileStore().set_proto(u.SerializeToString())
 
     def tearDown(self):
@@ -30,10 +34,79 @@ def test_MarketProfile_get_success(self):
         self.assertEqual('test_name', p.name)
         self.assertEqual(2, p.location)
         self.assertEqual('hello world', p.about)
+        self.assertEqual(1, len(p.social))
+        self.assertEqual(1, p.social[0].type)
+        self.assertEqual('test_fb_username', p.social[0].username)
 
     def test_MarketProfile_remove_field_success(self):
         p = Profile(self.db)
         p.remove_field("about")
         user = p.get()
         self.assertEqual('test_name', user.name)
         self.assertEqual('', user.about)
+
+    def test_MarketProfile_remove_social(self):
+        p = Profile(self.db)
+        p.remove_social_account("FACEBOOK")
+        u = p.get()
+        self.assertEqual(0, len(u.social))
+
+    def test_MarketProfile_remove_lowercase_social(self):
+        p = Profile(self.db)
+        p.remove_social_account("facebook")
+        u = p.get()
+        self.assertEqual(0, len(u.social))
+
+    def test_MarketProfile_remove_social_invalid(self):
+        p = Profile(self.db)
+        p.remove_social_account("TEST")
+        u = p.get()
+        self.assertEqual(1, len(u.social))
+
+    def test_MarketProfile_add_social_no_proof(self):
+        p = Profile(self.db)
+        p.add_social_account("TWITTER", "test_twitter_username")
+        u = p.get()
+        self.assertEqual(2, len(u.social))
+        self.assertEqual(1, u.social[0].type)
+        self.assertEqual('test_fb_username', u.social[0].username)
+        self.assertEqual(2, u.social[1].type)
+        self.assertEqual('test_twitter_username', u.social[1].username)
+
+    def test_MarketProfile_replace_social_no_proof(self):
+        p = Profile(self.db)
+        p.add_social_account("FACEBOOK", "test_updated_username")
+        u = p.get()
+        self.assertEqual(1, len(u.social))
+        self.assertEqual(1, u.social[0].type)
+        self.assertEqual('test_updated_username', u.social[0].username)
+
+    def test_MarketProfile_add_social_with_proof(self):
+        p = Profile(self.db)
+        p.add_social_account("TWITTER", "test_twitter_username",
+                                "http://test_url")
+        u = p.get()
+        self.assertEqual(2, len(u.social))
+        self.assertEqual(1, u.social[0].type)
+        self.assertEqual('test_fb_username', u.social[0].username)
+        self.assertEqual('', u.social[0].proof_url)
+        self.assertEqual(2, u.social[1].type)
+        self.assertEqual('test_twitter_username', u.social[1].username)
+        self.assertEqual('http://test_url', u.social[1].proof_url)
+
+    def test_MarketProfile_replace_social_with_proof(self):
+        p = Profile(self.db)
+        p.add_social_account("FACEBOOK", "test_updated_username", "http://fb_url")
+        u = p.get()
+        self.assertEqual(1, len(u.social))
+        self.assertEqual(1, u.social[0].type)
+        self.assertEqual('test_updated_username', u.social[0].username)
+        self.assertEqual('http://fb_url', u.social[0].proof_url)
+
+    def test_MarketProfile_add_social_invalid(self):
+        p = Profile(self.db)
+        p.add_social_account("TEST", "test_twitter_username")
+        u = p.get()
+        self.assertEqual(1, len(u.social))
+        self.assertEqual(1, u.social[0].type)
+        self.assertEqual('test_fb_username', u.social[0].username)