#511286 follow-up by DamZ: Make testMenuGetNames() less brittle (and also fix it so we can turn testing bot back on).

1 files changed, 19 insertions, 3 deletions

diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test
index a7f3b060d..c601b111f 100644
--- a/modules/simpletest/tests/menu.test
+++ b/modules/simpletest/tests/menu.test
@@ -157,9 +157,25 @@ class MenuIncTestCase extends DrupalWebTestCase {
    * Test menu_get_names().
    */
   function testMenuGetNames() {
-    // The main-menu is there but has no items by default, so not returned by
-    // menu_get_names(). Therefore we cannot check for that.
-    $this->assertEqual(menu_get_names(), array('management', 'navigation', 'original', 'shortcut-set-1', 'user-menu'), t('Expected menu names were returned.'));
+    // Create three menu items.
+    for ($i = 0; $i < 3; $i++) {
+      $menu_link = array(
+        'link_title' => 'Menu link #' . $i,
+        'link_path' => 'menu_test/' . $i,
+        'module' => 'menu_test',
+        'menu_name' => 'menu_test_' . $i,
+      );
+      menu_link_save($menu_link);
+    }
+
+    drupal_static_reset('menu_get_names');
+
+    // Verify that the menu names are correctly reported by menu_get_names().
+    $menu_names = menu_get_names();
+    $this->pass(implode(' | ', $menu_names));
+    for ($i = 0; $i < 3; $i++) {
+      $this->assertTrue(in_array('menu_test_' . $i, $menu_names), t('Expected menu name %expected is returned.', array('%expected' => 'menu_test_' . $i)));
+    }
   }
 
   /**