Added test for RetrieveAllUserAliases and changed OAuth scopes for Apps

Gunjan Sharma · Gunjan Sharma · commit b246a12d5da9 · 2011-11-09T11:31:25.000+05:30
diff --git a/src/gdata/gauth.py b/src/gdata/gauth.py
@@ -104,10 +104,10 @@
     'lh2': ( # Picasa Web Albums API
         'http://picasaweb.google.com/data/',),
     'apps': ( # Google Apps Provisioning API
-        'http://www.google.com/a/feeds/',
-        'https://www.google.com/a/feeds/',
-        'http://apps-apis.google.com/a/feeds/',
-        'https://apps-apis.google.com/a/feeds/'),
+        'https://apps-apis.google.com/a/feeds/user/',
+        'https://apps-apis.google.com/a/feeds/policies/',
+        'https://apps-apis.google.com/a/feeds/alias/',
+        'https://apps-apis.google.com/a/feeds/groups/'),
     'weaver': ( # Health H9 Sandbox
         'https://www.google.com/h9/feeds/',),
     'wise': ( # Spreadsheets Data API
diff --git a/tests/gdata_tests/apps/live_client_test.py b/tests/gdata_tests/apps/live_client_test.py
@@ -56,10 +56,10 @@ def testClientConfiguration(self):
     self.assertEqual('2.0', self.client.api_version)
     self.assertEqual('apps', self.client.auth_service)
     self.assertEqual(
-        ('http://www.google.com/a/feeds/',
-         'https://www.google.com/a/feeds/',
-         'http://apps-apis.google.com/a/feeds/',
-         'https://apps-apis.google.com/a/feeds/'),
+        ('https://apps-apis.google.com/a/feeds/user/',
+         'https://apps-apis.google.com/a/feeds/policies/',
+         'https://apps-apis.google.com/a/feeds/alias/',
+         'https://apps-apis.google.com/a/feeds/groups/'),
         self.client.auth_scopes)
     if conf.options.get_value('runlive') == 'true':
       self.assertEqual(self.client.domain,
diff --git a/tests/gdata_tests/apps/multidomain/live_client_test.py b/tests/gdata_tests/apps/multidomain/live_client_test.py
@@ -56,10 +56,10 @@ def testClientConfiguration(self):
     self.assertEqual('2.0', self.client.api_version)
     self.assertEqual('apps', self.client.auth_service)
     self.assertEqual(
-        ('http://www.google.com/a/feeds/',
-         'https://www.google.com/a/feeds/',
-         'http://apps-apis.google.com/a/feeds/',
-         'https://apps-apis.google.com/a/feeds/'), self.client.auth_scopes)
+        ('https://apps-apis.google.com/a/feeds/user/',
+         'https://apps-apis.google.com/a/feeds/policies/',
+         'https://apps-apis.google.com/a/feeds/alias/',
+         'https://apps-apis.google.com/a/feeds/groups/'), self.client.auth_scopes)
     if conf.options.get_value('runlive') == 'true':
       self.assertEqual(self.client.domain, conf.options.get_value('appsdomain'))
     else:
@@ -145,6 +145,12 @@ def testCreateRetrieveUpdateDelete(self):
     fetched_alias = self.client.RetrieveAlias(alias)
     self.assertEquals(fetched_alias.user_email, new_email)
     self.assertEquals(fetched_alias.alias_email, alias)
+    
+    fetched_aliases = self.client.RetrieveAllUserAliases(new_email)
+    self.assertEquals(fetched_aliases.entry[0].user_email, new_email)
+    self.assertEquals(fetched_aliases.entry[0].alias_email, email)
+    self.assertEquals(fetched_aliases.entry[1].user_email, new_email)
+    self.assertEquals(fetched_aliases.entry[1].alias_email, alias)
 
     self.client.DeleteAlias(alias)
     self.client.DeleteUser(new_email)
