mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 18:04:43 +02:00
Code Issues Projects Releases Wiki Activity

MDL-37457 testing Refactoring references

Browse Source
This commit is contained in:
David Monllao 2013-01-10 14:43:26 +08:00
parent f16e1af28e
commit 5c3c2c81be
17 changed files with 60 additions and 57 deletions
blocks/online_users/tests/generator
lib.php
lib
phpunit
classes
advanced_testcase.phputil.php
tests
advanced_test.php
testing
generator
block_generator.phpdata_generator.phplib.phpmodule_generator.php
tests
generator_test.php
mod
assign/tests/generator
lib.php
assignment/tests/generator
lib.php
data/tests/generator
lib.php
forum/tests/generator
lib.php
lti/tests/generator
lib.php
page/tests/generator
lib.php
quiz/tests/generator
lib.php
phpunit.xml.dist

8
blocks/online_users/tests/generator/lib.php

@ -18,7 +18,7 @@
* block_online_users data generator
*
* @package block_online_users
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@ -27,14 +27,14 @@ defined('MOODLE_INTERNAL') || die();
/**
* Page module PHPUnit data generator class
* Online users block data generator class
*
* @package mod_page
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class block_online_users_generator extends phpunit_block_generator {
class block_online_users_generator extends testing_block_generator {
/**
* Create new block instance

2
lib/phpunit/classes/advanced_testcase.php

@ -386,7 +386,7 @@ abstract class advanced_testcase extends PHPUnit_Framework_TestCase {
/**
* Get data generator
* @static
* @return phpunit_data_generator
* @return testing_data_generator
*/
public static function getDataGenerator() {
return phpunit_util::get_data_generator();

8
lib/phpunit/classes/util.php

@ -51,7 +51,7 @@ class phpunit_util {
/** @var int last value of db writes counter, used for db resetting */
public static $lastdbwrites = null;
/** @var phpunit_data_generator */
/** @var testing_data_generator */
protected static $generator = null;
/** @var resource used for prevention of parallel test execution */
@ -140,12 +140,12 @@ class phpunit_util {
/**
* Get data generator
* @static
* @return phpunit_data_generator
* @return testing_data_generator
*/
public static function get_data_generator() {
if (is_null(self::$generator)) {
require_once(__DIR__.'/../generatorlib.php');
self::$generator = new phpunit_data_generator();
require_once(__DIR__.'/../../testing/generator/lib.php');
self::$generator = new testing_data_generator();
}
return self::$generator;
}

2
lib/phpunit/tests/advanced_test.php

@ -249,7 +249,7 @@ class core_phpunit_advanced_testcase extends advanced_testcase {
public function test_getDataGenerator() {
$generator = $this->getDataGenerator();
$this->assertInstanceOf('phpunit_data_generator', $generator);
$this->assertInstanceOf('testing_data_generator', $generator);
}
public function test_database_mock1() {

6
lib/testing/generator/block_generator.php

@ -34,14 +34,14 @@
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
abstract class phpunit_block_generator {
/** @var phpunit_data_generator@var */
abstract class testing_block_generator {
/** @var testing_data_generator */
protected $datagenerator;
/** @var number of created instances */
protected $instancecount = 0;
public function __construct(phpunit_data_generator $datagenerator) {
public function __construct(testing_data_generator $datagenerator) {
$this->datagenerator = $datagenerator;
}

12
lib/testing/generator/data_generator.php

@ -33,7 +33,7 @@
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class phpunit_data_generator {
class testing_data_generator {
protected $usercounter = 0;
protected $categorycount = 0;
protected $cohortcount = 0;
@ -84,7 +84,7 @@ EOD;
$this->coursecount = 0;
$this->scalecount = 0;
foreach($this->generators as $generator) {
foreach ($this->generators as $generator) {
$generator->reset();
}
}
@ -395,11 +395,11 @@ EOD;
$record = (array)$record;
if (empty($record['course'])) {
throw new coding_exception('course must be present in phpunit_data_generator::create_course_section() $record');
throw new coding_exception('course must be present in testing_data_generator::create_course_section() $record');
}
if (!isset($record['section'])) {
throw new coding_exception('section must be present in phpunit_data_generator::create_course_section() $record');
throw new coding_exception('section must be present in testing_data_generator::create_course_section() $record');
}
course_create_sections_if_missing($record['course'], $record['section']);
@ -453,7 +453,7 @@ EOD;
$record = (array)$record;
if (empty($record['courseid'])) {
throw new coding_exception('courseid must be present in phpunit_data_generator::create_group() $record');
throw new coding_exception('courseid must be present in testing_data_generator::create_group() $record');
}
if (!isset($record['name'])) {
@ -496,7 +496,7 @@ EOD;
$record = (array)$record;
if (empty($record['courseid'])) {
throw new coding_exception('courseid must be present in phpunit_data_generator::create_grouping() $record');
throw new coding_exception('courseid must be present in testing_data_generator::create_grouping() $record');
}
if (!isset($record['name'])) {

10
lib/phpunit/generatorlib.php → lib/testing/generator/lib.php

@ -15,17 +15,17 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* PHPUnit data generator support
* Adds data generator support
*
* @package core
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
// NOTE: MOODLE_INTERNAL is not verified here because we load this before setup.php!
require_once(__DIR__.'/../testing/generator/data_generator.php');
require_once(__DIR__.'/../testing/generator/module_generator.php');
require_once(__DIR__.'/../testing/generator/block_generator.php');
require_once(__DIR__.'/data_generator.php');
require_once(__DIR__.'/module_generator.php');
require_once(__DIR__.'/block_generator.php');

8
lib/testing/generator/module_generator.php

@ -34,14 +34,14 @@
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
abstract class phpunit_module_generator {
/** @var phpunit_data_generator@var */
abstract class testing_module_generator {
/** @var testing_data_generator@var */
protected $datagenerator;
/** @var number of created instances */
protected $instancecount = 0;
public function __construct(phpunit_data_generator $datagenerator) {
public function __construct(testing_data_generator $datagenerator) {
$this->datagenerator = $datagenerator;
}
@ -94,7 +94,7 @@ abstract class phpunit_module_generator {
$cm->added = time();
$columns = $DB->get_columns('course_modules');
foreach ($options as $key=>$value) {
foreach ($options as $key => $value) {
if ($key === 'id' or !isset($columns[$key])) {
continue;
}

8
lib/phpunit/tests/generator_test.php → lib/testing/tests/generator_test.php

@ -15,10 +15,10 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* PHPUnit integration tests
* Data generators tests
*
* @package core
* @category phpunit
* @category test
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@ -30,11 +30,11 @@ defined('MOODLE_INTERNAL') || die();
* Test data generator
*
* @package core
* @category phpunit
* @category test
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_phpunit_generator_testcase extends advanced_testcase {
class core_test_generator_testcase extends advanced_testcase {
public function test_create() {
global $DB;

6
mod/assign/tests/generator/lib.php

@ -17,14 +17,14 @@
defined('MOODLE_INTERNAL') || die();
/**
* assign module PHPUnit data generator class
* assign module data generator class
*
* @package mod_assign
* @category phpunit
* @category testing
* @copyright 2012 Paul Charsley
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_assign_generator extends phpunit_module_generator {
class mod_assign_generator extends testing_module_generator {
/**
* Create new assign module instance

8
mod/assignment/tests/generator/lib.php

@ -18,7 +18,7 @@
* mod_assignment data generator
*
* @package mod_assignment
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@ -27,14 +27,14 @@ defined('MOODLE_INTERNAL') || die();
/**
* Assignment module PHPUnit data generator class
* Assignment module data generator class
*
* @package mod_assignment
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_assignment_generator extends phpunit_module_generator {
class mod_assignment_generator extends testing_module_generator {
/**
* Create new assignment module instance

8
mod/data/tests/generator/lib.php

@ -18,7 +18,7 @@
* mod_data data generator
*
* @package mod_data
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@ -27,14 +27,14 @@ defined('MOODLE_INTERNAL') || die();
/**
* Page module PHPUnit data generator class
* Database module data generator class
*
* @package mod_data
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_data_generator extends phpunit_module_generator {
class mod_data_generator extends testing_module_generator {
/**
* Create new data module instance

8
mod/forum/tests/generator/lib.php

@ -18,7 +18,7 @@
* mod_forum data generator
*
* @package mod_forum
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@ -27,14 +27,14 @@ defined('MOODLE_INTERNAL') || die();
/**
* Assignment module PHPUnit data generator class
* Forum module data generator class
*
* @package mod_forum
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_forum_generator extends phpunit_module_generator {
class mod_forum_generator extends testing_module_generator {
/**
* Create new forum module instance

10
mod/lti/tests/generator/lib.php

@ -18,7 +18,7 @@
* mod_lti data generator
*
* @package mod_lti
* @category phpunit
* @category testing
* @copyright Copyright (c) 2012 Moodlerooms Inc. (http://www.moodlerooms.com)
* @author Mark Nielsen
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@ -27,15 +27,15 @@
defined('MOODLE_INTERNAL') || die();
/**
* Assignment module PHPUnit data generator class
* LTI module data generator class
*
* @package mod_lti
* @category phpunit
* @category testing
* @copyright Copyright (c) 2012 Moodlerooms Inc. (http://www.moodlerooms.com)
* @author Mark Nielsen
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_lti_generator extends phpunit_module_generator {
class mod_lti_generator extends testing_module_generator {
/**
* Create new lti module instance
@ -98,4 +98,4 @@ class mod_lti_generator extends phpunit_module_generator {
$id = lti_add_instance($record, null);
return $this->post_add_instance($id, $record->coursemodule);
}
}
}

8
mod/page/tests/generator/lib.php

@ -18,7 +18,7 @@
* mod_page data generator
*
* @package mod_page
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@ -27,14 +27,14 @@ defined('MOODLE_INTERNAL') || die();
/**
* Page module PHPUnit data generator class
* Page module data generator class
*
* @package mod_page
* @category phpunit
* @category testing
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_page_generator extends phpunit_module_generator {
class mod_page_generator extends testing_module_generator {
/**
* Create new page module instance

2
mod/quiz/tests/generator/lib.php

@ -23,7 +23,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2012 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_quiz_generator extends phpunit_module_generator {
class mod_quiz_generator extends testing_module_generator {
/**
* Create new quiz module instance.

3
phpunit.xml.dist

@ -27,6 +27,9 @@
<testsuite name="core_phpunit">
<directory suffix="_test.php">lib/phpunit/tests</directory>
</testsuite>
<testsuite name="core_test">
<directory suffix="_test.php">lib/testing/tests</directory>
</testsuite>
<testsuite name="core_db">
<directory suffix="_test.php">lib/ddl/tests</directory>
<directory suffix="_test.php">lib/dml/tests</directory>