Index: modules/file/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/tests/file.test,v
retrieving revision 1.16
diff -u -p -r1.16 file.test
--- modules/file/tests/file.test	29 Jun 2010 00:57:19 -0000	1.16
+++ modules/file/tests/file.test	30 Jun 2010 14:24:41 -0000
@@ -491,8 +491,8 @@ class FileFieldValidateTestCase extends 
     $field = field_info_field($field_name);
     $instance = field_info_instance('node', $field_name, $type_name);
 
-    // Get the test file (a GIF image).
     $test_file = $this->getTestFile('image');
+    list(, $test_file_extension) = explode('.', $test_file->filename);
 
     // Disable extension checking.
     $this->updateFileField($field_name, $type_name, array('file_extensions' => ''));
@@ -513,7 +513,7 @@ class FileFieldValidateTestCase extends 
     $this->assertRaw($error_message, t('Node save failed when file uploaded with the wrong extension.'));
 
     // Enable extension checking for text and image files.
-    $this->updateFileField($field_name, $type_name, array('file_extensions' => 'txt gif'));
+    $this->updateFileField($field_name, $type_name, array('file_extensions' => "txt $test_file_extension"));
 
     // Check that the file can be uploaded with extension checking.
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
Index: modules/image/image.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.test,v
retrieving revision 1.22
diff -u -p -r1.22 image.test
--- modules/image/image.test	23 May 2010 19:10:23 -0000	1.22
+++ modules/image/image.test	30 Jun 2010 14:24:41 -0000
@@ -167,7 +167,7 @@ class ImageStylesPathAndUrlUnitTest exte
     // Create the directories for the styles.
     $d = $scheme . '://styles/' . $this->style_name;
     $status = file_prepare_directory($d, FILE_CREATE_DIRECTORY);
-    $this->assertNotIdentical(FALSE, $status, t('Created the directory for the generated images for the test style.' ));
+    $this->assertNotIdentical(FALSE, $status, t('Created the directory for the generated images for the test style.'));
 
     // Create a working copy of the file.
     $files = $this->drupalGetTestFiles('image');
@@ -212,8 +212,8 @@ class ImageStylesPathAndUrlUnitTest exte
     $this->drupalGet($expected_generated_url);
     $this->assertEqual($actual_generated_url, $expected_generated_url, t('Got the download URL for an existing file.'));
     $this->assertRaw(file_get_contents($generated_uri), t('URL returns expected file.'));
-    $this->assertEqual($this->drupalGetHeader('Content-Type'), $image_info['mime_type'], t('Expected Content-Type was reported.'));
-    $this->assertEqual($this->drupalGetHeader('Content-Length'), $image_info['file_size'], t('Expected Content-Length was reported.'));
+    $this->assertEqual($this->drupalGetHeader('Content-Type'), $generated_image_info['mime_type'], t('Expected Content-Type was reported.'));
+    $this->assertEqual($this->drupalGetHeader('Content-Length'), $generated_image_info['file_size'], t('Expected Content-Length was reported.'));
   }
 }
 
@@ -692,10 +692,12 @@ class ImageFieldDisplayTestCase extends 
    * Tests for image field settings.
    */
   function testImageFieldSettings() {
+    $test_image = current($this->drupalGetTestFiles('image'));
+    list(, $test_image_extension) = explode('.', $test_image->filename);
     $field_name = strtolower($this->randomName());
     $instance_settings = array(
       'alt_field' => 1,
-      'file_extensions' => 'gif jpg jpeg',
+      'file_extensions' => 'gif jpg jpeg ' . $test_image_extension,
       'max_filesize' => '50 KB',
       'max_resolution' => '100x100',
       'min_resolution' => '10x10',
@@ -709,12 +711,11 @@ class ImageFieldDisplayTestCase extends 
 
     $this->drupalGet('node/add/article');
     $this->assertText(t('Files must be less than 50 KB.'), t('Image widget max file size is displayed on article form.'));
-    $this->assertText(t('Allowed file types: gif jpg jpeg.'), t('Image widget allowed file types displayed on article form.'));
+    $this->assertText(t('Allowed file types: gif jpg jpeg ' . $test_image_extension . '.'), t('Image widget allowed file types displayed on article form.'));
     $this->assertText(t('Images must be between 10x10 and 100x100 pixels.'), t('Image widget allowed resolution displayed on article form.'));
 
     // We have to create the article first and then edit it because the alt
     // and title fields do not display until the image has been attached.
-    $test_image = current($this->drupalGetTestFiles('image'));
     $nid = $this->uploadNodeImage($test_image, $field_name, 'article');
     $this->drupalGet('node/' . $nid . '/edit');
     $this->assertFieldByName($field_name . '[' . LANGUAGE_NONE . '][0][alt]', '', t('Alt field displayed on article form.'));
@@ -817,20 +818,33 @@ class ImageFieldValidateTestCase extends
    */
   function testResolution() {
     $field_name = strtolower($this->randomName());
+    $min_resolution = 50;
+    $max_resolution = 100;
     $instance_settings = array(
-      'max_resolution' => '100x100',
-      'min_resolution' => '50x50',
+      'max_resolution' => $max_resolution . 'x' . $max_resolution,
+      'min_resolution' => $min_resolution . 'x' . $min_resolution,
     );
     $this->createImageField($field_name, 'article', array(), $instance_settings);
-
-    // Use image-test.png which has a resolution of 40x20.
-    $test_image = current($this->drupalGetTestFiles('image', 48006));
-    $nid = $this->uploadNodeImage($test_image, $field_name, 'article');
-    $this->assertText(t('The specified file image-test.png could not be uploaded. The image is too small; the minimum dimensions are 50x50 pixels.'), t('Node save failed when minimum image resolution was not met.'));
-
-    // Use image-1.png which has a resolution of 360x240.
-    $test_image = current($this->drupalGetTestFiles('image', 64027));
-    $nid = $this->uploadNodeImage($test_image, $field_name, 'article');
+    
+    // We want a test image that is too small, and a test image that is too
+    // big, so cycle through test image files until we have what we need.
+    $image_that_is_too_big = FALSE;
+    $image_that_is_too_small = FALSE;
+    foreach ($this->drupalGetTestFiles('image') as $image) {
+      $info = image_get_info($image->uri);
+      if ($info['width'] > $max_resolution) {
+        $image_that_is_too_big = $image;
+      }
+      if ($info['width'] < $min_resolution) {
+        $image_that_is_too_small = $image;
+      }
+      if ($image_that_is_too_small && $image_that_is_too_big) {
+        break;
+      }
+    }
+    $nid = $this->uploadNodeImage($image_that_is_too_small, $field_name, 'article');
+    $this->assertText(t('The specified file ' . $image_that_is_too_small->filename . ' could not be uploaded. The image is too small; the minimum dimensions are 50x50 pixels.'), t('Node save failed when minimum image resolution was not met.'));
+    $nid = $this->uploadNodeImage($image_that_is_too_big, $field_name, 'article');
     $this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'), t('Image exceeding max resolution was properly resized.'));
   }
 }
Index: modules/simpletest/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file.test,v
retrieving revision 1.57
diff -u -p -r1.57 file.test
--- modules/simpletest/tests/file.test	26 Jun 2010 19:55:47 -0000	1.57
+++ modules/simpletest/tests/file.test	30 Jun 2010 14:24:43 -0000
@@ -563,6 +563,7 @@ class FileSaveUploadTest extends FileHoo
     $this->drupalLogin($account);
 
     $this->image = current($this->drupalGetTestFiles('image'));
+    list(, $this->image_extension) = explode('.', $this->image->filename);
     $this->assertTrue(is_file($this->image->uri), t("The image file we're going to upload exists."));
 
     $this->phpfile = current($this->drupalGetTestFiles('php'));
@@ -665,8 +666,8 @@ class FileSaveUploadTest extends FileHoo
     // Reset the hook counters.
     file_test_reset();
 
-    $extensions = 'foo gif';
-    // Now tell file_save_upload() to allow ".gif".
+    $extensions = 'foo ' . $this->image_extension;
+    // Now tell file_save_upload() to allow the extension of our test image.
     $edit = array(
       'file_test_replace' => FILE_EXISTS_REPLACE,
       'files[file_test_upload]' => drupal_realpath($this->image->uri),
@@ -747,12 +748,12 @@ class FileSaveUploadTest extends FileHoo
   function testHandleFileMunge() {
     // Ensure insecure uploads are disabled for this test.
     variable_set('allow_insecure_uploads', 0);
-    $this->image = file_move($this->image, $this->image->uri . '.foo.gif');
+    $this->image = file_move($this->image, $this->image->uri . '.foo.' . $this->image_extension);
 
     // Reset the hook counters to get rid of the 'move' we just called.
     file_test_reset();
 
-    $extensions = 'gif';
+    $extensions = $this->image_extension;
     $edit = array(
       'files[file_test_upload]' => drupal_realpath($this->image->uri),
       'extensions' => $extensions,
@@ -760,7 +761,7 @@ class FileSaveUploadTest extends FileHoo
 
     $munged_filename = $this->image->filename;
     $munged_filename = substr($munged_filename, 0, strrpos($munged_filename, '.'));
-    $munged_filename .= '_.gif';
+    $munged_filename .= '_.' . $this->image_extension;
 
     $this->drupalPost('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, t('Received a 200 response for posted test file.'));