? menu-331720-1.patch
? sites/all/.DS_Store
? sites/all/modules/.DS_Store
? sites/all/modules/devel
? sites/default/files
? sites/default/settings.php
Index: modules/simpletest/tests/menu_callback.test
===================================================================
RCS file: modules/simpletest/tests/menu_callback.test
diff -N modules/simpletest/tests/menu_callback.test
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/simpletest/tests/menu_callback.test	17 Apr 2009 18:01:11 -0000
@@ -0,0 +1,49 @@
+<?php
+// $Id: menu.test,v 1.9 2009/04/13 12:18:52 dries Exp $
+
+/**
+ * @file
+ * Provides SimpleTests for menu.inc.
+ */
+
+class MenuIncCallbackTestCase extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => t('Menu callback tests'),
+      'description' => t('Test menu callback functionality.'),
+      'group' => t('Menu'),
+    );
+  }
+
+  function setUp() {
+    // Enable dummy module that implements hook_menu and callbacks.
+    parent::setUp('menu_callback_test');
+  }
+
+  /**
+   * Test local access & page callbacks with included title callback
+   */
+  function testLocalAccessPageIncludeTitleCallback() {
+    $this->drupalGet('menu_callback_test/local_access_page_include_title');
+    $this->assertTitle('include | Drupal', t('Included title found on page.'));
+    $this->assertText('local', t('Local text found on page.'));
+  }
+  
+  /**
+   * Test local access & page callbacks with included title callback
+   */
+  function testLocalPageTitleIncludeAccessCallback() {
+    $this->drupalGet('menu_callback_test/local_page_title_include_access');
+    $this->assertTitle('local | Drupal', t('Local title found on page.'));
+    $this->assertText('local', t('Local text found on page.'));
+  }
+  
+  /**
+   * Test local access & page callbacks with included title callback
+   */
+  function testLocalAccessTitleIncludePageCallback() {
+    $this->drupalGet('menu_callback_test/local_access_title_include_page');
+    $this->assertTitle('local | Drupal', t('Local title found on page.'));
+    $this->assertText('include', t('Included text found on page.'));
+  }
+}
Index: modules/simpletest/tests/menu_callback_test.inc
===================================================================
RCS file: modules/simpletest/tests/menu_callback_test.inc
diff -N modules/simpletest/tests/menu_callback_test.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/simpletest/tests/menu_callback_test.inc	17 Apr 2009 18:01:11 -0000
@@ -0,0 +1,16 @@
+<?php
+// $Id$
+
+/**
+ * Included callback function for text
+ */
+function menu_callback_test_include_text() {
+  return 'include';
+}
+
+/**
+ * Included callback function for boolean
+ */
+function menu_callback_test_include_boolean() {
+  return TRUE;
+}
Index: modules/simpletest/tests/menu_callback_test.info
===================================================================
RCS file: modules/simpletest/tests/menu_callback_test.info
diff -N modules/simpletest/tests/menu_callback_test.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/simpletest/tests/menu_callback_test.info	17 Apr 2009 18:01:11 -0000
@@ -0,0 +1,9 @@
+; $Id$
+name = "Menu callback tests"
+description = "Support module for menu callback testing."
+package = Testing
+version = VERSION
+core = 7.x
+files[] = menu_callback_test.module
+files[] = menu_callback_test.inc
+hidden = TRUE
Index: modules/simpletest/tests/menu_callback_test.module
===================================================================
RCS file: modules/simpletest/tests/menu_callback_test.module
diff -N modules/simpletest/tests/menu_callback_test.module
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/simpletest/tests/menu_callback_test.module	17 Apr 2009 18:01:11 -0000
@@ -0,0 +1,49 @@
+<?php
+// $Id$
+
+/**
+ * Implementation of hook_menu()
+ */
+function menu_callback_test_menu() {
+  $items['menu_callback_test/local_access_page_include_title'] = array(
+    'title' => 'Local Access & Page, Include Title',
+    'title callback' => 'menu_callback_test_include_text',
+    'title arguments' => array(),
+    'page callback' => 'menu_callback_test_local_text',
+    'access callback' => 'menu_callback_test_local_boolean',
+    'access arguments' => array(),
+  );
+  
+  $items['menu_callback_test/local_page_title_include_access'] = array(
+    'title' => 'Local Title & Page, Include Access',
+    'title callback' => 'menu_callback_test_local_text',
+    'page callback' => 'menu_callback_test_local_text',
+    'access callback' => 'menu_callback_test_include_boolean',
+    'access arguments' => array(),
+  );
+  
+  $items['menu_callback_test/local_access_title_include_page'] = array(
+    'title' => 'Local Access & Title, Include Page',
+    'title callback' => 'menu_callback_test_local_text',
+    'title arguments' => array(),
+    'page callback' => 'menu_callback_test_include_text',
+    'access callback' => 'menu_callback_test_local_boolean',
+    'access arguments' => array(),
+  );
+  
+  return $items;
+}
+
+/**
+ * Local callback function for text
+ */
+function menu_callback_test_local_text() {
+  return 'local';
+}
+
+/**
+ * Local callback function for boolean
+ */
+function menu_callback_test_local_boolean() {
+  return TRUE;
+}