From cc4245a3cd309b28e61767e71e019fc0f70e9a9b Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 10 Jan 2009 13:23:37 +0000 Subject: [PATCH] MDL-16483 - stopped using MoodleUnitTestCase in tests where $DB not needed --- lib/ajax/simpletest/testajaxlib.php | 2 +- lib/simpletest/portfolio_testclass.php | 4 ++-- lib/simpletest/slowtestcode.php | 2 +- lib/simpletest/testmathslib.php | 2 +- lib/simpletest/testmoodlelib.php | 2 +- lib/simpletest/testrepositorylib.php | 2 +- lib/simpletest/testweblib.php | 2 +- mod/data/simpletest/test_data_portfolio_callers.php | 2 +- mod/data/simpletest/testpreset.php | 2 +- mod/forum/simpletest/testmodforumlib.php | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/ajax/simpletest/testajaxlib.php b/lib/ajax/simpletest/testajaxlib.php index 3014d96742..30969e3d1a 100644 --- a/lib/ajax/simpletest/testajaxlib.php +++ b/lib/ajax/simpletest/testajaxlib.php @@ -42,7 +42,7 @@ require_once($CFG->libdir . '/ajax/ajaxlib.php'); * @author Petr Skoda (skodak) * @version $Id$ */ -class ajaxlib_test extends MoodleUnitTestCase { +class ajax_test extends UnitTestCase { function test_ajax_get_lib() { global $CFG; $cases = array( diff --git a/lib/simpletest/portfolio_testclass.php b/lib/simpletest/portfolio_testclass.php index 7b45ce51da..c0dc3460d2 100644 --- a/lib/simpletest/portfolio_testclass.php +++ b/lib/simpletest/portfolio_testclass.php @@ -216,7 +216,7 @@ class portfoliolib_test extends MoodleUnitTestCase { protected function setup_caller($class, $callbackargs, $user=null) { global $DB; $caller = new $class($callbackargs); - $caller->set('exporter', new partialmock_exporter(&$this)); + $caller->set('exporter', new partialmock_exporter($this)); if (is_numeric($user)) { $user = $DB->get_record('user', array('id' => $user)); } @@ -236,7 +236,7 @@ class portfoliolib_test extends MoodleUnitTestCase { foreach ($plugins as $plugin) { // Instantiate a fake plugin instance $plugin_class = "partialmock_plugin_$plugin"; - $plugin = new $plugin_class(&$this); + $plugin = new $plugin_class($this); // figure out our format intersection and test all of them. $formats = portfolio_supported_formats_intersect($this->caller->supported_formats(), $plugin->supported_formats()); diff --git a/lib/simpletest/slowtestcode.php b/lib/simpletest/slowtestcode.php index 1c2faa3b7a..d353853a04 100644 --- a/lib/simpletest/slowtestcode.php +++ b/lib/simpletest/slowtestcode.php @@ -12,7 +12,7 @@ if (!defined('MOODLE_INTERNAL')) { die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page } -class slow_code_test extends MoodleUnitTestCase { +class slow_code_test extends UnitTestCase { var $php_code_extensions = array('php', 'html', 'php\.inc'); var $ignore_folders = array(); var $phppath; diff --git a/lib/simpletest/testmathslib.php b/lib/simpletest/testmathslib.php index e15932bd9e..77e91f55cd 100755 --- a/lib/simpletest/testmathslib.php +++ b/lib/simpletest/testmathslib.php @@ -12,7 +12,7 @@ require_once($CFG->libdir . '/mathslib.php'); * @author Petr Skoda (skodak) * @version $Id$ */ -class mathsslib_test extends MoodleUnitTestCase { +class mathsslib_test extends UnitTestCase { /** * Tests the basic formula evaluation diff --git a/lib/simpletest/testmoodlelib.php b/lib/simpletest/testmoodlelib.php index 8a37a16773..3f1f2fffd4 100644 --- a/lib/simpletest/testmoodlelib.php +++ b/lib/simpletest/testmoodlelib.php @@ -39,7 +39,7 @@ if (!defined('MOODLE_INTERNAL')) { require_once($CFG->libdir . '/moodlelib.php'); -class moodlelib_test extends MoodleUnitTestCase { +class moodlelib_test extends UnitTestCase { var $user_agents = array( 'MSIE' => array( diff --git a/lib/simpletest/testrepositorylib.php b/lib/simpletest/testrepositorylib.php index d7e1a44cfd..447d113ffe 100644 --- a/lib/simpletest/testrepositorylib.php +++ b/lib/simpletest/testrepositorylib.php @@ -58,7 +58,7 @@ class repositorylib_test extends MoodleUnitTestCase { foreach ($plugins as $plugin) { // Instantiate a fake plugin instance $plugin_class = "partialmock_$plugin"; - $plugin = new $plugin_class(&$this); + $plugin = new $plugin_class($this); // add common plugin tests here } diff --git a/lib/simpletest/testweblib.php b/lib/simpletest/testweblib.php index 7c01b1aba5..06e3b51ffb 100644 --- a/lib/simpletest/testweblib.php +++ b/lib/simpletest/testweblib.php @@ -12,7 +12,7 @@ if (!defined('MOODLE_INTERNAL')) { die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page } -class web_test extends MoodleUnitTestCase { +class web_test extends UnitTestCase { function setUp() { } diff --git a/mod/data/simpletest/test_data_portfolio_callers.php b/mod/data/simpletest/test_data_portfolio_callers.php index 8f1360cc1e..bb7cbc797c 100644 --- a/mod/data/simpletest/test_data_portfolio_callers.php +++ b/mod/data/simpletest/test_data_portfolio_callers.php @@ -1,6 +1,6 @@ libdir/simpletest/portfolio_testclass.php"); -require_once("$CFG->dirroot.'/mod/data/lib.php"); +require_once("$CFG->dirroot/mod/data/lib.php"); require_once("$CFG->dirroot/$CFG->admin/generator.php"); Mock::generate('data_portfolio_caller', 'mock_caller'); diff --git a/mod/data/simpletest/testpreset.php b/mod/data/simpletest/testpreset.php index 263ccf9d63..efca3f2183 100644 --- a/mod/data/simpletest/testpreset.php +++ b/mod/data/simpletest/testpreset.php @@ -37,7 +37,7 @@ if (!defined('MOODLE_INTERNAL')) { require_once($CFG->dirroot . '/mod/data/lib.php'); -class data_preset_test extends MoodleUnitTestCase { +class data_preset_test extends UnitTestCase { function setUp() { } diff --git a/mod/forum/simpletest/testmodforumlib.php b/mod/forum/simpletest/testmodforumlib.php index b08ec912ed..7f490383ba 100644 --- a/mod/forum/simpletest/testmodforumlib.php +++ b/mod/forum/simpletest/testmodforumlib.php @@ -39,7 +39,7 @@ if (!defined('MOODLE_INTERNAL')) { require_once($CFG->dirroot . '/mod/forum/lib.php'); -class modforumlib_test extends MoodleUnitTestCase { +class modforumlib_test extends UnitTestCase { function setUp() { } -- 2.39.5