Index: admin_menu.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/tests/admin_menu.test,v
retrieving revision 1.1.2.5.2.5
diff -u -r1.1.2.5.2.5 admin_menu.test
--- admin_menu.test	22 Jul 2009 20:34:28 -0000	1.1.2.5.2.5
+++ admin_menu.test	4 Sep 2009 01:24:08 -0000
@@ -33,7 +33,7 @@
    */
   function testPermissions() {
     // Anonymous users should not see the menu.
-    $this->assertNoRaw('<div id="admin-menu">', t('Admin menu not displayed to anonymous.'));
+    $this->assertNoRaw('<div id="admin-menu"', t('Admin menu not displayed to anonymous.'));
 
     // Create a new user who can access administration menu, but without the
     // permission 'display drupal links'.
@@ -41,18 +41,18 @@
     $this->drupalLogin($admin_user);
 
     // Check that the user can see the admin links, but not the drupal links.
-    $this->assertRaw('<div id="admin-menu">', t('Administration menu is displayed.'));
+    $this->assertRaw('<div id="admin-menu"', t('Administration menu is displayed.'));
     $this->drupalGet('node');
-    $this->assertPattern('@<div id="admin-menu">.*admin/content/node@s', t('Administer content link found.'));
-    $this->assertNoPattern('@<div id="admin-menu">.*http://drupal.org@s', t('Drupal links not found.'));
-    $this->assertNoPattern('@<div id="admin-menu">.*admin/build/contact@s', t('Contact module link not found.'));
+    $this->assertPattern('@<div id="admin-menu".*admin/content/node@s', t('Administer content link found.'));
+    $this->assertNoPattern('@<div id="admin-menu".*http://drupal.org@s', t('Drupal links not found.'));
+    $this->assertNoPattern('@<div id="admin-menu".*admin/build/contact@s', t('Contact module link not found.'));
 
     // Create a new user with the permission 'display drupal links'.
     $admin_user2 = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'administer nodes', 'access administration menu', 'display drupal links'));
     $this->drupalLogin($admin_user2);
     $this->drupalGet('node');
-    $this->assertPattern('@<div id="admin-menu">.*http://drupal.org@s', t('Drupal links found.'));
-    $this->assertNoPattern('@<div id="admin-menu">.*admin/build/contact@s', t('Contact module link not found.'));
+    $this->assertPattern('@<div id="admin-menu".*http://drupal.org@s', t('Drupal links found.'));
+    $this->assertNoPattern('@<div id="admin-menu".*admin/build/contact@s', t('Contact module link not found.'));
   }
 }
 
@@ -83,9 +83,9 @@
     $this->drupalLogin($admin_user);
 
     // Verify that proper links are displayed.
-    $this->assertRaw('<div id="admin-menu">', t('Administration menu is displayed.'));
+    $this->assertRaw('<div id="admin-menu"', t('Administration menu is displayed.'));
     $this->drupalGet('node');
-    $this->assertNoPattern('@<div id="admin-menu">.*admin/build/contact@s', t('Contact module link not found.'));
+    $this->assertNoPattern('@<div id="admin-menu".*admin/build/contact@s', t('Contact module link not found.'));
 
     // Create a new user with 'administer site-wide contact form' permission.
     $admin_user = $this->drupalCreateUser(array('access administration pages', 'access administration menu', 'administer site-wide contact form'));
@@ -93,7 +93,7 @@
 
     // Verify that proper links are displayed.
     $this->drupalGet('node');
-    $this->assertPattern('@<div id="admin-menu">.*admin/build/contact@s', t('Contact module link found.'));
+    $this->assertPattern('@<div id="admin-menu".*admin/build/contact@s', t('Contact module link found.'));
   }
 }
 
@@ -137,25 +137,24 @@
 
     // Fetch a page.
     $this->drupalGet('node');
-    $this->assertRaw('<div id="admin-menu">', t('Administration menu is displayed.'));
+    $this->assertRaw('<div id="admin-menu"', t('Administration menu is displayed.'));
 
     // Verify that proper links are displayed.
     // We are explicitly NOT using t() here, since the purpose is to test our
     // custom link titles and 't' option.
     $links = array(
-      '/admin/content/types/page' => t('Page'),
-      '/admin/content/types/special' => t('Cool & Special'),
+      url('admin/content/types/page') => t('Page'),
+      url('admin/content/types/special') => t('Cool & Special'),
     );
     foreach ($links as $url => $title) {
       $this->assertFieldByXPath('//div[@id="admin-menu"]//a[@href="' . $url . '"]', $title, t('!link-title content-type link found.', array('!link-title' => $title)));
     }
     $links = array(
-      '/node/add/page' => t('Page'),
-      '/node/add/special' => t('Cool & Special'),
+      url('admin/node/add/page') => t('Page'),
+      url('admin/node/add/special') => t('Cool & Special'),
     );
     foreach ($links as $url => $title) {
       $this->assertFieldByXPath('//div[@id="admin-menu"]//a[@href="' . $url . '"]', $title, t('Create content &raquo; !link-title link found.', array('!link-title' => $title)));
     }
   }
-}
-
+}
\ No newline at end of file