From b5400519a6842221e0a99e7267601a30f0fbb167 Mon Sep 17 00:00:00 2001 From: Jonathan Hedstrom Date: Tue, 7 Jun 2011 13:48:16 -0700 Subject: [PATCH] Assert that modules passed into setUp are properly enabled. --- modules/simpletest/drupal_web_test_case.php | 3 ++- modules/simpletest/simpletest.test | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index b60c682..40af458 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -1315,7 +1315,8 @@ class DrupalWebTestCase extends DrupalTestCase { $modules = $modules[0]; } if ($modules) { - module_enable($modules, TRUE); + $success = module_enable($modules, TRUE); + $this->assertTrue($success, t('Enabled modules: %modules', array('%modules' => implode(', ', $modules)))); } // Run the profile tasks. diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test index f516364..e5b6042 100644 --- a/modules/simpletest/simpletest.test +++ b/modules/simpletest/simpletest.test @@ -37,7 +37,7 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase { $this->drupalLogin($admin_user); } else { - parent::setUp(); + parent::setUp('non_existent_module'); } } @@ -189,6 +189,8 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase { * Confirm that the stub test produced the desired results. */ function confirmStubTestResults() { + $this->assertAssertion(t('Enabled modules: %modules', array('%modules' => 'non_existent_module')), 'Other', 'Fail', 'simpletest.test', 'SimpleTestFunctionalTest->setUp()'); + $this->assertAssertion($this->pass, 'Other', 'Pass', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()'); $this->assertAssertion($this->fail, 'Other', 'Fail', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()'); @@ -208,7 +210,7 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase { $this->assertAssertion("Debug: 'Foo'", 'Debug', 'Fail', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()'); - $this->assertEqual('6 passes, 2 fails, 2 exceptions, and 1 debug message', $this->childTestResults['summary'], 'Stub test summary is correct'); + $this->assertEqual('6 passes, 5 fails, 2 exceptions, and 1 debug message', $this->childTestResults['summary'], 'Stub test summary is correct'); $this->test_ids[] = $test_id = $this->getTestIdFromResults(); $this->assertTrue($test_id, t('Found test ID in results.')); -- 1.7.4.1