diff --git a/admin/presets/tests/helper_test.php b/admin/presets/tests/helper_test.php index 0a4c6ed0595..f0e39c1ed97 100644 --- a/admin/presets/tests/helper_test.php +++ b/admin/presets/tests/helper_test.php @@ -344,7 +344,7 @@ class helper_test extends \advanced_testcase { ], 'plugins' => [ 'assign' => 1, - 'chat' => 1, + 'book' => 1, 'data' => 1, 'lesson' => 1, ], diff --git a/blocks/recentlyaccesseditems/tests/externallib_test.php b/blocks/recentlyaccesseditems/tests/externallib_test.php index 0d98f1e90ec..16b10af6380 100644 --- a/blocks/recentlyaccesseditems/tests/externallib_test.php +++ b/blocks/recentlyaccesseditems/tests/externallib_test.php @@ -58,7 +58,7 @@ class externallib_test extends externallib_advanced_testcase { $generator->enrol_user($student->id, $course->id, 'student'); $forum[] = $this->getDataGenerator()->create_module('forum', array('course' => $course)); $glossary[] = $this->getDataGenerator()->create_module('glossary', array('course' => $course)); - $chat[] = $this->getDataGenerator()->create_module('chat', array('course' => $course)); + $assign[] = $this->getDataGenerator()->create_module('assign', ['course' => $course]); } $generator->enrol_user($teacher->id, $courses[0]->id, 'teacher'); @@ -81,7 +81,7 @@ class externallib_test extends externallib_advanced_testcase { $this->assertCount(count($forum), $result); // Student access all assignments. - foreach ($chat as $module) { + foreach ($assign as $module) { $event = \mod_chat\event\course_module_viewed::create(array('context' => \context_module::instance($module->cmid), 'objectid' => $module->id)); $event->trigger(); @@ -90,7 +90,7 @@ class externallib_test extends externallib_advanced_testcase { // Test that results are sorted by timeaccess DESC (default). $result = \block_recentlyaccesseditems\external::get_recent_items(); - $this->assertCount((count($forum) + count($chat)), $result); + $this->assertCount((count($forum) + count($assign)), $result); foreach ($result as $key => $record) { if ($key == 0) { continue; @@ -101,11 +101,11 @@ class externallib_test extends externallib_advanced_testcase { // Delete a course and confirm it's activities don't get returned. delete_course($courses[0], false); $result = \block_recentlyaccesseditems\external::get_recent_items(); - $this->assertCount((count($forum) + count($chat)) - 2, $result); + $this->assertCount((count($forum) + count($assign)) - 2, $result); // Delete a single course module should still return. course_delete_module($forum[1]->cmid); $result = \block_recentlyaccesseditems\external::get_recent_items(); - $this->assertCount((count($forum) + count($chat)) - 3, $result); + $this->assertCount((count($forum) + count($assign)) - 3, $result); } } diff --git a/completion/tests/bulk_update_test.php b/completion/tests/bulk_update_test.php index e20ed85ab09..f378e3770f8 100644 --- a/completion/tests/bulk_update_test.php +++ b/completion/tests/bulk_update_test.php @@ -158,6 +158,11 @@ class bulk_update_test extends \advanced_testcase { protected function create_course_and_modules($modulenames) { global $CFG, $PAGE; + // Chat and Survey modules are disabled by default, enable them for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('chat', 1); + $manager::enable_plugin('survey', 1); + $CFG->enablecompletion = true; $course = $this->getDataGenerator()->create_course(['enablecompletion' => 1], ['createsections' => true]); $PAGE->set_course($course); diff --git a/course/tests/externallib_test.php b/course/tests/externallib_test.php index b939a07f644..e584b4c7562 100644 --- a/course/tests/externallib_test.php +++ b/course/tests/externallib_test.php @@ -3189,8 +3189,24 @@ class externallib_test extends externallib_advanced_testcase { // Create different types of activities. $course = self::getDataGenerator()->create_course(); - $tocreate = array('assign', 'book', 'choice', 'folder', 'forum', 'glossary', 'imscp', 'label', 'lti', 'page', 'quiz', - 'resource', 'scorm', 'survey', 'url', 'wiki'); + $tocreate = [ + 'assign', + 'book', + 'choice', + 'folder', + 'forum', + 'glossary', + 'imscp', + 'label', + 'lesson', + 'lti', + 'page', + 'quiz', + 'resource', + 'scorm', + 'url', + 'wiki', + ]; $modules = array(); foreach ($tocreate as $modname) { diff --git a/lib/phpunit/classes/restore_date_testcase.php b/lib/phpunit/classes/restore_date_testcase.php index 48d0412118d..7416181d28b 100644 --- a/lib/phpunit/classes/restore_date_testcase.php +++ b/lib/phpunit/classes/restore_date_testcase.php @@ -115,6 +115,15 @@ abstract class restore_date_testcase extends advanced_testcase { * @return array */ protected function create_course_and_module($modulename, $record = []) { + if ($modulename == 'chat') { + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('chat', 1); + } + if ($modulename == 'survey') { + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('survey', 1); + } + // Create a course with specific start date. $record = (array)$record; $generator = $this->getDataGenerator(); diff --git a/lib/tests/plugininfo/mod_test.php b/lib/tests/plugininfo/mod_test.php index f7ee4b8c8c4..4f83ea29dac 100644 --- a/lib/tests/plugininfo/mod_test.php +++ b/lib/tests/plugininfo/mod_test.php @@ -32,21 +32,21 @@ class mod_test extends advanced_testcase { public function test_get_enabled_plugins(): void { $this->resetAfterTest(); - // The bigbluebuttonbn plugin is disabled by default. + // The bigbluebuttonbn and chat plugins are disabled by default. // Check all default formats. $plugins = mod::get_enabled_plugins(); $this->assertArrayHasKey('assign', $plugins); - $this->assertArrayHasKey('chat', $plugins); $this->assertArrayHasKey('forum', $plugins); + $this->assertArrayNotHasKey('chat', $plugins); $this->assertArrayNotHasKey('bigbluebuttonbn', $plugins); // Disable assignment. mod::enable_plugin('assign', 0); $plugins = mod::get_enabled_plugins(); - $this->assertArrayHasKey('chat', $plugins); $this->assertArrayHasKey('forum', $plugins); $this->assertArrayNotHasKey('assign', $plugins); + $this->assertArrayNotHasKey('chat', $plugins); $this->assertArrayNotHasKey('bigbluebuttonbn', $plugins); } } diff --git a/mod/chat/tests/dates_test.php b/mod/chat/tests/dates_test.php index 86a19b1bde0..4b3a4d865f4 100644 --- a/mod/chat/tests/dates_test.php +++ b/mod/chat/tests/dates_test.php @@ -36,6 +36,15 @@ use core\activity_dates; */ class dates_test extends advanced_testcase { + /** + * Setup testcase. + */ + public function setUp(): void { + // Chat module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('chat', 1); + } + /** * Data provider for get_dates_for_module(). * @return array[] diff --git a/mod/chat/tests/event/events_test.php b/mod/chat/tests/event/events_test.php index a577d8e2d8b..242d3568029 100644 --- a/mod/chat/tests/event/events_test.php +++ b/mod/chat/tests/event/events_test.php @@ -38,6 +38,15 @@ require_once($CFG->dirroot . '/mod/chat/lib.php'); */ class events_test extends \advanced_testcase { + /** + * Setup testcase. + */ + public function setUp(): void { + // Chat module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('chat', 1); + } + public function test_message_sent() { global $DB; $this->resetAfterTest(); diff --git a/mod/chat/tests/external/view_sessions_test.php b/mod/chat/tests/external/view_sessions_test.php index ad66d96ec63..a791eeb11a6 100644 --- a/mod/chat/tests/external/view_sessions_test.php +++ b/mod/chat/tests/external/view_sessions_test.php @@ -54,7 +54,13 @@ class view_sessions_test extends externallib_advanced_testcase { */ private function prepare_test_data(): array { global $DB; + $this->resetAfterTest(true); + + // Chat module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('chat', 1); + $course = $this->getDataGenerator()->create_course(); $student1 = $this->getDataGenerator()->create_and_enrol($course); $chat = $this->getDataGenerator()->create_module('chat', ['course' => $course->id]); diff --git a/mod/chat/tests/externallib_test.php b/mod/chat/tests/externallib_test.php index 723bd42228a..0bff12616c7 100644 --- a/mod/chat/tests/externallib_test.php +++ b/mod/chat/tests/externallib_test.php @@ -37,6 +37,15 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); */ class externallib_test extends externallib_advanced_testcase { + /** + * Setup testcase. + */ + public function setUp(): void { + // Chat module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('chat', 1); + } + /** * Test login user */ diff --git a/mod/chat/tests/generator_test.php b/mod/chat/tests/generator_test.php index 6a4a7f37eaf..c600a61c6a4 100644 --- a/mod/chat/tests/generator_test.php +++ b/mod/chat/tests/generator_test.php @@ -25,6 +25,15 @@ namespace mod_chat; */ class generator_test extends \advanced_testcase { + /** + * Setup testcase. + */ + public function setUp(): void { + // Chat module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('chat', 1); + } + public function test_create_instance() { global $DB; $this->resetAfterTest(); diff --git a/mod/chat/tests/lib_test.php b/mod/chat/tests/lib_test.php index 006ff81be04..865c6486d65 100644 --- a/mod/chat/tests/lib_test.php +++ b/mod/chat/tests/lib_test.php @@ -38,6 +38,10 @@ class lib_test extends \advanced_testcase { public function setUp(): void { $this->resetAfterTest(); + + // Chat module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('chat', 1); } /* diff --git a/mod/chat/tests/privacy/provider_test.php b/mod/chat/tests/privacy/provider_test.php index 6fe54806be1..1adb112b4cf 100644 --- a/mod/chat/tests/privacy/provider_test.php +++ b/mod/chat/tests/privacy/provider_test.php @@ -52,6 +52,10 @@ class provider_test extends provider_testcase { global $PAGE; $this->resetAfterTest(); $PAGE->get_renderer('core'); + + // Chat module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('chat', 1); } public function test_get_contexts_for_userid() { diff --git a/mod/survey/tests/event/events_test.php b/mod/survey/tests/event/events_test.php index cf5bd501c80..62c2023e2a6 100644 --- a/mod/survey/tests/event/events_test.php +++ b/mod/survey/tests/event/events_test.php @@ -38,6 +38,9 @@ class events_test extends \advanced_testcase { */ public function setUp(): void { $this->resetAfterTest(); + // Survey module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('survey', 1); } /** diff --git a/mod/survey/tests/externallib_test.php b/mod/survey/tests/externallib_test.php index 105bfd64ff8..3684d39a709 100644 --- a/mod/survey/tests/externallib_test.php +++ b/mod/survey/tests/externallib_test.php @@ -70,6 +70,10 @@ class externallib_test extends externallib_advanced_testcase { $this->resetAfterTest(); $this->setAdminUser(); + // Survey module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('survey', 1); + // Setup test data. $this->course = $this->getDataGenerator()->create_course(); $this->survey = $this->getDataGenerator()->create_module('survey', array('course' => $this->course->id)); diff --git a/mod/survey/tests/generator_test.php b/mod/survey/tests/generator_test.php index 841c497db3e..da5f641407b 100644 --- a/mod/survey/tests/generator_test.php +++ b/mod/survey/tests/generator_test.php @@ -26,6 +26,15 @@ namespace mod_survey; */ class generator_test extends \advanced_testcase { + /** + * Setup testcase. + */ + public function setUp(): void { + // Survey module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('survey', 1); + } + public function test_create_instance() { global $DB; $this->resetAfterTest(); diff --git a/mod/survey/tests/lib_test.php b/mod/survey/tests/lib_test.php index 8b874b2e7ac..69038d2eab2 100644 --- a/mod/survey/tests/lib_test.php +++ b/mod/survey/tests/lib_test.php @@ -48,6 +48,15 @@ class lib_test extends \advanced_testcase { require_once($CFG->dirroot . '/mod/survey/lib.php'); } + /** + * Setup testcase. + */ + public function setUp(): void { + // Survey module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('survey', 1); + } + /** * Test survey_view * @return void diff --git a/mod/survey/tests/privacy/provider_test.php b/mod/survey/tests/privacy/provider_test.php index ef3e32c035f..56e7860d5cd 100644 --- a/mod/survey/tests/privacy/provider_test.php +++ b/mod/survey/tests/privacy/provider_test.php @@ -52,6 +52,10 @@ class provider_test extends provider_testcase { global $PAGE; $this->resetAfterTest(); $PAGE->get_renderer('core'); + + // Survey module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('survey', 1); } public function test_get_contexts_for_userid() { diff --git a/mod/survey/tests/search/search_test.php b/mod/survey/tests/search/search_test.php index 709be295a8a..5b8cd77dc87 100644 --- a/mod/survey/tests/search/search_test.php +++ b/mod/survey/tests/search/search_test.php @@ -39,6 +39,15 @@ namespace mod_survey\search; */ class search_test extends \advanced_testcase { + /** + * Setup testcase. + */ + public function setUp(): void { + // Survey module is disabled by default, enable it for testing. + $manager = \core_plugin_manager::resolve_plugininfo_class('mod'); + $manager::enable_plugin('survey', 1); + } + /** * Test survey_view * @return void