Commit 29730ab6 authored by Dries's avatar Dries

- Patch #887134 by mfb, klausi: setting up modules in DrupalUnitTestCase is useless.

parent 3702347a
......@@ -861,7 +861,8 @@ class SearchExpressionInsertExtractTestCase extends DrupalUnitTestCase {
}
function setUp() {
parent::setUp('search');
drupal_load('module', 'search');
parent::setUp();
}
/**
......@@ -1262,7 +1263,8 @@ class SearchExcerptTestCase extends DrupalUnitTestCase {
}
function setUp() {
parent::setUp('search');
drupal_load('module', 'search');
parent::setUp();
}
/**
......
......@@ -582,6 +582,14 @@ function __construct($test_id = NULL) {
$this->skipClasses[__CLASS__] = TRUE;
}
/**
* Sets up unit test environment.
*
* Unlike DrupalWebTestCase::setUp(), DrupalUnitTestCase::setUp() does not
* install modules because tests are performed without accessing the database.
* Any required files must be explicitly included by the child class setUp()
* method.
*/
protected function setUp() {
global $conf;
......
......@@ -340,7 +340,7 @@ class BatchPercentagesUnitTestCase extends DrupalUnitTestCase {
// 19999/20000 should add yet another digit and go to 99.995%.
'99.995' => array('total' => 20000, 'current' => 19999),
);
require_once DRUPAL_ROOT . '/includes/batch.inc';
parent::setUp();
}
......@@ -348,7 +348,6 @@ class BatchPercentagesUnitTestCase extends DrupalUnitTestCase {
* Test the _batch_api_percentage() function.
*/
function testBatchPercentages() {
require_once DRUPAL_ROOT . '/includes/batch.inc';
foreach ($this->testCases as $expected_result => $arguments) {
// PHP sometimes casts numeric strings that are array keys to integers,
// cast them back here.
......
......@@ -18,13 +18,15 @@ class GraphUnitTest extends DrupalUnitTestCase {
);
}
function setUp() {
require_once DRUPAL_ROOT . '/includes/graph.inc';
parent::setUp();
}
/**
* Test depth-first-search features.
*/
function testDepthFirstSearch() {
// Provoke the inclusion of graph.inc.
require_once DRUPAL_ROOT . '/includes/graph.inc';
// The sample graph used is:
// 1 --> 2 --> 3 5 ---> 6
// | ^ ^
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment