From 5c3c2c81befef7153f6a27ebdbc9202ead90b75c Mon Sep 17 00:00:00 2001 From: David Monllao Date: Thu, 10 Jan 2013 14:43:26 +0800 Subject: [PATCH] MDL-37457 testing Refactoring references --- blocks/online_users/tests/generator/lib.php | 8 ++++---- lib/phpunit/classes/advanced_testcase.php | 2 +- lib/phpunit/classes/util.php | 8 ++++---- lib/phpunit/tests/advanced_test.php | 2 +- lib/testing/generator/block_generator.php | 6 +++--- lib/testing/generator/data_generator.php | 12 ++++++------ .../generatorlib.php => testing/generator/lib.php} | 10 +++++----- lib/testing/generator/module_generator.php | 8 ++++---- lib/{phpunit => testing}/tests/generator_test.php | 8 ++++---- mod/assign/tests/generator/lib.php | 6 +++--- mod/assignment/tests/generator/lib.php | 8 ++++---- mod/data/tests/generator/lib.php | 8 ++++---- mod/forum/tests/generator/lib.php | 8 ++++---- mod/lti/tests/generator/lib.php | 10 +++++----- mod/page/tests/generator/lib.php | 8 ++++---- mod/quiz/tests/generator/lib.php | 2 +- phpunit.xml.dist | 3 +++ 17 files changed, 60 insertions(+), 57 deletions(-) rename lib/{phpunit/generatorlib.php => testing/generator/lib.php} (78%) rename lib/{phpunit => testing}/tests/generator_test.php (98%) diff --git a/blocks/online_users/tests/generator/lib.php b/blocks/online_users/tests/generator/lib.php index d762f42a191..bb0bb0a6dcb 100644 --- a/blocks/online_users/tests/generator/lib.php +++ b/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 diff --git a/lib/phpunit/classes/advanced_testcase.php b/lib/phpunit/classes/advanced_testcase.php index c63eed9ea63..9b9bb996791 100644 --- a/lib/phpunit/classes/advanced_testcase.php +++ b/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(); diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php index 4b10ce061f0..855269d67c8 100644 --- a/lib/phpunit/classes/util.php +++ b/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; } diff --git a/lib/phpunit/tests/advanced_test.php b/lib/phpunit/tests/advanced_test.php index d1d1db8dc16..60e058cb292 100644 --- a/lib/phpunit/tests/advanced_test.php +++ b/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() { diff --git a/lib/testing/generator/block_generator.php b/lib/testing/generator/block_generator.php index fa98d850454..dfcfdac4257 100644 --- a/lib/testing/generator/block_generator.php +++ b/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; } diff --git a/lib/testing/generator/data_generator.php b/lib/testing/generator/data_generator.php index f7c901d8f86..4b182a29ab2 100644 --- a/lib/testing/generator/data_generator.php +++ b/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'])) { diff --git a/lib/phpunit/generatorlib.php b/lib/testing/generator/lib.php similarity index 78% rename from lib/phpunit/generatorlib.php rename to lib/testing/generator/lib.php index e45f5d5a338..238a9ca9843 100644 --- a/lib/phpunit/generatorlib.php +++ b/lib/testing/generator/lib.php @@ -15,17 +15,17 @@ // along with Moodle. If not, see . /** - * 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'); diff --git a/lib/testing/generator/module_generator.php b/lib/testing/generator/module_generator.php index 380674f5f88..eed5d6ea567 100644 --- a/lib/testing/generator/module_generator.php +++ b/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; } diff --git a/lib/phpunit/tests/generator_test.php b/lib/testing/tests/generator_test.php similarity index 98% rename from lib/phpunit/tests/generator_test.php rename to lib/testing/tests/generator_test.php index 0213875ee51..19acca666f9 100644 --- a/lib/phpunit/tests/generator_test.php +++ b/lib/testing/tests/generator_test.php @@ -15,10 +15,10 @@ // along with Moodle. If not, see . /** - * 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; diff --git a/mod/assign/tests/generator/lib.php b/mod/assign/tests/generator/lib.php index 99907091d1c..6521d6fcc08 100644 --- a/mod/assign/tests/generator/lib.php +++ b/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 diff --git a/mod/assignment/tests/generator/lib.php b/mod/assignment/tests/generator/lib.php index ea07132582a..bf8affbbb9b 100644 --- a/mod/assignment/tests/generator/lib.php +++ b/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 diff --git a/mod/data/tests/generator/lib.php b/mod/data/tests/generator/lib.php index 4ff538d0b2c..872bf6671cf 100644 --- a/mod/data/tests/generator/lib.php +++ b/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 diff --git a/mod/forum/tests/generator/lib.php b/mod/forum/tests/generator/lib.php index 369b59349a1..926c0f4f32e 100644 --- a/mod/forum/tests/generator/lib.php +++ b/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 diff --git a/mod/lti/tests/generator/lib.php b/mod/lti/tests/generator/lib.php index b3d3480b146..07aa214c760 100644 --- a/mod/lti/tests/generator/lib.php +++ b/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); } -} \ No newline at end of file +} diff --git a/mod/page/tests/generator/lib.php b/mod/page/tests/generator/lib.php index d2ae2fa7309..f1a24148cdb 100644 --- a/mod/page/tests/generator/lib.php +++ b/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 diff --git a/mod/quiz/tests/generator/lib.php b/mod/quiz/tests/generator/lib.php index b889d3d5e8e..fa2e1dbd1c9 100644 --- a/mod/quiz/tests/generator/lib.php +++ b/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. diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d62dd73f82f..0c1d091ee12 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -27,6 +27,9 @@ lib/phpunit/tests + + lib/testing/tests + lib/ddl/tests lib/dml/tests