Index: modules/taxonomy/taxonomy.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v
retrieving revision 1.12
diff -u -p -r1.12 taxonomy.test
--- modules/taxonomy/taxonomy.test	13 Nov 2008 08:13:56 -0000	1.12
+++ modules/taxonomy/taxonomy.test	14 Nov 2008 13:18:48 -0000
@@ -1,14 +1,14 @@
 <?php
 // $Id: taxonomy.test,v 1.12 2008/11/13 08:13:56 webchick Exp $
 
-class TaxonomyVocabularyLoadTestCase extends DrupalWebTestCase {
+class TaxonomyVocabularyTesttCase extends DrupalWebTestCase {
   /**
    * Implementation of getInfo().
    */
    function getInfo() {
      return array(
-       'name' => t('Loading taxonomy vocabularies'),
-       'description' => t('Test loading vocabularies under various conditions.'),
+       'name' => t('Taxonomy vocabularies'),
+       'description' => t('Test loading, saving and deleting vocabularies under various conditions.'),
        'group' => t('Taxonomy'),
      );
    }
@@ -20,6 +20,14 @@ class TaxonomyVocabularyLoadTestCase ext
     parent::setUp('taxonomy');
     $admin_user = $this->drupalCreateUser(array('administer taxonomy'));
     $this->drupalLogin($admin_user);
+    // Create a new vocabulary.
+    $vocabulary = new stdClass();
+    $vocabulary->name = $this->randomName();
+    $vocabulary->description = $this->randomName();
+    $vocabulary->help = '';
+    $vocabulary->weight = 0;
+    taxonomy_vocabulary_save($vocabulary);
+    $this->vocabulary = $vocabulary;
   }
 
   /**
@@ -35,13 +43,12 @@ class TaxonomyVocabularyLoadTestCase ext
     $this->assertTrue(!is_object($vocabulary), t('No object loaded.'));
 
     // Create a new vocabulary.
-    $edit = array(
-      'name' => $this->randomName(),
-      'description' => $this->randomName(),
-      'help' => '',
-      'weight' => 0,
-    );
-    $this->drupalPost('admin/content/taxonomy/add/vocabulary', $edit, t('Save'));
+    $vocabulary = new stdClass();
+    $vocabulary->name = $this->randomName();
+    $vocabulary->description = $this->randomName();
+    $vocabulary->help = '';
+    $vocabulary->weight = 0;
+    taxonomy_vocabulary_save($vocabulary);
 
     // Load the vocabulary with the same $vid from earlier.
     // This should return a vocabulary object since it now matches a real vid.
@@ -54,9 +61,9 @@ class TaxonomyVocabularyLoadTestCase ext
    * Ensure that the vocabulary static reset works correctly.
    */
   function testTaxonomyVocabularyLoadStaticReset() {
-    // Load the first available vocabulary.
-    $original_vocabulary = taxonomy_vocabulary_load(1);
-    $this->assertTrue(is_object($original_vocabulary));
+    $original_vocabulary = taxonomy_vocabulary_load($this->vocabulary->vid);
+    $this->assertTrue(is_object($original_vocabulary), t('Vocabulary loaded successfully'));
+    $this->assertEqual($this->vocabulary->name, $original_vocabulary->name, t('Vocabulary loaded successfully'));
 
     // Change the name and description.
     $vocabulary = $original_vocabulary;
@@ -68,303 +75,98 @@ class TaxonomyVocabularyLoadTestCase ext
     $new_vocabulary = taxonomy_vocabulary_load($original_vocabulary->vid, TRUE);
     $this->assertEqual($new_vocabulary->name, $vocabulary->name);
     $this->assertEqual($new_vocabulary->name, $vocabulary->name);
-  }
-}
-
-class TaxonomyVocabularyFunctionsTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
-  function getInfo() {
-    return array(
-      'name' => t('Vocabulary functions'),
-      'description' => t('Test loading, saving, and deleting vocabularies.'),
-      'group' => t('Taxonomy')
-    );
-  }
-
-  /**
-   * Implementation of setUp().
-   */
-  function setUp() {
-    parent::setUp('taxonomy');
-  }
-
-  /**
-   * Create/Edit/Delete vocabulary and assert that all fields were properly saved.
-   */
-  function testVocabularyFunctions() {
-    //preparing data
-    $vid = 0;
-    $name = $this->randomName(200);
-    $description = $this->randomName(200);
-    $help = $this->randomName(200);
-    $hierarchy = rand(0,2); // Hierarchy 0,1,2
-    $multiple = rand(0,1); // multiple 0,1
-    $required = rand(0,1); // required 0,1
-    $relations = rand(0,1);
-    $tags = rand(0,1);
-    $weight = rand(-9,9);
-    $module = 'taxonomy';
-    $nodesList = array_keys(node_get_types());
-    $maxNodes = rand(1, count($nodesList));
-    $nodes = array();
-    for($i = 0; $i < $maxNodes; $i++) {
-      $nodes[$nodesList[$i]] = $nodesList[$i];
-      $nodesBak[$nodesList[$i]] = $nodesList[$i];
-    }
-    $_t = array('vid', 'name', 'description', 'help', 'relations', 'hierarchy', 'multiple',
-      'required', 'tags', 'module', 'weight', 'nodes');
-    $edit = array();
-    foreach($_t as $key)
-      $edit[$key] = $$key;
-
-    // Exec save function.
-    $vocabulary = (object) $edit;
-    taxonomy_vocabulary_save($vocabulary);
-    // After save we use $nodesBak.
-    ksort($nodesBak);
-    $edit['nodes'] = $nodesBak;
-    $vocabularies = taxonomy_get_vocabularies();
-    foreach($vocabularies as $voc) {
-      if ($voc->name == $name) {
-        $vid = $voc->vid;
-        break;
-      }
-    }
-    $edit['vid'] = $vid;
-    // Get data using function.
-    $getEdit = taxonomy_vocabulary_load($vid);
-    foreach($getEdit as $key => $value ) {
-      $this->assertEqual($value, $edit[$key], t('Checking value of @key.', array('@key' => $key)));
-    }
 
-    // Delete vocabulary.
-    taxonomy_vocabulary_delete($vid);
-    // Checking if we deleted voc.
+    // Delete the vocabulary.
+    taxonomy_vocabulary_delete($this->vocabulary->vid);
     $vocabularies = taxonomy_get_vocabularies();
-    $vid = 0;
-    foreach($vocabularies as $voc) {
-      if ($voc->name == $name) {
-        $vid = $voc->vid;
-        break;
-      }
-    }
-    $this->assertEqual($vid, 0, t('Deleted vocabulary (@vid)', array('@vid' => $vid)));
+    $this->assertTrue(!isset($vocabularies[$this->vocabulary->vid]), t('The vocabulary was deleted'));
   }
 }
 
-class TaxonomyTermFunctionsTestCase extends DrupalWebTestCase {
-  /**
-   * Implementation of getInfo().
-   */
-  function getInfo() {
-    return array(
-      'name' => t('Term no hierarchy'),
-      'description' => t('Testing save/update/delete terms without a hierarchy.'),
-      'group' => t('Taxonomy')
-    );
-  }
-
-  /**
-   * Test term related functions.
-   */
-  function testTermsFunctions() {
-    // Preparing data: vocabulary, hierarchy -> disabled, related terms = on.
-    $edit = array();
-    $_t = array('vid', 'name', 'description', 'help', 'relations', 'hierarchy', 'multiple',
-        'required', 'tags', 'module', 'weight', 'nodes');
-    foreach($_t as $key ) {
-      $edit[$key] = 0;
-    }
-    $name = $this->randomName(20);
-    $relation = 1;
-    $edit['name'] = $name;
-    $vocabulary = (object) $edit;
-    taxonomy_vocabulary_save($vocabulary);
-    $edit['vid'] = $vocabulary->vid;
-
-    // Create term.
-    $termname = $this->randomName(20);
-    $termdesc = $this->randomName(200);
-    $termweight = rand(-9, 9);
-    $randSyn = rand(0, 9);
-    $synonyms = array();
-    for($i = 0; $i < $randSyn; $i++) {
-      $synonyms[] = $this->randomName(20);
-    }
-    $termsyn = implode("\n", $synonyms);
-    $data = array('name' => $termname, 'description' => $termdesc, 'weight' => $termweight, 'synonyms' => $termsyn, 'vid' => $edit['vid'], 'tid' => 0, 'relations' => 0);
-    $term = (object) $data;
-    taxonomy_term_save($term);
 
-    // Retrieve term and check all fields.
-    $_tArray = taxonomy_get_term_by_name($termname);
-    $getTerm = $_tArray[0];
-    $checkField = array('name', 'description', 'weight', 'vid');
-    foreach($checkField as $v) {
-      $this->assertEqual($data[$v], $getTerm->$v, t('Checking value of the term (@v).', array('@v' => $v)));
-    }
-    $getSynonyms = taxonomy_get_synonyms($getTerm->tid);
-    $this->assertEqual(sort($synonyms), sort($getSynonyms), 'Checking synonyms');
 
-    // Creating related terms.
-    $relations = array();
-    $staryTid = $getTerm->tid;
-    $relations[] = $staryTid;
-    $termname = $this->randomName(20);
-    $data = array('name' => $termname, 'description' => '', 'weight' => 0, 'synonyms' => 0, 'vid' => $edit['vid'], 'tid' => 0, 'relations' => array($staryTid));
-    $term = (object) $data;
-    taxonomy_term_save($term);
-    $_tArray = taxonomy_get_term_by_name($termname);
-    $getTerm = $_tArray[0];
-    $relations[] = $getTerm->tid;
+class TaxonomyTermTestCase extends DrupalWebTestCase {
 
-    // Creating another term related to 2 terms above.
-    $termname = $this->randomName(20);
-    $data = array('name' => $termname, 'description' => '', 'weight' => 0, 'synonyms' => 0, 'vid' => $edit['vid'], 'tid' => 0, 'relations' => array($staryTid, $getTerm->tid));
-    $term = (object) $data;
-    taxonomy_term_save($term);
-    $_tArray = taxonomy_get_term_by_name($termname);
-    $getTerm = $_tArray[0];
-
-    // Check related terms.
-    $related = taxonomy_get_related($getTerm->tid);
-    foreach($relations as $rTid) {
-      $this->assertTrue(array_key_exists($rTid, $related), t('Checking relations (@rTid).', array('@rTid' => $rTid)));
-    }
-
-    // Delete vocabulary.
-    taxonomy_vocabulary_delete($edit['vid']);
-  }
-}
-
-class TaxonomyTermSingleTestCase extends DrupalWebTestCase {
-
-  /**
-   * Implementation of getInfo().
-   */
   function getInfo() {
     return array(
-      'name' => t('Term single hierarchy'),
-      'description' => t('Testing save/update/delete terms in a single hierarchy.'),
+      'name' => t('Taxonomy term functions and forms.'),
+      'description' => t('Test load, save and delete for taxonomy terms.'),
       'group' => t('Taxonomy')
     );
   }
 
-  /**
-   * Test single hierarchy terms.
-   */
-  function testTermsFunctionsSingleHierarchy() {
-    // Preparing data: vocabulary hierarchy->single.
-    $edit = array();
-    $_t = array('vid', 'name', 'description', 'help', 'relations', 'hierarchy', 'multiple',
-        'required', 'tags', 'module', 'weight', 'nodes');
-    foreach($_t as $key ) {
-      $edit[$key] = 0;
-    }
+  function setUp() {
+    parent::setUp('taxonomy');
+    $this->admin_user = $this->drupalCreateUser(array('administer taxonomy'));
 
-    // Create vocab.
-    $name = $this->randomName(20);
-    $edit['hierarchy'] = 1;
-    $edit['name'] = $name;
-    $vocabulary = (object) $edit;
+    // Create a vocabulary.
+    $vocabulary = new stdClass();
+    $vocabulary->name = $this->randomName();
+    $vocabulary->description = $this->randomName();
+    $vocabulary->help = '';
     taxonomy_vocabulary_save($vocabulary);
-    $edit['vid'] = $vocabulary->vid;
-
-    // Create 1st term.
-    $termname = $this->randomName(20);
-    $data = array('name' => $termname, 'description' => '', 'weight' => 0, 'synonyms' => '', 'vid' => $edit['vid'], 'tid' => 0, 'relations' => 0);
-    $term = (object) $data;
-    taxonomy_term_save($term);
-    $_tArray = taxonomy_get_term_by_name($termname);
-    $parent = $_tArray[0];
-
-    // Create 2nd term as a child.
-    $termname = $this->randomName(20);
-    $data = array('name' => $termname, 'description' => '', 'weight' => 0, 'synonyms' => '', 'vid' => $edit['vid'], 'tid' => 0, 'relations' => 0, 'parent' => array($parent->tid));
-    $term = (object) $data;
-    taxonomy_term_save($term);
-    $_tArray = taxonomy_get_term_by_name($termname);
-    $children = $_tArray[0];
-
-    // Check hierarchy.
-    $getChildren = taxonomy_get_children($parent->tid);
-    $getParent = taxonomy_get_parents($children->tid);
-    $this->assertEqual($parent,$getParent[$parent->tid], t('Checking parents.'));
-    $this->assertEqual($children,$getChildren[$children->tid], t('Checking children.'));
-
-    // Delete vocabulary.
-    taxonomy_vocabulary_delete($edit['vid']);
+    $this->vocabulary = $vocabulary;
   }
-}
-
-class TaxonomyTermMultipleTestCase extends DrupalWebTestCase {
 
   /**
-   * Implementation of getInfo().
+   * Test related terms.
    */
-  function getInfo() {
-    return array(
-      'name' => t('Term multiple hierarchy'),
-      'description' => t('Testing save/update/delete terms in a multiple hierarchy.'),
-      'group' => t('Taxonomy')
-    );
-  }
+ function testTaxonomyTermRelations() {
+   // Create two taxonomy terms.
+   $term1 = new stdClass();
+   $term1->name = $this->randomName();
+   $term1->vid = $this->vocabulary->vid;
+   $term2 = new stdClass();
+   $term2->name = $this->randomName();
+   $term2->vid = $this->vocabulary->vid;
+   taxonomy_term_save($term1);
+   taxonomy_term_save($term2);
+
+   $this->drupalLogin($this->admin_user);
+   $edit = array();
+   $edit['relations[]'] = $term2->tid;
+   $this->drupalPost('taxonomy/term/' . $term1->tid . '/edit', $edit, t('Save'));
+
+   $related = taxonomy_get_related($term1->tid);
+   $this->assertTrue(isset($related[$term2->tid]), t('Related term was found'));
+ }
+
+ /**
+  * Test terms in a single level hierarchy.
+  */
+  function testTaxonomyTermHierarchy() {
+    // Create two taxonomy terms.
+    $term1 = new stdClass();
+    $term1->name = $this->randomName();
+    $term1->vid = $this->vocabulary->vid;
+    $term2 = new stdClass();
+    $term2->name = $this->randomName();
+    $term2->vid = $this->vocabulary->vid;
+    taxonomy_term_save($term1);
+    taxonomy_term_save($term2);
 
-  /**
-   * Test multiple hierarchy terms.
-   */
-  function testTermsFunctionsMultipleHierarchy() {
-    // Preparing data: vocabulary hierarchy->single.
+    // Edit the second term, setting the first as parent.
+    $this->drupalLogin($this->admin_user);
     $edit = array();
-    $_t = array('vid', 'name', 'description', 'help', 'relations', 'hierarchy', 'multiple',
-        'required', 'tags', 'module', 'weight', 'nodes');
-    foreach($_t as $key )
-      $edit[$key] = 0;
+    $edit['parent[]'] = $term1->tid;
+    $this->drupalPost('taxonomy/term/' . $term2->tid . '/edit', $edit, t('Save'));
 
-    $name = $this->randomName(20);
-    $edit['hierarchy'] = 1;
-    $edit['name'] = $name;
-    $vocabulary = (object) $edit;
-    taxonomy_vocabulary_save($vocabulary);
-    $edit['vid'] = $vocabulary->vid;
-
-    // Create 1st term.
-    $parent = array();
-    $termname = $this->randomName(20);
-    $data = array('name' => $termname, 'description' => '', 'weight' => 0, 'synonyms' => '', 'vid' => $edit['vid'], 'tid' => 0, 'relations' => 0);
-    $term = (object) $data;
-    taxonomy_term_save($term);
-    $_tArray = taxonomy_get_term_by_name($termname);
-    $parent[] = $_tArray[0]->tid;
-
-    // Create 2nd term.
-    $termname = $this->randomName(20);
-    $data = array('name' => $termname, 'description' => '', 'weight' => 0, 'synonyms' => '', 'vid' => $edit['vid'], 'tid' => 0, 'relations' => 0);
-    $term = (object) $data;
-    taxonomy_term_save($term);
-    $_tArray = taxonomy_get_term_by_name($termname);
-    $parent[] = $_tArray[0]->tid;
-
-    // Create 3rd term as a child.
-    $termname = $this->randomName(20);
-    $data = array('name' => $termname, 'description' => '', 'weight' => 0, 'synonyms' => '', 'vid' => $edit['vid'], 'tid' => 0, 'relations' => 0, 'parent' => array($parent));
-    $term = (object) $data;
-    taxonomy_term_save($term);
-    $_tArray = taxonomy_get_term_by_name($termname);
-    $children = $_tArray[0];
-
-    $getParent = taxonomy_get_parents($children->tid);
-    foreach($parent as $p) {
-      $this->assertTrue(array_key_exists($p, $getParent), t('Checking parents (@p)', array('@p' => $p)));
-      //$this->assertEqual($parent,$getParent[$parent->tid], 'Checking parents');
-    }
-
-    // Delete vocabulary.
-    taxonomy_vocabulary_delete($edit['vid']);
+    // Check the hierarchy.
+    $children = taxonomy_get_children($term1->tid);
+    $parents = taxonomy_get_parents($term2->tid);
+    $this->assertTrue(isset($children[$term2->tid]), t('Child found correctly.'));
+    $this->assertTrue(isset($parents[$term1->tid]), t('Parent found correctly.'));
+
+    // Create a third term and save this as a parent of term2.
+    $term3 = new stdClass();
+    $term3->name = $this->randomName();
+    $term3->vid = $this->vocabulary->vid;
+    taxonomy_term_save($term3);
+    $term2->parent = array($term1->tid, $term3->tid);
+    taxonomy_term_save($term2);
+    $parents = taxonomy_get_parents($term2->tid);
+    $this->assertTrue(isset($parents[$term1->tid]) && isset($parents[$term3->tid]));
   }
-
 }
 
 class TaxonomyAdminTestCase extends DrupalWebTestCase {