? 269929_Break_alias_at_word-18.patch
? 290988_constants_instead_of_numerics.patch
? 290988_constants_instead_of_numerics_2.patch
? 6x2x_style_tests_pathauto.patch
Index: tests/pathauto.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/tests/pathauto.test,v
retrieving revision 1.3
diff -u -p -r1.3 pathauto.test
--- tests/pathauto.test	22 Jun 2008 15:20:45 -0000	1.3
+++ tests/pathauto.test	17 Aug 2008 19:04:25 -0000
@@ -11,17 +11,17 @@
 /**
  * TODO
  */
-class PathautoTestCase extends DrupalTestCase {
+class PathautoTestCase extends DrupalWebTestCase {
   protected $web_user;
   protected $content_type;
 
   /**
    * Implementation of getInfo().
    */
-  function get_info() {
+  function getInfo() {
     return array(
       'name' => t('Pathauto basic tests'),
-      'desc' => t('Test basic pathauto functionality.'),
+      'description' => t('Test basic pathauto functionality.'),
       'group' => 'Pathauto',
     );
   }
@@ -35,7 +35,7 @@ class PathautoTestCase extends DrupalTes
     menu_rebuild();
 
     // User to create paths with pathauto.
-    $this->web_user = $this->drupalCreateUserRolePerm(array(
+    $this->web_user = $this->drupalCreateUser(array(
       'administer pathauto',
       'create '. $this->content_type->type .' content',
       'edit own '. $this->content_type->type .' content',
@@ -51,18 +51,18 @@ class PathautoTestCase extends DrupalTes
    */
   function testPathAuto() {
     $this->drupalGet('logout');
-    $this->drupalLoginUser($this->web_user);
+    $this->drupalLogin($this->web_user);
 
     $this->drupalGet('admin/build/path/pathauto');
-    $this->assertWantedRaw(t('General settings'), '[testPathAuto]: Settings page displayed');
+    $this->assertRaw(t('General settings'), '[testPathAuto]: Settings page displayed');
 
     // Set pathauto settings we assume to be as-is in this test.
-    $this->drupalVariableSet('pathauto_node_'. $this->content_type->type .'_pattern', 'content/[title-raw]');
-    $this->drupalVariableSet('pathauto_separator', '-');
-    $this->drupalVariableSet('pathauto_case', '1'); // lowercase
-    $this->drupalVariableSet('pathauto_max_length', '100');
-    $this->drupalVariableSet('pathauto_max_component_length', '100');
-    $this->drupalVariableSet('pathauto_punctuation_underscore', '2'); // no action
+    variable_set('pathauto_node_'. $this->content_type->type .'_pattern', 'content/[title-raw]');
+    variable_set('pathauto_separator', '-');
+    variable_set('pathauto_case', '1'); // lowercase
+    variable_set('pathauto_max_length', '100');
+    variable_set('pathauto_max_component_length', '100');
+    variable_set('pathauto_punctuation_underscore', '2'); // no action
 
     // Create node for testing.
     $random_title = $this->randomName(10); // this contains _
@@ -70,17 +70,17 @@ class PathautoTestCase extends DrupalTes
     $expected_alias = 'content/simpletest-title-'. strtolower($random_title);
     $edit['body'] = 'Simpletest body '. $this->randomName(10);
     $this->drupalPost('node/add/'. str_replace('_', '-', $this->content_type->type), $edit, 'Save');
-    $this->assertWantedRaw(t('@type %title has been created.', array('@type' => $this->content_type->name, '%title' => $edit['title'])), '[testPathAuto]: Test node submitted');
+    $this->assertRaw(t('@type %title has been created.', array('@type' => $this->content_type->name, '%title' => $edit['title'])), '[testPathAuto]: Test node submitted');
 
     // Look for alias generated in the form.
     $node = node_load(array('title' => $edit['title']));
     $this->drupalGet('node/'. $node->nid .'/edit');
-    $this->assertWantedPattern('!<input[^>]+name="path"[^>]+value="'. $expected_alias .'"!', $this->drupalGetContent(), '[testPathAuto]: Proper automated alias generated');
+    $this->assertPattern('!<input[^>]+name="path"[^>]+value="'. $expected_alias .'"!', $this->drupalGetContent(), '[testPathAuto]: Proper automated alias generated');
     // Look for checkbox.
-    $this->assertWantedPattern('!<input[^>]+name="pathauto_perform_alias"[^>]+checked="checked"!', $this->drupalGetContent(), '[testPathAuto]: Automated alias turned on');
+    $this->assertPattern('!<input[^>]+name="pathauto_perform_alias"[^>]+checked="checked"!', $this->drupalGetContent(), '[testPathAuto]: Automated alias turned on');
 
     // Check whether the alias actually works.
     $this->drupalGet($expected_alias);
-    $this->assertWantedRaw($edit['title'], '[testPathAuto]: Node accessible through alias');
+    $this->assertRaw($edit['title'], '[testPathAuto]: Node accessible through alias');
   }
 }