2 files changed, 21 insertions, 16 deletions
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 6b767a527..4ea5cb4ce 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -261,9 +261,7 @@ class CascadingStylesheetsTestCase extends DrupalWebTestCase {
     // Create a node, using the PHP filter that tests drupal_add_css().
     $settings = array(
       'type' => 'page',
-      'format' => 3, // PHP filter.
-      'body_format' => 3,
-      'body' => t('This tests the inline CSS!') . "<?php drupal_add_css('$css', 'inline'); ?>",
+      'body' => array(array('value' => t('This tests the inline CSS!') . "<?php drupal_add_css('$css', 'inline'); ?>", 'format' => 3)), // PHP filter.
       'promote' => 1,
     );
     $node = $this->drupalCreateNode($settings);
diff --git a/modules/simpletest/tests/module.test b/modules/simpletest/tests/module.test
index 87f1a1544..f42753f58 100644
--- a/modules/simpletest/tests/module.test
+++ b/modules/simpletest/tests/module.test
@@ -22,19 +22,24 @@ class ModuleUnitTest extends DrupalWebTestCase {
    * The basic functionality of module_list().
    */
   function testModuleList() {
-    $base_module_list = drupal_get_profile_modules('default', 'en');
-    // Key the list by module name.
-    $base_module_list = array_combine($base_module_list, $base_module_list);
-    // All default profile modules have a weight equal to 0, the default sort
-    // order is thus simply alphabetical.
-    ksort($base_module_list);
-    $this->assertModuleList($base_module_list, t('Default profile'));
+    // Build a list of modules filenames.
+    $base_module_list = array();
+    foreach (drupal_get_profile_modules('default', 'en') as $module) {
+      $base_module_list[$module] = drupal_get_path('module', $module);
+    }
+    asort($base_module_list);
+    // Build a list of module names based on that order. Since all default
+    // profile modules have a weight equal to 0, the default sort order is
+    // simply alphabetical.
+    $module_list = array_keys($base_module_list);
+    $this->assertModuleList($module_list, t('Default profile'));
 
     // Try to install a new module.
     drupal_install_modules(array('path'));
-    $base_module_list['path'] = 'path';
-    ksort($base_module_list);
-    $this->assertModuleList($base_module_list, t('After adding a module'));
+    $base_module_list['path'] = drupal_get_path('module', 'path');
+    asort($base_module_list);
+    $module_list = array_keys($base_module_list);
+    $this->assertModuleList($module_list, t('After adding a module'));
 
     // Try to mess with the module weights.
     db_update('system')
@@ -46,8 +51,9 @@ class ModuleUnitTest extends DrupalWebTestCase {
     module_list(TRUE);
     // Move path at the end of the array.
     unset($base_module_list['path']);
-    $base_module_list['path'] = 'path';
-    $this->assertModuleList($base_module_list, t('After changing weights'));
+    $base_module_list['path'] = drupal_get_path('module', 'path');
+    $module_list = array_keys($base_module_list);
+    $this->assertModuleList($module_list, t('After changing weights'));
 
     // Test the fixed list feature.
     $fixed_list = array(
@@ -60,7 +66,7 @@ class ModuleUnitTest extends DrupalWebTestCase {
 
     // Reset the module list.
     module_list(TRUE);
-    $this->assertModuleList($base_module_list, t('After reset'));
+    $this->assertModuleList($module_list, t('After reset'));
   }
 
   /**
@@ -70,6 +76,7 @@ class ModuleUnitTest extends DrupalWebTestCase {
    *   The expected values, sorted by weight and file name.
    */
   protected function assertModuleList(Array $expected_values, $condition) {
+    $expected_values = array_combine($expected_values, $expected_values);
     $this->assertIdentical($expected_values, module_list(), t('@condition: module_list() returns correct results', array('@condition' => $condition)));
     ksort($expected_values);
     $this->assertIdentical($expected_values, module_list(FALSE, TRUE), t('@condition: module_list() returns correctly sorted results', array('@condition' => $condition)));