Add a hook for capturing a user profile photo and saving it to file and local state.

chrome/test/functional/chromeos_prefs.py

Index: chrome/test/functional/chromeos_prefs.py
diff --git a/chrome/test/functional/chromeos_prefs.py b/chrome/test/functional/chromeos_prefs.py
index 69244042f4facf267a909e57e70ff10fd82af544..13f9e645156710ba87d90e7cb74fea9ffce707c4 100644
--- a/chrome/test/functional/chromeos_prefs.py
+++ b/chrome/test/functional/chromeos_prefs.py
@@ -10,28 +10,49 @@ import pyauto
 class ChromeosPrefsTest(pyauto.PyUITest):
   """TestCase for ChromeOS Preferences."""
 
+  # Defined in src/chrome/browser/chromeos/login/user_manager.cc
+  k_logged_in_users = 'LoggedInUsers'

[Nirnimesh, 2011/07/30 10:32:31]

I don't think python constants need to have a k_ prefix

[frankf, 2011/08/01 19:31:09]

This was to match variable name in user_manager.cc

On 2011/07/30 10:32:31, Nirnimesh wrote:

+  k_user_images = 'UserImages'
+  # Defined in src/chrome/browser/chromeos/login/default_user_images.cc
+  default_image_prefix = 'default:'

[Nirnimesh, 2011/07/30 10:32:31]

nah.. move it into testDefaultUserImage

image1 = u'default:4'	
image2 = u'default:5'

... is fine I think

[frankf, 2011/08/01 19:31:09]

Done.

+
   def testDefaultUserImage(self):
     """Verify changing default user image prefs work."""
 
-    # Defined in src/chrome/browser/chromeos/login/user_manager.cc
-    k_logged_in_users = 'LoggedInUsers'
-    k_user_images = 'UserImages'
-    # Defined in src/chrome/browser/chromeos/login/default_user_images.cc
-    image1 = u'default:4'
-    image2 = u'default:5'
+    image1 = ChromeosPrefsTest.default_image_prefix + '4'
+    image2 = ChromeosPrefsTest.default_image_prefix + '5'
 
     for image in image1, image2:
       logged_in_user = \
-          self.GetLocalStatePrefsInfo().Prefs(k_logged_in_users)[0]
+          self.GetLocalStatePrefsInfo().Prefs(
+              ChromeosPrefsTest.k_logged_in_users)[0]
       user_images = {}
       user_images[logged_in_user] = image
-      self.SetLocalStatePrefs(k_user_images, user_images)
+      self.SetLocalStatePrefs(
+          ChromeosPrefsTest.k_user_images, user_images)
       self.RestartBrowser(clear_profile=False)
-      current_user_images = self.GetLocalStatePrefsInfo().Prefs(k_user_images)
+      current_user_images = self.GetLocalStatePrefsInfo().Prefs(
+          ChromeosPrefsTest.k_user_images)
       current_image = current_user_images.get(logged_in_user)
-      self.assertEqual(image, current_image)
+      self.assertEqual(image, current_image,
+                       msg='Default user image was not set in preferences.')
+
+  def testCaptureUserPhoto(self):
+    """Verify capturing/saving user photo works."""
+
+    logged_in_user = \
+        self.GetLocalStatePrefsInfo().Prefs(
+            ChromeosPrefsTest.k_logged_in_users)[0]
+    self.CaptureProfilePhoto()
+    self.RestartBrowser(clear_profile=False)

[Nirnimesh, 2011/07/30 10:32:31]

Should you verify before restarting the browser too?

[frankf, 2011/08/01 19:31:09]

Done.

+    current_user_images = self.GetLocalStatePrefsInfo().Prefs(
+        ChromeosPrefsTest.k_user_images)
+    current_image_path = current_user_images.get(logged_in_user)
+    # Defined in src/chrome/browser/chromeos/login/user_manager.cc
+    expected_photo_name = logged_in_user + '.png'
+    self.assertTrue(expected_photo_name in current_image_path,
+                    msg='Captured user photo was not set in preferences.')

[Nirnimesh, 2011/07/30 10:32:31]

Can you also verify the file on disk?

[frankf, 2011/08/01 19:31:09]

Done.

 
 
 if __name__ == '__main__':
   pyauto_functional.Main()
-