Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.45
diff -u -p -r1.45 filter.admin.inc
--- modules/filter/filter.admin.inc	18 Sep 2009 00:12:46 -0000	1.45
+++ modules/filter/filter.admin.inc	20 Sep 2009 05:07:32 -0000
@@ -32,7 +32,7 @@ function filter_admin_overview($form) {
     $form[$id]['name'] = array('#markup' => $format->name);
     $form[$id]['roles'] = array('#markup' => $default ? t('All roles may use the default format') : ($roles ? implode(', ', $roles) : t('No roles may use this format')));
     $form[$id]['configure'] = array('#markup' => l(t('configure'), 'admin/config/content/formats/' . $id));
-    $form[$id]['delete'] = array('#markup' => $default ? '' : l(t('delete'), 'admin/config/content/formats/delete/' . $id));
+    $form[$id]['delete'] = array('#markup' => $default ? '' : l(t('delete'), 'admin/config/content/formats/' . $id . '/delete'));
     $form[$id]['weight'] = array('#type' => 'weight', '#default_value' => $format->weight);
   }
   $form['default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('filter_default_format', 1));
Index: modules/filter/filter.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v
retrieving revision 1.41
diff -u -p -r1.41 filter.test
--- modules/filter/filter.test	12 Sep 2009 06:09:45 -0000	1.41
+++ modules/filter/filter.test	20 Sep 2009 06:03:12 -0000
@@ -10,6 +10,42 @@ class FilterAdminTestCase extends Drupal
     );
   }
 
+  function setUp() {
+    parent::setUp();
+
+    // Create users.
+    $this->admin_user = $this->drupalCreateUser(array('administer filters'));
+    $this->web_user = $this->drupalCreateUser(array('create page content'));
+    $this->drupalLogin($this->admin_user);
+  }
+
+  function testFormatAdmin() {
+    // Add text format.
+    $this->drupalGet('admin/config/content/formats');
+    $this->clickLink('Add text format');
+    $edit = array(
+      'name' => $this->randomName(),
+    );
+    $this->drupalPost(NULL, $edit, t('Save configuration'));
+
+    // Edit text format.
+    $format = $this->getFilter($edit['name']);
+    $this->drupalGet('admin/config/content/formats');
+    $this->assertRaw('admin/config/content/formats/' . $format->format);
+    $this->drupalGet('admin/config/content/formats/' . $format->format);
+    $this->drupalPost(NULL, array(), t('Save configuration'));
+
+    // Delete text format.
+    $this->drupalGet('admin/config/content/formats');
+    $this->assertRaw('admin/config/content/formats/' . $format->format . '/delete');
+    $this->drupalGet('admin/config/content/formats/' . $format->format . '/delete');
+    $this->drupalPost(NULL, array(), t('Delete'));
+
+    // Verify that deleted text format no longer exists.
+    $this->drupalGet('admin/config/content/formats/' . $format->format);
+    $this->assertResponse(404, t('Deleted text format no longer exists.'));
+  }
+
   /**
    * Test filter administration functionality.
    */
@@ -19,16 +55,11 @@ class FilterAdminTestCase extends Drupal
     // Line filter.
     $second_filter = 'filter_autop';
 
-    // Create users.
-    $admin_user = $this->drupalCreateUser(array('administer filters'));
-    $web_user = $this->drupalCreateUser(array('create page content'));
-    $this->drupalLogin($admin_user);
-
     list($filtered, $full) = $this->checkFilterFormats();
 
     // Verify access permissions to Full HTML format.
-    $this->assertTrue(filter_access($full, $admin_user), t('Admin user may use Full HTML.'));
-    $this->assertFalse(filter_access($full, $web_user), t('Web user may not use Full HTML.'));
+    $this->assertTrue(filter_access($full, $this->admin_user), t('Admin user may use Full HTML.'));
+    $this->assertFalse(filter_access($full, $this->web_user), t('Web user may not use Full HTML.'));
 
     // Change default filter.
     $edit = array();
@@ -104,7 +135,7 @@ class FilterAdminTestCase extends Drupal
 
     // Switch user.
     $this->drupalLogout();
-    $this->drupalLogin($web_user);
+    $this->drupalLogin($this->web_user);
 
     $this->drupalGet('node/add/page');
     $this->assertRaw('<option value="' . $full . '">Full HTML</option>', t('Full HTML filter accessible.'));
@@ -129,7 +160,7 @@ class FilterAdminTestCase extends Drupal
 
     // Switch user.
     $this->drupalLogout();
-    $this->drupalLogin($admin_user);
+    $this->drupalLogin($this->admin_user);
 
     // Clean up.
     // Allowed tags.