Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1171436 by jhedstrom: Check that modules passed into setUp() are properly enabled.

merge-requests/26/head
webchick 2011-06-21 22:59:13 -07:00
parent 7fb83c6354
commit d1ba79c125
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/simpletest/drupal_web_test_case.php
View File

@ -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.

6
modules/simpletest/simpletest.test
View File

@ -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.'));