Index: modules/forum/forum.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.test,v
retrieving revision 1.53
diff -u -r1.53 forum.test
--- modules/forum/forum.test	15 Apr 2010 11:58:07 -0000	1.53
+++ modules/forum/forum.test	22 Apr 2010 20:01:30 -0000
@@ -35,6 +35,9 @@
    * Login users, create forum nodes, and test forum functionality through the admin and user interfaces.
    */
   function testForum() {
+    // Test that the forum install created a default forum
+    $this->doInstallTests();
+
     // Do the admin tests.
     $this->doAdminTests($this->admin_user);
     // Generate topics to populate the active forum block.
@@ -94,11 +97,34 @@
    * Forum nodes should not be created without choosing forum from select list.
    */
   function testAddOrphanTopic() {
+    // Must remove forum topics to test creating orphan topics.
+    $vid = variable_get('forum_nav_vocabulary');
+    $tree = taxonomy_get_tree($vid);
+    foreach($tree as $term) {
+      taxonomy_term_delete($term->tid);
+    }
+
+    // Create an orphan forum item.
     $this->drupalLogin($this->admin_user);
     $this->drupalPost('node/add/forum', array('title' => $this->randomName(10), 'body[' . LANGUAGE_NONE .'][0][value]' => $this->randomName(120)), t('Save'));
 
     $nid_count = db_query('SELECT COUNT(nid) FROM {node}')->fetchField();
-    $this->assertEqual(0, $nid_count, t('A forum node was not created.'));
+    $this->assertEqual(0, $nid_count, t('A forum node was not created when missing a forum vocabulary.'));
+
+    // Reset the defaults for future tests.
+    module_enable(array('forum'));
+  }
+
+  /**
+   * Check that the basic forum install creates a default forum topic
+   *
+   */
+  private function doInstallTests() {
+    // Load the /forum url
+    $this->drupalGet("/forum");
+
+    // Look for the "General discussion" default forum
+    $this->assertText(t("General discussion"), "Found the default forum at the /forum listing");
   }
 
   /**