Index: modules/simpletest/tests/menu.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v retrieving revision 1.13 diff -u -9 -p -r1.13 menu.test --- modules/simpletest/tests/menu.test 14 Jul 2009 20:53:16 -0000 1.13 +++ modules/simpletest/tests/menu.test 1 Sep 2009 18:24:30 -0000 @@ -70,18 +70,26 @@ class MenuIncTestCase extends DrupalWebT // Load a different page to be sure that we have up to date information. $this->drupalGet('menu_test_maintain/2'); $this->assertNoLink(t('Menu link updated'), 0, t('Not found deleted menu link')); $this->assertNoLink(t('Menu link #1'), 0, t('Not found menu link #1')); $this->assertNoLink(t('Menu link #1'), 0, t('Not found menu link #1-1')); $this->assertLink(t('Menu link #2'), 0, t('Found menu link #2')); } /** + * Test menu_get_names(). + */ + function testMenuGetNames() { + $this->drupalGet('menu_get_names'); + $this->assertRaw(var_export(array('admin_shortcuts', 'main-menu', 'management', 'navigation', 'original', 'user-menu'), TRUE), t('Expected menu names was returned.')); + } + + /** * Tests for menu_name parameter for hook_menu(). */ function testMenuName() { $admin_user = $this->drupalCreateUser(array('administer site configuration')); $this->drupalLogin($admin_user); $sql = "SELECT menu_name FROM {menu_links} WHERE router_path = 'menu_name_test'"; $name = db_query($sql)->fetchField(); $this->assertEqual($name, 'original', t('Menu name is "original".')); Index: modules/simpletest/tests/menu_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu_test.module,v retrieving revision 1.6 diff -u -9 -p -r1.6 menu_test.module --- modules/simpletest/tests/menu_test.module 14 Jul 2009 20:53:16 -0000 1.6 +++ modules/simpletest/tests/menu_test.module 1 Sep 2009 18:24:30 -0000 @@ -18,25 +18,30 @@ function menu_test_menu() { ); // Use FALSE as 'title callback' to bypass t(). $items['menu_no_title_callback'] = array( 'title' => 'A title with @placeholder', 'title callback' => FALSE, 'title arguments' => array('@placeholder' => 'some other text'), 'page callback' => 'menu_test_callback', 'access arguments' => array('access content'), ); - + $items['menu_get_names'] = array( + 'title' => 'Menu names', + 'page callback' => 'menu_test_menu_get_names', + 'access arguments' => array('access content'), + 'type' => MENU_CALLBACK, + ); // Hidden link for menu_link_maintain tests $items['menu_test_maintain/%'] = array( 'title' => 'Menu maintain test', 'page callback' => 'node_page_default', 'access arguments' => array('access content'), - ); + ); // Hierarchical tests. $items['menu-test/hierarchy/parent'] = array( 'title' => 'Parent menu router', 'page callback' => 'node_page_default', ); $items['menu-test/hierarchy/parent/child'] = array( 'title' => 'Child menu router', 'page callback' => 'node_page_default', ); @@ -67,9 +72,18 @@ function menu_test_callback() { * The menu_name value to use. */ function menu_test_menu_name($new_name = '') { static $name = 'original'; if ($new_name) { $name = $new_name; } return $name; } + +/** + * Display the menu names. + */ +function menu_test_menu_get_names() { + var_export(menu_get_names()); + exit; +} +