Index: modules/simpletest/tests/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v
retrieving revision 1.35
diff -u -p -r1.35 menu.test
--- modules/simpletest/tests/menu.test	24 Sep 2010 00:37:44 -0000	1.35
+++ modules/simpletest/tests/menu.test	2 Oct 2010 03:14:04 -0000
@@ -541,6 +541,7 @@ class MenuBreadcrumbTestCase extends Dru
   function setUp() {
     parent::setUp(array('menu_test'));
     $perms = array_keys(module_invoke_all('permission'));
+    $this->web_user = $this->drupalCreateUser();
     $this->admin_user = $this->drupalCreateUser($perms);
     $this->drupalLogin($this->admin_user);
   }
@@ -874,15 +875,25 @@ class MenuBreadcrumbTestCase extends Dru
 
     $trail = $home;
     $this->assertBreadcrumb('user', $trail, t('User account'));
-    $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $this->admin_user->name);
+    $this->assertBreadcrumb('user/' . $this->web_user->uid, $trail, $this->web_user->name);
 
+    // First check the logged in user's page breadcrumb, and then check
+		// a secondary user's breadcrumb to verify that the pattern is consistent.
     $this->drupalLogin($this->admin_user);
     $trail += array(
       'user/' . $this->admin_user->uid => $this->admin_user->name,
     );
+    $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $this->admin_user->name);
     $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $this->admin_user->name);
 
-    // Add a Navigation menu links for 'user' and $this->admin_user.
+    $trail = $home;
+    $trail += array(
+      'user/' . $this->web_user->uid => $this->web_user->name,
+    );
+    $this->assertBreadcrumb('user/' . $this->web_user->uid, $trail, $this->web_user->name);
+    $this->assertBreadcrumb('user/' . $this->web_user->uid . '/edit', $trail, $this->web_user->name);
+
+    // Add a Navigation menu links for 'user' and $this->web_user.
     // Although it may be faster to manage these links via low-level API
     // functions, there's a lot that can go wrong in doing so.
     $edit = array(
@@ -896,11 +907,11 @@ class MenuBreadcrumbTestCase extends Dru
     ))->fetchAssoc();
 
     $edit = array(
-      'link_title' => $this->admin_user->name . ' link',
-      'link_path' => 'user/' . $this->admin_user->uid,
+      'link_title' => $this->web_user->name . ' link',
+      'link_path' => 'user/' . $this->web_user->uid,
     );
     $this->drupalPost("admin/structure/menu/manage/$menu/add", $edit, t('Save'));
-    $link_admin_user = db_query('SELECT * FROM {menu_links} WHERE link_title = :title AND link_path = :href', array(
+    $link_web_user = db_query('SELECT * FROM {menu_links} WHERE link_title = :title AND link_path = :href', array(
       ':title' => $edit['link_title'],
       ':href' => $edit['link_path'],
     ))->fetchAssoc();
@@ -913,21 +924,22 @@ class MenuBreadcrumbTestCase extends Dru
     );
     $this->assertBreadcrumb('user', $trail, $link_user['link_title'], $tree);
     $tree = array(
-      $link_admin_user['link_path'] => $link_admin_user['link_title'],
+      $link_web_user['link_path'] => $link_web_user['link_title'],
     );
-    $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $link_admin_user['link_title'], $tree);
+    $this->assertBreadcrumb('user/' . $this->web_user->uid, $trail, $link_web_user['link_title'], $tree);
 
     $this->drupalLogin($this->admin_user);
     $trail += array(
-      $link_admin_user['link_path'] => $link_admin_user['link_title'],
+      $link_web_user['link_path'] => $link_web_user['link_title'],
     );
-    $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $link_admin_user['link_title'], $tree, FALSE);
+    $this->assertBreadcrumb('user/' . $this->web_user->uid, $trail, $link_web_user['link_title'], $tree, FALSE);
+    $this->assertBreadcrumb('user/' . $this->web_user->uid . '/edit', $trail, $link_web_user['link_title'], $tree, FALSE);
 
     // Move 'user/%' below 'user' and verify again.
     $edit = array(
       'parent' => "$menu:{$link_user['mlid']}",
     );
-    $this->drupalPost("admin/structure/menu/item/{$link_admin_user['mlid']}/edit", $edit, t('Save'));
+    $this->drupalPost("admin/structure/menu/item/{$link_web_user['mlid']}/edit", $edit, t('Save'));
 
     $this->drupalLogout();
     $trail = $home;
@@ -939,22 +951,23 @@ class MenuBreadcrumbTestCase extends Dru
       $link_user['link_path'] => $link_user['link_title'],
     );
     $tree += array(
-      $link_admin_user['link_path'] => $link_admin_user['link_title'],
+      $link_web_user['link_path'] => $link_web_user['link_title'],
     );
-    $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $link_admin_user['link_title'], $tree);
+    $this->assertBreadcrumb('user/' . $this->web_user->uid, $trail, $link_web_user['link_title'], $tree);
 
     $this->drupalLogin($this->admin_user);
     $trail += array(
-      $link_admin_user['link_path'] => $link_admin_user['link_title'],
+      $link_web_user['link_path'] => $link_web_user['link_title'],
     );
-    $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $link_admin_user['link_title'], $tree, FALSE);
+    $this->assertBreadcrumb('user/' . $this->web_user->uid, $trail, $link_web_user['link_title'], $tree, FALSE);
+    $this->assertBreadcrumb('user/' . $this->web_user->uid . '/edit', $trail, $link_web_user['link_title'], $tree, FALSE);
 
     // Create an only slightly privileged user being able to access site reports
     // but not administration pages.
-    $this->web_user = $this->drupalCreateUser(array(
+    $this->prived_user = $this->drupalCreateUser(array(
       'access site reports',
     ));
-    $this->drupalLogin($this->web_user);
+    $this->drupalLogin($this->prived_user);
 
     // Verify that we can access recent log entries, there is a corresponding
     // page title, and that the breadcrumb is empty (because the user is not