Index: modules/simpletest/tests/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v
retrieving revision 1.41
diff -u -p -r1.41 menu.test
--- modules/simpletest/tests/menu.test	27 Nov 2010 20:25:44 -0000	1.41
+++ modules/simpletest/tests/menu.test	1 Dec 2010 00:11:38 -0000
@@ -480,14 +480,31 @@ class MenuRouterTestCase extends DrupalW
   function testMenuLoadArgumentsInheritance() {
     $arg1 = $this->randomName();
     $arg2 = $this->randomName();
-    $expected = print_r(array('%menu_test_argument' => $arg1, '%' => $arg2), TRUE);
+    $args = print_r(array('%menu_test_argument' => $arg1, '%' => $arg2), TRUE);
+    $functions = print_r(array(2 => '%menu_test_argument_load', 3 => ''), TRUE);
 
     $this->drupalGet("menu-test/arguments/$arg1/$arg2");
-    $this->assertRaw($expected, t('Inherited load arguments found.'));
+    $this->assertRaw($args, t('Load arguments found.'));
+    $this->assertRaw($functions, t('Load functions found.'));
+    $this->assertText('menu_test_argument_load', 'Argument load function found.');
+
     $this->drupalGet("menu-test/arguments/$arg1/$arg2/default");
-    $this->assertRaw($expected, t('Inherited load arguments found.'));
+    $this->assertRaw($args, t('Load arguments found.'));
+    $this->assertRaw($functions, t('Load functions found.'));
+    $this->assertText('menu_test_argument_load', 'Argument load function found.');
+
     $this->drupalGet("menu-test/arguments/$arg1/$arg2/task");
-    $this->assertRaw($expected, t('Inherited load arguments found.'));
+    $this->assertRaw($args, t('Load arguments found.'));
+    $this->assertRaw($functions, t('Load functions found.'));
+    $this->assertText('menu_test_argument_load', 'Argument load function found.');
+
+    $args = print_r(array('%menu_test_argument_single' => $arg1), TRUE);
+    $functions = print_r(array(2 => '%menu_test_argument_single_load'), TRUE);
+
+    $this->drupalGet("menu-test/arguments/$arg1");
+    $this->assertRaw($args, t('Load arguments found.'));
+    $this->assertRaw($functions, t('Load functions found.'));
+    $this->assertText('menu_test_argument_load', 'Argument load function found.');
   }
 }
 
Index: modules/simpletest/tests/menu_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu_test.module,v
retrieving revision 1.20
diff -u -p -r1.20 menu_test.module
--- modules/simpletest/tests/menu_test.module	27 Nov 2010 20:25:44 -0000	1.20
+++ modules/simpletest/tests/menu_test.module	30 Nov 2010 23:53:07 -0000
@@ -279,6 +279,12 @@ function menu_test_menu() {
     'access callback' => TRUE,
     'type' => MENU_LOCAL_TASK,
   );
+  $items['menu-test/arguments/%menu_test_argument_single'] = array(
+    'title' => 'Load arguments inheritance test',
+    'page callback' => 'menu_test_arguments',
+    'page arguments' => array(2),
+    'access callback' => TRUE,
+  );
 
   return $items;
 }
@@ -299,6 +305,16 @@ function menu_test_argument_load($arg1, 
 }
 
 /**
+ * Menu argument loader for the 'load arguments' inheritance test.
+ *
+ * @param $arg
+ *   The path argument defined as %menu_test_argument_single.
+ */
+function menu_test_argument_single_load($arg) {
+  return array('%menu_test_argument_single_load' => $arg);
+}
+
+/**
  * Page callback for the 'load arguments' inheritance test.
  *
  * @param $joined_args
@@ -311,7 +327,10 @@ function menu_test_argument_load($arg1, 
  *   A dump of the loaded %menu_test_argument argument.
  */
 function menu_test_arguments($joined_args) {
-  return print_r($joined_args, TRUE);
+  debug($joined_args, 'Arguments', TRUE);
+  $item = menu_get_item();
+  debug($item['load_functions'], 'Load functions', TRUE);
+  return 'menu_test_arguments() page callback.';
 }
 
 /**