From f16e1af28e8e027e3544467d77a8bc9379aa9d52 Mon Sep 17 00:00:00 2001
From: David Monllao <davidm@moodle.com>
Date: Thu, 10 Jan 2013 14:18:35 +0800
Subject: [PATCH] MDL-36457 testing Relocating classes

---
 lib/phpunit/generatorlib.php                         |  6 +++---
 .../generator}/block_generator.php                   |  4 ++--
 .../classes => testing/generator}/data_generator.php | 12 ++++++------
 .../generator}/module_generator.php                  |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename lib/{phpunit/classes => testing/generator}/block_generator.php (98%)
 rename lib/{phpunit/classes => testing/generator}/data_generator.php (98%)
 rename lib/{phpunit/classes => testing/generator}/module_generator.php (98%)

diff --git a/lib/phpunit/generatorlib.php b/lib/phpunit/generatorlib.php
index f6c8897fa7f..e45f5d5a338 100644
--- a/lib/phpunit/generatorlib.php
+++ b/lib/phpunit/generatorlib.php
@@ -25,7 +25,7 @@
 
 // NOTE: MOODLE_INTERNAL is not verified here because we load this before setup.php!
 
-require_once(__DIR__.'/classes/data_generator.php');
-require_once(__DIR__.'/classes/module_generator.php');
-require_once(__DIR__.'/classes/block_generator.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');
 
diff --git a/lib/phpunit/classes/block_generator.php b/lib/testing/generator/block_generator.php
similarity index 98%
rename from lib/phpunit/classes/block_generator.php
rename to lib/testing/generator/block_generator.php
index a1cb635180d..fa98d850454 100644
--- a/lib/phpunit/classes/block_generator.php
+++ b/lib/testing/generator/block_generator.php
@@ -18,7 +18,7 @@
  * Block generator base class.
  *
  * @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
  */
@@ -30,7 +30,7 @@
  * Extend in blocks/xxxx/tests/generator/lib.php as class block_xxxx_generator.
  *
  * @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
  */
diff --git a/lib/phpunit/classes/data_generator.php b/lib/testing/generator/data_generator.php
similarity index 98%
rename from lib/phpunit/classes/data_generator.php
rename to lib/testing/generator/data_generator.php
index 7e43c107728..f7c901d8f86 100644
--- a/lib/phpunit/classes/data_generator.php
+++ b/lib/testing/generator/data_generator.php
@@ -18,7 +18,7 @@
  * Data generator.
  *
  * @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
  */
@@ -29,7 +29,7 @@
  * that need to create fake test sites.
  *
  * @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
  */
@@ -395,11 +395,11 @@ EOD;
         $record = (array)$record;
 
         if (empty($record['course'])) {
-            throw new coding_exception('course must be present in phpunit_util::create_course_section() $record');
+            throw new coding_exception('course must be present in phpunit_data_generator::create_course_section() $record');
         }
 
         if (!isset($record['section'])) {
-            throw new coding_exception('section must be present in phpunit_util::create_course_section() $record');
+            throw new coding_exception('section must be present in phpunit_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_util::create_group() $record');
+            throw new coding_exception('courseid must be present in phpunit_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_util::create_grouping() $record');
+            throw new coding_exception('courseid must be present in phpunit_data_generator::create_grouping() $record');
         }
 
         if (!isset($record['name'])) {
diff --git a/lib/phpunit/classes/module_generator.php b/lib/testing/generator/module_generator.php
similarity index 98%
rename from lib/phpunit/classes/module_generator.php
rename to lib/testing/generator/module_generator.php
index ffa20f9724b..380674f5f88 100644
--- a/lib/phpunit/classes/module_generator.php
+++ b/lib/testing/generator/module_generator.php
@@ -18,7 +18,7 @@
  * Module generator base class.
  *
  * @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
  */
@@ -30,7 +30,7 @@
  * Extend in mod/xxxx/tests/generator/lib.php as class mod_xxxx_generator.
  *
  * @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
  */