L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-73785 phpunit: Move more tests to use correct names and namespaces

Browse Source 
Applied the following changes to various testcase classes:

- Namespaced with component[\level2-API]
- Moved to level2-API subdirectory when required.
- Fixed incorrect use statements with leading backslash.
- Remove file phpdoc block
- Remove MOODLE_INTERNAL if not needed.
- Changed code to point to global scope when needed.
- Fix some relative paths and comments here and there.
- All them passing individually.
- Complete runs passing too.

Special mention to:

- When belonging to other components and being valid api:
  - analytics related tests have been moved to tests/analytics subdir.
  - backup & restore related tests have been moved to tests/backup subdir.
  - events related tests have been moved to tests/event subdir.
  - privacy related tests have been moved to tests/privacy.
  - task related tests have been moved to tests/task subdir.
- Some simple renames, not including the component part anymore (not
  needed now that they are namespaced):
  - some xxxlib_test.php have been renamed lib_test.php
    (when they where testing the corresponding lib.php).
  - cache stores tests have been all renamed store_test, originally
    each one had its own name (file_test, apcu_test, redis_test...)
  - assign feedback tests have been all renamed feedback_test, originally
    each one had its own name (file_test, editpdf_test...)
This commit is contained in:
Eloy Lafuente (stronk7)
2022-03-03 12:19:38 +01:00
parent 646c691107
commit eb0c520ad6
86 changed files with 1304 additions and 1707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/uploadcourse/tests/processor_test.php
+20 -24
View File
@@ -14,13 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* File containing tests for the processor.
*
* @package tool_uploadcourse
* @copyright 2013 Frédéric Massart
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_uploadcourse;
use tool_uploadcourse_processor;
defined('MOODLE_INTERNAL') || die();
@@ -34,7 +30,7 @@ require_once($CFG->libdir . '/csvlib.class.php');
* @copyright 2013 Frédéric Massart
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_uploadcourse_processor_testcase extends advanced_testcase {
class processor_test extends \advanced_testcase {
public function test_basic() {
global $DB;
@@ -46,8 +42,8 @@ class tool_uploadcourse_processor_testcase extends advanced_testcase {
"c2,Course 2,Course 2 summary",
);
$content = implode("\n", $content);
$iid = csv_import_reader::get_new_iid('uploadcourse');
$cir = new csv_import_reader($iid, 'uploadcourse');
$iid = \csv_import_reader::get_new_iid('uploadcourse');
$cir = new \csv_import_reader($iid, 'uploadcourse');
$cir->load_csv_content($content, 'utf-8', 'comma');
$cir->init();
@@ -75,8 +71,8 @@ class tool_uploadcourse_processor_testcase extends advanced_testcase {
"c2,Course 2,Course 2 summary",
);
$content = implode("\n", $content);
$iid = csv_import_reader::get_new_iid('uploadcourse');
$cir = new csv_import_reader($iid, 'uploadcourse');
$iid = \csv_import_reader::get_new_iid('uploadcourse');
$cir = new \csv_import_reader($iid, 'uploadcourse');
$cir->load_csv_content($content, 'utf-8', 'comma');
$cir->init();
@@ -108,8 +104,8 @@ class tool_uploadcourse_processor_testcase extends advanced_testcase {
"c1,Course 1,Course 1 summary",
);
$content = implode("\n", $content);
$iid = csv_import_reader::get_new_iid('uploadcourse');
$cir = new csv_import_reader($iid, 'uploadcourse');
$iid = \csv_import_reader::get_new_iid('uploadcourse');
$cir = new \csv_import_reader($iid, 'uploadcourse');
$cir->load_csv_content($content, 'utf-8', 'comma');
$cir->init();
@@ -144,8 +140,8 @@ class tool_uploadcourse_processor_testcase extends advanced_testcase {
",Course 1,C1 Summary,ID123",
);
$content = implode("\n", $content);
$iid = csv_import_reader::get_new_iid('uploadcourse');
$cir = new csv_import_reader($iid, 'uploadcourse');
$iid = \csv_import_reader::get_new_iid('uploadcourse');
$cir = new \csv_import_reader($iid, 'uploadcourse');
$cir->load_csv_content($content, 'utf-8', 'comma');
$cir->init();
@@ -165,13 +161,13 @@ class tool_uploadcourse_processor_testcase extends advanced_testcase {
$content = array();
$content = implode("\n", $content);
$iid = csv_import_reader::get_new_iid('uploadcourse');
$cir = new csv_import_reader($iid, 'uploadcourse');
$iid = \csv_import_reader::get_new_iid('uploadcourse');
$cir = new \csv_import_reader($iid, 'uploadcourse');
$cir->load_csv_content($content, 'utf-8', 'comma');
$cir->init();
$options = array('mode' => tool_uploadcourse_processor::MODE_CREATE_NEW);
$this->expectException(moodle_exception::class);
$this->expectException(\moodle_exception::class);
$p = new tool_uploadcourse_processor($cir, $options, array());
}
@@ -183,13 +179,13 @@ class tool_uploadcourse_processor_testcase extends advanced_testcase {
"c1",
);
$content = implode("\n", $content);
$iid = csv_import_reader::get_new_iid('uploadcourse');
$cir = new csv_import_reader($iid, 'uploadcourse');
$iid = \csv_import_reader::get_new_iid('uploadcourse');
$cir = new \csv_import_reader($iid, 'uploadcourse');
$cir->load_csv_content($content, 'utf-8', 'comma');
$cir->init();
$options = array('mode' => tool_uploadcourse_processor::MODE_CREATE_NEW);
$this->expectException(moodle_exception::class);
$this->expectException(\moodle_exception::class);
$p = new tool_uploadcourse_processor($cir, $options, array());
}
@@ -203,8 +199,8 @@ class tool_uploadcourse_processor_testcase extends advanced_testcase {
"c2,Course 2,Course 2 summary",
);
$content = implode("\n", $content);
$iid = csv_import_reader::get_new_iid('uploadcourse');
$cir = new csv_import_reader($iid, 'uploadcourse');
$iid = \csv_import_reader::get_new_iid('uploadcourse');
$cir = new \csv_import_reader($iid, 'uploadcourse');
$cir->load_csv_content($content, 'utf-8', 'comma');
$cir->init();