From 76aedbefe05d9f5b8aad9573635a07045efa392a Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 8 Jun 2008 19:50:54 +0000
Subject: [PATCH] - Patch #267813 by alpritt: fixed some user module tests.

---
 modules/simpletest/drupal_reporter.php   | 4 ++--
 modules/simpletest/drupal_test_suite.php | 2 +-
 modules/simpletest/reporter.php          | 4 ++--
 modules/user/user.test                   | 7 ++++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/simpletest/drupal_reporter.php b/modules/simpletest/drupal_reporter.php
index 7664925f617..f885d227fc7 100644
--- a/modules/simpletest/drupal_reporter.php
+++ b/modules/simpletest/drupal_reporter.php
@@ -252,6 +252,6 @@ class DrupalReporter extends SimpleReporter {
 }
 
 function unit_tests($args, $reporter) {
-  return $reporter->form['Drupal Unit Tests'];
+  return $reporter->form['Drupal unit tests'];
 }
-?>
\ No newline at end of file
+?>
diff --git a/modules/simpletest/drupal_test_suite.php b/modules/simpletest/drupal_test_suite.php
index 9aa428391cc..cdc681203ec 100644
--- a/modules/simpletest/drupal_test_suite.php
+++ b/modules/simpletest/drupal_test_suite.php
@@ -36,7 +36,7 @@ class DrupalTests extends DrupalTestSuite {
    */
   function DrupalTests($class_list = NULL) {
     static $classes;
-    $this->DrupalTestSuite('Drupal Unit Tests');
+    $this->DrupalTestSuite('Drupal unit tests');
 
     // Tricky part to avoid double inclusion.
     if (!$classes) {
diff --git a/modules/simpletest/reporter.php b/modules/simpletest/reporter.php
index e0487a243c2..5c63e5d4313 100644
--- a/modules/simpletest/reporter.php
+++ b/modules/simpletest/reporter.php
@@ -210,9 +210,9 @@ class TextReporter extends SimpleReporter {
       print "OK\n";
     }
     else {
-      print "FAILURES!!!\n";
+      print "FAILURES\n";
     }
-    print "Test cases run: ". $this->getTestCaseProgress() ."/". $this->getTestCaseCount() .", Passes: ". $this->getPassCount() .", Failures: ". $this->getFailCount() .", Exceptions: ". $this->getExceptionCount() ."\n";
+    print "Test cases run: ". $this->getTestCaseProgress() ."/". $this->getTestCaseCount() .", passes: ". $this->getPassCount() .", failures: ". $this->getFailCount() .", exceptions: ". $this->getExceptionCount() ."\n";
   }
 
   /**
diff --git a/modules/user/user.test b/modules/user/user.test
index 937a4db9531..fe9c9f59bba 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -302,7 +302,7 @@ class UserPictureTestCase extends DrupalWebTestCase {
         $this->assertText(t('The changes have been saved.'));
 
         // Check if image is displayed in user's profile page.
-        $this->assertRaw(file_create_url($picture_url), t("Image is displayed in user's profile page"));
+        $this->assertRaw(file_create_url($picture_path), t("Image is displayed in user's profile page"));
 
         // Check if file is located in proper directory.
         $this->assertTrue(is_file($picture_path), t('File is located in proper directory'));
@@ -404,9 +404,10 @@ class UserPictureTestCase extends DrupalWebTestCase {
   function saveUserPicture($image) {
     $edit = array('files[picture_upload]' => realpath($image->filename));
     $this->drupalPost('user/' . $this->user->uid.'/edit', $edit, t('Save'));
-    
+
+    $img_info = image_get_info($image->filename);
     $picture_dir = variable_get('user_picture_path', 'pictures');
-    $pic_path = file_directory_path() .'/'.$picture_dir .'/picture-'.$this->user->uid.'.jpg';
+    $pic_path = file_directory_path() . '/' . $picture_dir . '/picture-' . $this->user->uid . '.' . $img_info['extension'];
 
     return $pic_path;
   }