? .bzr
? node_format.patch
? simpletest
? simplified_modules.patch
? upload.patch
? x.php
? tests/enable_modules.test
? tests/homepage.test
? tests/menu_enable.patch
? tests/menu_tests.patch
? tests/functional/profile_cleanup.tst
Index: drupal_test_case.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_test_case.php,v
retrieving revision 1.82
diff -u -p -r1.82 drupal_test_case.php
--- drupal_test_case.php	4 Apr 2008 14:19:33 -0000	1.82
+++ drupal_test_case.php	5 Apr 2008 09:27:06 -0000
@@ -180,19 +180,16 @@ class DrupalTestCase extends UnitTestCas
       $this->pass(" [module] $name already enabled");
       return TRUE;
     }
-    $this->checkOriginalModules();
-    if (array_search($name, $this->_modules) === FALSE) {
-      $this->_modules[$name] = $name;
-      $form_state['values'] = array('status' => $this->_modules, 'op' => t('Save configuration'));
-      drupal_execute('system_modules', $form_state);
-
-      //rebuilding all caches
-      drupal_rebuild_theme_registry();
-      node_types_rebuild();
-      menu_rebuild();
-      cache_clear_all('schema', 'cache');
-      module_rebuild_cache();
-    }
+    $this->_modules[$name] = $name;
+    $form_state['values'] = array('status' => $this->_modules, 'op' => t('Save configuration'));
+    drupal_execute('system_modules', $form_state);
+
+    //rebuilding all caches
+    drupal_rebuild_theme_registry();
+    node_types_rebuild();
+    menu_rebuild();
+    cache_clear_all('schema', 'cache');
+    module_rebuild_cache();
   }
 
   /**
@@ -207,32 +204,16 @@ class DrupalTestCase extends UnitTestCas
       $this->pass(" [module] $name already disabled");
       return TRUE;
     }
-    $this->checkOriginalModules();
-    if (($key = array_search($name, $this->_modules)) !== FALSE) {
-      unset($this->_modules[$key]);
-      $form_state['values'] = array('status' => $this->_modules, 'op' => t('Save configuration'));
-      drupal_execute('system_modules', $form_state);
-
-      //rebuilding all caches
-      drupal_rebuild_theme_registry();
-      node_types_rebuild();
-      menu_rebuild();
-      cache_clear_all('schema', 'cache');
-      module_rebuild_cache();
-    }
-  }
-
-  /**
-   * Retrieves and saves current modules list into $_originalModules and $_modules.
-   */
-  function checkOriginalModules() {
-    if (empty($this->_originalModules)) {
-      require_once ('./modules/system/system.admin.inc');
-      $form_state = array();
-      $form = drupal_retrieve_form('system_modules', $form_state);
-      $this->_originalModules = drupal_map_assoc($form['status']['#default_value']);
-      $this->_modules = $this->_originalModules;
-    }
+    unset($this->_modules[$key]);
+    $form_state['values'] = array('status' => $this->_modules, 'op' => t('Save configuration'));
+    drupal_execute('system_modules', $form_state);
+
+    //rebuilding all caches
+    drupal_rebuild_theme_registry();
+    node_types_rebuild();
+    menu_rebuild();
+    cache_clear_all('schema', 'cache');
+    module_rebuild_cache();
   }
 
   /**
@@ -376,8 +357,10 @@ class DrupalTestCase extends UnitTestCas
       $db_prefix = 'simpletest'. mt_rand(1000, 1000000);
       include_once './includes/install.inc';
       drupal_install_system();
-      $module_list = drupal_verify_profile('default', 'en');
-      drupal_install_modules($module_list);
+      $modules = array_unique(array_merge(func_get_args(), drupal_verify_profile('default', 'en')));
+      drupal_install_modules($modules);
+      $this->_modules = drupal_map_assoc($modules);
+      $this->_modules['system'] = 'system';
       $task = 'profile';
       default_profile_tasks($task, '');
       menu_rebuild();
@@ -403,7 +386,6 @@ class DrupalTestCase extends UnitTestCas
       }
       $db_prefix = $this->db_prefix_original;
       $this->_logged_in = FALSE;
-      $this->_modules = $this->_originalModules;
       $this->curlClose();
     }
     parent::tearDown();
Index: simpletest.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/simpletest.module,v
retrieving revision 1.41
diff -u -p -r1.41 simpletest.module
--- simpletest.module	3 Apr 2008 19:57:15 -0000	1.41
+++ simpletest.module	5 Apr 2008 09:27:06 -0000
@@ -64,7 +64,7 @@ function simpletest_load() {
     return simpletest_trigger_error('not available');
   }
 
-  // We currently use only the web tester that DrupalTestCase is built upon
+  require_once(SIMPLE_TEST .'/simpletest.php');
   require_once(SIMPLE_TEST .'/unit_tester.php');
   require_once(SIMPLE_TEST .'/reporter.php');
   require_once('drupal_reporter.php');
Index: tests/functional/aggregator.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/aggregator.test,v
retrieving revision 1.8
diff -u -p -r1.8 aggregator.test
--- tests/functional/aggregator.test	1 Apr 2008 23:33:54 -0000	1.8
+++ tests/functional/aggregator.test	5 Apr 2008 09:27:06 -0000
@@ -8,8 +8,7 @@ class AggregatorTestCase extends DrupalT
    * Implementation of setUp().
    */
   function setUp() {
-    parent::setUp();
-    $this->drupalModuleEnable('aggregator');
+    parent::setUp('aggregator');
     $web_user = $this->drupalCreateUser(array('administer news feeds', 'access news feeds'));
     $this->drupalLogin($web_user);
   }
Index: tests/functional/blog.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/blog.test,v
retrieving revision 1.3
diff -u -p -r1.3 blog.test
--- tests/functional/blog.test	1 Apr 2008 23:33:54 -0000	1.3
+++ tests/functional/blog.test	5 Apr 2008 09:27:06 -0000
@@ -21,10 +21,7 @@ class BlogModuleTestCase extends DrupalT
    * Enable modules and create users with specific permissions.
    */
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('blog');
-
+    parent::setUp('blog');
     // Create users.
     $this->big_user = $this->drupalCreateUser(array('administer blocks'));
     $this->own_user = $this->drupalCreateUser(array('create blog content', 'edit own blog content', 'delete own blog content'));
Index: tests/functional/blogapi.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/blogapi.test,v
retrieving revision 1.9
diff -u -p -r1.9 blogapi.test
--- tests/functional/blogapi.test	1 Apr 2008 23:33:54 -0000	1.9
+++ tests/functional/blogapi.test	5 Apr 2008 09:27:06 -0000
@@ -11,11 +11,7 @@ class BlogAPITestCase extends DrupalTest
   }
 
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('blog');
-    $this->drupalModuleEnable('blogapi');
-    $this->drupalModuleEnable('taxonomy');
+    parent::setUp('blog', 'blogapi', 'taxonomy');
   }
 
   function testBlogAPI() {
Index: tests/functional/book.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/book.test,v
retrieving revision 1.10
diff -u -p -r1.10 book.test
--- tests/functional/book.test	1 Apr 2008 23:33:54 -0000	1.10
+++ tests/functional/book.test	5 Apr 2008 09:27:06 -0000
@@ -19,9 +19,7 @@ class BookTestCase extends DrupalTestCas
    * Implementation of setUp().
    */
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('book');
+    parent::setUp('book');
   }
 
   /**
Index: tests/functional/comment.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/comment.test,v
retrieving revision 1.14
diff -u -p -r1.14 comment.test
--- tests/functional/comment.test	1 Apr 2008 23:33:54 -0000	1.14
+++ tests/functional/comment.test	5 Apr 2008 09:27:06 -0000
@@ -21,10 +21,7 @@ class CommentTestCase extends DrupalTest
    * Implementation of setUp().
    */
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('comment');
-
+    parent::setUp('comment');
     // Create users.
     $this->admin_user = $this->drupalCreateUser(array('administer content types', 'administer comments', 'administer permissions'));
     $this->web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'create story content'));
Index: tests/functional/contact.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/contact.test,v
retrieving revision 1.10
diff -u -p -r1.10 contact.test
--- tests/functional/contact.test	1 Apr 2008 23:33:54 -0000	1.10
+++ tests/functional/contact.test	5 Apr 2008 09:27:06 -0000
@@ -17,9 +17,7 @@ class ContactTestCase extends DrupalTest
    * Implementation of setUp().
    */
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('contact');
+    parent::setUp('contact');
   }
 
   /**
Index: tests/functional/dblog.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/dblog.test,v
retrieving revision 1.1
diff -u -p -r1.1 dblog.test
--- tests/functional/dblog.test	2 Apr 2008 22:33:48 -0000	1.1
+++ tests/functional/dblog.test	5 Apr 2008 09:27:06 -0000
@@ -20,12 +20,7 @@ class DBLogModuleTestCase extends Drupal
    * Enable modules and create users with specific permissions.
    */
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('dblog'); // Probably already enabled
-    $this->drupalModuleEnable('blog');
-    $this->drupalModuleEnable('poll');
-
+    parent::setUp('dblog', 'blog', 'poll');
     // Create users.
     $this->big_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'access site reports', 'administer users'));
     $this->any_user = $this->drupalCreateUser(array());
Index: tests/functional/forum.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/forum.test,v
retrieving revision 1.10
diff -u -p -r1.10 forum.test
--- tests/functional/forum.test	1 Apr 2008 23:33:54 -0000	1.10
+++ tests/functional/forum.test	5 Apr 2008 09:27:06 -0000
@@ -10,12 +10,7 @@ class ForumTestCase extends DrupalTestCa
   }
 
   function setUp() {
-    parent::setUp();
-
-    // Enable the forum module and its dependencies
-    $this->drupalModuleEnable('taxonomy');
-    $this->drupalModuleEnable('comment');
-    $this->drupalModuleEnable('forum');
+    parent::setUp('taxonomy', 'comment', 'forum');
   }
 
   function createForumContainer() {
Index: tests/functional/locale.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/locale.test,v
retrieving revision 1.9
diff -u -p -r1.9 locale.test
--- tests/functional/locale.test	1 Apr 2008 23:33:54 -0000	1.9
+++ tests/functional/locale.test	5 Apr 2008 09:27:06 -0000
@@ -14,9 +14,7 @@ class LocaleTestCase extends DrupalTestC
   }
 
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('locale');
+    parent::setUp('locale');
   }
 
   function testlocaleModuleTest() {
Index: tests/functional/menu.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/menu.test,v
retrieving revision 1.8
diff -u -p -r1.8 menu.test
--- tests/functional/menu.test	1 Apr 2008 23:33:54 -0000	1.8
+++ tests/functional/menu.test	5 Apr 2008 09:27:06 -0000
@@ -15,9 +15,8 @@ class MenuTestCase extends  DrupalTestCa
   }
 
   function setUp() {
-    parent::setUp();
+    parent::setUp('menu');
 
-    $this->drupalModuleEnable('menu');
   }
 
   function testCreateCheckDelete() {
@@ -95,13 +94,7 @@ class CustomMenuTestCase extends MenuTes
   }
 
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('menu');
-  }
-
-  function tearDown() {
-    parent::tearDown();
+    parent::setUp('menu');
   }
 
   function testCreateCheckDelete() {
@@ -146,13 +139,7 @@ class MenuEnableTestCase extends DrupalT
   }
 
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('menu');
-  }
-
-  function tearDown() {
-    parent::tearDown();
+    parent::setUp('menu');
   }
 
   function testMenuModuleEnable() {
@@ -190,13 +177,7 @@ class MenuResetTestCase extends DrupalTe
   }
 
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('menu');
-  }
-
-  function tearDown() {
-    parent::tearDown();
+    parent::setUp('menu');
   }
 
   function testMenuModuleReset() {;
@@ -251,13 +232,7 @@ class MenuInvalidPathTestCase extends Dr
   }
 
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('menu');
-  }
-
-  function tearDown() {
-    parent::tearDown();
+    parent::setUp('menu');
   }
 
   function testMenuModuleInvalidPath() {
Index: tests/functional/path.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/path.test,v
retrieving revision 1.8
diff -u -p -r1.8 path.test
--- tests/functional/path.test	1 Apr 2008 23:33:54 -0000	1.8
+++ tests/functional/path.test	5 Apr 2008 09:27:06 -0000
@@ -14,10 +14,7 @@ class PathModuleTestCase extends DrupalT
    * Create user, setup permissions, log user in, and create a node.
    */
   function setUp() {
-    parent::setUp();
-
-   $this->drupalModuleEnable('path');
-
+    parent::setUp('path');
     // create and login user
     $web_user = $this->drupalCreateUser(array('edit own page content', 'create page content', 'administer url aliases', 'create url aliases'));
     $this->drupalLogin($web_user);
Index: tests/functional/poll.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/poll.test,v
retrieving revision 1.9
diff -u -p -r1.9 poll.test
--- tests/functional/poll.test	1 Apr 2008 23:33:54 -0000	1.9
+++ tests/functional/poll.test	5 Apr 2008 09:27:06 -0000
@@ -51,8 +51,7 @@ class PollCreateTestCase extends PollTes
   }
 
   function setUp() {
-    parent::setUp();
-    $this->drupalModuleEnable('poll');
+    parent::setUp('poll');
   }
 
   function testPollCreate() {
@@ -69,8 +68,7 @@ class PollVoteTestCase extends PollTestC
   }
 
   function setUp() {
-    parent::setUp();
-    $this->drupalModuleEnable('poll');
+    parent::setUp('poll');
   }
 
   function tearDown() {
Index: tests/functional/search.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/search.test,v
retrieving revision 1.7
diff -u -p -r1.7 search.test
--- tests/functional/search.test	24 Mar 2008 02:36:46 -0000	1.7
+++ tests/functional/search.test	5 Apr 2008 09:27:06 -0000
@@ -14,9 +14,7 @@ class SearchMatchTestCase extends Drupal
   }
 
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('search');
+    parent::setUp('search');
   }
 
   function testMatching() {
Index: tests/functional/translation.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/translation.test,v
retrieving revision 1.9
diff -u -p -r1.9 translation.test
--- tests/functional/translation.test	1 Apr 2008 23:33:54 -0000	1.9
+++ tests/functional/translation.test	5 Apr 2008 09:27:06 -0000
@@ -13,11 +13,7 @@ class TranslationModuleTestCase extends 
   }
 
   function setUp() {
-    parent::setUp();
-
-    // Enable modules.
-    $this->drupalModuleEnable('locale');
-    $this->drupalModuleEnable('translation');
+    parent::setUp('locale', 'translation');
   }
 
   function testContentTranslation() {
Index: tests/functional/trigger.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/trigger.test,v
retrieving revision 1.9
diff -u -p -r1.9 trigger.test
--- tests/functional/trigger.test	1 Apr 2008 23:33:54 -0000	1.9
+++ tests/functional/trigger.test	5 Apr 2008 09:27:06 -0000
@@ -16,14 +16,16 @@ class ActionsContentTestCase extends  Dr
     );
   }
 
+  function setUp() {
+    parent::setUp('trigger');
+  }
+
   /**
    * Various tests, all in one function to assure they happen in the right order.
    */
   function testActionsContent() {
     global $user;
 
-    $this->drupalModuleEnable('trigger');
-
     $content_actions = array('node_publish_action', 'node_unpublish_action', 'node_make_sticky_action', 'node_make_unsticky_action', 'node_promote_action', 'node_unpromote_action');
 
     $hash = md5('node_publish_action');
Index: tests/functional/upload.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/functional/upload.test,v
retrieving revision 1.14
diff -u -p -r1.14 upload.test
--- tests/functional/upload.test	4 Apr 2008 14:19:33 -0000	1.14
+++ tests/functional/upload.test	5 Apr 2008 09:27:06 -0000
@@ -14,9 +14,7 @@ class UploadTestCase extends DrupalTestC
   }
 
   function setUp() {
-    parent::setUp();
-
-    $this->drupalModuleEnable('upload');
+    parent::setUp('upload');
   }
 
   /**