Index: modules/simpletest/tests/upgrade/upgrade.filter.test
===================================================================
RCS file: modules/simpletest/tests/upgrade/upgrade.filter.test
diff -N modules/simpletest/tests/upgrade/upgrade.filter.test
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/simpletest/tests/upgrade/upgrade.filter.test	22 Oct 2010 15:19:36 -0000
@@ -0,0 +1,56 @@
+<?php
+// $Id$
+
+/**
+ * Upgrade test for filter format identifiers.
+ *
+ * Filter format identifiers changed from sequential ids to machine names.
+ * Verify that filter formats and references to filter formats in core are
+ * converted properly.
+ */
+class FilterFormatUpgradePathTestCase extends UpgradePathTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Filter format upgrade path',
+      'description' => 'Verifies that filter formats and references to filter formats are converted properly.',
+      'group' => 'Upgrade path',
+    );
+  }
+
+  function setUp() {
+    // Path to the database dump.
+    $this->databaseDumpFiles = array(
+      drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-6.filled.database.php',
+    );
+    parent::setUp();
+  }
+
+  /**
+   * Test a successful upgrade.
+   */
+  function testFilterFormatUpgrade() {
+    $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+
+    $format = filter_format_load('1');
+    $this->assertTrue($format->format == '1', t('Filter format found.'));
+    $format->format = 'test_filter';
+    $format->name = 'Test filter';
+    filter_format_save($format);
+    $format = filter_format_load('test_filter');
+    $this->assertTrue($format->format == 'test_filter', t('Saved a filter format with machine name.'));
+
+    $account = user_load(4);
+    user_save($account, array('signature_format' => 'test_filter'));
+    $account = user_load(4);
+    $this->assertTrue($account->signature_format == 'test_filter', t('Signature format changed successfully to a filter format with machine name.'));
+
+    $delta = db_insert('block_custom')
+      ->fields(array(
+        'body' => 'Test block',
+        'info' => 'Test block',
+        'format' => 'test_filter',
+      ))
+      ->execute();
+    $this->assertTrue($delta > 0, t('Created a custom block using a filter format with machine name.'));
+  }
+}