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

Merge branch 'MDL-73348' of https://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Shamim Rezaie
2021-12-22 21:19:52 +11:00
parent 90c0a7aff4 e4a2d9c1d4
commit dacfebedf3
132 changed files with 1674 additions and 1529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/roles/tests/privacy_test.php → admin/roles/tests/privacy/provider_test.php
+9 -8
View File
@@ -22,16 +22,17 @@
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_role\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_role\privacy\provider;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\writer;
use \core_privacy\tests\provider_testcase;
use \core_privacy\local\request\transform;
use \tool_cohortroles\api;
use \core_privacy\local\request\approved_userlist;
use core_role\privacy\provider;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\writer;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\transform;
use tool_cohortroles\api;
use core_privacy\local\request\approved_userlist;
/**
* Privacy test for core_role
@@ -39,7 +40,7 @@ use \core_privacy\local\request\approved_userlist;
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_role_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test to check export_user_preferences.
* returns user preferences data.
admin/tool/admin_presets/tests/privacy_provider_test.php → admin/tool/admin_presets/tests/privacy/provider_test.php
+1 -1
View File
@@ -30,7 +30,7 @@ use core_privacy\tests\provider_testcase;
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \tool_admin_presets\privacy\provider
*/
class privacy_provider_test extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test for provider::get_metadata().
admin/tool/cohortroles/tests/privacy_test.php → admin/tool/cohortroles/tests/privacy/provider_test.php
+16 -15
View File
@@ -22,14 +22,15 @@
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_cohortroles\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
use \core_privacy\local\request\writer;
use \core_privacy\local\request\approved_contextlist;
use \tool_cohortroles\api;
use \tool_cohortroles\privacy\provider;
use core_privacy\local\request\writer;
use core_privacy\local\request\approved_contextlist;
use tool_cohortroles\api;
use tool_cohortroles\privacy\provider;
use core_privacy\local\request\approved_userlist;
/**
@@ -38,7 +39,7 @@ use core_privacy\local\request\approved_userlist;
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Overriding setUp() function to always reset after tests.
@@ -61,7 +62,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
// Create course category.
$coursecategory = $this->getDataGenerator()->create_category();
$coursecategoryctx = \context_coursecat::instance($coursecategory->id);
$systemctx = context_system::instance();
$systemctx = \context_system::instance();
// Create course.
$course = $this->getDataGenerator()->create_course();
$coursectx = \context_course::instance($course->id);
@@ -102,7 +103,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
// Create course category.
$coursecategory = $this->getDataGenerator()->create_category();
$coursecategoryctx = \context_coursecat::instance($coursecategory->id);
$systemctx = context_system::instance();
$systemctx = \context_system::instance();
// Create course.
$course = $this->getDataGenerator()->create_course();
$coursectx = \context_course::instance($course->id);
@@ -154,7 +155,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
// Create course category.
$coursecategory = $this->getDataGenerator()->create_category();
$coursecategoryctx = \context_coursecat::instance($coursecategory->id);
$systemctx = context_system::instance();
$systemctx = \context_system::instance();
$this->setup_test_scenario_data($user->id, $systemctx, 1);
$this->setup_test_scenario_data($user->id, $coursecategoryctx, 1, 'Sausage roll 2',
@@ -170,7 +171,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
$this->assertCount(2, $contexts);
// Make sure the user data is only being deleted in within the system and course category context.
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
// Delete all the User's records in mdl_tool_cohortroles table by the user context.
provider::delete_data_for_all_users_in_context($usercontext);
@@ -213,7 +214,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
// Create course category.
$coursecategory = $this->getDataGenerator()->create_category();
$coursecategoryctx = \context_coursecat::instance($coursecategory->id);
$systemctx = context_system::instance();
$systemctx = \context_system::instance();
$this->setup_test_scenario_data($user->id, $systemctx, 1);
$this->setup_test_scenario_data($user->id, $coursecategoryctx, 1, 'Sausage roll 2',
@@ -229,7 +230,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
$this->assertCount(2, $contexts);
// Make sure the user data is only being deleted in within the system and the course category contexts.
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
// Delete all the User's records in mdl_tool_cohortroles table by the specified approved context list.
$approvedcontextlist = new approved_contextlist($user, 'tool_cohortroles', [$usercontext->id]);
provider::delete_data_for_user($approvedcontextlist);
@@ -255,12 +256,12 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
// Create a user.
$user = $this->getDataGenerator()->create_user();
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
// Create course category.
$coursecategory = $this->getDataGenerator()->create_category();
$coursecategoryctx = \context_coursecat::instance($coursecategory->id);
$systemctx = context_system::instance();
$systemctx = \context_system::instance();
$this->setAdminUser();
@@ -301,12 +302,12 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
$user2 = $this->getDataGenerator()->create_user();
// Create user3.
$user3 = $this->getDataGenerator()->create_user();
$usercontext3 = context_user::instance($user3->id);
$usercontext3 = \context_user::instance($user3->id);
// Create course category.
$coursecategory = $this->getDataGenerator()->create_category();
$coursecategoryctx = \context_coursecat::instance($coursecategory->id);
$systemctx = context_system::instance();
$systemctx = \context_system::instance();
$this->setAdminUser();
admin/tool/dataprivacy/tests/privacy_provider_test.php → admin/tool/dataprivacy/tests/privacy/provider_test.php
+7 -6
View File
@@ -21,6 +21,7 @@
* @copyright 2020 Paul Holden <paulh@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_dataprivacy\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -38,7 +39,7 @@ use tool_dataprivacy\privacy\provider;
* @copyright 2020 Paul Holden <paulh@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test provider get_contexts_for_userid method
@@ -49,7 +50,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
// Returned context list should contain a single item.
$contextlist = $this->get_contexts_for_userid($user->id, 'tool_dataprivacy');
@@ -68,7 +69,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$userlist = new userlist($context, 'tool_dataprivacy');
provider::get_users_in_context($userlist);
@@ -82,7 +83,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
* @return void
*/
public function test_get_users_in_context_non_user_context() {
$context = context_system::instance();
$context = \context_system::instance();
$userlist = new userlist($context, 'tool_dataprivacy');
provider::get_users_in_context($userlist);
@@ -99,7 +100,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$this->setUser($user);
@@ -170,7 +171,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
provider::export_user_preferences($user->id);
/** @var \core_privacy\tests\request\content_writer $writer */
$writer = writer::with_context(context_system::instance());
$writer = writer::with_context(\context_system::instance());
$this->assertTrue($writer->has_any_data());
/** @var stdClass[] $preferences */
admin/tool/log/store/database/tests/privacy_test.php → admin/tool/log/store/database/tests/privacy/provider_test.php
+25 -24
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace logstore_database\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -34,7 +35,7 @@ use core_privacy\local\request\transform;
use core_privacy\local\request\writer;
use logstore_database\privacy\provider;
require_once(__DIR__ . '/fixtures/event.php');
require_once(__DIR__ . '/../fixtures/event.php');
/**
* Data provider testcase class.
@@ -48,7 +49,7 @@ require_once(__DIR__ . '/fixtures/event.php');
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class logstore_database_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
global $CFG;
@@ -105,11 +106,11 @@ class logstore_database_privacy_testcase extends provider_testcase {
$c2 = $this->getDataGenerator()->create_course();
$cm2 = $this->getDataGenerator()->create_module('url', ['course' => $c2]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -143,7 +144,7 @@ class logstore_database_privacy_testcase extends provider_testcase {
$this->assert_contextlist_equals($this->get_contextlist_for_user($u3), [$sysctx, $c1ctx]);
$this->assert_contextlist_equals($this->get_contextlist_for_user($admin), [$sysctx, $c1ctx]);
$this->setAdminUser();
\core\session\manager::loginas($u1->id, context_system::instance());
\core\session\manager::loginas($u1->id, \context_system::instance());
$e = \logstore_database\event\unittest_executed::create(['context' => $c2ctx, 'relateduserid' => $u3->id]);
$e->trigger();
$this->assert_contextlist_equals($this->get_contextlist_for_user($u1), [$sysctx, $cm1ctx, $c2ctx]);
@@ -163,8 +164,8 @@ class logstore_database_privacy_testcase extends provider_testcase {
$c1 = $this->getDataGenerator()->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -185,7 +186,7 @@ class logstore_database_privacy_testcase extends provider_testcase {
$e->trigger();
// The admin user should be added (realuserid).
$this->setAdminUser();
\core\session\manager::loginas($u2->id, context_system::instance());
\core\session\manager::loginas($u2->id, \context_system::instance());
$e = \logstore_database\event\unittest_executed::create(['context' => $sysctx]);
$e->trigger();
// Set off an event in a different context. User 4 should not be returned below.
@@ -206,9 +207,9 @@ class logstore_database_privacy_testcase extends provider_testcase {
$u2 = $this->getDataGenerator()->create_user();
$c1 = $this->getDataGenerator()->create_course();
$c2 = $this->getDataGenerator()->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -247,9 +248,9 @@ class logstore_database_privacy_testcase extends provider_testcase {
$u2 = $this->getDataGenerator()->create_user();
$c1 = $this->getDataGenerator()->create_course();
$c2 = $this->getDataGenerator()->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -294,8 +295,8 @@ class logstore_database_privacy_testcase extends provider_testcase {
$u4 = $this->getDataGenerator()->create_user();
$course = $this->getDataGenerator()->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($course->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($course->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -337,11 +338,11 @@ class logstore_database_privacy_testcase extends provider_testcase {
$cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
$c2 = $this->getDataGenerator()->create_course();
$cm2 = $this->getDataGenerator()->create_module('url', ['course' => $c2]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$path = [get_string('privacy:path:logs', 'tool_log'), get_string('pluginname', 'logstore_database')];
$this->enable_logging();
admin/tool/log/store/legacy/tests/privacy_test.php → admin/tool/log/store/legacy/tests/privacy/provider_test.php
+26 -25
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace logstore_legacy\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -35,7 +36,7 @@ use core_privacy\local\request\writer;
use logstore_legacy\privacy\provider;
use logstore_legacy\event\unittest_executed;
require_once(__DIR__ . '/fixtures/event.php');
require_once(__DIR__ . '/../fixtures/event.php');
/**
* Data provider testcase class.
@@ -46,7 +47,7 @@ require_once(__DIR__ . '/fixtures/event.php');
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class logstore_legacy_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
$this->resetAfterTest();
@@ -58,9 +59,9 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
$u3 = $this->getDataGenerator()->create_user();
$c1 = $this->getDataGenerator()->create_course();
$cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$cm1ctx = context_module::instance($cm1->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -96,11 +97,11 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
$u3 = $this->getDataGenerator()->create_user();
$course = $this->getDataGenerator()->create_course();
$module = $this->getDataGenerator()->create_module('url', ['course' => $course]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($course->id);
$cm1ctx = context_module::instance($module->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($course->id);
$cm1ctx = \context_module::instance($module->cmid);
$userctx = context_user::instance($u1->id);
$userctx = \context_user::instance($u1->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -161,10 +162,10 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
$c1 = $this->getDataGenerator()->create_course();
$c2 = $this->getDataGenerator()->create_course();
$cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$cm1ctx = context_module::instance($cm1->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -238,10 +239,10 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
$c1 = $this->getDataGenerator()->create_course();
$c2 = $this->getDataGenerator()->create_course();
$cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$cm1ctx = context_module::instance($cm1->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -317,11 +318,11 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
$u3 = $this->getDataGenerator()->create_user();
$course = $this->getDataGenerator()->create_course();
$module = $this->getDataGenerator()->create_module('url', ['course' => $course]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($course->id);
$cm1ctx = context_module::instance($module->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($course->id);
$cm1ctx = \context_module::instance($module->cmid);
$userctx = context_user::instance($u1->id);
$userctx = \context_user::instance($u1->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -377,10 +378,10 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
$c1 = $this->getDataGenerator()->create_course();
$c2 = $this->getDataGenerator()->create_course();
$cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$cm1ctx = context_module::instance($cm1->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$this->enable_logging();
$manager = get_log_manager(true);
admin/tool/log/store/standard/tests/privacy_test.php → admin/tool/log/store/standard/tests/privacy/provider_test.php
+25 -24
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace logstore_standard\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -34,7 +35,7 @@ use core_privacy\local\request\transform;
use core_privacy\local\request\writer;
use logstore_standard\privacy\provider;
require_once(__DIR__ . '/fixtures/event.php');
require_once(__DIR__ . '/../fixtures/event.php');
/**
* Data provider testcase class.
@@ -45,7 +46,7 @@ require_once(__DIR__ . '/fixtures/event.php');
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class logstore_standard_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
$this->resetAfterTest();
@@ -63,11 +64,11 @@ class logstore_standard_privacy_testcase extends provider_testcase {
$c2 = $this->getDataGenerator()->create_course();
$cm2 = $this->getDataGenerator()->create_module('url', ['course' => $c2]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -101,7 +102,7 @@ class logstore_standard_privacy_testcase extends provider_testcase {
$this->assert_contextlist_equals($this->get_contextlist_for_user($u3), [$sysctx, $c1ctx]);
$this->assert_contextlist_equals($this->get_contextlist_for_user($admin), [$sysctx, $c1ctx]);
$this->setAdminUser();
\core\session\manager::loginas($u1->id, context_system::instance());
\core\session\manager::loginas($u1->id, \context_system::instance());
$e = \logstore_standard\event\unittest_executed::create(['context' => $c2ctx, 'relateduserid' => $u3->id]);
$e->trigger();
$this->assert_contextlist_equals($this->get_contextlist_for_user($u1), [$sysctx, $cm1ctx, $c2ctx]);
@@ -118,8 +119,8 @@ class logstore_standard_privacy_testcase extends provider_testcase {
$c1 = $this->getDataGenerator()->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -140,7 +141,7 @@ class logstore_standard_privacy_testcase extends provider_testcase {
$e->trigger();
// The admin user should be added (realuserid).
$this->setAdminUser();
\core\session\manager::loginas($u2->id, context_system::instance());
\core\session\manager::loginas($u2->id, \context_system::instance());
$e = \logstore_standard\event\unittest_executed::create(['context' => $sysctx]);
$e->trigger();
// Set off an event in a different context. User 4 should not be returned below.
@@ -161,9 +162,9 @@ class logstore_standard_privacy_testcase extends provider_testcase {
$u2 = $this->getDataGenerator()->create_user();
$c1 = $this->getDataGenerator()->create_course();
$c2 = $this->getDataGenerator()->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -202,9 +203,9 @@ class logstore_standard_privacy_testcase extends provider_testcase {
$u2 = $this->getDataGenerator()->create_user();
$c1 = $this->getDataGenerator()->create_course();
$c2 = $this->getDataGenerator()->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -246,8 +247,8 @@ class logstore_standard_privacy_testcase extends provider_testcase {
$u4 = $this->getDataGenerator()->create_user();
$course = $this->getDataGenerator()->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($course->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($course->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -289,11 +290,11 @@ class logstore_standard_privacy_testcase extends provider_testcase {
$cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
$c2 = $this->getDataGenerator()->create_course();
$cm2 = $this->getDataGenerator()->create_module('url', ['course' => $c2]);
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$path = [get_string('privacy:path:logs', 'tool_log'), get_string('pluginname', 'logstore_standard')];
$this->enable_logging();
admin/tool/log/tests/privacy_test.php → admin/tool/log/tests/privacy/provider_test.php
+6 -5
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_log\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -49,7 +50,7 @@ require_once($CFG->dirroot . '/admin/tool/log/store/standard/tests/fixtures/even
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_log_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
$this->resetAfterTest();
@@ -60,7 +61,7 @@ class tool_log_privacy_testcase extends provider_testcase {
$admin = \core_user::get_user(2);
$u1 = $this->getDataGenerator()->create_user();
$c1 = $this->getDataGenerator()->create_course();
$c1ctx = context_course::instance($c1->id);
$c1ctx = \context_course::instance($c1->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -77,7 +78,7 @@ class tool_log_privacy_testcase extends provider_testcase {
$u1 = $this->getDataGenerator()->create_user();
$u2 = $this->getDataGenerator()->create_user();
$c1 = $this->getDataGenerator()->create_course();
$c1ctx = context_course::instance($c1->id);
$c1ctx = \context_course::instance($c1->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -111,7 +112,7 @@ class tool_log_privacy_testcase extends provider_testcase {
$u1 = $this->getDataGenerator()->create_user();
$u2 = $this->getDataGenerator()->create_user();
$c1 = $this->getDataGenerator()->create_course();
$c1ctx = context_course::instance($c1->id);
$c1ctx = \context_course::instance($c1->id);
$this->enable_logging();
$manager = get_log_manager(true);
@@ -144,7 +145,7 @@ class tool_log_privacy_testcase extends provider_testcase {
$admin = \core_user::get_user(2);
$u1 = $this->getDataGenerator()->create_user();
$c1 = $this->getDataGenerator()->create_course();
$c1ctx = context_course::instance($c1->id);
$c1ctx = \context_course::instance($c1->id);
$path = [get_string('privacy:path:logs', 'tool_log'), get_string('pluginname', 'logstore_standard')];
$this->enable_logging();
admin/tool/messageinbound/tests/privacy_test.php → admin/tool/messageinbound/tests/privacy/provider_test.php
+15 -14
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_messageinbound\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -44,7 +45,7 @@ use tool_messageinbound\privacy\provider;
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_messageinbound_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
global $CFG;
@@ -60,8 +61,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
$dg = $this->getDataGenerator();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$contexts = provider::get_contexts_for_userid($u1->id)->get_contexts();
$this->assertCount(1, $contexts);
@@ -81,9 +82,9 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u3ctx = context_user::instance($u3->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$u3ctx = \context_user::instance($u3->id);
$addressmanager = new \core\message\inbound\address_manager();
$addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');
@@ -122,8 +123,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
$dg = $this->getDataGenerator();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$addressmanager = new \core\message\inbound\address_manager();
$addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');
@@ -166,8 +167,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
$dg = $this->getDataGenerator();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$addressmanager = new \core\message\inbound\address_manager();
$addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');
@@ -214,8 +215,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
$dg = $this->getDataGenerator();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$addressmanager = new \core\message\inbound\address_manager();
$addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');
@@ -246,8 +247,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
$dg = $this->getDataGenerator();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$addressmanager = new \core\message\inbound\address_manager();
$addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');
admin/tool/mobile/tests/privacy_provider_test.php → admin/tool/mobile/tests/privacy/provider_test.php
+3 -1
View File
@@ -21,6 +21,8 @@
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_mobile\privacy;
defined('MOODLE_INTERNAL') || die();
use core_privacy\local\request\writer;
@@ -35,7 +37,7 @@ use tool_mobile\privacy\provider;
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_mobile_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Basic setup for these tests.
admin/tool/monitor/tests/privacy_test.php → admin/tool/monitor/tests/privacy/provider_test.php
+9 -8
View File
@@ -22,13 +22,14 @@
* @copyright 2018 Adrian Greeve <adriangreeve.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_monitor\privacy;
defined('MOODLE_INTERNAL') || die();
use \tool_monitor\privacy\provider;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\approved_userlist;
use \core_privacy\tests\provider_testcase;
use tool_monitor\privacy\provider;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\approved_userlist;
use core_privacy\tests\provider_testcase;
/**
* Privacy test for the event monitor
@@ -38,7 +39,7 @@ use \core_privacy\tests\provider_testcase;
* @copyright 2018 Adrian Greeve <adriangreeve.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_monitor_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Set up method.
@@ -115,7 +116,7 @@ class tool_monitor_privacy_testcase extends provider_testcase {
$this->setUser($user2);
$record = new stdClass();
$record = new \stdClass();
$record->courseid = 0;
$record->userid = $user2->id;
$record->ruleid = $rule->id;
@@ -164,7 +165,7 @@ class tool_monitor_privacy_testcase extends provider_testcase {
// Create a subscription with user2.
$this->setUser($user2);
$record = new stdClass();
$record = new \stdClass();
$record->courseid = 0;
$record->userid = $user2->id;
$record->ruleid = $rule->id;
@@ -251,7 +252,7 @@ class tool_monitor_privacy_testcase extends provider_testcase {
$subscription3 = $monitorgenerator->create_subscription($subscription3);
// Try a different context first.
provider::delete_data_for_all_users_in_context(context_system::instance());
provider::delete_data_for_all_users_in_context(\context_system::instance());
// Get all of the monitor rules.
$dbrules = $DB->get_records('tool_monitor_rules');
admin/tool/policy/tests/privacy_provider_test.php → admin/tool/policy/tests/privacy/provider_test.php
+3 -2
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_policy\privacy;
use core_privacy\local\metadata\collection;
use tool_policy\privacy\provider;
@@ -38,7 +39,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/** @var stdClass The user object. */
protected $user;
@@ -59,7 +60,7 @@ class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider
// Create manager user.
$this->manager = $generator->create_user();
$this->syscontext = context_system::instance();
$this->syscontext = \context_system::instance();
$rolemanagerid = create_role('Policy manager', 'policymanager', 'Can manage policy documents');
assign_capability('tool/policy:managedocs', CAP_ALLOW, $rolemanagerid, $this->syscontext->id);
assign_capability('tool/policy:acceptbehalf', CAP_ALLOW, $rolemanagerid, $this->syscontext->id);
admin/tool/usertours/tests/privacy_provider_test.php → admin/tool/usertours/tests/privacy/provider_test.php
+6 -5
View File
@@ -22,13 +22,14 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_usertours\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\local\metadata\collection;
use \core_privacy\local\request\writer;
use \tool_usertours\tour;
use \tool_usertours\privacy\provider;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\writer;
use tool_usertours\tour;
use tool_usertours\privacy\provider;
/**
* Unit tests for the tool_usertours implementation of the privacy API.
@@ -36,7 +37,7 @@ use \tool_usertours\privacy\provider;
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_usertours_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Helper method for creating a tour
analytics/tests/privacy_test.php → analytics/tests/privacy/provider_test.php
+7 -6
View File
@@ -21,8 +21,9 @@
* @copyright 2018 David Monllaó {@link http://www.davidmonllao.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_analytics\privacy;
use \core_analytics\privacy\provider;
use core_analytics\privacy\provider;
use core_privacy\local\request\transform;
use core_privacy\local\request\writer;
use core_privacy\local\request\approved_contextlist;
@@ -30,10 +31,10 @@ use core_privacy\local\request\approved_userlist;
defined('MOODLE_INTERNAL') || die();
require_once(__DIR__ . '/fixtures/test_indicator_max.php');
require_once(__DIR__ . '/fixtures/test_indicator_min.php');
require_once(__DIR__ . '/fixtures/test_target_site_users.php');
require_once(__DIR__ . '/fixtures/test_target_course_users.php');
require_once(__DIR__ . '/../fixtures/test_indicator_max.php');
require_once(__DIR__ . '/../fixtures/test_indicator_min.php');
require_once(__DIR__ . '/../fixtures/test_target_site_users.php');
require_once(__DIR__ . '/../fixtures/test_target_course_users.php');
/**
* Unit tests for privacy.
@@ -42,7 +43,7 @@ require_once(__DIR__ . '/fixtures/test_target_course_users.php');
* @copyright 2018 David Monllaó {@link http://www.davidmonllao.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_analytics_privacy_model_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
public function setUp(): void {
auth/manual/tests/privacy_provider_test.php → auth/manual/tests/privacy/provider_test.php
+7 -6
View File
@@ -21,15 +21,16 @@
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace auth_manual\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot.'/auth/manual/auth.php');
use \core_privacy\local\request\writer;
use \core_privacy\local\request\transform;
use \auth_manual\privacy\provider;
use core_privacy\local\request\writer;
use core_privacy\local\request\transform;
use auth_manual\privacy\provider;
/**
* Unit tests for the auth_manual implementation of the privacy API.
@@ -37,9 +38,9 @@ use \auth_manual\privacy\provider;
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class auth_manual_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/** @var auth_plugin_manual Keeps the authentication plugin. */
/** @var \auth_plugin_manual Keeps the authentication plugin. */
protected $authplugin;
/**
@@ -47,7 +48,7 @@ class auth_manual_privacy_testcase extends \core_privacy\tests\provider_testcase
*/
public function setUp(): void {
$this->resetAfterTest(true);
$this->authplugin = new auth_plugin_manual();
$this->authplugin = new \auth_plugin_manual();
}
/**
auth/mnet/tests/privacy_provider_test.php → auth/mnet/tests/privacy/provider_test.php
+21 -20
View File
@@ -21,13 +21,14 @@
* @copyright 2018 Victor Deniz <victor@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace auth_mnet\privacy;
defined('MOODLE_INTERNAL') || die();
use \auth_mnet\privacy\provider;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\writer;
use \core_privacy\tests\provider_testcase;
use auth_mnet\privacy\provider;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\writer;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\transform;
use core_privacy\local\request\approved_userlist;
@@ -39,7 +40,7 @@ use core_privacy\local\request\approved_userlist;
* @copyright 2018 Victor Deniz <victor@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class auth_mnet_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Set up method.
*/
@@ -58,7 +59,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$this->assertEmpty(provider::get_contexts_for_userid($user->id));
// Insert mnet_log record.
$logrecord = new stdClass();
$logrecord = new \stdClass();
$logrecord->hostid = '';
$logrecord->remoteid = 65;
$logrecord->time = time();
@@ -85,7 +86,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$user = $this->getDataGenerator()->create_user(['auth' => 'mnet']);
// Insert mnet_host record.
$hostrecord = new stdClass();
$hostrecord = new \stdClass();
$hostrecord->wwwroot = 'https://external.moodle.com';
$hostrecord->name = 'External Moodle';
$hostrecord->public_key = '-----BEGIN CERTIFICATE-----';
@@ -93,7 +94,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$hostid = $DB->insert_record('mnet_host', $hostrecord);
// Insert mnet_log record.
$logrecord = new stdClass();
$logrecord = new \stdClass();
$logrecord->hostid = $hostid;
$logrecord->remoteid = 65;
$logrecord->time = time();
@@ -125,7 +126,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$user1 = $this->getDataGenerator()->create_user(['auth' => 'mnet']);
// Insert mnet_log record.
$logrecord1 = new stdClass();
$logrecord1 = new \stdClass();
$logrecord1->hostid = '';
$logrecord1->remoteid = 65;
$logrecord1->time = time();
@@ -138,7 +139,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$user2 = $this->getDataGenerator()->create_user(['auth' => 'mnet']);
// Insert mnet_log record.
$logrecord2 = new stdClass();
$logrecord2 = new \stdClass();
$logrecord2->hostid = '';
$logrecord2->remoteid = 65;
$logrecord2->time = time();
@@ -173,7 +174,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$user1 = $this->getDataGenerator()->create_user(['auth' => 'mnet']);
// Insert mnet_log record.
$logrecord1 = new stdClass();
$logrecord1 = new \stdClass();
$logrecord1->hostid = '';
$logrecord1->remoteid = 65;
$logrecord1->time = time();
@@ -186,7 +187,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$user2 = $this->getDataGenerator()->create_user(['auth' => 'mnet']);
// Insert mnet_log record.
$logrecord2 = new stdClass();
$logrecord2 = new \stdClass();
$logrecord2->hostid = '';
$logrecord2->remoteid = 65;
$logrecord2->time = time();
@@ -224,7 +225,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$component = 'auth_mnet';
// Create a user.
$user = $this->getDataGenerator()->create_user(['auth' => 'mnet']);
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
// The list of users should not return anything yet (related data still haven't been created).
$userlist = new \core_privacy\local\request\userlist($usercontext, $component);
@@ -232,7 +233,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$this->assertCount(0, $userlist);
// Insert mnet_log record.
$logrecord = new stdClass();
$logrecord = new \stdClass();
$logrecord->hostid = '';
$logrecord->remoteid = 65;
$logrecord->time = time();
@@ -247,7 +248,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$this->assertEquals($expected, $actual);
// The list of users for system context should not return any users.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist);
$this->assertCount(0, $userlist);
@@ -264,13 +265,13 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$component = 'auth_mnet';
// Create user1.
$user1 = $this->getDataGenerator()->create_user(['auth' => 'mnet']);
$usercontext1 = context_user::instance($user1->id);
$usercontext1 = \context_user::instance($user1->id);
// Create user2.
$user2 = $this->getDataGenerator()->create_user(['auth' => 'mnet']);
$usercontext2 = context_user::instance($user2->id);
$usercontext2 = \context_user::instance($user2->id);
// Insert mnet_log record.
$logrecord1 = new stdClass();
$logrecord1 = new \stdClass();
$logrecord1->hostid = '';
$logrecord1->remoteid = 65;
$logrecord1->time = time();
@@ -278,7 +279,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$DB->insert_record('mnet_log', $logrecord1);
// Insert mnet_log record.
$logrecord2 = new stdClass();
$logrecord2 = new \stdClass();
$logrecord2->hostid = '';
$logrecord2->remoteid = 65;
$logrecord2->time = time();
@@ -317,7 +318,7 @@ class auth_mnet_privacy_testcase extends provider_testcase {
$this->assertCount(1, $userlist2);
// User data should be only removed in the user context.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
// Add userlist2 to the approved user list in the system context.
$approvedlist = new approved_userlist($systemcontext, $component, $userlist2->get_userids());
// Delete user1 data using delete_data_for_user.
auth/oauth2/tests/privacy_provider_test.php → auth/oauth2/tests/privacy/provider_test.php
+11 -10
View File
@@ -21,13 +21,14 @@
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace auth_oauth2\privacy;
defined('MOODLE_INTERNAL') || die();
use \auth_oauth2\privacy\provider;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\writer;
use \core_privacy\tests\provider_testcase;
use auth_oauth2\privacy\provider;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\writer;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\approved_userlist;
/**
@@ -38,7 +39,7 @@ use core_privacy\local\request\approved_userlist;
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class auth_oauth2_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Set up method.
*/
@@ -180,7 +181,7 @@ class auth_oauth2_privacy_testcase extends provider_testcase {
$component = 'auth_oauth2';
// Create a user.
$user = $this->getDataGenerator()->create_user();
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
// The list of users should not return anything yet (related data still haven't been created).
$userlist = new \core_privacy\local\request\userlist($usercontext, $component);
@@ -201,7 +202,7 @@ class auth_oauth2_privacy_testcase extends provider_testcase {
$this->assertEquals($expected, $actual);
// The list of users for system context should not return any users.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist);
$this->assertCount(0, $userlist);
@@ -216,10 +217,10 @@ class auth_oauth2_privacy_testcase extends provider_testcase {
$component = 'auth_oauth2';
// Create user1.
$user1 = $this->getDataGenerator()->create_user();
$usercontext1 = context_user::instance($user1->id);
$usercontext1 = \context_user::instance($user1->id);
// Create user2.
$user2 = $this->getDataGenerator()->create_user();
$usercontext2 = context_user::instance($user2->id);
$usercontext2 = \context_user::instance($user2->id);
$issuer1 = \core\oauth2\api::create_standard_issuer('google');
$info1 = [];
@@ -265,7 +266,7 @@ class auth_oauth2_privacy_testcase extends provider_testcase {
$this->assertCount(1, $userlist2);
// User data should be only removed in the user context.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
// Add userlist2 to the approved user list in the system context.
$approvedlist = new approved_userlist($systemcontext, $component, $userlist2->get_userids());
// Delete user1 data using delete_data_for_user.
auth/tests/privacy_test.php → auth/tests/privacy/provider_test.php
+3 -2
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_auth\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -41,7 +42,7 @@ use core_auth\privacy\provider;
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_auth_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
$this->resetAfterTest();
@@ -51,7 +52,7 @@ class core_auth_privacy_testcase extends provider_testcase {
$dg = $this->getDataGenerator();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$sysctx = context_system::instance();
$sysctx = \context_system::instance();
$now = time();
// Check nothing is there.
backup/tests/privacy_provider_test.php → backup/tests/privacy/provider_test.php
+12 -11
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_backup\privacy;
use core_backup\privacy\provider;
use core_privacy\local\request\approved_userlist;
@@ -33,7 +34,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_backup_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Test getting the context for the user ID related to this plugin.
@@ -69,7 +70,7 @@ class core_backup_privacy_provider_testcase extends \core_privacy\tests\provider
$contextlist = provider::get_contexts_for_userid($user->id);
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$context = context_course::instance($course->id);
$context = \context_course::instance($course->id);
$this->assertEquals($context->id, $contextforuser->id);
}
@@ -145,7 +146,7 @@ class core_backup_privacy_provider_testcase extends \core_privacy\tests\provider
];
$DB->insert_record('backup_controllers', $bcdata3);
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
// Export all of the data for the context.
$this->export_context_data_for_user($user1->id, $coursecontext, 'core_backup');
@@ -220,7 +221,7 @@ class core_backup_privacy_provider_testcase extends \core_privacy\tests\provider
$this->assertEquals(2, $count);
// Delete data based on context.
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
provider::delete_data_for_all_users_in_context($coursecontext);
// After deletion, the operations for that course should have been deleted.
@@ -284,9 +285,9 @@ class core_backup_privacy_provider_testcase extends \core_privacy\tests\provider
$count = $DB->count_records('backup_controllers', ['itemid' => $course->id]);
$this->assertEquals(2, $count);
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
$contextlist = new \core_privacy\local\request\approved_contextlist($user1, 'core_backup',
[context_system::instance()->id, $coursecontext->id]);
[\context_system::instance()->id, $coursecontext->id]);
provider::delete_data_for_user($contextlist);
// After deletion, the backup operation for the user should have been deleted.
@@ -316,7 +317,7 @@ class core_backup_privacy_provider_testcase extends \core_privacy\tests\provider
$user = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
$activitycontext = \context_module::instance($activity->cmid);
// The list of users for course context should return the user.
@@ -384,7 +385,7 @@ class core_backup_privacy_provider_testcase extends \core_privacy\tests\provider
$this->assertEquals($expected, $actual);
// The list of users for system context should not return any users.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist);
$this->assertCount(0, $userlist);
@@ -402,10 +403,10 @@ class core_backup_privacy_provider_testcase extends \core_privacy\tests\provider
// Create course1.
$course1 = $this->getDataGenerator()->create_course();
$coursecontext = context_course::instance($course1->id);
$coursecontext = \context_course::instance($course1->id);
// Create course2.
$course2 = $this->getDataGenerator()->create_course();
$coursecontext2 = context_course::instance($course2->id);
$coursecontext2 = \context_course::instance($course2->id);
// Create an activity.
$activity = $this->getDataGenerator()->create_module('chat', ['course' => $course1->id]);
$activitycontext = \context_module::instance($activity->cmid);
@@ -526,7 +527,7 @@ class core_backup_privacy_provider_testcase extends \core_privacy\tests\provider
$this->assertCount(0, $userlist3);
// User data should be only removed in the course context and module context.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
// Add userlist2 to the approved user list in the system context.
$approvedlist = new approved_userlist($systemcontext, $component, $userlist2->get_userids());
// Delete user1 data using delete_data_for_user.
badges/tests/privacy_test.php → badges/tests/privacy/provider_test.php
+50 -49
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_badges\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -46,7 +47,7 @@ require_once($CFG->libdir . '/badgeslib.php');
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_badges_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
$this->resetAfterTest();
@@ -61,9 +62,9 @@ class core_badges_privacy_testcase extends provider_testcase {
$u5 = $dg->create_user();
$c1 = $dg->create_course();
$c2 = $dg->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
// Assert that we find contexts where we created/modified a badge.
$this->create_badge(['usercreated' => $u1->id, 'usermodified' => $u5->id]);
@@ -103,12 +104,12 @@ class core_badges_privacy_testcase extends provider_testcase {
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$c1 = $dg->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u3ctx = context_user::instance($u3->id);
$u4ctx = context_user::instance($u4->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$u3ctx = \context_user::instance($u3->id);
$u4ctx = \context_user::instance($u4->id);
$b1 = $this->create_badge();
$b2 = $this->create_badge(['type' => BADGE_TYPE_COURSE, 'courseid' => $c1->id]);
@@ -134,12 +135,12 @@ class core_badges_privacy_testcase extends provider_testcase {
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$c1 = $dg->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u3ctx = context_user::instance($u3->id);
$u4ctx = context_user::instance($u4->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$u3ctx = \context_user::instance($u3->id);
$u4ctx = \context_user::instance($u4->id);
$b1 = $this->create_badge();
$b2 = $this->create_badge(['type' => BADGE_TYPE_COURSE, 'courseid' => $c1->id]);
@@ -174,10 +175,10 @@ class core_badges_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1 = $dg->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$b1 = $this->create_badge(['usercreated' => $u1->id, 'usermodified' => $u2->id]);
$b2 = $this->create_badge(['usercreated' => $u2->id, 'usermodified' => $u1->id,
@@ -232,10 +233,10 @@ class core_badges_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1 = $dg->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$b1 = $this->create_badge(['usercreated' => $u1->id, 'usermodified' => $u2->id]);
$b2 = $this->create_badge(['usercreated' => $u2->id, 'usermodified' => $u1->id,
@@ -301,10 +302,10 @@ class core_badges_privacy_testcase extends provider_testcase {
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$c1 = $dg->create_course();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$b1 = $this->create_badge(['usercreated' => $u3->id]);
$this->endorse_badge(['badgeid' => $b1->id]);
@@ -446,19 +447,19 @@ class core_badges_privacy_testcase extends provider_testcase {
// Create course1.
$course1 = $this->getDataGenerator()->create_course();
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
// Create course2.
$course2 = $this->getDataGenerator()->create_course();
$coursecontext2 = context_course::instance($course2->id);
$coursecontext2 = \context_course::instance($course2->id);
// Create user1.
$user1 = $this->getDataGenerator()->create_user();
$usercontext1 = context_user::instance($user1->id);
$usercontext1 = \context_user::instance($user1->id);
// Create user2.
$user2 = $this->getDataGenerator()->create_user();
$usercontext2 = context_user::instance($user2->id);
$usercontext2 = \context_user::instance($user2->id);
// Create user3.
$user3 = $this->getDataGenerator()->create_user();
$usercontext3 = context_user::instance($user3->id);
$usercontext3 = \context_user::instance($user3->id);
// The list of users in usercontext1 should not return anything yet (related data still haven't been created).
$userlist1 = new \core_privacy\local\request\userlist($usercontext1, $component);
@@ -469,7 +470,7 @@ class core_badges_privacy_testcase extends provider_testcase {
provider::get_users_in_context($userlist2);
$this->assertCount(0, $userlist2);
// The list of users in systemcontext should not return anything yet (related data still haven't been created).
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist3 = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist3);
$this->assertCount(0, $userlist3);
@@ -516,19 +517,19 @@ class core_badges_privacy_testcase extends provider_testcase {
// Create course1.
$course1 = $this->getDataGenerator()->create_course();
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
// Create course2.
$course2 = $this->getDataGenerator()->create_course();
$coursecontext2 = context_course::instance($course2->id);
$coursecontext2 = \context_course::instance($course2->id);
// Create user1.
$user1 = $this->getDataGenerator()->create_user();
$usercontext1 = context_user::instance($user1->id);
$usercontext1 = \context_user::instance($user1->id);
// Create user2.
$user2 = $this->getDataGenerator()->create_user();
$usercontext2 = context_user::instance($user2->id);
$usercontext2 = \context_user::instance($user2->id);
// Create user3.
$user3 = $this->getDataGenerator()->create_user();
$usercontext3 = context_user::instance($user3->id);
$usercontext3 = \context_user::instance($user3->id);
$this->create_badge(['usercreated' => $user1->id, 'usermodified' => $user2->id]);
$badge1 = $this->create_badge(['usercreated' => $user2->id, 'type' => BADGE_TYPE_COURSE, 'courseid' => $course1->id]);
@@ -560,7 +561,7 @@ class core_badges_privacy_testcase extends provider_testcase {
$this->assertTrue(in_array($user3->id, $userlist2->get_userids()));
// The list of users for system context should return users.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist3 = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist3);
$this->assertCount(2, $userlist3);
@@ -593,7 +594,7 @@ class core_badges_privacy_testcase extends provider_testcase {
$this->assertCount(2, $userlist2);
// The list of users for system context should return the previous users.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist3 = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist3);
$this->assertCount(2, $userlist3);
@@ -717,13 +718,13 @@ class core_badges_privacy_testcase extends provider_testcase {
* @return object
*/
protected function create_criteria_badge($badgeid, array $params = []) {
$badge = new badge($badgeid);
$badge = new \badge($badgeid);
if (empty($badge->criteria)) {
$overall = award_criteria::build(['criteriatype' => BADGE_CRITERIA_TYPE_OVERALL, 'badgeid' => $badge->id]);
$overall = \award_criteria::build(['criteriatype' => BADGE_CRITERIA_TYPE_OVERALL, 'badgeid' => $badge->id]);
$overall->save(['agg' => BADGE_CRITERIA_AGGREGATION_ALL]);
}
$criteria = award_criteria::build([
$criteria = \award_criteria::build([
'badgeid' => $badge->id,
'criteriatype' => BADGE_CRITERIA_TYPE_BADGE,
]);
@@ -734,7 +735,7 @@ class core_badges_privacy_testcase extends provider_testcase {
}
$criteria->save($params);
$badge = new badge($badgeid);
$badge = new \badge($badgeid);
return $badge->criteria[BADGE_CRITERIA_TYPE_BADGE];
}
@@ -748,13 +749,13 @@ class core_badges_privacy_testcase extends provider_testcase {
protected function create_criteria_manual($badgeid, array $params = []) {
global $DB;
$badge = new badge($badgeid);
$badge = new \badge($badgeid);
if (empty($badge->criteria)) {
$overall = award_criteria::build(['criteriatype' => BADGE_CRITERIA_TYPE_OVERALL, 'badgeid' => $badge->id]);
$overall = \award_criteria::build(['criteriatype' => BADGE_CRITERIA_TYPE_OVERALL, 'badgeid' => $badge->id]);
$overall->save(['agg' => BADGE_CRITERIA_AGGREGATION_ALL]);
}
$criteria = award_criteria::build([
$criteria = \award_criteria::build([
'badgeid' => $badge->id,
'criteriatype' => BADGE_CRITERIA_TYPE_MANUAL,
]);
@@ -767,7 +768,7 @@ class core_badges_privacy_testcase extends provider_testcase {
}
$criteria->save($params);
$badge = new badge($badgeid);
$badge = new \badge($badgeid);
return $badge->criteria[BADGE_CRITERIA_TYPE_MANUAL];
}
blocks/comments/tests/privacy_provider_test.php → blocks/comments/tests/privacy/provider_test.php
+30 -29
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Shamim Rezaie <shamim@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace block_comments\privacy;
use core_privacy\local\metadata\collection;
use block_comments\privacy\provider;
@@ -29,12 +30,12 @@ use core_privacy\local\request\approved_userlist;
defined('MOODLE_INTERNAL') || die();
/**
* Class block_comments_privacy_provider_testcase.
* Privacy provider test for block_comments.
*
* @copyright 2018 Shamim Rezaie <shamim@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class block_comments_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/** @var stdClass A student who is only enrolled in course1. */
protected $student1;
@@ -74,8 +75,8 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
$generator->enrol_user($this->student12->id, $this->course2->id, $studentrole->id);
// Comment block on course pages.
$block = $this->add_comments_block_in_context(context_course::instance($this->course1->id));
$block = $this->add_comments_block_in_context(context_course::instance($this->course2->id));
$block = $this->add_comments_block_in_context(\context_course::instance($this->course1->id));
$block = $this->add_comments_block_in_context(\context_course::instance($this->course2->id));
}
/**
@@ -84,8 +85,8 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
* @param string $text The comment's text.
* @param context $context The context on which we want to put the comment.
*/
protected function add_comment($text, context $context) {
$args = new stdClass;
protected function add_comment($text, \context $context) {
$args = new \stdClass;
$args->context = $context;
$args->area = 'page_comments';
$args->itemid = 0;
@@ -94,7 +95,7 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
$args->notoggle = true;
$args->autostart = true;
$args->displaycancel = false;
$comment = new comment($args);
$comment = new \comment($args);
$comment->add($text);
}
@@ -106,7 +107,7 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
* @return block_base The created block instance.
* @throws coding_exception
*/
protected function add_comments_block_in_context(context $context) {
protected function add_comments_block_in_context(\context $context) {
global $DB;
$course = null;
@@ -185,7 +186,7 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
*/
public function test_get_contexts_for_userid_no_comment() {
$this->setUser($this->student1);
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$this->add_comment('New comment', $coursecontext1);
$this->setUser($this->student2);
@@ -197,8 +198,8 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
* Test for provider::get_contexts_for_userid().
*/
public function test_get_contexts_for_userid() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$this->setUser($this->student12);
$this->add_comment('New comment', $coursecontext1);
@@ -216,8 +217,8 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
* Test for provider::export_user_data() when the user has not posted any comments.
*/
public function test_export_for_context_no_comment() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$this->setUser($this->student1);
$this->add_comment('New comment', $coursecontext1);
@@ -235,8 +236,8 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
* Test for provider::export_user_data().
*/
public function test_export_for_context() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$this->setUser($this->student12);
$this->add_comment('New comment', $coursecontext1);
@@ -255,8 +256,8 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
public function test_delete_data_for_all_users_in_context() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$this->setUser($this->student1);
$this->add_comment('New comment', $coursecontext1);
@@ -310,7 +311,7 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
$submission = $assign->get_user_submission($this->student1->id, true);
$options = new stdClass();
$options = new \stdClass();
$options->area = 'submission_comments';
$options->course = $assign->get_course();
$options->context = $assigncontext;
@@ -319,7 +320,7 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
$options->showcount = true;
$options->displaycancel = true;
$comment = new comment($options);
$comment = new \comment($options);
$comment->set_post_permission(true);
$this->setUser($this->student1);
@@ -361,8 +362,8 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
public function test_delete_data_for_user() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$this->setUser($this->student1);
$this->add_comment('New comment', $coursecontext1);
@@ -426,7 +427,7 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
$submission = $assign->get_user_submission($this->student1->id, true);
$options = new stdClass();
$options = new \stdClass();
$options->area = 'submission_comments';
$options->course = $assign->get_course();
$options->context = $assigncontext;
@@ -435,7 +436,7 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
$options->showcount = true;
$options->displaycancel = true;
$comment = new comment($options);
$comment = new \comment($options);
$comment->set_post_permission(true);
$this->setUser($this->student1);
@@ -474,8 +475,8 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
public function test_get_users_in_context() {
$component = 'block_comments';
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$userlist1 = new \core_privacy\local\request\userlist($coursecontext1, $component);
provider::get_users_in_context($userlist1);
@@ -511,8 +512,8 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
public function test_delete_data_for_users() {
$component = 'block_comments';
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$this->setUser($this->student12);
$this->add_comment('New comment', $coursecontext1);
@@ -563,7 +564,7 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
$submission = $assign->get_user_submission($this->student1->id, true);
$options = new stdClass();
$options = new \stdClass();
$options->area = 'submission_comments';
$options->course = $assign->get_course();
$options->context = $assigncontext;
@@ -572,7 +573,7 @@ class block_comments_privacy_provider_testcase extends \core_privacy\tests\provi
$options->showcount = true;
$options->displaycancel = true;
$comment = new comment($options);
$comment = new \comment($options);
$comment->set_post_permission(true);
$this->setUser($this->student1);
blocks/html/tests/privacy_provider_test.php → blocks/html/tests/privacy/provider_test.php
+6 -5
View File
@@ -22,13 +22,14 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace block_html\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\local\request\writer;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\approved_userlist;
use \block_html\privacy\provider;
use core_privacy\local\request\writer;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\approved_userlist;
use block_html\privacy\provider;
/**
* Unit tests for the block_html implementation of the privacy API.
@@ -36,7 +37,7 @@ use \block_html\privacy\provider;
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class block_html_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Get the list of standard format options for comparison.
*
blocks/myoverview/tests/privacy_test.php → blocks/myoverview/tests/privacy/provider_test.php
+6 -3
View File
@@ -21,16 +21,19 @@
* @copyright 2018 Peter Dias <peter@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace block_myoverview\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\local\request\writer;
use \block_myoverview\privacy\provider;
use core_privacy\local\request\writer;
use block_myoverview\privacy\provider;
/**
* Unit tests for the block_myoverview implementation of the privacy API.
*
* @copyright 2018 Peter Dias <peter@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class block_myoverview_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Ensure that export_user_preferences returns no data if the user has not visited the myoverview block.
*/
blocks/recentlyaccesseditems/tests/privacy_test.php → blocks/recentlyaccesseditems/tests/privacy/provider_test.php
+37 -35
View File
@@ -22,11 +22,13 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @since Moodle 3.6
*/
namespace block_recentlyaccesseditems\privacy;
defined('MOODLE_INTERNAL') || die();
use \block_recentlyaccesseditems\privacy\provider;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\approved_userlist;
use block_recentlyaccesseditems\privacy\provider;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\approved_userlist;
/**
* Block Recently accessed items privacy provider tests.
@@ -36,7 +38,7 @@ use \core_privacy\local\request\approved_userlist;
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @since Moodle 3.6
*/
class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Test getting the context for the user ID related to this plugin.
@@ -46,9 +48,9 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$generator = $this->getDataGenerator();
$student = $generator->create_user();
$studentcontext = context_user::instance($student->id);
$studentcontext = \context_user::instance($student->id);
$teacher = $generator->create_user();
$teachercontext = context_user::instance($teacher->id);
$teachercontext = \context_user::instance($teacher->id);
// Enrol users in course and add course items.
$course = $generator->create_course();
@@ -65,12 +67,12 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
// Generate some recent activity for both users.
$this->setUser($student);
$event = \mod_forum\event\course_module_viewed::create(['context' => context_module::instance($forum->cmid),
$event = \mod_forum\event\course_module_viewed::create(['context' => \context_module::instance($forum->cmid),
'objectid' => $forum->id]);
$event->trigger();
$this->setUser($teacher);
$event = \mod_chat\event\course_module_viewed::create(['context' => context_module::instance($chat->cmid),
$event = \mod_chat\event\course_module_viewed::create(['context' => \context_module::instance($chat->cmid),
'objectid' => $chat->id]);
$event->trigger();
@@ -93,9 +95,9 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$component = 'block_recentlyaccesseditems';
$student = $generator->create_user();
$studentcontext = context_user::instance($student->id);
$studentcontext = \context_user::instance($student->id);
$teacher = $generator->create_user();
$teachercontext = context_user::instance($teacher->id);
$teachercontext = \context_user::instance($teacher->id);
// Enrol users in course and add course items.
$course = $generator->create_course();
@@ -114,18 +116,18 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
// Generate some recent activity for both users.
$this->setUser($student);
$event = \mod_forum\event\course_module_viewed::create(['context' => context_module::instance($forum->cmid),
$event = \mod_forum\event\course_module_viewed::create(['context' => \context_module::instance($forum->cmid),
'objectid' => $forum->id]);
$event->trigger();
$event = \mod_chat\event\course_module_viewed::create(['context' => context_module::instance($chat->cmid),
$event = \mod_chat\event\course_module_viewed::create(['context' => \context_module::instance($chat->cmid),
'objectid' => $chat->id]);
$event->trigger();
$this->setUser($teacher);
$event = \mod_forum\event\course_module_viewed::create(['context' => context_module::instance($forum->cmid),
$event = \mod_forum\event\course_module_viewed::create(['context' => \context_module::instance($forum->cmid),
'objectid' => $forum->id]);
$event->trigger();
$event = \mod_chat\event\course_module_viewed::create(['context' => context_module::instance($chat->cmid),
$event = \mod_chat\event\course_module_viewed::create(['context' => \context_module::instance($chat->cmid),
'objectid' => $chat->id]);
$event->trigger();
@@ -174,7 +176,7 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$component = 'block_recentlyaccesseditems';
$student = $generator->create_user();
$studentcontext = context_user::instance($student->id);
$studentcontext = \context_user::instance($student->id);
// Enrol user in course and add course items.
$course = $generator->create_course();
@@ -184,10 +186,10 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
// Generate some recent activity.
$this->setUser($student);
$event = \mod_forum\event\course_module_viewed::create(['context' => context_module::instance($forum->cmid),
$event = \mod_forum\event\course_module_viewed::create(['context' => \context_module::instance($forum->cmid),
'objectid' => $forum->id]);
$event->trigger();
$event = \mod_chat\event\course_module_viewed::create(['context' => context_module::instance($chat->cmid),
$event = \mod_chat\event\course_module_viewed::create(['context' => \context_module::instance($chat->cmid),
'objectid' => $chat->id]);
$event->trigger();
@@ -209,7 +211,7 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$this->assertTrue($writer->has_any_data());
delete_course($course, false);
$sc = context_user::instance($student->id);
$sc = \context_user::instance($student->id);
$approvedlist = new approved_contextlist($student, $component, [$sc->id]);
provider::export_user_data($approvedlist);
$writer = \core_privacy\local\request\writer::with_context($sc);
@@ -227,7 +229,7 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$component = 'block_recentlyaccesseditems';
$student = $generator->create_user();
$studentcontext = context_user::instance($student->id);
$studentcontext = \context_user::instance($student->id);
// Enrol user in course and add course items.
$course = $generator->create_course();
@@ -237,10 +239,10 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
// Generate some recent activity.
$this->setUser($student);
$event = \mod_forum\event\course_module_viewed::create(['context' => context_module::instance($forum->cmid),
$event = \mod_forum\event\course_module_viewed::create(['context' => \context_module::instance($forum->cmid),
'objectid' => $forum->id]);
$event->trigger();
$event = \mod_chat\event\course_module_viewed::create(['context' => context_module::instance($chat->cmid),
$event = \mod_chat\event\course_module_viewed::create(['context' => \context_module::instance($chat->cmid),
'objectid' => $chat->id]);
$event->trigger();
@@ -273,7 +275,7 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$generator = $this->getDataGenerator();
$student = $generator->create_user();
$studentcontext = context_user::instance($student->id);
$studentcontext = \context_user::instance($student->id);
$teacher = $generator->create_user();
// Enrol users in course and add course items.
@@ -287,10 +289,10 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$users = [$student, $teacher];
foreach ($users as $user) {
$this->setUser($user);
$event = \mod_forum\event\course_module_viewed::create(['context' => context_module::instance($forum->cmid),
$event = \mod_forum\event\course_module_viewed::create(['context' => \context_module::instance($forum->cmid),
'objectid' => $forum->id]);
$event->trigger();
$event = \mod_chat\event\course_module_viewed::create(['context' => context_module::instance($chat->cmid),
$event = \mod_chat\event\course_module_viewed::create(['context' => \context_module::instance($chat->cmid),
'objectid' => $chat->id]);
$event->trigger();
}
@@ -308,7 +310,7 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$this->assertEquals(2, $result);
// Attempt system context deletion (should have no effect).
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
provider::delete_data_for_all_users_in_context($systemcontext);
$params = ['courseid' => $course->id];
@@ -342,9 +344,9 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$component = 'block_recentlyaccesseditems';
$student = $generator->create_user();
$studentcontext = context_user::instance($student->id);
$studentcontext = \context_user::instance($student->id);
$teacher = $generator->create_user();
$teachercontext = context_user::instance($teacher->id);
$teachercontext = \context_user::instance($teacher->id);
// Enrol users in course and add course items.
$course = $generator->create_course();
@@ -357,10 +359,10 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$users = [$student, $teacher];
foreach ($users as $user) {
$this->setUser($user);
$event = \mod_forum\event\course_module_viewed::create(['context' => context_module::instance($forum->cmid),
$event = \mod_forum\event\course_module_viewed::create(['context' => \context_module::instance($forum->cmid),
'objectid' => $forum->id]);
$event->trigger();
$event = \mod_chat\event\course_module_viewed::create(['context' => context_module::instance($chat->cmid),
$event = \mod_chat\event\course_module_viewed::create(['context' => \context_module::instance($chat->cmid),
'objectid' => $chat->id]);
$event->trigger();
}
@@ -378,7 +380,7 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$this->assertEquals(2, $result);
// Attempt system context deletion (should have no effect).
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$approvedlist = new approved_contextlist($teacher, $component, [$systemcontext->id]);
provider::delete_data_for_user($approvedlist);
@@ -422,9 +424,9 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$component = 'block_recentlyaccesseditems';
$student = $generator->create_user();
$studentcontext = context_user::instance($student->id);
$studentcontext = \context_user::instance($student->id);
$teacher = $generator->create_user();
$teachercontext = context_user::instance($teacher->id);
$teachercontext = \context_user::instance($teacher->id);
// Enrol users in course and add course items.
$course = $generator->create_course();
@@ -437,10 +439,10 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$users = [$student, $teacher];
foreach ($users as $user) {
$this->setUser($user);
$event = \mod_forum\event\course_module_viewed::create(['context' => context_module::instance($forum->cmid),
$event = \mod_forum\event\course_module_viewed::create(['context' => \context_module::instance($forum->cmid),
'objectid' => $forum->id]);
$event->trigger();
$event = \mod_chat\event\course_module_viewed::create(['context' => context_module::instance($chat->cmid),
$event = \mod_chat\event\course_module_viewed::create(['context' => \context_module::instance($chat->cmid),
'objectid' => $chat->id]);
$event->trigger();
}
@@ -458,7 +460,7 @@ class block_recentlyaccesseditems_privacy_testcase extends \core_privacy\tests\p
$this->assertEquals(2, $result);
// Attempt system context deletion (should have no effect).
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$approvedlist = new approved_userlist($systemcontext, $component, [$student->id, $teacher->id]);
provider::delete_data_for_users($approvedlist);
blocks/rss_client/tests/privacy_test.php → blocks/rss_client/tests/privacy/provider_test.php
+14 -13
View File
@@ -20,12 +20,13 @@
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace block_rss_client\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\tests\provider_testcase;
use \block_rss_client\privacy\provider;
use \core_privacy\local\request\approved_userlist;
use core_privacy\tests\provider_testcase;
use block_rss_client\privacy\provider;
use core_privacy\local\request\approved_userlist;
/**
* Unit tests for blocks\rss_client\classes\privacy\provider.php
@@ -33,7 +34,7 @@ use \core_privacy\local\request\approved_userlist;
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class block_rss_client_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Basic setup for these tests.
@@ -48,7 +49,7 @@ class block_rss_client_testcase extends provider_testcase {
public function test_get_contexts_for_userid() {
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$this->add_rss_feed($user);
@@ -63,7 +64,7 @@ class block_rss_client_testcase extends provider_testcase {
public function test_export_user_data() {
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$this->add_rss_feed($user);
$this->add_rss_feed($user);
@@ -90,7 +91,7 @@ class block_rss_client_testcase extends provider_testcase {
// Create a user.
$user = $this->getDataGenerator()->create_user();
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
$userlist = new \core_privacy\local\request\userlist($usercontext, $component);
provider::get_users_in_context($userlist);
@@ -106,7 +107,7 @@ class block_rss_client_testcase extends provider_testcase {
$this->assertEquals($expected, $actual);
// The list of users within the system context should be empty.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist2 = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist2);
$this->assertCount(0, $userlist2);
@@ -119,9 +120,9 @@ class block_rss_client_testcase extends provider_testcase {
$component = 'block_rss_client';
$user1 = $this->getDataGenerator()->create_user();
$usercontext1 = context_user::instance($user1->id);
$usercontext1 = \context_user::instance($user1->id);
$user2 = $this->getDataGenerator()->create_user();
$usercontext2 = context_user::instance($user2->id);
$usercontext2 = \context_user::instance($user2->id);
$this->add_rss_feed($user1);
$this->add_rss_feed($user2);
@@ -158,7 +159,7 @@ class block_rss_client_testcase extends provider_testcase {
$this->assertCount(1, $userlist2);
// Convert $userlist2 into an approved_contextlist in the system context.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$approvedlist2 = new approved_userlist($systemcontext, $component, $userlist2->get_userids());
// Delete using delete_data_for_user.
provider::delete_data_for_users($approvedlist2);
@@ -176,7 +177,7 @@ class block_rss_client_testcase extends provider_testcase {
global $DB;
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$this->add_rss_feed($user);
@@ -198,7 +199,7 @@ class block_rss_client_testcase extends provider_testcase {
global $DB;
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$this->add_rss_feed($user);
blocks/tests/privacy_test.php → blocks/tests/privacy/provider_test.php
+25 -24
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_block\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -42,7 +43,7 @@ use core_block\privacy\provider;
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_block_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
$this->resetAfterTest();
@@ -54,10 +55,10 @@ class core_block_privacy_testcase extends provider_testcase {
$c2 = $dg->create_course();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$manager = $this->get_block_manager(['region-a'], $c1ctx);
$manager->add_block('myprofile', 'region-a', 0, false);
@@ -104,7 +105,7 @@ class core_block_privacy_testcase extends provider_testcase {
$course = $this->getDataGenerator()->create_course();
$manager = $this->get_block_manager(['region-a'], context_course::instance($course->id));
$manager = $this->get_block_manager(['region-a'], \context_course::instance($course->id));
$manager->add_block('myprofile', 'region-a', 0, false);
$manager->load_blocks();
$blockmyprofile = $manager->get_blocks_for_region('region-a')[0];
@@ -116,7 +117,7 @@ class core_block_privacy_testcase extends provider_testcase {
$records = $DB->get_records('block_instances', ['blockname' => 'myprofile']);
$record = array_shift($records);
$blockcontext = context_block::instance($record->id);
$blockcontext = \context_block::instance($record->id);
$userlist = new \core_privacy\local\request\userlist($blockcontext, 'core_block');
provider::get_users_in_context($userlist);
@@ -131,10 +132,10 @@ class core_block_privacy_testcase extends provider_testcase {
$c2 = $dg->create_course();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$manager = $this->get_block_manager(['region-a'], $c1ctx);
$manager->add_block('myprofile', 'region-a', 0, false);
@@ -201,10 +202,10 @@ class core_block_privacy_testcase extends provider_testcase {
$c2 = $dg->create_course();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$manager = $this->get_block_manager(['region-a'], $c1ctx);
$manager->add_block('myprofile', 'region-a', 0, false);
@@ -308,7 +309,7 @@ class core_block_privacy_testcase extends provider_testcase {
$course = $this->getDataGenerator()->create_course();
$manager = $this->get_block_manager(['region-a'], context_course::instance($course->id));
$manager = $this->get_block_manager(['region-a'], \context_course::instance($course->id));
$manager->add_block('myprofile', 'region-a', 0, false);
$manager->load_blocks();
$blockmyprofile = $manager->get_blocks_for_region('region-a')[0];
@@ -320,7 +321,7 @@ class core_block_privacy_testcase extends provider_testcase {
$records = $DB->get_records('block_instances', ['blockname' => 'myprofile']);
$record = array_shift($records);
$blockcontext = context_block::instance($record->id);
$blockcontext = \context_block::instance($record->id);
$userlist = new \core_privacy\local\request\userlist($blockcontext, 'core_block');
provider::get_users_in_context($userlist);
@@ -345,10 +346,10 @@ class core_block_privacy_testcase extends provider_testcase {
$c2 = $dg->create_course();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$yes = transform::yesno(true);
$no = transform::yesno(false);
@@ -398,13 +399,13 @@ class core_block_privacy_testcase extends provider_testcase {
* @return block_manager
*/
protected function get_block_manager($regions, $context, $pagetype = 'page-type', $subpage = '') {
$page = new moodle_page();
$page = new \moodle_page();
$page->set_context($context);
$page->set_pagetype($pagetype);
$page->set_subpage($subpage);
$page->set_url(new moodle_url('/'));
$page->set_url(new \moodle_url('/'));
$blockmanager = new block_manager($page);
$blockmanager = new \block_manager($page);
$blockmanager->add_regions($regions, false);
$blockmanager->set_default_region($regions[0]);
blocks/timeline/tests/privacy_test.php → blocks/timeline/tests/privacy/provider_test.php
+4 -3
View File
@@ -22,11 +22,12 @@
* @copyright 2018 Peter Dias <peter@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace block_timeline\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\local\request\writer;
use \block_timeline\privacy\provider;
use core_privacy\local\request\writer;
use block_timeline\privacy\provider;
/**
* Unit tests for the block_timeline implementation of the privacy API.
@@ -34,7 +35,7 @@ use \block_timeline\privacy\provider;
* @copyright 2018 Peter Dias <peter@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class block_timeline_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Ensure that export_user_preferences returns no data if the user has not visited the myoverview block.
blog/tests/privacy_test.php → blog/tests/privacy/provider_test.php
+96 -95
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_blog\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -45,7 +46,7 @@ require_once($CFG->dirroot . '/comment/lib.php');
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_blog_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
$this->resetAfterTest();
@@ -61,7 +62,7 @@ class core_blog_privacy_testcase extends provider_testcase {
$cm2a = $dg->create_module('page', ['course' => $c2]);
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u1ctx = \context_user::instance($u1->id);
// Blog share a table with notes, so throw data in there and make sure it doesn't get reported.
$dg->get_plugin_generator('core_notes')->create_instance(['userid' => $u1->id, 'courseid' => $c3->id]);
@@ -78,23 +79,23 @@ class core_blog_privacy_testcase extends provider_testcase {
// Create a blog post associated with c1.
$post = $this->create_post(['userid' => $u1->id, 'courseid' => $c1->id]);
$entry = new blog_entry($post->id);
$entry->add_association(context_course::instance($c1->id)->id);
$entry = new \blog_entry($post->id);
$entry->add_association(\context_course::instance($c1->id)->id);
$contextids = provider::get_contexts_for_userid($u1->id)->get_contextids();
$this->assertCount(2, $contextids);
$this->assertTrue(in_array($u1ctx->id, $contextids));
$this->assertTrue(in_array(context_course::instance($c1->id)->id, $contextids));
$this->assertTrue(in_array(\context_course::instance($c1->id)->id, $contextids));
$this->assertEmpty(provider::get_contexts_for_userid($u2->id)->get_contextids());
// Create a blog post associated with cm2a.
$post = $this->create_post(['userid' => $u1->id, 'courseid' => $c2->id]);
$entry = new blog_entry($post->id);
$entry->add_association(context_module::instance($cm2a->cmid)->id);
$entry = new \blog_entry($post->id);
$entry->add_association(\context_module::instance($cm2a->cmid)->id);
$contextids = provider::get_contexts_for_userid($u1->id)->get_contextids();
$this->assertCount(3, $contextids);
$this->assertTrue(in_array($u1ctx->id, $contextids));
$this->assertTrue(in_array(context_course::instance($c1->id)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm2a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_course::instance($c1->id)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm2a->cmid)->id, $contextids));
$this->assertEmpty(provider::get_contexts_for_userid($u2->id)->get_contextids());
// User 2 comments on u1's post.
@@ -104,8 +105,8 @@ class core_blog_privacy_testcase extends provider_testcase {
$contextids = provider::get_contexts_for_userid($u1->id)->get_contextids();
$this->assertCount(3, $contextids);
$this->assertTrue(in_array($u1ctx->id, $contextids));
$this->assertTrue(in_array(context_course::instance($c1->id)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm2a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_course::instance($c1->id)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm2a->cmid)->id, $contextids));
$contextids = provider::get_contexts_for_userid($u2->id)->get_contextids();
$this->assertCount(1, $contextids);
$this->assertTrue(in_array($u1ctx->id, $contextids));
@@ -115,18 +116,18 @@ class core_blog_privacy_testcase extends provider_testcase {
$dg = $this->getDataGenerator();
$c1 = $dg->create_course();
$u1 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u1ctx = \context_user::instance($u1->id);
$this->assertEmpty(provider::get_contexts_for_userid($u1->id)->get_contextids());
// Create a blog post associated with c1. It should always return both the course and user context.
$post = $this->create_post(['userid' => $u1->id, 'courseid' => $c1->id]);
$entry = new blog_entry($post->id);
$entry->add_association(context_course::instance($c1->id)->id);
$entry = new \blog_entry($post->id);
$entry->add_association(\context_course::instance($c1->id)->id);
$contextids = provider::get_contexts_for_userid($u1->id)->get_contextids();
$this->assertCount(2, $contextids);
$this->assertTrue(in_array($u1ctx->id, $contextids));
$this->assertTrue(in_array(context_course::instance($c1->id)->id, $contextids));
$this->assertTrue(in_array(\context_course::instance($c1->id)->id, $contextids));
}
/**
@@ -136,14 +137,14 @@ class core_blog_privacy_testcase extends provider_testcase {
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$course = $this->getDataGenerator()->create_course();
$c1ctx = context_course::instance($course->id);
$c1ctx = \context_course::instance($course->id);
$post = $this->create_post(['userid' => $user1->id, 'courseid' => $course->id]);
$entry = new blog_entry($post->id);
$entry = new \blog_entry($post->id);
$entry->add_association($c1ctx->id);
// Add a comment from user 2.
$comment = $this->get_comment_object(context_user::instance($user1->id), $entry->id);
$comment = $this->get_comment_object(\context_user::instance($user1->id), $entry->id);
$this->setUser($user2);
$comment->add('Nice blog post');
@@ -154,10 +155,10 @@ class core_blog_privacy_testcase extends provider_testcase {
// Add an association for a module.
$cm1a = $this->getDataGenerator()->create_module('page', ['course' => $course]);
$cm1ctx = context_module::instance($cm1a->cmid);
$cm1ctx = \context_module::instance($cm1a->cmid);
$post2 = $this->create_post(['userid' => $user2->id, 'courseid' => $course->id]);
$entry2 = new blog_entry($post2->id);
$entry2 = new \blog_entry($post2->id);
$entry2->add_association($cm1ctx->id);
$userlist = new \core_privacy\local\request\userlist($cm1ctx, 'core_blog');
@@ -172,10 +173,10 @@ class core_blog_privacy_testcase extends provider_testcase {
public function test_get_users_in_context_user_context() {
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$u1ctx = context_user::instance($user1->id);
$u1ctx = \context_user::instance($user1->id);
$post = $this->create_post(['userid' => $user1->id]);
$entry = new blog_entry($post->id);
$entry = new \blog_entry($post->id);
// Add a comment from user 2.
$comment = $this->get_comment_object($u1ctx, $entry->id);
@@ -193,7 +194,7 @@ class core_blog_privacy_testcase extends provider_testcase {
*/
public function test_get_users_in_context_external_blog() {
$user1 = $this->getDataGenerator()->create_user();
$u1ctx = context_user::instance($user1->id);
$u1ctx = \context_user::instance($user1->id);
$extu1 = $this->create_external_blog(['userid' => $user1->id]);
$userlist = new \core_privacy\local\request\userlist($u1ctx, 'core_blog');
@@ -215,13 +216,13 @@ class core_blog_privacy_testcase extends provider_testcase {
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$cm1actx = context_module::instance($cm1a->cmid);
$cm1bctx = context_module::instance($cm1b->cmid);
$cm2actx = context_module::instance($cm2a->cmid);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$cm1actx = \context_module::instance($cm1a->cmid);
$cm1bctx = \context_module::instance($cm1b->cmid);
$cm2actx = \context_module::instance($cm2a->cmid);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
// Blog share a table with notes, so throw data in there and make sure it doesn't get deleted.
$this->assertFalse($DB->record_exists('post', ['courseid' => $c1->id, 'userid' => $u1->id, 'module' => 'notes']));
@@ -233,36 +234,36 @@ class core_blog_privacy_testcase extends provider_testcase {
$extu2 = $this->create_external_blog(['userid' => $u2->id]);
// Create a set of posts.
$entry = new blog_entry($this->create_post(['userid' => $u1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id])->id);
$commentedon = $entry;
$entry = new blog_entry($this->create_post(['userid' => $u2->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u2->id])->id);
// Two course associations for u1.
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($c1ctx->id);
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($c1ctx->id);
// Two module associations with cm1a, and 1 with cm1b for u1.
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($cm1actx->id);
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($cm1actx->id);
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($cm1bctx->id);
// One association for u2 in c1, cm1a and cm2a.
$entry = new blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id])->id);
$entry->add_association($c1ctx->id);
$entry = new blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id])->id);
$entry->add_association($cm1actx->id);
$entry = new blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c2->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c2->id])->id);
$entry->add_association($cm2actx->id);
// One association for u1 in c2 and cm2a.
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c2->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c2->id])->id);
$entry->add_association($c2ctx->id);
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c2->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c2->id])->id);
$entry->add_association($cm2actx->id);
// Add comments.
@@ -380,10 +381,10 @@ class core_blog_privacy_testcase extends provider_testcase {
$user = $this->getDataGenerator()->create_user();
$course = $this->getDataGenerator()->create_course();
$context = context_course::instance($course->id);
$context = \context_course::instance($course->id);
// Create a blog entry for user, associated with course.
$entry = new blog_entry($this->create_post(['userid' => $user->id, 'courseid' => $course->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $user->id, 'courseid' => $course->id])->id);
$entry->add_association($context->id);
// Generate list of contexts for user.
@@ -413,45 +414,45 @@ class core_blog_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$cm1actx = context_module::instance($cm1a->cmid);
$cm1bctx = context_module::instance($cm1b->cmid);
$cm2actx = context_module::instance($cm2a->cmid);
$u1ctx = context_user::instance($u1->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$cm1actx = \context_module::instance($cm1a->cmid);
$cm1bctx = \context_module::instance($cm1b->cmid);
$cm2actx = \context_module::instance($cm2a->cmid);
$u1ctx = \context_user::instance($u1->id);
// Create two external blogs.
$extu1 = $this->create_external_blog(['userid' => $u1->id]);
$extu2 = $this->create_external_blog(['userid' => $u2->id]);
// Create a set of posts.
$entry = new blog_entry($this->create_post(['userid' => $u1->id])->id);
$entry = new blog_entry($this->create_post(['userid' => $u2->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u2->id])->id);
// Course associations for u1 and u2.
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($c1ctx->id);
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($c1ctx->id);
$entry = new blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id])->id);
$entry->add_association($c1ctx->id);
// Module associations for u1 and u2.
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($cm1actx->id);
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($cm1actx->id);
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id])->id);
$entry->add_association($cm1bctx->id);
$entry = new blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id])->id);
$entry->add_association($cm1actx->id);
// Foreign associations for u1, u2.
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c2->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c2->id])->id);
$entry->add_association($c2ctx->id);
$entry = new blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c2->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c2->id])->id);
$entry->add_association($c2ctx->id);
$entry = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $cm2a->id])->id);
$entry = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $cm2a->id])->id);
$entry->add_association($cm2actx->id);
// Validate what we've got.
@@ -547,31 +548,31 @@ class core_blog_privacy_testcase extends provider_testcase {
$cm1b = $dg->create_module('page', ['course' => $c1]);
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$cm1actx = context_module::instance($cm1a->cmid);
$cm1bctx = context_module::instance($cm1b->cmid);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$cm1actx = \context_module::instance($cm1a->cmid);
$cm1bctx = \context_module::instance($cm1b->cmid);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
// System entries.
$e1 = new blog_entry($this->create_post(['userid' => $u1->id, 'subject' => 'Hello world!',
$e1 = new \blog_entry($this->create_post(['userid' => $u1->id, 'subject' => 'Hello world!',
'publishstate' => 'public'])->id);
$e2 = new blog_entry($this->create_post(['userid' => $u1->id, 'subject' => 'Hi planet!',
$e2 = new \blog_entry($this->create_post(['userid' => $u1->id, 'subject' => 'Hi planet!',
'publishstate' => 'draft'])->id);
$e3 = new blog_entry($this->create_post(['userid' => $u2->id, 'subject' => 'Ignore me'])->id);
$e3 = new \blog_entry($this->create_post(['userid' => $u2->id, 'subject' => 'Ignore me'])->id);
// Create a blog entry associated with contexts.
$e4 = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id, 'subject' => 'Course assoc'])->id);
$e4 = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id, 'subject' => 'Course assoc'])->id);
$e4->add_association($c1ctx->id);
$e4b = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id, 'subject' => 'Course assoc 2'])->id);
$e4b = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id, 'subject' => 'Course assoc 2'])->id);
$e4b->add_association($c1ctx->id);
$e5 = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id, 'subject' => 'Module assoc',
$e5 = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id, 'subject' => 'Module assoc',
'publishstate' => 'public'])->id);
$e5->add_association($cm1actx->id);
$e5b = new blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id, 'subject' => 'C/CM assoc'])->id);
$e5b = new \blog_entry($this->create_post(['userid' => $u1->id, 'courseid' => $c1->id, 'subject' => 'C/CM assoc'])->id);
$e5b->add_association($c1ctx->id);
$e5b->add_association($cm1actx->id);
$e6 = new blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id, 'subject' => 'Module assoc'])->id);
$e6 = new \blog_entry($this->create_post(['userid' => $u2->id, 'courseid' => $c1->id, 'subject' => 'Module assoc'])->id);
$e6->add_association($cm1actx->id);
// External blogs.
@@ -580,11 +581,11 @@ class core_blog_privacy_testcase extends provider_testcase {
$ex3 = $this->create_external_blog(['userid' => $u2->id, 'url' => 'https://example.com', 'name' => 'Ignore me']);
// Attach tags.
core_tag_tag::set_item_tags('core', 'post', $e1->id, $u1ctx, ['Beer', 'Golf']);
core_tag_tag::set_item_tags('core', 'blog_external', $ex1->id, $u1ctx, ['Car', 'Golf']);
core_tag_tag::set_item_tags('core', 'post', $e3->id, $u2ctx, ['ITG']);
core_tag_tag::set_item_tags('core', 'blog_external', $ex3->id, $u2ctx, ['DDR']);
core_tag_tag::set_item_tags('core', 'dontfindme', $e1->id, $u1ctx, ['Lone tag']);
\core_tag_tag::set_item_tags('core', 'post', $e1->id, $u1ctx, ['Beer', 'Golf']);
\core_tag_tag::set_item_tags('core', 'blog_external', $ex1->id, $u1ctx, ['Car', 'Golf']);
\core_tag_tag::set_item_tags('core', 'post', $e3->id, $u2ctx, ['ITG']);
\core_tag_tag::set_item_tags('core', 'blog_external', $ex3->id, $u2ctx, ['DDR']);
\core_tag_tag::set_item_tags('core', 'dontfindme', $e1->id, $u1ctx, ['Lone tag']);
// Attach comments.
$comment = $this->get_comment_object($u1ctx, $e1->id);
@@ -745,10 +746,10 @@ class core_blog_privacy_testcase extends provider_testcase {
$u4 = $this->getDataGenerator()->create_user();
$u5 = $this->getDataGenerator()->create_user();
$u1ctx = context_user::instance($u1->id);
$u1ctx = \context_user::instance($u1->id);
$post = $this->create_post(['userid' => $u1->id]);
$entry = new blog_entry($post->id);
$entry = new \blog_entry($post->id);
$comment = $this->get_comment_object($u1ctx, $entry->id);
$this->setUser($u1);
@@ -785,8 +786,8 @@ class core_blog_privacy_testcase extends provider_testcase {
$u1 = $this->getDataGenerator()->create_user();
$u2 = $this->getDataGenerator()->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$post = $this->create_external_blog(['userid' => $u1->id, 'url' => 'https://moodle.org', 'name' => 'Moodle RSS']);
$post2 = $this->create_external_blog(['userid' => $u2->id, 'url' => 'https://moodle.com', 'name' => 'Some other thing']);
@@ -811,19 +812,19 @@ class core_blog_privacy_testcase extends provider_testcase {
$course = $this->getDataGenerator()->create_course();
$module = $this->getDataGenerator()->create_module('page', ['course' => $course]);
$u1ctx = context_user::instance($u1->id);
$u3ctx = context_user::instance($u3->id);
$c1ctx = context_course::instance($course->id);
$cm1ctx = context_module::instance($module->cmid);
$u1ctx = \context_user::instance($u1->id);
$u3ctx = \context_user::instance($u3->id);
$c1ctx = \context_course::instance($course->id);
$cm1ctx = \context_module::instance($module->cmid);
// Blog with course association.
$post1 = $this->create_post(['userid' => $u1->id, 'courseid' => $course->id]);
$entry1 = new blog_entry($post1->id);
$entry1 = new \blog_entry($post1->id);
$entry1->add_association($c1ctx->id);
// Blog with module association.
$post2 = $this->create_post(['userid' => $u3->id, 'courseid' => $course->id]);
$entry2 = new blog_entry($post2->id);
$entry2 = new \blog_entry($post2->id);
$entry2->add_association($cm1ctx->id);
$comment = $this->get_comment_object($u1ctx, $entry1->id);
@@ -870,7 +871,7 @@ class core_blog_privacy_testcase extends provider_testcase {
*/
protected function create_post(array $params) {
global $DB;
$post = new stdClass();
$post = new \stdClass();
$post->module = 'blog';
$post->courseid = 0;
$post->subject = 'the test post';
@@ -895,7 +896,7 @@ class core_blog_privacy_testcase extends provider_testcase {
*/
protected function create_external_blog(array $params) {
global $DB;
$post = new stdClass();
$post = new \stdClass();
$post->name = 'test external';
$post->description = 'the description';
$post->url = 'http://example.com';
@@ -918,14 +919,14 @@ class core_blog_privacy_testcase extends provider_testcase {
* @param string $area The area.
* @return comment
*/
protected function get_comment_object(context $context, $itemid) {
$args = new stdClass();
protected function get_comment_object(\context $context, $itemid) {
$args = new \stdClass();
$args->context = $context;
$args->course = get_course(SITEID);
$args->area = 'format_blog';
$args->itemid = $itemid;
$args->component = 'blog';
$comment = new comment($args);
$comment = new \comment($args);
$comment->set_post_permission(true);
return $comment;
}
calendar/tests/privacy_test.php → calendar/tests/privacy/provider_test.php
+42 -41
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_calendar\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -29,12 +30,12 @@ global $CFG;
require_once($CFG->dirroot . '/calendar/lib.php');
require_once($CFG->dirroot . '/calendar/tests/externallib_test.php');
use \core_calendar\privacy\provider;
use \core_privacy\local\metadata\collection;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\writer;
use \core_privacy\tests\provider_testcase;
use \core_privacy\local\request\approved_userlist;
use core_calendar\privacy\provider;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\writer;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\approved_userlist;
/**
* Unit tests for calendar/classes/privacy/provider
@@ -42,7 +43,7 @@ use \core_privacy\local\request\approved_userlist;
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_calendar_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Overriding setUp() function to always reset after tests.
@@ -73,11 +74,11 @@ class core_calendar_privacy_testcase extends provider_testcase {
$course3group = $this->getDataGenerator()->create_group($grouprecord);
// Get contexts.
$usercontext = context_user::instance($user->id);
$categorycontext = context_coursecat::instance($category->id);
$course1context = context_course::instance($course1->id);
$course2context = context_course::instance($course2->id);
$course3context = context_course::instance($course3->id);
$usercontext = \context_user::instance($user->id);
$categorycontext = \context_coursecat::instance($category->id);
$course1context = \context_course::instance($course1->id);
$course2context = \context_course::instance($course2->id);
$course3context = \context_course::instance($course3->id);
// Add Category Calendar Events for Category.
$this->create_test_standard_calendar_event('category', $user->id, time(), '', $category->id);
@@ -97,8 +98,8 @@ class core_calendar_privacy_testcase extends provider_testcase {
$params['assignsubmission_onlinetext_enabled'] = 1;
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
$modulecontext = context_module::instance($cm->id);
$assign = new assign($modulecontext, $cm, $course2);
$modulecontext = \context_module::instance($cm->id);
$assign = new \assign($modulecontext, $cm, $course2);
$this->create_test_action_calendar_event('duedate', $course2->id, $instance->id, 'assign', $user->id, time());
$this->create_test_action_calendar_event('gradingduedate', $course2->id, $instance->id, 'assign', $user->id, time());
@@ -163,8 +164,8 @@ class core_calendar_privacy_testcase extends provider_testcase {
$params['assignsubmission_onlinetext_enabled'] = 1;
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
$modulecontext = context_module::instance($cm->id);
$assign = new assign($modulecontext, $cm, $course2);
$modulecontext = \context_module::instance($cm->id);
$assign = new \assign($modulecontext, $cm, $course2);
$event5 = $this->create_test_action_calendar_event('duedate', $course2->id, $instance->id, 'assign', $user->id, time());
// Add a Calendar Subscription and Group Calendar Event to Course 3.
@@ -289,7 +290,7 @@ class core_calendar_privacy_testcase extends provider_testcase {
// Test the user preferences export contains 1 user preference record for the User.
provider::export_user_preferences($user->id);
$contextuser = context_user::instance($user->id);
$contextuser = \context_user::instance($user->id);
$writer = writer::with_context($contextuser);
$this->assertTrue($writer->has_any_data());
@@ -315,8 +316,8 @@ class core_calendar_privacy_testcase extends provider_testcase {
$course2 = $this->getDataGenerator()->create_course();
// Get contexts.
$course1context = context_course::instance($course1->id);
$course2context = context_course::instance($course2->id);
$course1context = \context_course::instance($course1->id);
$course2context = \context_course::instance($course2->id);
// Add a Course Calendar Event by User 1 for Course 1 and Course 2.
$this->setUser($user1);
@@ -340,8 +341,8 @@ class core_calendar_privacy_testcase extends provider_testcase {
$params['assignsubmission_onlinetext_enabled'] = 1;
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
$modulecontext = context_module::instance($cm->id);
$assign = new assign($modulecontext, $cm, $course2);
$modulecontext = \context_module::instance($cm->id);
$assign = new \assign($modulecontext, $cm, $course2);
$this->create_test_action_calendar_event('duedate', $course2->id, $instance->id, 'assign', $user2->id, time());
$this->create_test_action_calendar_event('gradingduedate', $course2->id, $instance->id, 'assign', $user2->id, time());
@@ -449,23 +450,23 @@ class core_calendar_privacy_testcase extends provider_testcase {
// Create user1 to create Calendar Events and Subscriptions.
$user1 = $this->getDataGenerator()->create_user();
$usercontext1 = context_user::instance($user1->id);
$usercontext1 = \context_user::instance($user1->id);
// Create user2 to create Calendar Events and Subscriptions.
$user2 = $this->getDataGenerator()->create_user();
$usercontext2 = context_user::instance($user2->id);
$usercontext2 = \context_user::instance($user2->id);
// Create user3 to create Calendar Events and Subscriptions.
$user3 = $this->getDataGenerator()->create_user();
$usercontext3 = context_user::instance($user3->id);
$usercontext3 = \context_user::instance($user3->id);
// Create a Category and Courses to assign Calendar Events and Subscriptions.
$category = $this->getDataGenerator()->create_category();
$categorycontext = context_coursecat::instance($category->id);
$categorycontext = \context_coursecat::instance($category->id);
$course1 = $this->getDataGenerator()->create_course();
$course1context = context_course::instance($course1->id);
$course1context = \context_course::instance($course1->id);
$course2 = $this->getDataGenerator()->create_course();
$course2context = context_course::instance($course2->id);
$course2context = \context_course::instance($course2->id);
$course3 = $this->getDataGenerator()->create_course();
$course3context = context_course::instance($course3->id);
$course3context = \context_course::instance($course3->id);
$grouprecord = (object)[
'courseid' => $course3->id,
'name' => 'test_group'
@@ -505,8 +506,8 @@ class core_calendar_privacy_testcase extends provider_testcase {
$params['assignsubmission_onlinetext_enabled'] = 1;
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
$modulecontext = context_module::instance($cm->id);
$assign = new assign($modulecontext, $cm, $course2);
$modulecontext = \context_module::instance($cm->id);
$assign = new \assign($modulecontext, $cm, $course2);
$this->setUser($user2);
$this->create_test_action_calendar_event('duedate', $course2->id, $instance->id,
'assign', $user2->id, time());
@@ -571,23 +572,23 @@ class core_calendar_privacy_testcase extends provider_testcase {
// Create user1 to create Calendar Events and Subscriptions.
$user1 = $this->getDataGenerator()->create_user();
$usercontext1 = context_user::instance($user1->id);
$usercontext1 = \context_user::instance($user1->id);
// Create user2 to create Calendar Events and Subscriptions.
$user2 = $this->getDataGenerator()->create_user();
$usercontext2 = context_user::instance($user2->id);
$usercontext2 = \context_user::instance($user2->id);
// Create user3 to create Calendar Events and Subscriptions.
$user3 = $this->getDataGenerator()->create_user();
$usercontext3 = context_user::instance($user3->id);
$usercontext3 = \context_user::instance($user3->id);
// Create a Category and Courses to assign Calendar Events and Subscriptions.
$category = $this->getDataGenerator()->create_category();
$categorycontext = context_coursecat::instance($category->id);
$categorycontext = \context_coursecat::instance($category->id);
$course1 = $this->getDataGenerator()->create_course();
$course1context = context_course::instance($course1->id);
$course1context = \context_course::instance($course1->id);
$course2 = $this->getDataGenerator()->create_course();
$course2context = context_course::instance($course2->id);
$course2context = \context_course::instance($course2->id);
$course3 = $this->getDataGenerator()->create_course();
$course3context = context_course::instance($course3->id);
$course3context = \context_course::instance($course3->id);
$grouprecord = (object)[
'courseid' => $course3->id,
'name' => 'test_group'
@@ -627,8 +628,8 @@ class core_calendar_privacy_testcase extends provider_testcase {
$params['assignsubmission_onlinetext_enabled'] = 1;
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
$modulecontext = context_module::instance($cm->id);
$assign = new assign($modulecontext, $cm, $course2);
$modulecontext = \context_module::instance($cm->id);
$assign = new \assign($modulecontext, $cm, $course2);
$this->setUser($user2);
$this->create_test_action_calendar_event('duedate', $course2->id, $instance->id,
'assign', $user2->id, time());
@@ -770,7 +771,7 @@ class core_calendar_privacy_testcase extends provider_testcase {
'timestart' => $time,
'visible' => 1
];
return calendar_event::create($event, false);
return \calendar_event::create($event, false);
}
/**
@@ -800,7 +801,7 @@ class core_calendar_privacy_testcase extends provider_testcase {
'timestart' => $time,
'visible' => 1
];
return calendar_event::create($event, false);
return \calendar_event::create($event, false);
}
/**
cohort/tests/privacy_test.php → cohort/tests/privacy/provider_test.php
+2 -1
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_cohort\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -37,7 +38,7 @@ use core_privacy\local\request\approved_userlist;
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_cohort_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Basic setup for these tests.
comment/tests/privacy_test.php → comment/tests/privacy/provider_test.php
+30 -27
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_comment\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -28,7 +29,9 @@ global $CFG;
require_once($CFG->dirroot . '/comment/locallib.php');
require_once($CFG->dirroot . '/comment/lib.php');
use \core_privacy\tests\provider_testcase;
use core_privacy\local\request\approved_userlist;
use core_privacy\tests\provider_testcase;
use core_privacy\tests\request\approved_contextlist;
/**
* Unit tests for comment/classes/privacy/policy
@@ -36,7 +39,7 @@ use \core_privacy\tests\provider_testcase;
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_comment_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
protected function setUp(): void {
$this->resetAfterTest();
@@ -47,7 +50,7 @@ class core_comment_privacy_testcase extends provider_testcase {
*/
public function test_export_comments() {
$course = $this->getDataGenerator()->create_course();
$context = context_course::instance($course->id);
$context = \context_course::instance($course->id);
$comment = $this->get_comment_object($context, $course);
@@ -69,7 +72,7 @@ class core_comment_privacy_testcase extends provider_testcase {
// Retrieve comments only for user1.
$this->setUser($user1);
$writer = \core_privacy\local\request\writer::with_context($context);
\core_comment\privacy\provider::export_comments($context, 'block_comments', 'page_comments', 0, []);
provider::export_comments($context, 'block_comments', 'page_comments', 0, []);
$data = $writer->get_data([get_string('commentsubcontext', 'core_comment')]);
$exportedcomments = $data->comments;
@@ -80,7 +83,7 @@ class core_comment_privacy_testcase extends provider_testcase {
$this->assertEquals($comments[$user1->id], format_string($comment->content, FORMAT_PLAIN));
// Retrieve comments from any user.
\core_comment\privacy\provider::export_comments($context, 'block_comments', 'page_comments', 0, [], false);
provider::export_comments($context, 'block_comments', 'page_comments', 0, [], false);
$data = $writer->get_data([get_string('commentsubcontext', 'core_comment')]);
$exportedcomments = $data->comments;
@@ -101,8 +104,8 @@ class core_comment_privacy_testcase extends provider_testcase {
$course1 = $this->getDataGenerator()->create_course();
$course2 = $this->getDataGenerator()->create_course();
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
@@ -143,7 +146,7 @@ class core_comment_privacy_testcase extends provider_testcase {
$DB->insert_record('comments', $record);
// Delete only for the first context. All records in the comments table for this context should be removed.
\core_comment\privacy\provider::delete_comments_for_all_users($coursecontext1, 'block_comments', 'page_comments', 0);
provider::delete_comments_for_all_users($coursecontext1, 'block_comments', 'page_comments', 0);
// No records left here.
$this->assertCount(0, $comment1->get_comments());
// All of the records are left intact here.
@@ -169,8 +172,8 @@ class core_comment_privacy_testcase extends provider_testcase {
$course1 = $this->getDataGenerator()->create_course();
$course2 = $this->getDataGenerator()->create_course();
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
@@ -212,7 +215,7 @@ class core_comment_privacy_testcase extends provider_testcase {
// Delete only for the first context. All records in the comments table for this context should be removed.
list($sql, $params) = $DB->get_in_or_equal([0, 1, 2, 3], SQL_PARAMS_NAMED);
\core_comment\privacy\provider::delete_comments_for_all_users_select($coursecontext1,
provider::delete_comments_for_all_users_select($coursecontext1,
'block_comments', 'page_comments', $sql, $params);
// No records left here.
$this->assertCount(0, $comment1->get_comments());
@@ -240,9 +243,9 @@ class core_comment_privacy_testcase extends provider_testcase {
$course2 = $this->getDataGenerator()->create_course();
$course3 = $this->getDataGenerator()->create_course();
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext3 = context_course::instance($course3->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$coursecontext3 = \context_course::instance($course3->id);
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
@@ -285,9 +288,9 @@ class core_comment_privacy_testcase extends provider_testcase {
$DB->insert_record('comments', $record);
// Delete the comments for user 1.
$approvedcontextlist = new core_privacy\tests\request\approved_contextlist($user1, 'block_comments',
$approvedcontextlist = new approved_contextlist($user1, 'block_comments',
[$coursecontext1->id, $coursecontext2->id]);
\core_comment\privacy\provider::delete_comments_for_user($approvedcontextlist, 'block_comments', 'page_comments', 0);
provider::delete_comments_for_user($approvedcontextlist, 'block_comments', 'page_comments', 0);
// No comments left in comments 1 as only user 1 commented there.
$this->assertCount(0, $comment1->get_comments());
@@ -323,9 +326,9 @@ class core_comment_privacy_testcase extends provider_testcase {
$course2 = $this->getDataGenerator()->create_course();
$course3 = $this->getDataGenerator()->create_course();
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext3 = context_course::instance($course3->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$coursecontext3 = \context_course::instance($course3->id);
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
@@ -374,14 +377,14 @@ class core_comment_privacy_testcase extends provider_testcase {
// Delete the comments for users 1 and 2 in all 3 contexts.
$approvedusers = [$user1->id, $user2->id];
$approveduserlist = new core_privacy\local\request\approved_userlist($coursecontext1, 'block_comments', $approvedusers);
\core_comment\privacy\provider::delete_comments_for_users($approveduserlist, 'block_comments', 'page_comments');
$approveduserlist = new approved_userlist($coursecontext1, 'block_comments', $approvedusers);
provider::delete_comments_for_users($approveduserlist, 'block_comments', 'page_comments');
$approveduserlist = new core_privacy\local\request\approved_userlist($coursecontext2, 'block_comments', $approvedusers);
\core_comment\privacy\provider::delete_comments_for_users($approveduserlist, 'block_comments', 'page_comments');
$approveduserlist = new approved_userlist($coursecontext2, 'block_comments', $approvedusers);
provider::delete_comments_for_users($approveduserlist, 'block_comments', 'page_comments');
$approveduserlist = new core_privacy\local\request\approved_userlist($coursecontext3, 'block_comments', $approvedusers);
\core_comment\privacy\provider::delete_comments_for_users($approveduserlist, 'block_comments', 'page_comments');
$approveduserlist = new approved_userlist($coursecontext3, 'block_comments', $approvedusers);
provider::delete_comments_for_users($approveduserlist, 'block_comments', 'page_comments');
// No comments left in comments 1 as only user 1 commented there.
$this->assertCount(0, $comment1->get_comments());
@@ -420,13 +423,13 @@ class core_comment_privacy_testcase extends provider_testcase {
*/
protected function get_comment_object($context, $course) {
// Comment on course page.
$args = new stdClass;
$args = new \stdClass;
$args->context = $context;
$args->course = $course;
$args->area = 'page_comments';
$args->itemid = 0;
$args->component = 'block_comments';
$comment = new comment($args);
$comment = new \comment($args);
$comment->set_post_permission(true);
return $comment;
}
competency/tests/privacy_test.php → competency/tests/privacy/provider_test.php
+68 -67
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_competency\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG, $DB;
@@ -46,7 +47,7 @@ use core_competency\privacy\provider;
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_competency_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
global $PAGE;
@@ -67,9 +68,9 @@ class core_competency_privacy_testcase extends provider_testcase {
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$sysctx = context_system::instance();
$cat1ctx = context_coursecat::instance($cat1->id);
$cat2ctx = context_coursecat::instance($cat2->id);
$sysctx = \context_system::instance();
$cat1ctx = \context_coursecat::instance($cat1->id);
$cat2ctx = \context_coursecat::instance($cat2->id);
// Test recovery through framework context.
$this->setUser($u1);
@@ -124,9 +125,9 @@ class core_competency_privacy_testcase extends provider_testcase {
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$sysctx = context_system::instance();
$cat1ctx = context_coursecat::instance($cat1->id);
$cat2ctx = context_coursecat::instance($cat2->id);
$sysctx = \context_system::instance();
$cat1ctx = \context_coursecat::instance($cat1->id);
$cat2ctx = \context_coursecat::instance($cat2->id);
// Add frameworks.
$this->setUser($u1);
@@ -181,9 +182,9 @@ class core_competency_privacy_testcase extends provider_testcase {
$u4 = $dg->create_user();
$cohort = $dg->create_cohort();
$sysctx = context_system::instance();
$cat1ctx = context_coursecat::instance($cat1->id);
$cat2ctx = context_coursecat::instance($cat2->id);
$sysctx = \context_system::instance();
$cat1ctx = \context_coursecat::instance($cat1->id);
$cat2ctx = \context_coursecat::instance($cat2->id);
$f1 = $ccg->create_framework();
$f2 = $ccg->create_framework(['contextid' => $cat1ctx->id]);
@@ -244,9 +245,9 @@ class core_competency_privacy_testcase extends provider_testcase {
$u4 = $dg->create_user();
$cohort = $dg->create_cohort();
$sysctx = context_system::instance();
$cat1ctx = context_coursecat::instance($cat1->id);
$cat2ctx = context_coursecat::instance($cat2->id);
$sysctx = \context_system::instance();
$cat1ctx = \context_coursecat::instance($cat1->id);
$cat2ctx = \context_coursecat::instance($cat2->id);
$f1 = $ccg->create_framework();
$f2 = $ccg->create_framework(['contextid' => $cat1ctx->id]);
@@ -305,8 +306,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -356,8 +357,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -399,8 +400,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$m2 = $dg->create_module('choice', ['course' => $c1]);
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$m1ctx = context_module::instance($m1->cmid);
$m2ctx = context_module::instance($m2->cmid);
$m1ctx = \context_module::instance($m1->cmid);
$m2ctx = \context_module::instance($m2->cmid);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -432,8 +433,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$m2 = $dg->create_module('choice', ['course' => $c1]);
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$m1ctx = context_module::instance($m1->cmid);
$m2ctx = context_module::instance($m2->cmid);
$m1ctx = \context_module::instance($m1->cmid);
$m2ctx = \context_module::instance($m2->cmid);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -467,7 +468,7 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u0ctx = context_user::instance($u0->id);
$u0ctx = \context_user::instance($u0->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -503,7 +504,7 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u0ctx = context_user::instance($u0->id);
$u0ctx = \context_user::instance($u0->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -540,7 +541,7 @@ class core_competency_privacy_testcase extends provider_testcase {
$u6 = $dg->create_user();
$u7 = $dg->create_user();
$u8 = $dg->create_user();
$u0ctx = context_user::instance($u0->id);
$u0ctx = \context_user::instance($u0->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -618,7 +619,7 @@ class core_competency_privacy_testcase extends provider_testcase {
$u6 = $dg->create_user();
$u7 = $dg->create_user();
$u8 = $dg->create_user();
$u0ctx = context_user::instance($u0->id);
$u0ctx = \context_user::instance($u0->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -666,11 +667,11 @@ class core_competency_privacy_testcase extends provider_testcase {
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u3ctx = context_user::instance($u3->id);
$u4ctx = context_user::instance($u4->id);
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$u3ctx = \context_user::instance($u3->id);
$u4ctx = \context_user::instance($u4->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -715,11 +716,11 @@ class core_competency_privacy_testcase extends provider_testcase {
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u3ctx = context_user::instance($u3->id);
$u4ctx = context_user::instance($u4->id);
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$u3ctx = \context_user::instance($u3->id);
$u4ctx = \context_user::instance($u4->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -762,9 +763,9 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -933,8 +934,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -1028,8 +1029,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -1198,8 +1199,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -1295,9 +1296,9 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -1432,8 +1433,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$m1 = $dg->create_module('page', ['course' => $c1]);
$m2 = $dg->create_module('page', ['course' => $c1]);
$m1ctx = context_module::instance($m1->cmid);
$m2ctx = context_module::instance($m2->cmid);
$m1ctx = \context_module::instance($m1->cmid);
$m2ctx = \context_module::instance($m2->cmid);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -1489,8 +1490,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -1580,8 +1581,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -1638,9 +1639,9 @@ class core_competency_privacy_testcase extends provider_testcase {
$cat1 = $dg->create_category();
$cat2 = $dg->create_category();
$cat1ctx = context_coursecat::instance($cat1->id);
$cat2ctx = context_coursecat::instance($cat2->id);
$sysctx = context_system::instance();
$cat1ctx = \context_coursecat::instance($cat1->id);
$cat2ctx = \context_coursecat::instance($cat2->id);
$sysctx = \context_system::instance();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
@@ -1828,7 +1829,7 @@ class core_competency_privacy_testcase extends provider_testcase {
$u8 = $dg->create_user();
$dg->role_assign($DB->get_field('role', 'id', ['archetype' => 'manager'], IGNORE_MULTIPLE), $u6->id);
$u0ctx = context_user::instance($u0->id);
$u0ctx = \context_user::instance($u0->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -2003,7 +2004,7 @@ class core_competency_privacy_testcase extends provider_testcase {
$u4 = $dg->create_user();
$u5 = $dg->create_user();
$u0ctx = context_user::instance($u0->id);
$u0ctx = \context_user::instance($u0->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -2160,7 +2161,7 @@ class core_competency_privacy_testcase extends provider_testcase {
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$u0ctx = context_user::instance($u0->id);
$u0ctx = \context_user::instance($u0->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -2235,8 +2236,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -2396,8 +2397,8 @@ class core_competency_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -2502,9 +2503,9 @@ class core_competency_privacy_testcase extends provider_testcase {
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u3ctx = context_user::instance($u3->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$u3ctx = \context_user::instance($u3->id);
$f = $ccg->create_framework();
$comp1 = $ccg->create_competency(['competencyframeworkid' => $f->get('id')]);
@@ -2595,7 +2596,7 @@ class core_competency_privacy_testcase extends provider_testcase {
protected function assert_contextlist(contextlist $contextlist, $expectedcontextsorids) {
$contextids = array_unique($contextlist->get_contextids());
$expectedids = array_unique(array_map(function($item) {
return $item instanceof context ? $item->id : $id;
return $item instanceof \context ? $item->id : $id;
}, $expectedcontextsorids));
$this->assert_array_match($contextids, $expectedids);
}
completion/tests/privacy_test.php → completion/tests/privacy/provider_test.php
+3 -2
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Adrian Greeve <adriangreeve.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_completion\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -35,9 +36,9 @@ require_once($CFG->dirroot . '/completion/tests/fixtures/completion_creation.php
* @copyright 2018 Adrian Greeve <adriangreeve.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_completion_privacy_test extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
use completion_creation;
use \completion_creation;
/**
* Test joining course completion data to an sql statement.
contentbank/tests/privacy_test.php → contentbank/tests/privacy/provider_test.php
+2 -2
View File
@@ -23,7 +23,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_contentbank;
namespace core_contentbank\privacy;
use stdClass;
use context_system;
@@ -43,7 +43,7 @@ use core_privacy\local\request\approved_userlist;
* @copyright 2020 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class privacy_test extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Setup to ensure that fixtures are loaded.
course/format/tests/privacy_test.php → course/format/tests/privacy/provider_test.php
+6 -7
View File
@@ -14,6 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_courseformat\privacy;
use context_course;
use core_privacy\local\request\writer;
/**
* Privacy tests for core_courseformat.
*
@@ -22,13 +27,7 @@
* @copyright 2021 Ferran Recio <ferran@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_courseformat\privacy;
use context_course;
use core_privacy\local\request\writer;
class privacy_test extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Test for provider::test_export_user_preferences().
course/tests/privacy_test.php → course/tests/privacy/provider_test.php
+8 -7
View File
@@ -21,13 +21,14 @@
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_course\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/completion/tests/fixtures/completion_creation.php');
use \core_privacy\local\request\transform;
use core_privacy\local\request\transform;
/**
* Unit tests for course/classes/privacy/policy
@@ -35,9 +36,9 @@ use \core_privacy\local\request\transform;
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_course_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
use completion_creation;
use \completion_creation;
/**
* Test getting the appropriate context for the userid. This should only ever
@@ -177,9 +178,9 @@ class core_course_privacy_testcase extends \core_privacy\tests\provider_testcase
// Create a course and a single module.
$course1 = $this->getDataGenerator()->create_course(['fullname' => 'Course 1', 'shortname' => 'C1']);
$context1 = context_course::instance($course1->id);
$context1 = \context_course::instance($course1->id);
$modassign = $this->getDataGenerator()->create_module('assign', ['course' => $course1->id, 'name' => 'assign test 1']);
$assigncontext = context_module::instance($modassign->cmid);
$assigncontext = \context_module::instance($modassign->cmid);
// Now, let's assume during user info export, only the coursemodule context is returned in the contextlist_collection.
$user = $this->getDataGenerator()->create_user();
@@ -207,9 +208,9 @@ class core_course_privacy_testcase extends \core_privacy\tests\provider_testcase
// Create a course and a single module.
$course1 = $this->getDataGenerator()->create_course(['fullname' => 'Course 1', 'shortname' => 'C1', 'format' => 'site']);
$context1 = context_course::instance($course1->id);
$context1 = \context_course::instance($course1->id);
$modassign = $this->getDataGenerator()->create_module('assign', ['course' => $course1->id, 'name' => 'assign test 1']);
$assigncontext = context_module::instance($modassign->cmid);
$assigncontext = \context_module::instance($modassign->cmid);
// Now, assume during user info export, that both module and course contexts are returned in the contextlist_collection.
$user = $this->getDataGenerator()->create_user();
customfield/tests/privacy_test.php → customfield/tests/privacy/provider_test.php
+10 -9
View File
@@ -21,6 +21,7 @@
* @copyright 2019 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_customfield\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -36,7 +37,7 @@ use core_customfield\privacy\provider;
* @copyright 2019 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_customfield_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Generate data.
@@ -116,8 +117,8 @@ class core_customfield_privacy_testcase extends provider_testcase {
list($sql, $params) = $DB->get_in_or_equal([$courses[1]->id, $courses[2]->id], SQL_PARAMS_NAMED);
$r = provider::get_customfields_data_contexts('core_course', 'course', '=0',
$sql, $params);
$this->assertEqualsCanonicalizing([context_course::instance($courses[1]->id)->id,
context_course::instance($courses[2]->id)->id],
$this->assertEqualsCanonicalizing([\context_course::instance($courses[1]->id)->id,
\context_course::instance($courses[2]->id)->id],
$r->get_contextids());
}
@@ -128,7 +129,7 @@ class core_customfield_privacy_testcase extends provider_testcase {
$this->generate_test_data();
$r = provider::get_customfields_configuration_contexts('core_course', 'course');
$this->assertEquals([context_system::instance()->id], $r->get_contextids());
$this->assertEquals([\context_system::instance()->id], $r->get_contextids());
}
/**
@@ -147,7 +148,7 @@ class core_customfield_privacy_testcase extends provider_testcase {
$invalidfieldid = $cffields[21]->get('id');
$DB->update_record('customfield_field', ['id' => $invalidfieldid, 'type' => 'invalid']);
$context = context_course::instance($courses[1]->id);
$context = \context_course::instance($courses[1]->id);
$contextlist = new approved_contextlist($USER, 'core_customfield', [$context->id]);
provider::export_customfields_data($contextlist, 'core_course', 'course', '=0', '=:i', ['i' => $courses[1]->id]);
/** @var core_privacy\tests\request\content_writer $writer */
@@ -185,7 +186,7 @@ class core_customfield_privacy_testcase extends provider_testcase {
'courses' => $courses,
] = $this->generate_test_data();
$approvedcontexts = new approved_contextlist($USER, 'core_course', [context_course::instance($courses[1]->id)->id]);
$approvedcontexts = new approved_contextlist($USER, 'core_course', [\context_course::instance($courses[1]->id)->id]);
provider::delete_customfields_data($approvedcontexts, 'core_course', 'course');
$this->assertEmpty($DB->get_records('customfield_data', ['instanceid' => $courses[1]->id]));
$this->assertNotEmpty($DB->get_records('customfield_data', ['instanceid' => $courses[2]->id]));
@@ -213,7 +214,7 @@ class core_customfield_privacy_testcase extends provider_testcase {
// A little hack here, modify customfields configuration so they have different itemids.
$DB->update_record('customfield_category', ['id' => $catid2, 'itemid' => 1]);
$contextlist = new approved_contextlist($USER, 'core_course', [context_system::instance()->id]);
$contextlist = new approved_contextlist($USER, 'core_course', [\context_system::instance()->id]);
provider::delete_customfields_configuration($contextlist, 'core_course', 'course', '=:i', ['i' => 1]);
// Make sure everything for category $catid2 is gone but present for $catid1.
@@ -249,7 +250,7 @@ class core_customfield_privacy_testcase extends provider_testcase {
$this->assertNotEmpty($DB->get_records_select('customfield_data', 'fieldid ' . $fsql, $fparams));
// A little hack here, modify customfields configuration so they have different contexts.
$context = context_user::instance($USER->id);
$context = \context_user::instance($USER->id);
$DB->update_record('customfield_category', ['id' => $catid2, 'contextid' => $context->id]);
provider::delete_customfields_configuration_for_context('core_course', 'course', $context);
@@ -278,7 +279,7 @@ class core_customfield_privacy_testcase extends provider_testcase {
] = $this->generate_test_data();
provider::delete_customfields_data_for_context('core_course', 'course',
context_course::instance($courses[1]->id));
\context_course::instance($courses[1]->id));
$fids2 = $DB->get_fieldset_select('customfield_field', 'id', '1=1', []);
list($fsql, $fparams) = $DB->get_in_or_equal($fids2, SQL_PARAMS_NAMED);
$fparams['course1'] = $courses[1]->id;
enrol/cohort/tests/privacy_test.php → enrol/cohort/tests/privacy/provider_test.php
+18 -17
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace enrol_cohort\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -35,7 +36,7 @@ use enrol_cohort\privacy\provider;
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Test getting the context for the user ID related to this plugin.
@@ -44,7 +45,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
global $DB;
$this->resetAfterTest();
$trace = new null_progress_trace();
$trace = new \null_progress_trace();
$cohortplugin = enrol_get_plugin('cohort');
$user1 = $this->getDataGenerator()->create_user();
@@ -53,7 +54,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
$group1 = $this->getDataGenerator()->create_group(array('courseid' => $course1->id));
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
$cohort1 = $this->getDataGenerator()->create_cohort(
array('contextid' => context_coursecat::instance($cat1->id)->id));
array('contextid' => \context_coursecat::instance($cat1->id)->id));
$cohortplugin->add_instance($course1, array(
'customint1' => $cohort1->id,
'roleid' => $studentrole->id,
@@ -82,7 +83,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
global $DB;
$this->resetAfterTest();
$trace = new null_progress_trace();
$trace = new \null_progress_trace();
$cohortplugin = enrol_get_plugin('cohort');
$user1 = $this->getDataGenerator()->create_user();
@@ -91,7 +92,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
$group1 = $this->getDataGenerator()->create_group(array('courseid' => $course1->id));
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
$cohort1 = $this->getDataGenerator()->create_cohort(
array('contextid' => context_coursecat::instance($cat1->id)->id));
array('contextid' => \context_coursecat::instance($cat1->id)->id));
$cohortplugin->add_instance($course1, array(
'customint1' => $cohort1->id,
'roleid' => $studentrole->id,
@@ -136,7 +137,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
global $DB;
$this->resetAfterTest();
$trace = new null_progress_trace();
$trace = new \null_progress_trace();
$cohortplugin = enrol_get_plugin('cohort');
$user1 = $this->getDataGenerator()->create_user();
@@ -147,7 +148,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
$group1 = $this->getDataGenerator()->create_group(array('courseid' => $course1->id));
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
$cohort1 = $this->getDataGenerator()->create_cohort(
array('contextid' => context_coursecat::instance($cat1->id)->id));
array('contextid' => \context_coursecat::instance($cat1->id)->id));
$cohortplugin->add_instance($course1, array(
'customint1' => $cohort1->id,
'roleid' => $studentrole->id,
@@ -166,7 +167,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
WHERE g.courseid = ?", [$course1->id])
);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
provider::delete_data_for_all_users_in_context($coursecontext1);
$this->assertEquals(
0,
@@ -184,7 +185,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
global $DB;
$this->resetAfterTest();
$trace = new null_progress_trace();
$trace = new \null_progress_trace();
$cohortplugin = enrol_get_plugin('cohort');
$user1 = $this->getDataGenerator()->create_user();
@@ -197,7 +198,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
$group2 = $this->getDataGenerator()->create_group(array('courseid' => $course2->id));
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
$cohort1 = $this->getDataGenerator()->create_cohort(
array('contextid' => context_coursecat::instance($cat1->id)->id));
array('contextid' => \context_coursecat::instance($cat1->id)->id));
$cohortplugin->add_instance($course1, array(
'customint1' => $cohort1->id,
'roleid' => $studentrole->id,
@@ -234,8 +235,8 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
);
$this->setUser($user1);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$approvedcontextlist = new \core_privacy\tests\request\approved_contextlist($user1, 'enrol_cohort',
[$coursecontext1->id, $coursecontext2->id]);
provider::delete_data_for_user($approvedcontextlist);
@@ -265,7 +266,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
$this->resetAfterTest();
$trace = new null_progress_trace();
$trace = new \null_progress_trace();
$cohortplugin = enrol_get_plugin('cohort');
@@ -284,7 +285,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
$cohort1 = $this->getDataGenerator()->create_cohort(
array('contextid' => context_coursecat::instance($cat1->id)->id));
array('contextid' => \context_coursecat::instance($cat1->id)->id));
$cohortplugin->add_instance($course1, array(
'customint1' => $cohort1->id,
'roleid' => $studentrole->id,
@@ -320,7 +321,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
WHERE g.courseid = ?", [$course2->id])
);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
$approveduserlist = new \core_privacy\local\request\approved_userlist($coursecontext1, 'enrol_cohort',
[$user1->id, $user2->id]);
@@ -354,7 +355,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
$this->resetAfterTest();
$trace = new null_progress_trace();
$trace = new \null_progress_trace();
$cohortplugin = enrol_get_plugin('cohort');
@@ -363,7 +364,7 @@ class enrol_cohort_privacy_testcase extends \core_privacy\tests\provider_testcas
$group1 = $this->getDataGenerator()->create_group(array('courseid' => $course1->id));
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
$cohort1 = $this->getDataGenerator()->create_cohort(
array('contextid' => context_coursecat::instance($cat1->id)->id));
array('contextid' => \context_coursecat::instance($cat1->id)->id));
$cohortplugin->add_instance($course1, array(
'customint1' => $cohort1->id,
'roleid' => $studentrole->id,
enrol/flatfile/tests/privacy_provider_test.php → enrol/flatfile/tests/privacy/provider_test.php
+6 -5
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace enrol_flatfile\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -37,7 +38,7 @@ use enrol_flatfile\privacy\provider;
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class enrol_flatfile_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/** @var \stdClass $user1 a test user.*/
protected $user1;
@@ -276,9 +277,9 @@ class enrol_flatfile_privacy_testcase extends provider_testcase {
$course1 = $this->getDataGenerator()->create_course(['idnumber' => 'c1']);
$course2 = $this->getDataGenerator()->create_course(['idnumber' => 'c2']);
$course3 = $this->getDataGenerator()->create_course(['idnumber' => 'c3']);
$this->coursecontext1 = context_course::instance($course1->id);
$this->coursecontext2 = context_course::instance($course2->id);
$this->coursecontext3 = context_course::instance($course3->id);
$this->coursecontext1 = \context_course::instance($course1->id);
$this->coursecontext2 = \context_course::instance($course2->id);
$this->coursecontext3 = \context_course::instance($course3->id);
$now = time();
$future = $now + 60 * 60 * 5;
@@ -292,7 +293,7 @@ class enrol_flatfile_privacy_testcase extends provider_testcase {
add,student,u1,c3,$future,$farfuture";
file_put_contents($file, $data);
$trace = new null_progress_trace();
$trace = new \null_progress_trace();
$this->enable_plugin();
$flatfileplugin = enrol_get_plugin('flatfile');
$flatfileplugin->set_config('location', $file);
enrol/lti/tests/privacy_provider_test.php → enrol/lti/tests/privacy/provider_test.php
+13 -12
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace enrol_lti\privacy;
use enrol_lti\privacy\provider;
@@ -33,7 +34,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class enrol_lti_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* @var stdClass The user
@@ -87,8 +88,8 @@ class enrol_lti_privacy_provider_testcase extends \core_privacy\tests\provider_t
$this->assertCount(2, $contextlist);
$coursectx = context_course::instance($this->course->id);
$activityctx = context_module::instance($this->activity->cmid);
$coursectx = \context_course::instance($this->course->id);
$activityctx = \context_module::instance($this->activity->cmid);
$expectedids = [$coursectx->id, $activityctx->id];
$actualids = $contextlist->get_contextids();
@@ -99,7 +100,7 @@ class enrol_lti_privacy_provider_testcase extends \core_privacy\tests\provider_t
* Test for provider::export_user_data().
*/
public function test_export_for_context() {
$coursecontext = context_course::instance($this->course->id);
$coursecontext = \context_course::instance($this->course->id);
$cmcontext = \context_module::instance($this->activity->cmid);
// Export all of the data for the course context.
@@ -139,7 +140,7 @@ class enrol_lti_privacy_provider_testcase extends \core_privacy\tests\provider_t
$this->assertEquals(4, $count);
// Delete data based on context.
$coursecontext = context_course::instance($this->course->id);
$coursecontext = \context_course::instance($this->course->id);
provider::delete_data_for_all_users_in_context($coursecontext);
$ltiusers = $DB->get_records('enrol_lti_users');
@@ -155,14 +156,14 @@ class enrol_lti_privacy_provider_testcase extends \core_privacy\tests\provider_t
public function test_delete_data_for_user() {
global $DB;
$cmcontext = context_module::instance($this->activity->cmid);
$coursecontext = context_course::instance($this->course->id);
$cmcontext = \context_module::instance($this->activity->cmid);
$coursecontext = \context_course::instance($this->course->id);
$count = $DB->count_records('enrol_lti_users');
$this->assertEquals(4, $count);
$contextlist = new \core_privacy\local\request\approved_contextlist($this->user, 'enrol_lti',
[context_system::instance()->id, $coursecontext->id, $cmcontext->id]);
[\context_system::instance()->id, $coursecontext->id, $cmcontext->id]);
provider::delete_data_for_user($contextlist);
$ltiusers = $DB->get_records('enrol_lti_users');
@@ -207,7 +208,7 @@ class enrol_lti_privacy_provider_testcase extends \core_privacy\tests\provider_t
* Test for provider::get_users_in_context() when the context is a course.
*/
public function test_get_users_in_context_course() {
$coursecontext = context_course::instance($this->course->id);
$coursecontext = \context_course::instance($this->course->id);
$userlist = new \core_privacy\local\request\userlist($coursecontext, 'enrol_paypal');
provider::get_users_in_context($userlist);
@@ -220,7 +221,7 @@ class enrol_lti_privacy_provider_testcase extends \core_privacy\tests\provider_t
* Test for provider::get_users_in_context() when the context is an activity.
*/
public function test_get_users_in_context_activity() {
$activityctx = context_module::instance($this->activity->cmid);
$activityctx = \context_module::instance($this->activity->cmid);
$userlist = new \core_privacy\local\request\userlist($activityctx, 'enrol_paypal');
provider::get_users_in_context($userlist);
@@ -235,7 +236,7 @@ class enrol_lti_privacy_provider_testcase extends \core_privacy\tests\provider_t
public function test_delete_data_for_users_course() {
global $DB;
$coursecontext = context_course::instance($this->course->id);
$coursecontext = \context_course::instance($this->course->id);
$count = $DB->count_records('enrol_lti_users');
$this->assertEquals(4, $count);
@@ -265,7 +266,7 @@ class enrol_lti_privacy_provider_testcase extends \core_privacy\tests\provider_t
public function test_delete_data_for_users_activity() {
global $DB;
$cmcontext = context_module::instance($this->activity->cmid);
$cmcontext = \context_module::instance($this->activity->cmid);
$count = $DB->count_records('enrol_lti_users');
$this->assertEquals(4, $count);
enrol/meta/tests/privacy_test.php → enrol/meta/tests/privacy/provider_test.php
+6 -5
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace enrol_meta\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -35,7 +36,7 @@ use enrol_meta\privacy\provider;
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class enrol_meta_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Enable enrol_meta plugin.
@@ -147,7 +148,7 @@ class enrol_meta_privacy_testcase extends \core_privacy\tests\provider_testcase
WHERE g.courseid = ?", [$course1->id])
);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
provider::delete_data_for_all_users_in_context($coursecontext1);
$this->assertEquals(
0,
@@ -189,8 +190,8 @@ class enrol_meta_privacy_testcase extends \core_privacy\tests\provider_testcase
);
$this->setUser($user1);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$approvedcontextlist = new \core_privacy\tests\request\approved_contextlist($user1, 'enrol_meta',
[$coursecontext1->id]);
provider::delete_data_for_user($approvedcontextlist);
@@ -238,7 +239,7 @@ class enrol_meta_privacy_testcase extends \core_privacy\tests\provider_testcase
WHERE g.courseid = ?", [$course1->id])
);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
$approveduserlist = new \core_privacy\local\request\approved_userlist($coursecontext1, 'enrol_meta',
[$user1->id, $user2->id]);
enrol/paypal/tests/privacy_provider_test.php → enrol/paypal/tests/privacy/provider_test.php
+27 -26
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Shamim Rezaie <shamim@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace enrol_paypal\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -30,12 +31,12 @@ use enrol_paypal\privacy\provider;
use core_privacy\local\request\writer;
/**
* Class enrol_paypal_privacy_provider_testcase.
* Privacy provider test for enrol_paypal.
*
* @copyright 2018 Shamim Rezaie <shamim@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/** @var stdClass A user whose email address matches the business field in some of the PayPal transactions. */
protected $businessuser1;
@@ -248,8 +249,8 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
* Test for provider::get_contexts_for_userid().
*/
public function test_get_contexts_for_userid() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
// Student1 is only enrolled in 1 course.
$contextlist = provider::get_contexts_for_userid($this->student1->id);
@@ -271,8 +272,8 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
* Test for provider::get_contexts_for_userid with a user who is a receiver.
*/
public function test_get_contexts_for_userid_receiver() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
// Receiver User 1 is the Receiver of one course.
$contextlist = provider::get_contexts_for_userid($this->receiveruser1->id);
@@ -293,9 +294,9 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
* Test for provider::get_contexts_for_userid with a user who is a business.
*/
public function test_get_contexts_for_userid_business() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext3 = context_course::instance($this->course3->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$coursecontext3 = \context_course::instance($this->course3->id);
// Business User 1 is the Receiver of course 1 and course 2.
$contextlist = provider::get_contexts_for_userid($this->businessuser1->id);
@@ -316,7 +317,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
* Test for provider::export_user_data().
*/
public function test_export_user_data() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$this->setUser($this->student1);
@@ -333,7 +334,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
* Test for provider::export_user_data() when user is not enrolled.
*/
public function test_export_user_data_not_enrolled() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$this->setUser($this->student2);
@@ -347,7 +348,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
* Test for provider::export_user_data() when user has no enrolment.
*/
public function test_export_user_data_no_enrolment() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$this->setUser($this->student0);
@@ -358,7 +359,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
}
public function test_export_user_data_multiple_paypal_history() {
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$this->setUser($this->student2);
// Export all of the data for the context.
@@ -379,7 +380,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_delete_data_for_all_users_in_context() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$this->setUser($this->student1);
// Before deletion, we should have 2 PayPal transactions in course1 and 3 PayPal transactions in course2.
@@ -412,7 +413,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_delete_data_for_all_users_in_context_multiple_transactions() {
global $DB;
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$this->setUser($this->student2);
// Before deletion, we should have 2 PayPal transactions in course1 and 3 PayPal transactions in course2.
@@ -445,7 +446,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_delete_data_for_user_from_single_context() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$this->setUser($this->student12);
@@ -498,8 +499,8 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_delete_data_for_user_from_multiple_context() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$this->setUser($this->student12);
@@ -552,7 +553,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_delete_data_for_user_for_business_user() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$this->setUser($this->businessuser1);
@@ -597,7 +598,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_delete_data_for_user_for_receiver_user() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$this->setUser($this->receiveruser1);
@@ -666,9 +667,9 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
* Test for provider::get_users_in_context().
*/
public function test_get_users_in_context() {
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext2 = context_course::instance($this->course2->id);
$coursecontext3 = context_course::instance($this->course3->id);
$coursecontext1 = \context_course::instance($this->course1->id);
$coursecontext2 = \context_course::instance($this->course2->id);
$coursecontext3 = \context_course::instance($this->course3->id);
$userlist1 = new \core_privacy\local\request\userlist($coursecontext1, 'enrol_paypal');
provider::get_users_in_context($userlist1);
@@ -714,7 +715,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_delete_data_for_users() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
// Before deletion, we should have 2 PayPal transactions (1 of them for student12) in course1
// and 3 PayPal transactions (1 of them for student12) in course2.
@@ -774,7 +775,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_delete_data_for_users_business() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
// Before deletion, there are 3 transactions under the name of businessuser1 and one of them is in course1.
$this->assertEquals(3, $DB->count_records('enrol_paypal', ['business' => $this->businessuser1->email]));
@@ -809,7 +810,7 @@ class enrol_paypal_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_delete_data_for_users_receiver() {
global $DB;
$coursecontext1 = context_course::instance($this->course1->id);
$coursecontext1 = \context_course::instance($this->course1->id);
// Before deletion, there are 2 transactions under the name of receiveruser1 and both of them are in course1.
$this->assertEquals(2, $DB->count_records('enrol_paypal', ['receiver_email' => $this->receiveruser1->email]));
enrol/tests/privacy_test.php → enrol/tests/privacy/provider_test.php
+10 -9
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_enrol\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -28,8 +29,8 @@ use core_enrol\privacy\provider;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\writer;
use core_privacy\tests\provider_testcase;
use \core_privacy\local\request\transform;
use \core_privacy\local\request\approved_userlist;
use core_privacy\local\request\transform;
use core_privacy\local\request\approved_userlist;
/**
* Privacy test for the core_enrol.
@@ -39,7 +40,7 @@ use \core_privacy\local\request\approved_userlist;
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_enrol_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Check that a course context is returned if there is any user data for this user.
*/
@@ -186,9 +187,9 @@ class core_enrol_privacy_testcase extends provider_testcase {
$component = 'core_enrol';
$user = $this->getDataGenerator()->create_user();
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
$course = $this->getDataGenerator()->create_course();
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
$userlist1 = new \core_privacy\local\request\userlist($coursecontext, $component);
provider::get_users_in_context($userlist1);
@@ -223,9 +224,9 @@ class core_enrol_privacy_testcase extends provider_testcase {
$user3 = $this->getDataGenerator()->create_user();
$course1 = $this->getDataGenerator()->create_course();
$course2 = $this->getDataGenerator()->create_course();
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$systemcontext = context_system::instance();
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$systemcontext = \context_system::instance();
// Enrol user1 into course1.
$this->getDataGenerator()->enrol_user($user1->id, $course1->id, null, 'manual');
@@ -268,4 +269,4 @@ class core_enrol_privacy_testcase extends provider_testcase {
// The user data in systemcontext should not be deleted.
$this->assertCount(1, $userlist2);
}
}
}
favourites/tests/privacy_test.php → favourites/tests/privacy/provider_test.php
+10 -9
View File
@@ -22,12 +22,13 @@
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_favourites\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\tests\provider_testcase;
use \core_favourites\privacy\provider;
use \core_privacy\local\request\transform;
use core_privacy\tests\provider_testcase;
use core_favourites\privacy\provider;
use core_privacy\local\request\transform;
/**
* Unit tests for favourites/classes/privacy/provider
@@ -35,7 +36,7 @@ use \core_privacy\local\request\transform;
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class privacy_test extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
$this->resetAfterTest(true);
@@ -51,8 +52,8 @@ class privacy_test extends provider_testcase {
$user2context = \context_user::instance($user2->id);
$course1 = self::getDataGenerator()->create_course();
$course2 = self::getDataGenerator()->create_course();
$course1context = context_course::instance($course1->id);
$course2context = context_course::instance($course2->id);
$course1context = \context_course::instance($course1->id);
$course2context = \context_course::instance($course2->id);
return [$user1, $user2, $user1context, $user2context, $course1context, $course2context];
}
@@ -65,7 +66,7 @@ class privacy_test extends provider_testcase {
// Favourite 2 courses for user1 and 1 course for user2, all at the site context.
$ufservice1 = \core_favourites\service_factory::get_service_for_user_context($user1context);
$ufservice2 = \core_favourites\service_factory::get_service_for_user_context($user2context);
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$ufservice1->create_favourite('core_course', 'courses', $course1context->instanceid, $systemcontext);
$ufservice1->create_favourite('core_course', 'courses', $course2context->instanceid, $systemcontext);
$ufservice2->create_favourite('core_course', 'courses', $course2context->instanceid, $systemcontext);
@@ -145,7 +146,7 @@ class privacy_test extends provider_testcase {
// Favourite 2 courses for user1 and 1 course for user2, all at the site context.
$ufservice1 = \core_favourites\service_factory::get_service_for_user_context($user1context);
$ufservice2 = \core_favourites\service_factory::get_service_for_user_context($user2context);
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$ufservice1->create_favourite('core_course', 'courses', $course1context->instanceid, $systemcontext);
$ufservice1->create_favourite('core_course', 'courses', $course2context->instanceid, $systemcontext);
$ufservice2->create_favourite('core_course', 'courses', $course2context->instanceid, $systemcontext);
@@ -188,7 +189,7 @@ class privacy_test extends provider_testcase {
list($user1, $user2, $user1context, $user2context, $course1context, $course2context) = $this->set_up_courses_and_users();
// Favourite 2 courses for user1 and 1 course for user2.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$ufservice1 = \core_favourites\service_factory::get_service_for_user_context($user1context);
$ufservice2 = \core_favourites\service_factory::get_service_for_user_context($user2context);
$ufservice1->create_favourite('core_course', 'courses', $course1context->instanceid, $systemcontext);
files/converter/googledrive/tests/privacy_test.php → files/converter/googledrive/tests/privacy/provider_test.php
+3 -2
View File
@@ -21,10 +21,11 @@
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace fileconverter_googledrive\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\tests\provider_testcase;
use core_privacy\tests\provider_testcase;
/**
* Unit tests for files/converter/googledrive/classes/privacy/provider.php
@@ -32,7 +33,7 @@ use \core_privacy\tests\provider_testcase;
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class fileconverter_googledrive_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test getting the context for the user ID related to this plugin.
files/tests/privacy_test.php → files/tests/privacy/provider_test.php
+2 -1
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_files\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -37,7 +38,7 @@ use core_privacy\local\request\approved_userlist;
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_files_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test getting the context for the user ID related to this plugin.
grade/grading/form/guide/tests/privacy_test.php → grade/grading/form/guide/tests/privacy/provider_test.php
+10 -9
View File
@@ -22,14 +22,15 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace gradingform_guide\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
use \core_privacy\tests\provider_testcase;
use \core_privacy\local\request\writer;
use \gradingform_guide\privacy\provider;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\writer;
use gradingform_guide\privacy\provider;
/**
* Privacy tests for gradingform_guide.
@@ -38,7 +39,7 @@ use \gradingform_guide\privacy\provider;
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class gradingform_guide_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Ensure that export_user_preferences returns no data if the user has no data.
@@ -65,7 +66,7 @@ class gradingform_guide_privacy_testcase extends provider_testcase {
// Validate exported data.
provider::export_user_preferences($user->id);
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$writer = writer::with_context($context);
$this->assertTrue($writer->has_any_data());
$prefs = $writer->get_user_preferences('gradingform_guide');
@@ -90,7 +91,7 @@ class gradingform_guide_privacy_testcase extends provider_testcase {
$this->setUser($user);
$modulecontext = context_module::instance($module->cmid);
$modulecontext = \context_module::instance($module->cmid);
$controller = $this->get_test_guide($modulecontext);
// In the situation of mod_assign this would be the id from assign_grades.
@@ -128,7 +129,7 @@ class gradingform_guide_privacy_testcase extends provider_testcase {
$this->setUser($user);
$modulecontext = context_module::instance($module->cmid);
$modulecontext = \context_module::instance($module->cmid);
$controller = $this->get_test_guide($modulecontext);
// In the situation of mod_assign this would be the id from assign_grades.
@@ -174,7 +175,7 @@ class gradingform_guide_privacy_testcase extends provider_testcase {
* @param context_module $context
* @return gradingform_guide_controller
*/
protected function get_test_guide(context_module $context): gradingform_guide_controller {
protected function get_test_guide(\context_module $context): \gradingform_guide_controller {
$generator = \testing_util::get_data_generator();
$guidegenerator = $generator->get_plugin_generator('gradingform_guide');
@@ -193,7 +194,7 @@ class gradingform_guide_privacy_testcase extends provider_testcase {
* @return array
*/
protected function get_test_form_data(
gradingform_guide_controller $controller,
\gradingform_guide_controller $controller,
int $itemid,
float $spellingscore,
string $spellingremark,
grade/grading/form/rubric/tests/privacy_test.php → grade/grading/form/rubric/tests/privacy/provider_test.php
+2 -3
View File
@@ -22,8 +22,7 @@
* @copyright 2018 Adrian Greeve <adriangreeve.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace gradingform_rubric;
namespace gradingform_rubric\privacy;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\writer;
@@ -37,7 +36,7 @@ use context_module;
* @copyright 2018 Adrian Greeve <adriangreeve.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class privacy_test extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test the export of rubric data.
grade/grading/tests/privacy_test.php → grade/grading/tests/privacy/provider_test.php
+14 -13
View File
@@ -22,16 +22,17 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_grading\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
use \core_privacy\tests\provider_testcase;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\transform;
use \core_privacy\local\request\writer;
use \core_grading\privacy\provider;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\transform;
use core_privacy\local\request\writer;
use core_grading\privacy\provider;
/**
* Privacy tests for core_grading.
@@ -39,7 +40,7 @@ use \core_grading\privacy\provider;
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_grading_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/** @var stdClass User without data. */
protected $user0;
@@ -271,7 +272,7 @@ class core_grading_privacy_testcase extends provider_testcase {
$this->setUser($user);
$modulecontext = context_module::instance($module->cmid);
$modulecontext = \context_module::instance($module->cmid);
$controller = $guidegenerator->get_test_guide($modulecontext);
// In the situation of mod_assign this would be the id from assign_grades.
@@ -309,7 +310,7 @@ class core_grading_privacy_testcase extends provider_testcase {
$this->setUser($user);
$modulecontext = context_module::instance($module->cmid);
$modulecontext = \context_module::instance($module->cmid);
$controller = $guidegenerator->get_test_guide($modulecontext);
// In the situation of mod_assign this would be the id from assign_grades.
@@ -364,7 +365,7 @@ class core_grading_privacy_testcase extends provider_testcase {
$this->setUser($user1);
$modulecontext = context_module::instance($module->cmid);
$modulecontext = \context_module::instance($module->cmid);
$controller = $guidegenerator->get_test_guide($modulecontext);
// In the situation of mod_assign this would be the id from assign_grades.
@@ -443,7 +444,7 @@ class core_grading_privacy_testcase extends provider_testcase {
// Create a course.
$course = $this->getDataGenerator()->create_course();
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
// Create some assignment instances.
$params = (object)array(
@@ -453,13 +454,13 @@ class core_grading_privacy_testcase extends provider_testcase {
$generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
$instance0 = $generator->create_instance($params);
$cm0 = get_coursemodule_from_instance('assign', $instance0->id);
$this->instancecontext0 = context_module::instance($cm0->id);
$this->instancecontext0 = \context_module::instance($cm0->id);
$instance1 = $generator->create_instance($params);
$cm1 = get_coursemodule_from_instance('assign', $instance1->id);
$this->instancecontext1 = context_module::instance($cm1->id);
$this->instancecontext1 = \context_module::instance($cm1->id);
$instance2 = $generator->create_instance($params);
$cm2 = get_coursemodule_from_instance('assign', $instance2->id);
$this->instancecontext2 = context_module::instance($cm2->id);
$this->instancecontext2 = \context_module::instance($cm2->id);
// Create fake grading areas.
$fakearea1 = (object)array(
grade/report/grader/tests/privacy_test.php → grade/report/grader/tests/privacy/provider_test.php
+9 -8
View File
@@ -22,14 +22,15 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace gradereport_grader\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\local\metadata\collection;
use \core_privacy\local\request\writer;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\deletion_criteria;
use \gradereport_grader\privacy\provider;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\writer;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\deletion_criteria;
use gradereport_grader\privacy\provider;
/**
* Unit tests for the gradereport_grader implementation of the privacy API.
@@ -37,7 +38,7 @@ use \gradereport_grader\privacy\provider;
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class gradereport_grader_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Basic setup for these tests.
@@ -76,7 +77,7 @@ class gradereport_grader_privacy_testcase extends \core_privacy\tests\provider_t
// Validate exported data for our test user.
provider::export_user_preferences($user->id);
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$writer = writer::with_context($context);
$this->assertTrue($writer->has_any_data());
$prefs = $writer->get_user_preferences('gradereport_grader');
@@ -102,7 +103,7 @@ class gradereport_grader_privacy_testcase extends \core_privacy\tests\provider_t
// Validate exported data.
provider::export_user_preferences($user->id);
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$writer = writer::with_context($context);
$this->assertTrue($writer->has_any_data());
$prefs = $writer->get_user_preferences('gradereport_grader');
grade/report/user/tests/privacy_test.php → grade/report/user/tests/privacy/provider_test.php
+6 -5
View File
@@ -22,12 +22,13 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace gradereport_user\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\local\metadata\collection;
use \core_privacy\local\request\writer;
use \gradereport_user\privacy\provider;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\writer;
use gradereport_user\privacy\provider;
/**
* Unit tests for the gradereport_user implementation of the privacy API.
@@ -35,7 +36,7 @@ use \gradereport_user\privacy\provider;
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class gradereport_user_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Basic setup for these tests.
@@ -67,7 +68,7 @@ class gradereport_user_privacy_testcase extends \core_privacy\tests\provider_tes
// Validate exported data.
provider::export_user_preferences($user->id);
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$writer = writer::with_context($context);
$this->assertTrue($writer->has_any_data());
$prefs = $writer->get_user_preferences('gradereport_user');
grade/tests/privacy_test.php → grade/tests/privacy/provider_test.php
+118 -117
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_grades\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -44,7 +45,7 @@ require_once($CFG->libdir . '/gradelib.php');
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_grades_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
global $PAGE;
@@ -70,18 +71,18 @@ class core_grades_privacy_testcase extends provider_testcase {
$u10 = $dg->create_user();
$u11 = $dg->create_user();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
// Create some stuff.
$gi1a = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gc1a = new grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc1b = new grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc2a = new grade_category($dg->create_grade_category(['courseid' => $c2->id]), false);
$go2 = new grade_outcome($dg->create_grade_outcome(['courseid' => $c2->id, 'shortname' => 'go2',
$gi1a = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new \grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gc1a = new \grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc1b = new \grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc2a = new \grade_category($dg->create_grade_category(['courseid' => $c2->id]), false);
$go2 = new \grade_outcome($dg->create_grade_outcome(['courseid' => $c2->id, 'shortname' => 'go2',
'fullname' => 'go2']), false);
// Nothing as of now.
@@ -90,15 +91,15 @@ class core_grades_privacy_testcase extends provider_testcase {
$this->assertEmpty($contexts);
}
$go0 = new grade_outcome(['shortname' => 'go0', 'fullname' => 'go0', 'usermodified' => $u1->id]);
$go0 = new \grade_outcome(['shortname' => 'go0', 'fullname' => 'go0', 'usermodified' => $u1->id]);
$go0->insert();
$go1 = new grade_outcome(['shortname' => 'go1', 'fullname' => 'go1', 'courseid' => $c1->id, 'usermodified' => $u11->id]);
$go1 = new \grade_outcome(['shortname' => 'go1', 'fullname' => 'go1', 'courseid' => $c1->id, 'usermodified' => $u11->id]);
$go1->insert();
// Create scales.
$s1 = new grade_scale(['name' => 's1', 'scale' => 'a,b', 'userid' => $u7->id, 'courseid' => 0, 'description' => '']);
$s1 = new \grade_scale(['name' => 's1', 'scale' => 'a,b', 'userid' => $u7->id, 'courseid' => 0, 'description' => '']);
$s1->insert();
$s2 = new grade_scale(['name' => 's2', 'scale' => 'a,b', 'userid' => $u8->id, 'courseid' => $c1->id, 'description' => '']);
$s2 = new \grade_scale(['name' => 's2', 'scale' => 'a,b', 'userid' => $u8->id, 'courseid' => $c1->id, 'description' => '']);
$s2->insert();
// User 2 creates history.
@@ -190,15 +191,15 @@ class core_grades_privacy_testcase extends provider_testcase {
$u5 = $dg->create_user();
$u6 = $dg->create_user();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
// Create some stuff.
$gi1a = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi2b = new grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi1a = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new \grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi2b = new \grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
// Nothing as of now.
foreach ([$u1, $u2, $u3, $u4, $u5, $u6] as $u) {
@@ -232,7 +233,7 @@ class core_grades_privacy_testcase extends provider_testcase {
$this->assertCount(3, $contexts);
$this->assertArrayHasKey($c1ctx->id, $contexts);
$this->assertArrayHasKey($c2ctx->id, $contexts);
$this->assertArrayHasKey(context_user::instance($u2->id)->id, $contexts);
$this->assertArrayHasKey(\context_user::instance($u2->id)->id, $contexts);
$contexts = array_flip(provider::get_contexts_for_userid($u3->id)->get_contextids());
$this->assertCount(1, $contexts);
$this->assertArrayHasKey($c1ctx->id, $contexts);
@@ -242,10 +243,10 @@ class core_grades_privacy_testcase extends provider_testcase {
$contexts = array_flip(provider::get_contexts_for_userid($u5->id)->get_contextids());
$this->assertCount(2, $contexts);
$this->assertArrayHasKey($c2ctx->id, $contexts);
$this->assertArrayHasKey(context_user::instance($u2->id)->id, $contexts);
$this->assertArrayHasKey(\context_user::instance($u2->id)->id, $contexts);
$contexts = array_flip(provider::get_contexts_for_userid($u6->id)->get_contextids());
$this->assertCount(1, $contexts);
$this->assertArrayHasKey(context_user::instance($u2->id)->id, $contexts);
$this->assertArrayHasKey(\context_user::instance($u2->id)->id, $contexts);
}
/**
@@ -269,29 +270,29 @@ class core_grades_privacy_testcase extends provider_testcase {
$u10 = $dg->create_user();
$u11 = $dg->create_user();
$sysctx = context_system::instance();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$sysctx = \context_system::instance();
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
// Create some stuff.
$gi1a = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gc1a = new grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc1b = new grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc2a = new grade_category($dg->create_grade_category(['courseid' => $c2->id]), false);
$go2 = new grade_outcome($dg->create_grade_outcome(['courseid' => $c2->id, 'shortname' => 'go2',
$gi1a = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new \grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gc1a = new \grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc1b = new \grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc2a = new \grade_category($dg->create_grade_category(['courseid' => $c2->id]), false);
$go2 = new \grade_outcome($dg->create_grade_outcome(['courseid' => $c2->id, 'shortname' => 'go2',
'fullname' => 'go2']), false);
$go0 = new grade_outcome(['shortname' => 'go0', 'fullname' => 'go0', 'usermodified' => $u1->id]);
$go0 = new \grade_outcome(['shortname' => 'go0', 'fullname' => 'go0', 'usermodified' => $u1->id]);
$go0->insert();
$go1 = new grade_outcome(['shortname' => 'go1', 'fullname' => 'go1', 'courseid' => $c1->id, 'usermodified' => $u11->id]);
$go1 = new \grade_outcome(['shortname' => 'go1', 'fullname' => 'go1', 'courseid' => $c1->id, 'usermodified' => $u11->id]);
$go1->insert();
// Create scales.
$s1 = new grade_scale(['name' => 's1', 'scale' => 'a,b', 'userid' => $u7->id, 'courseid' => 0, 'description' => '']);
$s1 = new \grade_scale(['name' => 's1', 'scale' => 'a,b', 'userid' => $u7->id, 'courseid' => 0, 'description' => '']);
$s1->insert();
$s2 = new grade_scale(['name' => 's2', 'scale' => 'a,b', 'userid' => $u8->id, 'courseid' => $c1->id, 'description' => '']);
$s2 = new \grade_scale(['name' => 's2', 'scale' => 'a,b', 'userid' => $u8->id, 'courseid' => $c1->id, 'description' => '']);
$s2->insert();
// User 2 creates history.
@@ -359,15 +360,15 @@ class core_grades_privacy_testcase extends provider_testcase {
$u5 = $dg->create_user();
$u6 = $dg->create_user();
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$u2ctx = \context_user::instance($u2->id);
// Create some stuff.
$gi1a = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi2b = new grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi1a = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new \grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi2b = new \grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
// User 1 is graded in course 1.
$gi1a->update_final_grade($u1->id, 1, 'test');
@@ -405,7 +406,7 @@ class core_grades_privacy_testcase extends provider_testcase {
public function test_delete_data_for_all_users_in_context() {
global $DB;
$fs = new file_storage();
$fs = new \file_storage();
$dg = $this->getDataGenerator();
@@ -413,22 +414,22 @@ class core_grades_privacy_testcase extends provider_testcase {
$c2 = $dg->create_course();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$u1ctx = \context_user::instance($u1->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$a1 = $dg->create_module('assign', ['course' => $c1->id]);
$a2 = $dg->create_module('assign', ['course' => $c1->id]);
$a3 = $dg->create_module('assign', ['course' => $c2->id]);
$a4 = $dg->create_module('assign', ['course' => $c2->id]);
$a1context = context_module::instance($a1->cmid);
$a2context = context_module::instance($a2->cmid);
$a3context = context_module::instance($a3->cmid);
$a4context = context_module::instance($a4->cmid);
$a1context = \context_module::instance($a1->cmid);
$a2context = \context_module::instance($a2->cmid);
$a3context = \context_module::instance($a3->cmid);
$a4context = \context_module::instance($a4->cmid);
// Create some stuff.
$gi1a = new grade_item($dg->create_grade_item(
$gi1a = new \grade_item($dg->create_grade_item(
[
'courseid' => $c1->id,
'itemtype' => 'mod',
@@ -436,7 +437,7 @@ class core_grades_privacy_testcase extends provider_testcase {
'iteminstance' => $a1->id
]
), false);
$gi1b = new grade_item($dg->create_grade_item(
$gi1b = new \grade_item($dg->create_grade_item(
[
'courseid' => $c1->id,
'itemtype' => 'mod',
@@ -444,7 +445,7 @@ class core_grades_privacy_testcase extends provider_testcase {
'iteminstance' => $a2->id
]
), false);
$gi2a = new grade_item($dg->create_grade_item(
$gi2a = new \grade_item($dg->create_grade_item(
[
'courseid' => $c2->id,
'itemtype' => 'mod',
@@ -452,7 +453,7 @@ class core_grades_privacy_testcase extends provider_testcase {
'iteminstance' => $a3->id
]
), false);
$gi2b = new grade_item($dg->create_grade_item(
$gi2b = new \grade_item($dg->create_grade_item(
[
'courseid' => $c2->id,
'itemtype' => 'mod',
@@ -645,7 +646,7 @@ class core_grades_privacy_testcase extends provider_testcase {
public function test_delete_data_for_user() {
global $DB;
$fs = new file_storage();
$fs = new \file_storage();
$dg = $this->getDataGenerator();
@@ -653,23 +654,23 @@ class core_grades_privacy_testcase extends provider_testcase {
$c2 = $dg->create_course();
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$a1 = $dg->create_module('assign', ['course' => $c1->id]);
$a2 = $dg->create_module('assign', ['course' => $c1->id]);
$a3 = $dg->create_module('assign', ['course' => $c2->id]);
$a4 = $dg->create_module('assign', ['course' => $c2->id]);
$a1context = context_module::instance($a1->cmid);
$a2context = context_module::instance($a2->cmid);
$a3context = context_module::instance($a3->cmid);
$a4context = context_module::instance($a4->cmid);
$a1context = \context_module::instance($a1->cmid);
$a2context = \context_module::instance($a2->cmid);
$a3context = \context_module::instance($a3->cmid);
$a4context = \context_module::instance($a4->cmid);
// Create some stuff.
$gi1a = new grade_item($dg->create_grade_item(
$gi1a = new \grade_item($dg->create_grade_item(
[
'courseid' => $c1->id,
'itemtype' => 'mod',
@@ -677,7 +678,7 @@ class core_grades_privacy_testcase extends provider_testcase {
'iteminstance' => $a1->id
]
), false);
$gi1b = new grade_item($dg->create_grade_item(
$gi1b = new \grade_item($dg->create_grade_item(
[
'courseid' => $c1->id,
'itemtype' => 'mod',
@@ -685,7 +686,7 @@ class core_grades_privacy_testcase extends provider_testcase {
'iteminstance' => $a2->id
]
), false);
$gi2a = new grade_item($dg->create_grade_item(
$gi2a = new \grade_item($dg->create_grade_item(
[
'courseid' => $c2->id,
'itemtype' => 'mod',
@@ -693,7 +694,7 @@ class core_grades_privacy_testcase extends provider_testcase {
'iteminstance' => $a3->id
]
), false);
$gi2b = new grade_item($dg->create_grade_item(
$gi2b = new \grade_item($dg->create_grade_item(
[
'courseid' => $c2->id,
'itemtype' => 'mod',
@@ -903,16 +904,16 @@ class core_grades_privacy_testcase extends provider_testcase {
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
// Create some stuff.
$gi1a = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi2b = new grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi1a = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new \grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi2b = new \grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gi1a->update_final_grade($u1->id, 1, 'test');
$gi1a->update_final_grade($u2->id, 1, 'test');
@@ -979,19 +980,19 @@ class core_grades_privacy_testcase extends provider_testcase {
$ua2 = $dg->create_user();
$ua3 = $dg->create_user();
$ug1ctx = context_user::instance($ug1->id);
$ug2ctx = context_user::instance($ug2->id);
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$ug1ctx = \context_user::instance($ug1->id);
$ug2ctx = \context_user::instance($ug2->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$rootpath = [get_string('grades', 'core_grades')];
$relatedtomepath = array_merge($rootpath, [get_string('privacy:path:relatedtome', 'core_grades')]);
// Create the course minimal stuff.
grade_category::fetch_course_category($c1->id);
$ci1 = grade_item::fetch_course_item($c1->id);
grade_category::fetch_course_category($c2->id);
$ci2 = grade_item::fetch_course_item($c2->id);
\grade_category::fetch_course_category($c1->id);
$ci1 = \grade_item::fetch_course_item($c1->id);
\grade_category::fetch_course_category($c2->id);
$ci2 = \grade_item::fetch_course_item($c2->id);
$this->add_feedback_file_to_copy();
@@ -1005,7 +1006,7 @@ class core_grades_privacy_testcase extends provider_testcase {
$a1 = $dg->create_module('assign', ['course' => $c1->id]);
// Create data that will sit in the user context because we will delete the grate item.
$gi1 = new grade_item($dg->create_grade_item(
$gi1 = new \grade_item($dg->create_grade_item(
[
'courseid' => $c1->id,
'itemtype' => 'mod',
@@ -1040,7 +1041,7 @@ class core_grades_privacy_testcase extends provider_testcase {
// Create another set for another user.
$a2 = $dg->create_module('assign', ['course' => $c2->id]);
$a3 = $dg->create_module('assign', ['course' => $c2->id]);
$gi2a = new grade_item($dg->create_grade_item(
$gi2a = new \grade_item($dg->create_grade_item(
[
'courseid' => $c2->id,
'itemtype' => 'mod',
@@ -1048,7 +1049,7 @@ class core_grades_privacy_testcase extends provider_testcase {
'iteminstance' => $a2->id
]
), false);
$gi2b = new grade_item($dg->create_grade_item(
$gi2b = new \grade_item($dg->create_grade_item(
[
'courseid' => $c2->id,
'itemtype' => 'mod',
@@ -1289,15 +1290,15 @@ class core_grades_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$u1ctx = context_user::instance($u1->id);
$c1ctx = context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
$c1ctx = \context_course::instance($c1->id);
$rootpath = [get_string('grades', 'core_grades')];
// Create another set for another user.
$gi1 = new grade_item($dg->create_grade_item(['courseid' => $c1->id, 'scaleid' => $scale->id]), false);
$gi1 = new \grade_item($dg->create_grade_item(['courseid' => $c1->id, 'scaleid' => $scale->id]), false);
$gi1->update_final_grade($u1->id, 1, 'test', '', FORMAT_PLAIN, $u2->id);
$gi2 = new grade_item($dg->create_grade_item(['courseid' => $c1->id, 'scaleid' => $scale->id]), false);
$gi2 = new \grade_item($dg->create_grade_item(['courseid' => $c1->id, 'scaleid' => $scale->id]), false);
$gi2->update_final_grade($u1->id, 3, 'test', '', FORMAT_PLAIN, $u2->id);
// Export user's data.
@@ -1305,7 +1306,7 @@ class core_grades_privacy_testcase extends provider_testcase {
provider::export_user_data(new approved_contextlist($u1, 'core_grades', [$c1ctx->id]));
$data = writer::with_context($c1ctx)->get_data($rootpath);
$this->assertCount(3, $data->grades);
$this->assertEquals(grade_item::fetch_course_item($c1->id)->get_name(), $data->grades[0]['item']);
$this->assertEquals(\grade_item::fetch_course_item($c1->id)->get_name(), $data->grades[0]['item']);
$this->assertEquals($gi1->get_name(), $data->grades[1]['item']);
$this->assertEquals(1, $data->grades[1]['grade']);
$this->assertEquals('Awesome', $data->grades[1]['grade_formatted']);
@@ -1330,15 +1331,15 @@ class core_grades_privacy_testcase extends provider_testcase {
$u9 = $dg->create_user();
$u10 = $dg->create_user();
$sysctx = context_system::instance();
$u1ctx = context_user::instance($u1->id);
$u2ctx = context_user::instance($u2->id);
$u3ctx = context_user::instance($u3->id);
$u4ctx = context_user::instance($u4->id);
$u5ctx = context_user::instance($u5->id);
$u6ctx = context_user::instance($u6->id);
$c1ctx = context_course::instance($c1->id);
$c2ctx = context_course::instance($c2->id);
$sysctx = \context_system::instance();
$u1ctx = \context_user::instance($u1->id);
$u2ctx = \context_user::instance($u2->id);
$u3ctx = \context_user::instance($u3->id);
$u4ctx = \context_user::instance($u4->id);
$u5ctx = \context_user::instance($u5->id);
$u6ctx = \context_user::instance($u6->id);
$c1ctx = \context_course::instance($c1->id);
$c2ctx = \context_course::instance($c2->id);
$rootpath = [get_string('grades', 'core_grades')];
$relatedtomepath = array_merge($rootpath, [get_string('privacy:path:relatedtome', 'core_grades')]);
@@ -1347,26 +1348,26 @@ class core_grades_privacy_testcase extends provider_testcase {
$updateactionstr = get_string('privacy:request:historyactionupdate', 'core_grades');
// Create some stuff.
$gi1a = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gc1a = new grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc1b = new grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc2a = new grade_category($dg->create_grade_category(['courseid' => $c2->id]), false);
$go2 = new grade_outcome($dg->create_grade_outcome(['courseid' => $c2->id, 'shortname' => 'go2',
$gi1a = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi1b = new \grade_item($dg->create_grade_item(['courseid' => $c1->id]), false);
$gi2a = new \grade_item($dg->create_grade_item(['courseid' => $c2->id]), false);
$gc1a = new \grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc1b = new \grade_category($dg->create_grade_category(['courseid' => $c1->id]), false);
$gc2a = new \grade_category($dg->create_grade_category(['courseid' => $c2->id]), false);
$go2 = new \grade_outcome($dg->create_grade_outcome(['courseid' => $c2->id, 'shortname' => 'go2',
'fullname' => 'go2']), false);
$go0 = new grade_outcome(['shortname' => 'go0', 'fullname' => 'go0', 'usermodified' => $u1->id]);
$go0 = new \grade_outcome(['shortname' => 'go0', 'fullname' => 'go0', 'usermodified' => $u1->id]);
$go0->insert();
$go1 = new grade_outcome(['shortname' => 'go1', 'fullname' => 'go1', 'courseid' => $c1->id, 'usermodified' => $u1->id]);
$go1 = new \grade_outcome(['shortname' => 'go1', 'fullname' => 'go1', 'courseid' => $c1->id, 'usermodified' => $u1->id]);
$go1->insert();
// Create scales.
$s1 = new grade_scale(['name' => 's1', 'scale' => 'a,b', 'userid' => $u7->id, 'courseid' => 0, 'description' => '']);
$s1 = new \grade_scale(['name' => 's1', 'scale' => 'a,b', 'userid' => $u7->id, 'courseid' => 0, 'description' => '']);
$s1->insert();
$s2 = new grade_scale(['name' => 's2', 'scale' => 'a,b', 'userid' => $u8->id, 'courseid' => $c1->id, 'description' => '']);
$s2 = new \grade_scale(['name' => 's2', 'scale' => 'a,b', 'userid' => $u8->id, 'courseid' => $c1->id, 'description' => '']);
$s2->insert();
$s3 = new grade_scale(['name' => 's3', 'scale' => 'a,b', 'userid' => $u8->id, 'courseid' => $c2->id, 'description' => '']);
$s3 = new \grade_scale(['name' => 's3', 'scale' => 'a,b', 'userid' => $u8->id, 'courseid' => $c2->id, 'description' => '']);
$s3->insert();
// User 2 creates history.
@@ -1568,7 +1569,7 @@ class core_grades_privacy_testcase extends provider_testcase {
* @param context $context The context.
* @return void
*/
protected function assert_context_has_no_data(context $context) {
protected function assert_context_has_no_data(\context $context) {
$rootpath = [get_string('grades', 'core_grades')];
$relatedtomepath = array_merge($rootpath, [get_string('privacy:path:relatedtome', 'core_grades')]);
group/tests/privacy_provider_test.php → group/tests/privacy/provider_test.php
+24 -23
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Shamim Rezaie <shamim@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_group\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -31,12 +32,12 @@ use core_group\privacy\provider;
use core_privacy\local\request\writer;
/**
* Class core_group_privacy_provider_testcase.
* Privacy provider test for core_group.
*
* @copyright 2018 Shamim Rezaie <shamim@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_group_privacy_provider_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test for provider::get_metadata().
@@ -85,7 +86,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
$this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user2->id));
$this->getDataGenerator()->create_group_member(array('groupid' => $group3->id, 'userid' => $user2->id));
$context = context_course::instance($course->id);
$context = \context_course::instance($course->id);
// Retrieve groups for user1.
$this->setUser($user1);
@@ -129,7 +130,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
array('groupid' => $group3->id, 'userid' => $user2->id, 'component' => 'enrol_self'));
$this->getDataGenerator()->create_group_member(array('groupid' => $group4->id, 'userid' => $user2->id));
$context = context_course::instance($course->id);
$context = \context_course::instance($course->id);
// Retrieve groups for user1.
$this->setUser($user1);
@@ -189,7 +190,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
WHERE g.courseid = ?", [$course2->id])
);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
provider::delete_groups_for_all_users($coursecontext1, '');
$this->assertEquals(
@@ -254,7 +255,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
WHERE g.courseid = ?", [$course2->id])
);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
provider::delete_groups_for_all_users($coursecontext1, 'enrol_self');
$this->assertEquals(
@@ -297,7 +298,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
$this->assertEqualsCanonicalizing([[$group1->id, $group2->id]], groups_get_user_groups($course->id, $user1->id));
$this->assertEquals([[$group1->id]], groups_get_user_groups($course->id, $user2->id));
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
provider::delete_groups_for_all_users($coursecontext, '');
$this->assertEquals([[]], groups_get_user_groups($course->id, $user1->id));
@@ -370,8 +371,8 @@ class core_group_privacy_provider_testcase extends provider_testcase {
);
$this->setUser($user1);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$approvedcontextlist = new \core_privacy\tests\request\approved_contextlist($user1, 'core_group',
[$coursecontext1->id, $coursecontext2->id]);
provider::delete_groups_for_user($approvedcontextlist, '');
@@ -474,8 +475,8 @@ class core_group_privacy_provider_testcase extends provider_testcase {
);
$this->setUser($user1);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$approvedcontextlist = new \core_privacy\tests\request\approved_contextlist($user1, 'core_group',
[$coursecontext1->id, $coursecontext2->id]);
provider::delete_groups_for_user($approvedcontextlist, 'enrol_self');
@@ -580,7 +581,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
);
// Delete user1 and user2 from groups in course1.
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
$approveduserlist = new \core_privacy\local\request\approved_userlist($coursecontext1, 'core_group',
[$user1->id, $user2->id]);
provider::delete_groups_for_users($approveduserlist, 'enrol_self');
@@ -615,7 +616,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
);
// Delete user1 and user2 from course3.
$coursecontext3 = context_course::instance($course3->id);
$coursecontext3 = \context_course::instance($course3->id);
$approveduserlist = new \core_privacy\local\request\approved_userlist($coursecontext3, 'core_group',
[$user1->id, $user2->id]);
provider::delete_groups_for_users($approveduserlist, 'enrol_self');
@@ -670,7 +671,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
$this->assertEqualsCanonicalizing([[$group1->id, $group2->id]], groups_get_user_groups($course->id, $user->id));
$this->setUser($user);
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
$approvedcontextlist = new \core_privacy\tests\request\approved_contextlist($user, 'core_group', [$coursecontext->id]);
provider::delete_groups_for_user($approvedcontextlist, '');
@@ -710,8 +711,8 @@ class core_group_privacy_provider_testcase extends provider_testcase {
$this->getDataGenerator()->create_group_member(array('userid' => $user2->id, 'groupid' => $group2b->id));
$this->getDataGenerator()->create_group_member(array('userid' => $user2->id, 'groupid' => $group3b->id));
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
// User1 is member of some groups in course1 and course2 + self-conversation.
$contextlist = provider::get_contexts_for_userid($user1->id);
@@ -752,7 +753,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
'component' => 'enrol_meta'
));
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
// User is member of some groups in course1 and course2,
// but only the membership in course1 is directly managed by core_group.
@@ -784,7 +785,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
$this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user2->id));
$this->getDataGenerator()->create_group_member(array('groupid' => $group3->id, 'userid' => $user2->id));
$context = context_course::instance($course->id);
$context = \context_course::instance($course->id);
$this->setUser($user1);
@@ -847,7 +848,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
WHERE g.courseid = ?", [$course2->id])
);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
provider::delete_data_for_all_users_in_context($coursecontext1);
$this->assertEquals(
@@ -932,8 +933,8 @@ class core_group_privacy_provider_testcase extends provider_testcase {
);
$this->setUser($user1);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext2 = context_course::instance($course2->id);
$coursecontext1 = \context_course::instance($course1->id);
$coursecontext2 = \context_course::instance($course2->id);
$approvedcontextlist = new \core_privacy\tests\request\approved_contextlist($user1, 'core_group',
[$coursecontext1->id, $coursecontext2->id]);
provider::delete_data_for_user($approvedcontextlist);
@@ -1019,7 +1020,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
WHERE g.courseid = ?", [$course2->id])
);
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
$approveduserlist = new \core_privacy\local\request\approved_userlist($coursecontext1, 'core_group',
[$user1->id, $user2->id]);
provider::delete_data_for_users($approveduserlist);
@@ -1071,7 +1072,7 @@ class core_group_privacy_provider_testcase extends provider_testcase {
$this->getDataGenerator()->create_group_member(array('userid' => $user2->id, 'groupid' => $group2b->id));
$this->getDataGenerator()->create_group_member(array('userid' => $user3->id, 'groupid' => $group2a->id));
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
$userlist = new \core_privacy\local\request\userlist($coursecontext1, 'core_group');
\core_group\privacy\provider::get_users_in_context($userlist);
lib/editor/atto/tests/privacy_provider_test.php → lib/editor/atto/tests/privacy/provider_test.php
+6 -5
View File
@@ -22,13 +22,14 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace editor_atto\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\local\request\writer;
use \core_privacy\local\request\approved_contextlist;
use \editor_atto\privacy\provider;
use \core_privacy\local\request\approved_userlist;
use core_privacy\local\request\writer;
use core_privacy\local\request\approved_contextlist;
use editor_atto\privacy\provider;
use core_privacy\local\request\approved_userlist;
/**
* Unit tests for the editor_atto implementation of the privacy API.
@@ -36,7 +37,7 @@ use \core_privacy\local\request\approved_userlist;
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class editor_atto_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* One test to check fetch and export of all drafts.
*/
lib/editor/tests/privacy_provider_test.php → lib/editor/tests/privacy/provider_test.php
+2 -1
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_editor\privacy;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\writer;
@@ -35,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_editor_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* When no preference exists, there should be no export.
lib/form/tests/privacy_provider_test.php → lib/form/tests/privacy/provider_test.php
+3 -2
View File
@@ -15,13 +15,14 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Provides the {@link core_form_privacy_provider_testcase} class.
* Provides the {@see \core_form\privacy\provider_test} class.
*
* @package core_form
* @category test
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_form\privacy;
use core_form\privacy\provider;
use core_privacy\local\request\writer;
@@ -34,7 +35,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_form_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* When no preference exists, there should be no export.
lib/userkey/tests/privacy_provider_test.php → lib/userkey/tests/privacy/provider_test.php
+5 -4
View File
@@ -22,12 +22,13 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_userkey\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\tests\provider_testcase;
use \core_privacy\local\request\writer;
use \core_userkey\privacy\provider;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\writer;
use core_userkey\privacy\provider;
/**
* Privacy tests for core_userkey.
@@ -35,7 +36,7 @@ use \core_userkey\privacy\provider;
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_userkey_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Export for a user with no keys in the specified instance will not have any data exported.
*/
message/output/airnotifier/tests/privacy_test.php → message/output/airnotifier/tests/privacy/provider_test.php
+14 -13
View File
@@ -20,12 +20,13 @@
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace message_airnotifier\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\tests\provider_testcase;
use \message_airnotifier\privacy\provider;
use \core_privacy\local\request\approved_userlist;
use core_privacy\tests\provider_testcase;
use message_airnotifier\privacy\provider;
use core_privacy\local\request\approved_userlist;
/**
* Unit tests for message\output\airnotifier\classes\privacy\provider.php
@@ -33,7 +34,7 @@ use \core_privacy\local\request\approved_userlist;
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class message_airnotifier_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Basic setup for these tests.
@@ -87,7 +88,7 @@ class message_airnotifier_testcase extends provider_testcase {
public function test_get_contexts_for_userid() {
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$this->add_device($user, 'apuJih874kj');
$this->add_device($user, 'bdu09Ikjjsu');
@@ -101,7 +102,7 @@ class message_airnotifier_testcase extends provider_testcase {
*/
public function test_export_user_data() {
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$this->add_device($user, 'apuJih874kj');
$this->add_device($user, 'bdu09Ikjjsu');
@@ -126,7 +127,7 @@ class message_airnotifier_testcase extends provider_testcase {
global $DB;
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$this->add_device($user, 'apuJih874kj');
@@ -148,7 +149,7 @@ class message_airnotifier_testcase extends provider_testcase {
global $DB;
$user = $this->getDataGenerator()->create_user();
$context = context_user::instance($user->id);
$context = \context_user::instance($user->id);
$this->add_device($user, 'apuJih874kj');
@@ -172,7 +173,7 @@ class message_airnotifier_testcase extends provider_testcase {
// Create user.
$user = $this->getDataGenerator()->create_user();
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
// The lists of users for the user context should be empty.
// Related user data have not been created yet.
@@ -191,7 +192,7 @@ class message_airnotifier_testcase extends provider_testcase {
$this->assertEquals($expected, $actual);
// The list of users should only return users in the user context.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist1 = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist1);
$this->assertCount(0, $userlist1);
@@ -205,10 +206,10 @@ class message_airnotifier_testcase extends provider_testcase {
// Create user1.
$user1 = $this->getDataGenerator()->create_user();
$usercontext1 = context_user::instance($user1->id);
$usercontext1 = \context_user::instance($user1->id);
// Create user2.
$user2 = $this->getDataGenerator()->create_user();
$usercontext2 = context_user::instance($user2->id);
$usercontext2 = \context_user::instance($user2->id);
$this->add_device($user1, 'apuJih874kj');
$this->add_device($user1, 'cpuJih874kp');
@@ -239,7 +240,7 @@ class message_airnotifier_testcase extends provider_testcase {
$this->assertCount(1, $userlist2);
// User data should only be removed in the user context.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$approvedlist = new approved_userlist($systemcontext, $component, $userlist2->get_userids());
// Delete using delete_data_for_user.
provider::delete_data_for_users($approvedlist);
message/output/email/tests/privacy_test.php → message/output/email/tests/privacy/provider_test.php
+3 -3
View File
@@ -20,17 +20,18 @@
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace message_email\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\tests\provider_testcase;
use core_privacy\tests\provider_testcase;
/**
* Unit tests for message\output\email\classes\privacy\provider.php
*
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class message_email_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Basic setup for these tests.
*/
@@ -57,4 +58,3 @@ class message_email_testcase extends provider_testcase {
$this->assertEmpty($contextlist);
}
}
message/tests/privacy_provider_test.php → message/tests/privacy/provider_test.php
+36 -35
View File
@@ -21,13 +21,14 @@
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_message\privacy;
use core_privacy\local\metadata\collection;
use core_message\privacy\provider;
use \core_privacy\local\request\contextlist;
use \core_privacy\local\request\writer;
use \core_privacy\local\request\transform;
use \core_message\tests\helper as testhelper;
use core_privacy\local\request\contextlist;
use core_privacy\local\request\writer;
use core_privacy\local\request\transform;
use core_message\tests\helper as testhelper;
defined('MOODLE_INTERNAL') || die();
@@ -38,7 +39,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_message_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Test for provider::get_metadata().
@@ -292,7 +293,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
// Create course.
$course1 = $this->getDataGenerator()->create_course();
$coursecontext1 = context_course::instance($course1->id);
$coursecontext1 = \context_course::instance($course1->id);
// Enrol users to courses.
$this->getDataGenerator()->enrol_user($user1->id, $course1->id);
@@ -393,7 +394,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$this->assertEquals(
context_user::instance($user1->id)->id,
\context_user::instance($user1->id)->id,
$contextforuser->id);
// Test for the receiver.
@@ -401,7 +402,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$this->assertEquals(
context_user::instance($user2->id)->id,
\context_user::instance($user2->id)->id,
$contextforuser->id);
}
@@ -431,7 +432,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$this->assertEquals(
context_user::instance($user1->id)->id,
\context_user::instance($user1->id)->id,
$contextforuser->id);
// Test for the user who is the contact.
@@ -439,7 +440,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$this->assertEquals(
context_user::instance($user2->id)->id,
\context_user::instance($user2->id)->id,
$contextforuser->id);
}
@@ -469,7 +470,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$this->assertEquals(
context_user::instance($user1->id)->id,
\context_user::instance($user1->id)->id,
$contextforuser->id);
// Test for the user receiving the contact request.
@@ -477,7 +478,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$this->assertEquals(
context_user::instance($user2->id)->id,
\context_user::instance($user2->id)->id,
$contextforuser->id);
}
@@ -507,7 +508,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$this->assertEquals(
context_user::instance($user1->id)->id,
\context_user::instance($user1->id)->id,
$contextforuser->id);
// Test for the user who is blocked.
@@ -515,7 +516,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$this->assertEquals(
context_user::instance($user2->id)->id,
\context_user::instance($user2->id)->id,
$contextforuser->id);
}
@@ -541,7 +542,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
\core_message\api::add_contact($user1->id, $user3->id);
\core_message\api::add_contact($user1->id, $user4->id);
$user1context = context_user::instance($user1->id);
$user1context = \context_user::instance($user1->id);
$this->export_context_data_for_user($user1->id, $user1context, 'core_message');
@@ -584,7 +585,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
\core_message\api::create_contact_request($user3->id, $user1->id);
\core_message\api::create_contact_request($user1->id, $user4->id);
$user1context = context_user::instance($user1->id);
$user1context = \context_user::instance($user1->id);
$this->export_context_data_for_user($user1->id, $user1context, 'core_message');
@@ -629,7 +630,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
\core_message\api::block_user($user1->id, $user3->id);
\core_message\api::block_user($user1->id, $user4->id);
$user1context = context_user::instance($user1->id);
$user1context = \context_user::instance($user1->id);
$this->export_context_data_for_user($user1->id, $user1context, 'core_message');
@@ -688,7 +689,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
\core_message\api::delete_message($user1->id, $m2);
\core_message\api::delete_message($user1->id, $m5);
$user1context = context_user::instance($user1->id);
$user1context = \context_user::instance($user1->id);
$this->export_context_data_for_user($user1->id, $user1context, 'core_message');
@@ -898,7 +899,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->create_notification($user2->id, $user3->id, $now + (2 * DAYSECS));
$this->create_notification($user3->id, $user2->id, $now + (1 * DAYSECS));
$user1context = context_user::instance($user1->id);
$user1context = \context_user::instance($user1->id);
$this->export_context_data_for_user($user1->id, $user1context, 'core_message');
@@ -930,7 +931,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$now = time();
$timeread = $now - DAYSECS;
$user1context = context_user::instance($user1->id);
$user1context = \context_user::instance($user1->id);
// Create contacts.
\core_message\api::add_contact($user1->id, $user2->id);
@@ -1097,7 +1098,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
// There should be 5 notifications (3 from create_notification and 2 from create_contact_request).
$this->assertEquals(5, $DB->count_records('notifications'));
$user1context = context_user::instance($user1->id);
$user1context = \context_user::instance($user1->id);
$contextlist = new \core_privacy\local\request\approved_contextlist($user1, 'core_message',
[$user1context->id]);
provider::delete_data_for_user($contextlist);
@@ -1153,7 +1154,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
$this->remove_user_self_conversation($user->id);
$userlist = new \core_privacy\local\request\userlist($usercontext, 'core_message');
@@ -1171,8 +1172,8 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$user1context = context_user::instance($user1->id);
$user2context = context_user::instance($user2->id);
$user1context = \context_user::instance($user1->id);
$user2context = \context_user::instance($user2->id);
// Delete user self-conversations.
$this->remove_user_self_conversation($user1->id);
@@ -1212,8 +1213,8 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$user1context = context_user::instance($user1->id);
$user2context = context_user::instance($user2->id);
$user1context = \context_user::instance($user1->id);
$user2context = \context_user::instance($user2->id);
// Delete user self-conversations.
$this->remove_user_self_conversation($user1->id);
@@ -1253,8 +1254,8 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$user1context = context_user::instance($user1->id);
$user2context = context_user::instance($user2->id);
$user1context = \context_user::instance($user1->id);
$user2context = \context_user::instance($user2->id);
// Delete user self-conversations.
$this->remove_user_self_conversation($user1->id);
@@ -1294,8 +1295,8 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$user1context = context_user::instance($user1->id);
$user2context = context_user::instance($user2->id);
$user1context = \context_user::instance($user1->id);
$user2context = \context_user::instance($user2->id);
// Delete user self-conversations.
$this->remove_user_self_conversation($user1->id);
@@ -1335,8 +1336,8 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$user1context = context_user::instance($user1->id);
$user2context = context_user::instance($user2->id);
$user1context = \context_user::instance($user1->id);
$user2context = \context_user::instance($user2->id);
// Delete user self-conversations.
$this->remove_user_self_conversation($user1->id);
@@ -1431,7 +1432,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
// There should be three notifications + two for the contact requests.
$this->assertEquals(5, $DB->count_records('notifications'));
$user1context = context_user::instance($user1->id);
$user1context = \context_user::instance($user1->id);
$approveduserlist = new \core_privacy\local\request\approved_userlist($user1context, 'core_message',
[$user1->id, $user2->id]);
provider::delete_data_for_users($approveduserlist);
@@ -2842,7 +2843,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
}
// Ok, send the message.
$record = new stdClass();
$record = new \stdClass();
$record->useridfrom = $useridfrom;
$record->conversationid = $conversationid;
$record->subject = 'No subject';
@@ -2881,7 +2882,7 @@ class core_message_privacy_provider_testcase extends \core_privacy\tests\provide
$timecreated = time();
}
$record = new stdClass();
$record = new \stdClass();
$record->useridfrom = $useridfrom;
$record->useridto = $useridto;
$record->subject = 'No subject';
mnet/service/enrol/tests/privacy_test.php → mnet/service/enrol/tests/privacy/provider_test.php
+10 -9
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mnetservice_enrol\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -38,7 +39,7 @@ use core_privacy\local\request\approved_userlist;
* @copyright 2018 Carlos Escobedo <carlos@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mnetservice_enrol_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/** @var stdClass the mnet host we are using to test. */
protected $mnethost;
@@ -55,7 +56,7 @@ class mnetservice_enrol_privacy_testcase extends provider_testcase {
global $DB;
// Add a mnet host.
$this->mnethost = new stdClass();
$this->mnethost = new \stdClass();
$this->mnethost->name = 'A mnet host';
$this->mnethost->public_key = 'A random public key!';
$this->mnethost->id = $DB->insert_record('mnet_host', $this->mnethost);
@@ -200,7 +201,7 @@ class mnetservice_enrol_privacy_testcase extends provider_testcase {
// Create a user.
$user = $this->getDataGenerator()->create_user();
$usercontext = context_user::instance($user->id);
$usercontext = \context_user::instance($user->id);
// Create user2.
$user2 = $this->getDataGenerator()->create_user();
@@ -222,7 +223,7 @@ class mnetservice_enrol_privacy_testcase extends provider_testcase {
$this->assertTrue(in_array($user->id, $userlist->get_userids()));
// The list of users within the system context should be empty.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist2 = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist2);
$this->assertCount(0, $userlist2);
@@ -238,10 +239,10 @@ class mnetservice_enrol_privacy_testcase extends provider_testcase {
// Create user1.
$user1 = $this->getDataGenerator()->create_user();
$usercontext1 = context_user::instance($user1->id);
$usercontext1 = \context_user::instance($user1->id);
// Create user2.
$user2 = $this->getDataGenerator()->create_user();
$usercontext2 = context_user::instance($user2->id);
$usercontext2 = \context_user::instance($user2->id);
// Create a test MNet service enrol enrolments.
$remotecourseid = 101;
@@ -281,7 +282,7 @@ class mnetservice_enrol_privacy_testcase extends provider_testcase {
$this->assertCount(1, $userlist2);
// Convert $userlist2 into an approved_contextlist in the system context.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$approvedlist3 = new approved_userlist($systemcontext, $component, $userlist2->get_userids());
// Delete using delete_data_for_user.
provider::delete_data_for_users($approvedlist3);
@@ -303,7 +304,7 @@ class mnetservice_enrol_privacy_testcase extends provider_testcase {
global $DB;
// Create a test MNet service enrol enrolments.
$this->enrolment = new stdclass();
$this->enrolment = new \stdClass();
$this->enrolment->hostid = $this->mnethost->id;
$this->enrolment->userid = $userid;
$this->enrolment->remotecourseid = $remotecourseid;
@@ -324,7 +325,7 @@ class mnetservice_enrol_privacy_testcase extends provider_testcase {
global $DB;
// Create a Dummy Remote Course to test.
$course = new stdclass();
$course = new \stdClass();
$course->hostid = $this->mnethost->id;
$course->remoteid = $remoteid;
$course->categoryid = 1;
mod/assign/feedback/comments/tests/privacy_test.php → mod/assign/feedback/comments/tests/privacy/provider_test.php
+12 -11
View File
@@ -21,12 +21,13 @@
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace assignfeedback_comments\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/mod/assign/locallib.php');
require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
require_once($CFG->dirroot . '/mod/assign/tests/privacy/provider_test.php');
/**
* Unit tests for mod/assign/feedback/comments/classes/privacy/
@@ -34,7 +35,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy_test {
class provider_test extends \mod_assign\privacy\provider_test {
/**
* Convenience function for creating feedback data.
@@ -64,7 +65,7 @@ class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy
$this->setUser($teacher);
$context = context_user::instance($teacher->id);
$context = \context_user::instance($teacher->id);
$draftitemid = file_get_unused_draft_itemid();
file_prepare_draft_area($draftitemid, $context->id, ASSIGNFEEDBACK_COMMENTS_COMPONENT,
@@ -183,7 +184,7 @@ class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy
$feedbackcomments = $plugin1->get_feedback_comments($grade2->id);
$this->assertNotEmpty($feedbackcomments);
$fs = new file_storage();
$fs = new \file_storage();
$files = $fs->get_area_files($assign->get_context()->id, ASSIGNFEEDBACK_COMMENTS_COMPONENT,
ASSIGNFEEDBACK_COMMENTS_FILEAREA);
// 4 including directories.
@@ -191,7 +192,7 @@ class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy
// Delete all comments for this context.
$requestdata = new \mod_assign\privacy\assign_plugin_request_data($context, $assign);
assignfeedback_comments\privacy\provider::delete_feedback_for_context($requestdata);
provider::delete_feedback_for_context($requestdata);
// Check that the data is now gone.
$feedbackcomments = $plugin1->get_feedback_comments($grade1->id);
@@ -199,7 +200,7 @@ class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy
$feedbackcomments = $plugin1->get_feedback_comments($grade2->id);
$this->assertEmpty($feedbackcomments);
$fs = new file_storage();
$fs = new \file_storage();
$files = $fs->get_area_files($assign->get_context()->id, ASSIGNFEEDBACK_COMMENTS_COMPONENT,
ASSIGNFEEDBACK_COMMENTS_FILEAREA);
$this->assertEquals(0, count($files));
@@ -236,7 +237,7 @@ class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy
$feedbackcomments = $plugin1->get_feedback_comments($grade2->id);
$this->assertNotEmpty($feedbackcomments);
$fs = new file_storage();
$fs = new \file_storage();
$files = $fs->get_area_files($assign->get_context()->id, ASSIGNFEEDBACK_COMMENTS_COMPONENT,
ASSIGNFEEDBACK_COMMENTS_FILEAREA);
// 4 including directories.
@@ -244,7 +245,7 @@ class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy
// Delete all comments for this grade object.
$requestdata = new \mod_assign\privacy\assign_plugin_request_data($context, $assign, $grade1, [], $user1);
assignfeedback_comments\privacy\provider::delete_feedback_for_grade($requestdata);
provider::delete_feedback_for_grade($requestdata);
// These comments should be empty.
$feedbackcomments = $plugin1->get_feedback_comments($grade1->id);
@@ -254,7 +255,7 @@ class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy
$feedbackcomments = $plugin1->get_feedback_comments($grade2->id);
$this->assertNotEmpty($feedbackcomments);
$fs = new file_storage();
$fs = new \file_storage();
$files = $fs->get_area_files($assign->get_context()->id, ASSIGNFEEDBACK_COMMENTS_COMPONENT,
ASSIGNFEEDBACK_COMMENTS_FILEAREA);
// 2 files that were not deleted.
@@ -313,7 +314,7 @@ class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy
$feedbackcomments = $plugin5->get_feedback_comments($grade5->id);
$this->assertNotEmpty($feedbackcomments);
$fs = new file_storage();
$fs = new \file_storage();
// 6 including directories for assign 1.
// 4 including directories for assign 2.
$this->assertCount(6, $fs->get_area_files($assign1->get_context()->id,
@@ -324,7 +325,7 @@ class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy
$deletedata = new \mod_assign\privacy\assign_plugin_request_data($assign1->get_context(), $assign1);
$deletedata->set_userids([$user1->id, $user3->id]);
$deletedata->populate_submissions_and_grades();
assignfeedback_comments\privacy\provider::delete_feedback_for_grades($deletedata);
provider::delete_feedback_for_grades($deletedata);
// Check that grade 1 and grade 3 have been removed.
$feedbackcomments = $plugin1->get_feedback_comments($grade1->id);
mod/assign/feedback/editpdf/tests/privacy_test.php → mod/assign/feedback/editpdf/tests/privacy/provider_test.php
+5 -4
View File
@@ -21,15 +21,16 @@
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace assignfeedback_editpdf\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/mod/assign/locallib.php');
require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
require_once($CFG->dirroot . '/mod/assign/tests/privacy/provider_test.php');
use \assignfeedback_editpdf\page_editor;
use \mod_assign\privacy\assign_plugin_request_data;
use assignfeedback_editpdf\page_editor;
use mod_assign\privacy\assign_plugin_request_data;
/**
* Unit tests for mod/assign/feedback/editpdf/classes/privacy/
@@ -37,7 +38,7 @@ use \mod_assign\privacy\assign_plugin_request_data;
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class assignfeedback_editpdf_privacy_testcase extends \mod_assign\tests\privacy_test {
class provider_test extends \mod_assign\privacy\provider_test {
public function setUp(): void {
// Skip this test if ghostscript is not supported.
mod/assign/feedback/file/tests/privacy_test.php → mod/assign/feedback/file/tests/privacy/provider_test.php
+5 -4
View File
@@ -21,12 +21,13 @@
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace assignfeedback_file\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/mod/assign/locallib.php');
require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
require_once($CFG->dirroot . '/mod/assign/tests/privacy/provider_test.php');
use mod_assign\privacy\assign_plugin_request_data;
@@ -36,7 +37,7 @@ use mod_assign\privacy\assign_plugin_request_data;
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class assignfeedback_file_privacy_testcase extends \mod_assign\tests\privacy_test {
class provider_test extends \mod_assign\privacy\provider_test {
/**
* Convenience function for creating feedback data.
@@ -65,7 +66,7 @@ class assignfeedback_file_privacy_testcase extends \mod_assign\tests\privacy_tes
$this->setUser($teacher);
$context = context_user::instance($teacher->id);
$context = \context_user::instance($teacher->id);
$draftitemid = file_get_unused_draft_itemid();
file_prepare_draft_area($draftitemid, $context->id, 'assignfeedback_file', 'feedback_files', 1);
@@ -83,7 +84,7 @@ class assignfeedback_file_privacy_testcase extends \mod_assign\tests\privacy_tes
$file = $fs->create_file_from_string($dummy, $feedbacktext);
// Create formdata.
$data = new stdClass();
$data = new \stdClass();
$data->{'files_' . $teacher->id . '_filemanager'} = $draftitemid;
$plugin = $assign->get_feedback_plugin_by_type('file');
mod/assign/submission/comments/tests/privacy_test.php → mod/assign/submission/comments/tests/privacy/provider_test.php
+8 -5
View File
@@ -21,11 +21,14 @@
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace assignsubmission_comments\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
require_once($CFG->dirroot . '/mod/assign/tests/privacy/provider_test.php');
use mod_assign\privacy\useridlist;
/**
* Unit tests for mod/assign/submission/comments/classes/privacy/
@@ -33,7 +36,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class assignsubmission_comments_privacy_testcase extends \mod_assign\tests\privacy_test {
class provider_test extends \mod_assign\privacy\provider_test {
/**
* Convenience function for creating feedback data.
@@ -50,7 +53,7 @@ class assignsubmission_comments_privacy_testcase extends \mod_assign\tests\priva
$plugin = $assign->get_submission_plugin_by_type('comments');
$context = $assign->get_context();
$options = new stdClass();
$options = new \stdClass();
$options->area = 'submission_comments';
$options->course = $assign->get_course();
$options->context = $context;
@@ -59,7 +62,7 @@ class assignsubmission_comments_privacy_testcase extends \mod_assign\tests\priva
$options->showcount = true;
$options->displaycancel = true;
$comment = new comment($options);
$comment = new \comment($options);
$comment->set_post_permission(true);
$this->setUser($student);
@@ -129,7 +132,7 @@ class assignsubmission_comments_privacy_testcase extends \mod_assign\tests\priva
$this->setUser($user2);
$comment->add($teachercomment);
$useridlist = new mod_assign\privacy\useridlist($user2->id, $assign->get_instance()->id);
$useridlist = new useridlist($user2->id, $assign->get_instance()->id);
\assignsubmission_comments\privacy\provider::get_student_user_ids($useridlist);
$this->assertEquals($user1->id, $useridlist->get_userids()[0]->id);
}
mod/assign/submission/file/tests/privacy_test.php → mod/assign/submission/file/tests/privacy/provider_test.php
+3 -2
View File
@@ -21,11 +21,12 @@
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace assignsubmission_file\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
require_once($CFG->dirroot . '/mod/assign/tests/privacy/provider_test.php');
/**
* Unit tests for mod/assign/submission/file/classes/privacy/
@@ -33,7 +34,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class assignsubmission_file_privacy_testcase extends \mod_assign\tests\privacy_test {
class provider_test extends \mod_assign\privacy\provider_test {
/**
* Convenience function for creating feedback data.
mod/assign/submission/onlinetext/tests/privacy_test.php → mod/assign/submission/onlinetext/tests/privacy/provider_test.php
+4 -3
View File
@@ -21,11 +21,12 @@
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace assignsubmission_onlinetext\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
require_once($CFG->dirroot . '/mod/assign/tests/privacy/provider_test.php');
/**
* Unit tests for mod/assign/submission/onlinetext/classes/privacy/
@@ -33,7 +34,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class assignsubmission_online_privacy_testcase extends \mod_assign\tests\privacy_test {
class provider_test extends \mod_assign\privacy\provider_test {
/**
* Convenience function for creating feedback data.
@@ -48,7 +49,7 @@ class assignsubmission_online_privacy_testcase extends \mod_assign\tests\privacy
$this->setUser($student->id);
$submission = $assign->get_user_submission($student->id, true);
$data = new stdClass();
$data = new \stdClass();
$data->onlinetext_editor = array(
'itemid' => file_get_unused_draft_itemid(),
'text' => $text,
mod/assign/tests/privacy_test.php → mod/assign/tests/privacy/provider_test.php
+6 -6
View File
@@ -22,17 +22,17 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_assign\tests;
namespace mod_assign\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/mod/assign/locallib.php');
use \core_privacy\tests\provider_testcase;
use \core_privacy\local\request\writer;
use \core_privacy\local\request\approved_contextlist;
use \mod_assign\privacy\provider;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\writer;
use core_privacy\local\request\approved_contextlist;
use mod_assign\privacy\provider;
/**
* Unit tests for mod/assign/classes/privacy/
@@ -40,7 +40,7 @@ use \mod_assign\privacy\provider;
* @copyright 2018 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class privacy_test extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Convenience method for creating a submission.
mod/assignment/tests/privacy_test.php → mod/assignment/tests/privacy/provider_test.php
+20 -19
View File
@@ -22,16 +22,17 @@
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_assignment\privacy;
defined('MOODLE_INTERNAL') || die();
require_once(__DIR__ . '/../lib.php');
require_once(__DIR__ . '/../../lib.php');
use \mod_assignment\privacy\provider;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\transform;
use \core_privacy\local\request\writer;
use \core_privacy\tests\provider_testcase;
use mod_assignment\privacy\provider;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\transform;
use core_privacy\local\request\writer;
use core_privacy\tests\provider_testcase;
/**
* Privacy test for the event monitor
@@ -41,7 +42,7 @@ use \core_privacy\tests\provider_testcase;
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_assignment_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* @var int array Array of test student ids associated for Course 1.
@@ -152,7 +153,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
$this->mark_assignment_submission($submission->assignment, $submission->id, $teacher1, 50);
}
$c1ass1ctx = context_module::instance($course1assignment1->cmid);
$c1ass1ctx = \context_module::instance($course1assignment1->cmid);
$userlist = new \core_privacy\local\request\userlist($c1ass1ctx, 'mod_assignment');
provider::get_users_in_context($userlist);
@@ -163,7 +164,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
// Make sure that student 3 is not in the returned userids.
$this->assertFalse(in_array($student3->id, $userids));
// Try with the course context.
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
$userlist = new \core_privacy\local\request\userlist($coursecontext, 'mod_assignment');
provider::get_users_in_context($userlist);
$this->assertEmpty($userlist->get_userids());
@@ -195,7 +196,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
$contexts = $contextlist->get_contexts();
// Context 1 - Course 1's Assignment 1 -- (onlinetext).
$context = context_module::instance($this->course1assignments['ass1']->cmid);
$context = \context_module::instance($this->course1assignments['ass1']->cmid);
$this->assertContains($context, $contexts);
$writer = writer::with_context($context);
@@ -218,7 +219,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
}
// Context 2 - Course 1's Assignment 2 -- (single file upload).
$context = context_module::instance($this->course1assignments['ass2']->cmid);
$context = \context_module::instance($this->course1assignments['ass2']->cmid);
$this->assertContains($context, $contexts);
$writer = writer::with_context($context);
@@ -237,7 +238,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
}
// Context 3 - Course 2's Assignment 1 -- (offline).
$context = context_module::instance($this->course2assignments['ass1']->cmid);
$context = \context_module::instance($this->course2assignments['ass1']->cmid);
$this->assertContains($context, $contexts);
$writer = writer::with_context($context);
@@ -252,7 +253,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
}
// Context 4 - Course 2's Assignment 2 -- (multiple file upload).
$context = context_module::instance($this->course2assignments['ass2']->cmid);
$context = \context_module::instance($this->course2assignments['ass2']->cmid);
$this->assertContains($context, $contexts);
$writer = writer::with_context($context);
@@ -294,7 +295,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
$contexts = $contextlist->get_contexts();
// Context 1 - Course 1's Assignment 1 -- (onlinetext).
$context = context_module::instance($this->course1assignments['ass1']->cmid);
$context = \context_module::instance($this->course1assignments['ass1']->cmid);
$this->assertContains($context, $contexts);
$writer = writer::with_context($context);
@@ -307,7 +308,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
$this->assertEquals("<p>Course 1 - Ass 1: " . $student1->id . "</p>", $submission->data1);
// Context 2 - Course 1's Assignment 2 -- (single file upload).
$context = context_module::instance($this->course1assignments['ass2']->cmid);
$context = \context_module::instance($this->course1assignments['ass2']->cmid);
$this->assertContains($context, $contexts);
$writer = writer::with_context($context);
@@ -334,7 +335,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
$contexts = $contextlist->get_contexts();
// Context 1 - Course 2's Assignment 1 -- (offline).
$context = context_module::instance($this->course2assignments['ass1']->cmid);
$context = \context_module::instance($this->course2assignments['ass1']->cmid);
$this->assertContains($context, $contexts);
$writer = writer::with_context($context);
@@ -347,7 +348,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
$this->assertEquals("<p>Course 2 - Ass 1: " . $student2->id . "</p>", $submission->data1);
// Context 2 - Course 2's Assignment 2 -- (multiple file upload).
$context = context_module::instance($this->course2assignments['ass2']->cmid);
$context = \context_module::instance($this->course2assignments['ass2']->cmid);
$this->assertContains($context, $contexts);
$writer = writer::with_context($context);
@@ -451,7 +452,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
'assignmenttype' => 'uploadsingle'
]
);
$context = context_module::instance($course1assignment->cmid);
$context = \context_module::instance($course1assignment->cmid);
// Student one submission.
$this->add_file_assignment_submission(
@@ -660,7 +661,7 @@ class mod_assignment_privacy_testcase extends provider_testcase {
// Create a file submission with the test pdf.
$this->setUser($user->id);
$context = context_module::instance($assignment->cmid);
$context = \context_module::instance($assignment->cmid);
$fs = get_file_storage();
$sourcefile = $CFG->dirroot . '/mod/assign/feedback/editpdf/tests/fixtures/submission.pdf';
mod/chat/tests/privacy_test.php → mod/chat/tests/privacy/provider_test.php
+17 -16
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_chat\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -45,7 +46,7 @@ require_once($CFG->dirroot . '/mod/chat/lib.php');
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_chat_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
global $PAGE;
@@ -88,13 +89,13 @@ class mod_chat_privacy_testcase extends provider_testcase {
// Check contexts for user 1.
$contextids = provider::get_contexts_for_userid($u1->id)->get_contextids();
$this->assertCount(2, $contextids);
$this->assertTrue(in_array(context_module::instance($chat1a->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($chat1b->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($chat1a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($chat1b->cmid)->id, $contextids));
$contextids = provider::get_contexts_for_userid($u2->id)->get_contextids();
$this->assertCount(2, $contextids);
$this->assertTrue(in_array(context_module::instance($chat1b->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($chat2a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($chat1b->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($chat2a->cmid)->id, $contextids));
}
/**
@@ -132,9 +133,9 @@ class mod_chat_privacy_testcase extends provider_testcase {
$chatuser = $this->login_user_in_course_chat($u2, $c2, $chat2a);
chat_send_chatmessage($chatuser, 'What\'s happening here?');
$context1a = context_module::instance($chat1a->cmid);
$context1b = context_module::instance($chat1b->cmid);
$context2a = context_module::instance($chat2a->cmid);
$context1a = \context_module::instance($chat1a->cmid);
$context1b = \context_module::instance($chat1b->cmid);
$context2a = \context_module::instance($chat2a->cmid);
$userlist1a = new \core_privacy\local\request\userlist($context1a, $component);
$userlist1b = new \core_privacy\local\request\userlist($context1b, $component);
@@ -172,8 +173,8 @@ class mod_chat_privacy_testcase extends provider_testcase {
$chat1a = $dg->create_module('chat', ['course' => $c1]);
$chat1b = $dg->create_module('chat', ['course' => $c1]);
$chat1actx = context_module::instance($chat1a->cmid);
$chat1bctx = context_module::instance($chat1b->cmid);
$chat1actx = \context_module::instance($chat1a->cmid);
$chat1bctx = \context_module::instance($chat1b->cmid);
$u1chat1a = $this->login_user_in_course_chat($u1, $c1, $chat1a);
$u2chat1a = $this->login_user_in_course_chat($u2, $c1, $chat1a);
@@ -196,7 +197,7 @@ class mod_chat_privacy_testcase extends provider_testcase {
$this->assert_has_data_in_chat($u2, $chat1b);
// No change.
provider::delete_data_for_all_users_in_context(context_course::instance($c1->id));
provider::delete_data_for_all_users_in_context(\context_course::instance($c1->id));
$this->assert_has_data_in_chat($u1, $chat1a);
$this->assert_has_data_in_chat($u2, $chat1a);
$this->assert_has_data_in_chat($u1, $chat1b);
@@ -220,8 +221,8 @@ class mod_chat_privacy_testcase extends provider_testcase {
$chat1a = $dg->create_module('chat', ['course' => $c1]);
$chat1b = $dg->create_module('chat', ['course' => $c1]);
$chat1actx = context_module::instance($chat1a->cmid);
$chat1bctx = context_module::instance($chat1b->cmid);
$chat1actx = \context_module::instance($chat1a->cmid);
$chat1bctx = \context_module::instance($chat1b->cmid);
$u1chat1a = $this->login_user_in_course_chat($u1, $c1, $chat1a);
$u2chat1a = $this->login_user_in_course_chat($u2, $c1, $chat1a);
@@ -270,7 +271,7 @@ class mod_chat_privacy_testcase extends provider_testcase {
$u3 = $dg->create_user();
$chat1 = $dg->create_module('chat', ['course' => $c1]);
$chat1context = context_module::instance($chat1->cmid);
$chat1context = \context_module::instance($chat1->cmid);
$u1chat1 = $this->login_user_in_course_chat($u1, $c1, $chat1);
$u2chat1 = $this->login_user_in_course_chat($u2, $c1, $chat1);
@@ -322,8 +323,8 @@ class mod_chat_privacy_testcase extends provider_testcase {
$chat1a = $dg->create_module('chat', ['course' => $c1]);
$chat1b = $dg->create_module('chat', ['course' => $c1]);
$chat1actx = context_module::instance($chat1a->cmid);
$chat1bctx = context_module::instance($chat1b->cmid);
$chat1actx = \context_module::instance($chat1a->cmid);
$chat1bctx = \context_module::instance($chat1b->cmid);
$u1chat1a = $this->login_user_in_course_chat($u1, $c1, $chat1a);
$u2chat1a = $this->login_user_in_course_chat($u2, $c1, $chat1a);
mod/choice/tests/privacy_provider_test.php → mod/choice/tests/privacy/provider_test.php
+11 -10
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Jun Pataleta
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_choice\privacy;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\deletion_criteria;
@@ -35,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Jun Pataleta
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_choice_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/** @var stdClass The student object. */
protected $student;
@@ -113,7 +114,7 @@ class mod_choice_privacy_provider_testcase extends \core_privacy\tests\provider_
$contextlist = provider::get_contexts_for_userid($this->student->id);
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
$this->assertEquals($cmcontext->id, $contextforuser->id);
}
@@ -122,7 +123,7 @@ class mod_choice_privacy_provider_testcase extends \core_privacy\tests\provider_
*/
public function test_export_for_context() {
$cm = get_coursemodule_from_instance('choice', $this->choice->id);
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
// Export all of the data for the context.
$this->export_context_data_for_user($this->student->id, $cmcontext, 'mod_choice');
@@ -155,7 +156,7 @@ class mod_choice_privacy_provider_testcase extends \core_privacy\tests\provider_
$this->assertEquals(2, $count);
// Delete data based on context.
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
provider::delete_data_for_all_users_in_context($cmcontext);
// After deletion, the choice answers for that choice activity should have been deleted.
@@ -205,10 +206,10 @@ class mod_choice_privacy_provider_testcase extends \core_privacy\tests\provider_
$count = $DB->count_records('choice_answers', ['choiceid' => $choice->id]);
$this->assertEquals(2, $count);
$context1 = context_module::instance($cm1->id);
$context2 = context_module::instance($cm2->id);
$context1 = \context_module::instance($cm1->id);
$context2 = \context_module::instance($cm2->id);
$contextlist = new \core_privacy\local\request\approved_contextlist($this->student, 'choice',
[context_system::instance()->id, $context1->id, $context2->id]);
[\context_system::instance()->id, $context1->id, $context2->id]);
provider::delete_data_for_user($contextlist);
// After deletion, the choice answers for the first student should have been deleted.
@@ -228,7 +229,7 @@ class mod_choice_privacy_provider_testcase extends \core_privacy\tests\provider_
*/
public function test_get_users_in_context() {
$cm = get_coursemodule_from_instance('choice', $this->choice->id);
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
$userlist = new \core_privacy\local\request\userlist($cmcontext, 'mod_choice');
\mod_choice\privacy\provider::get_users_in_context($userlist);
@@ -243,7 +244,7 @@ class mod_choice_privacy_provider_testcase extends \core_privacy\tests\provider_
* Test for provider::get_users_in_context() with invalid context type.
*/
public function test_get_users_in_context_invalid_context_type() {
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist = new \core_privacy\local\request\userlist($systemcontext, 'mod_choice');
\mod_choice\privacy\provider::get_users_in_context($userlist);
@@ -293,7 +294,7 @@ class mod_choice_privacy_provider_testcase extends \core_privacy\tests\provider_
$count = $DB->count_records('choice_answers', ['choiceid' => $choice->id]);
$this->assertEquals(3, $count);
$context1 = context_module::instance($cm1->id);
$context1 = \context_module::instance($cm1->id);
$approveduserlist = new \core_privacy\local\request\approved_userlist($context1, 'choice',
[$this->student->id, $otherstudent->id]);
provider::delete_data_for_users($approveduserlist);
mod/data/tests/privacy_provider_test.php → mod/data/tests/privacy/provider_test.php
+8 -7
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_data\privacy;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\approved_userlist;
@@ -35,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_data_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/** @var stdClass The student object. */
protected $student;
/** @var stdClass The student object. */
@@ -182,7 +183,7 @@ class mod_data_privacy_provider_testcase extends \core_privacy\tests\provider_te
$contextlist = provider::get_contexts_for_userid($this->student->id);
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
$this->assertEquals($cmcontext->id, $contextforuser->id);
}
@@ -192,7 +193,7 @@ class mod_data_privacy_provider_testcase extends \core_privacy\tests\provider_te
public function test_get_users_in_context() {
$component = 'mod_data';
$cm = get_coursemodule_from_instance('data', $this->datamodule->id);
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
$userlist = new \core_privacy\local\request\userlist($cmcontext, $component);
provider::get_users_in_context($userlist);
@@ -223,7 +224,7 @@ class mod_data_privacy_provider_testcase extends \core_privacy\tests\provider_te
public function test_export_for_context() {
global $DB;
$cm = get_coursemodule_from_instance('data', $this->datamodule->id);
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
$records = $DB->get_records_select('data_records', 'userid = :userid ORDER BY id', ['userid' => $this->student->id]);
$record = reset($records);
$contents = $DB->get_records('data_content', ['recordid' => $record->id]);
@@ -248,7 +249,7 @@ class mod_data_privacy_provider_testcase extends \core_privacy\tests\provider_te
*/
public function test_delete_data_for_all_users_in_context() {
$cm = get_coursemodule_from_instance('data', $this->datamodule->id);
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
provider::delete_data_for_all_users_in_context($cmcontext);
@@ -262,7 +263,7 @@ class mod_data_privacy_provider_testcase extends \core_privacy\tests\provider_te
*/
public function test_delete_data_for_user() {
$cm = get_coursemodule_from_instance('data', $this->datamodule->id);
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
$appctxt = new \core_privacy\local\request\approved_contextlist($this->student, 'mod_data', [$cmcontext->id]);
provider::delete_data_for_user($appctxt);
@@ -276,7 +277,7 @@ class mod_data_privacy_provider_testcase extends \core_privacy\tests\provider_te
*/
public function test_delete_data_for_users() {
$cm = get_coursemodule_from_instance('data', $this->datamodule->id);
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
$userstodelete = [$this->student->id, $this->student2->id];
// Ensure student, student 2 and student 3 have data before being deleted.
mod/feedback/tests/privacy_test.php → mod/feedback/tests/privacy/provider_test.php
+37 -35
View File
@@ -23,12 +23,14 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_feedback\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\approved_userlist;
use core_privacy\local\request\transform;
use core_privacy\local\request\writer;
use mod_feedback\privacy\provider;
@@ -44,7 +46,7 @@ require_once($CFG->dirroot . '/mod/feedback/lib.php');
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_feedback_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
$this->resetAfterTest();
@@ -98,21 +100,21 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$contextids = provider::get_contexts_for_userid($u1->id)->get_contextids();
$this->assertCount(4, $contextids);
$this->assertTrue(in_array(context_module::instance($cm0a->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm1a->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm2a->cmid)->id, $contextids));
$this->assertFalse(in_array(context_module::instance($cm1b->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm2b->cmid)->id, $contextids));
$this->assertFalse(in_array(context_module::instance($cm2c->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm0a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm1a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm2a->cmid)->id, $contextids));
$this->assertFalse(in_array(\context_module::instance($cm1b->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm2b->cmid)->id, $contextids));
$this->assertFalse(in_array(\context_module::instance($cm2c->cmid)->id, $contextids));
$contextids = provider::get_contexts_for_userid($u2->id)->get_contextids();
$this->assertCount(2, $contextids);
$this->assertFalse(in_array(context_module::instance($cm0a->cmid)->id, $contextids));
$this->assertFalse(in_array(context_module::instance($cm1a->cmid)->id, $contextids));
$this->assertFalse(in_array(context_module::instance($cm2a->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm1b->cmid)->id, $contextids));
$this->assertFalse(in_array(context_module::instance($cm2b->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm2c->cmid)->id, $contextids));
$this->assertFalse(in_array(\context_module::instance($cm0a->cmid)->id, $contextids));
$this->assertFalse(in_array(\context_module::instance($cm1a->cmid)->id, $contextids));
$this->assertFalse(in_array(\context_module::instance($cm2a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm1b->cmid)->id, $contextids));
$this->assertFalse(in_array(\context_module::instance($cm2b->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm2c->cmid)->id, $contextids));
}
/**
@@ -154,14 +156,14 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$this->create_tmp_submission_with_answers($feedback, $u2, $answers);
// Only u1 in cm0.
$context = context_module::instance($cm0->cmid);
$context = \context_module::instance($cm0->cmid);
$userlist = new \core_privacy\local\request\userlist($context, $component);
provider::get_users_in_context($userlist);
$this->assertCount(1, $userlist);
$this->assertEquals([$u1->id], $userlist->get_userids());
$context = context_module::instance($cm1a->cmid);
$context = \context_module::instance($cm1a->cmid);
$userlist = new \core_privacy\local\request\userlist($context, $component);
provider::get_users_in_context($userlist);
@@ -176,7 +178,7 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$this->assertEquals($expected, $actual);
// Only u2 in cm1b.
$context = context_module::instance($cm1b->cmid);
$context = \context_module::instance($cm1b->cmid);
$userlist = new \core_privacy\local\request\userlist($context, $component);
provider::get_users_in_context($userlist);
@@ -184,7 +186,7 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$this->assertEquals([$u2->id], $userlist->get_userids());
// Only u1 in cm2.
$context = context_module::instance($cm2->cmid);
$context = \context_module::instance($cm2->cmid);
$userlist = new \core_privacy\local\request\userlist($context, $component);
provider::get_users_in_context($userlist);
@@ -226,8 +228,8 @@ class mod_feedback_privacy_testcase extends provider_testcase {
}
$appctx = new approved_contextlist($u1, 'mod_feedback', [
context_module::instance($cm0a->cmid)->id,
context_module::instance($cm1a->cmid)->id
\context_module::instance($cm0a->cmid)->id,
\context_module::instance($cm1a->cmid)->id
]);
provider::delete_data_for_user($appctx);
@@ -259,8 +261,8 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$cm0 = $dg->create_module('feedback', ['course' => SITEID]);
$cm1 = $dg->create_module('feedback', ['course' => $c1, 'anonymous' => FEEDBACK_ANONYMOUS_NO]);
$cm2 = $dg->create_module('feedback', ['course' => $c2]);
$context0 = context_module::instance($cm0->cmid);
$context1 = context_module::instance($cm1->cmid);
$context0 = \context_module::instance($cm0->cmid);
$context1 = \context_module::instance($cm1->cmid);
$u1 = $dg->create_user();
$u2 = $dg->create_user();
@@ -279,7 +281,7 @@ class mod_feedback_privacy_testcase extends provider_testcase {
}
// Delete u1 from cm0, ensure u2 data is retained.
$approveduserlist = new core_privacy\local\request\approved_userlist($context0, 'mod_feedback', [$u1->id]);
$approveduserlist = new approved_userlist($context0, 'mod_feedback', [$u1->id]);
provider::delete_data_for_users($approveduserlist);
$this->assert_no_feedback_data_for_user($cm0, $u1);
@@ -293,7 +295,7 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$this->assert_feedback_tmp_data_for_user($cm1, $u2);
// Delete u1 and u2 from cm1, ensure no data is retained.
$approveduserlist = new core_privacy\local\request\approved_userlist($context1, 'mod_feedback', [$u1->id, $u2->id]);
$approveduserlist = new approved_userlist($context1, 'mod_feedback', [$u1->id, $u2->id]);
provider::delete_data_for_users($approveduserlist);
$this->assert_no_feedback_data_for_user($cm1, $u1);
@@ -335,7 +337,7 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$this->create_tmp_submission_with_answers($feedback, $u2, $answers);
}
provider::delete_data_for_all_users_in_context(context_module::instance($cm1a->cmid));
provider::delete_data_for_all_users_in_context(\context_module::instance($cm1a->cmid));
$this->assert_no_feedback_data_for_user($cm1a, $u1);
$this->assert_no_feedback_data_for_user($cm1a, $u2);
@@ -389,15 +391,15 @@ class mod_feedback_privacy_testcase extends provider_testcase {
}
$appctx = new approved_contextlist($u1, 'mod_feedback', [
context_module::instance($cm0a->cmid)->id,
context_module::instance($cm1a->cmid)->id,
context_module::instance($cm2a->cmid)->id,
context_module::instance($cm2b->cmid)->id,
\context_module::instance($cm0a->cmid)->id,
\context_module::instance($cm1a->cmid)->id,
\context_module::instance($cm2a->cmid)->id,
\context_module::instance($cm2b->cmid)->id,
]);
provider::export_user_data($appctx);
// CM0A.
$data = writer::with_context(context_module::instance($cm0a->cmid))->get_data();
$data = writer::with_context(\context_module::instance($cm0a->cmid))->get_data();
$this->assertCount(2, $data->submissions);
$submission = $data->submissions[0];
$this->assertEquals(transform::yesno(false), $submission['inprogress']);
@@ -417,7 +419,7 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$this->assertEquals('a', $submission['answers'][1]['answer']);
// CM1A.
$data = writer::with_context(context_module::instance($cm1a->cmid))->get_data();
$data = writer::with_context(\context_module::instance($cm1a->cmid))->get_data();
$this->assertCount(1, $data->submissions);
$submission = $data->submissions[0];
$this->assertEquals(transform::yesno(true), $submission['inprogress']);
@@ -429,7 +431,7 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$this->assertEquals('a', $submission['answers'][1]['answer']);
// CM2A.
$data = writer::with_context(context_module::instance($cm2a->cmid))->get_data();
$data = writer::with_context(\context_module::instance($cm2a->cmid))->get_data();
$this->assertCount(2, $data->submissions);
$submission = $data->submissions[0];
$this->assertEquals(transform::yesno(false), $submission['inprogress']);
@@ -447,11 +449,11 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$this->assertEquals('1337', $submission['answers'][0]['answer']);
// CM2B (no data).
$data = writer::with_context(context_module::instance($cm2b->cmid))->get_data();
$data = writer::with_context(\context_module::instance($cm2b->cmid))->get_data();
$this->assertEmpty($data);
// CM2C (not exported).
$data = writer::with_context(context_module::instance($cm2b->cmid))->get_data();
$data = writer::with_context(\context_module::instance($cm2b->cmid))->get_data();
$this->assertEmpty($data);
}
@@ -529,7 +531,7 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$modinfo = get_fast_modinfo($feedback->course);
$cm = $modinfo->get_cm($feedback->cmid);
$feedbackcompletion = new mod_feedback_completion($feedback, $cm, $feedback->course, false, null, null, $user->id);
$feedbackcompletion = new \mod_feedback_completion($feedback, $cm, $feedback->course, false, null, null, $user->id);
$feedbackcompletion->save_response_tmp((object) $answers);
$feedbackcompletion->save_response();
$this->assertEquals($submissioncount, $DB->count_records('feedback_completed', ['feedback' => $feedback->id,
@@ -552,7 +554,7 @@ class mod_feedback_privacy_testcase extends provider_testcase {
$modinfo = get_fast_modinfo($feedback->course);
$cm = $modinfo->get_cm($feedback->cmid);
$feedbackcompletion = new mod_feedback_completion($feedback, $cm, $feedback->course, false, null, null, $user->id);
$feedbackcompletion = new \mod_feedback_completion($feedback, $cm, $feedback->course, false, null, null, $user->id);
$feedbackcompletion->save_response_tmp((object) $answers);
$this->assertEquals(1, $DB->count_records('feedback_completedtmp', ['feedback' => $feedback->id, 'userid' => $user->id]));
$this->assertEquals(2, $DB->count_records('feedback_valuetmp', [
mod/forum/tests/privacy_provider_test.php → mod/forum/tests/privacy/provider_test.php
+15 -14
View File
@@ -21,15 +21,16 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_forum\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once(__DIR__ . '/generator_trait.php');
require_once(__DIR__ . '/../generator_trait.php');
require_once($CFG->dirroot . '/rating/lib.php');
use \mod_forum\privacy\provider;
use mod_forum\privacy\provider;
/**
* Tests for the forum implementation of the Privacy Provider API.
@@ -37,7 +38,7 @@ use \mod_forum\privacy\provider;
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
// Include the privacy subcontext_info trait.
// This includes the subcontext builders.
@@ -45,7 +46,7 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
// Include the mod_forum test helpers.
// This includes functions to create forums, users, discussions, and posts.
use mod_forum_tests_generator_trait;
use \mod_forum_tests_generator_trait;
// Include the privacy helper trait for the ratings API.
use \core_rating\phpunit\privacy_helper;
@@ -499,8 +500,8 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
$context = \context_module::instance($cm->id);
// Rate the other users content.
$rm = new rating_manager();
$ratingoptions = new stdClass;
$rm = new \rating_manager();
$ratingoptions = new \stdClass;
$ratingoptions->context = $context;
$ratingoptions->component = 'mod_forum';
$ratingoptions->ratingarea = 'post';
@@ -569,8 +570,8 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
$context = \context_module::instance($cm->id);
// Other users rate my content.
$rm = new rating_manager();
$ratingoptions = new stdClass;
$rm = new \rating_manager();
$ratingoptions = new \stdClass;
$ratingoptions->context = $context;
$ratingoptions->component = 'mod_forum';
$ratingoptions->ratingarea = 'post';
@@ -1140,7 +1141,7 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
// Rate the other users content.
if ($post->userid != $user->id) {
$ratedposts[$post->id] = $post;
$rm = new rating_manager();
$rm = new \rating_manager();
$ratingoptions = (object) [
'context' => $context,
'component' => 'mod_forum',
@@ -1199,7 +1200,7 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
}
// All ratings should have been deleted.
$rm = new rating_manager();
$rm = new \rating_manager();
foreach ($postsinforum as $post) {
$ratings = $rm->get_all_ratings_for_item((object) [
'context' => $context,
@@ -1243,7 +1244,7 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
}
// Ratings should not have been deleted.
$rm = new rating_manager();
$rm = new \rating_manager();
foreach ($postsinforum as $post) {
if (!isset($ratedposts[$post->id])) {
continue;
@@ -1364,7 +1365,7 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
// Rate the other users content.
if ($post->userid != $user->id) {
$ratedposts[$post->id] = $post;
$rm = new rating_manager();
$rm = new \rating_manager();
$ratingoptions = (object) [
'context' => $context,
'component' => 'mod_forum',
@@ -1579,7 +1580,7 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
// Rate the other users content.
if ($post->userid != $user->id) {
$ratedposts[$post->id] = $post;
$rm = new rating_manager();
$rm = new \rating_manager();
$ratingoptions = (object) [
'context' => $context,
'component' => 'mod_forum',
@@ -1768,7 +1769,7 @@ class mod_forum_privacy_provider_testcase extends \core_privacy\tests\provider_t
list($fd1, $fp1) = $this->helper_post_to_forum($forum, $author);
// Rate the other users content.
$rm = new rating_manager();
$rm = new \rating_manager();
$ratingoptions = (object) [
'context' => $context,
'component' => 'mod_forum',
mod/glossary/tests/privacy_provider_test.php → mod/glossary/tests/privacy/provider_test.php
+26 -24
View File
@@ -21,8 +21,10 @@
* @copyright 2018 Simey Lameze <simey@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_glossary\privacy;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\approved_userlist;
use core_privacy\local\request\deletion_criteria;
use mod_glossary\privacy\provider;
@@ -39,7 +41,7 @@ require_once($CFG->dirroot . '/rating/lib.php');
* @copyright 2018 Simey Lameze <simey@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/** @var stdClass The student object. */
protected $student;
@@ -73,7 +75,7 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$this->glossary = $glossary;
$cm = get_coursemodule_from_instance('glossary', $glossary->id);
$context = context_module::instance($cm->id);
$context = \context_module::instance($cm->id);
// Create a student which will add an entry to a glossary.
$student = $generator->create_user();
@@ -93,7 +95,7 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$comment->add('Hello, it\'s me!');
// Attach tags.
core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge1->id, $context, ['Beer', 'Golf']);
\core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge1->id, $context, ['Beer', 'Golf']);
}
/**
@@ -128,7 +130,7 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$contextlist = provider::get_contexts_for_userid($this->student->id);
$this->assertCount(1, $contextlist);
$contextforuser = $contextlist->current();
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
$this->assertEquals($cmcontext->id, $contextforuser->id);
}
@@ -138,7 +140,7 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
public function test_get_users_in_context() {
$component = 'mod_glossary';
$cm = get_coursemodule_from_instance('glossary', $this->glossary->id);
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
$userlist = new \core_privacy\local\request\userlist($cmcontext, $component);
provider::get_users_in_context($userlist);
@@ -158,7 +160,7 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
*/
public function test_export_for_context() {
$cm = get_coursemodule_from_instance('glossary', $this->glossary->id);
$cmcontext = context_module::instance($cm->id);
$cmcontext = \context_module::instance($cm->id);
// Export all of the data for the context.
$writer = \core_privacy\local\request\writer::with_context($cmcontext);
@@ -180,7 +182,7 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$generator = $this->getDataGenerator();
$cm = get_coursemodule_from_instance('glossary', $this->glossary->id);
$context = context_module::instance($cm->id);
$context = \context_module::instance($cm->id);
// Create another student who will add an entry the glossary activity.
$student2 = $generator->create_user();
$generator->enrol_user($student2->id, $this->course->id, 'student');
@@ -193,7 +195,7 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$this->plugingenerator->create_category($this->glossary, ['cat1'], [$ge3]);
$count = $DB->count_records('glossary_entries_categories', ['entryid' => $ge3->id]);
$this->assertEquals(1, $count);
core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge3->id, $context, ['Pizza', 'Noodles']);
\core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge3->id, $context, ['Pizza', 'Noodles']);
// As a teacher, rate student 2 entry.
$this->setUser($this->teacher);
@@ -245,9 +247,9 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$ge1 = $this->plugingenerator->create_content($this->glossary, ['concept' => 'first user glossary entry', 'approved' => 1]);
$this->plugingenerator->create_content($glossary2, ['concept' => 'first user second glossary entry', 'approved' => 1]);
$context1 = context_module::instance($cm1->id);
$context2 = context_module::instance($cm2->id);
core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge1->id, $context1, ['Parmi', 'Sushi']);
$context1 = \context_module::instance($cm1->id);
$context2 = \context_module::instance($cm2->id);
\core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge1->id, $context1, ['Parmi', 'Sushi']);
$this->setUser($student2);
$ge3 = $this->plugingenerator->create_content($this->glossary, ['concept' => 'second user glossary entry',
@@ -256,7 +258,7 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$comment = $this->get_comment_object($context1, $ge3->id);
$comment->add('User 2 comment');
core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge3->id, $context1, ['Pizza', 'Noodles']);
\core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge3->id, $context1, ['Pizza', 'Noodles']);
// As a teacher, rate student 2's entry.
$this->setUser($this->teacher);
@@ -329,9 +331,9 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$ge2 = $this->plugingenerator->create_content($glossary2, ['concept' => 'first user second glossary entry',
'approved' => 1], ['two']);
$context1 = context_module::instance($cm1->id);
$context2 = context_module::instance($cm2->id);
core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge1->id, $context1, ['Parmi', 'Sushi']);
$context1 = \context_module::instance($cm1->id);
$context2 = \context_module::instance($cm2->id);
\core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge1->id, $context1, ['Parmi', 'Sushi']);
$this->setUser($student2);
$ge3 = $this->plugingenerator->create_content($this->glossary, ['concept' => 'second user glossary entry',
@@ -342,8 +344,8 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$comment = $this->get_comment_object($context2, $ge2->id);
$comment->add('User 2 comment 2');
core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge3->id, $context1, ['Pizza', 'Noodles']);
core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge2->id, $context2, ['Potato', 'Kumara']);
\core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge3->id, $context1, ['Pizza', 'Noodles']);
\core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $ge2->id, $context2, ['Potato', 'Kumara']);
// As a teacher, rate student 2's entry.
$this->setUser($this->teacher);
@@ -384,7 +386,7 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
$this->assertEquals(1, $ratingcount);
// Perform deletion within context 1 for both students.
$approveduserlist = new core_privacy\local\request\approved_userlist($context1, 'mod_glossary',
$approveduserlist = new approved_userlist($context1, 'mod_glossary',
[$this->student->id, $student2->id]);
provider::delete_data_for_users($approveduserlist);
@@ -428,15 +430,15 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
* @param int $itemid The item ID.
* @return comment
*/
protected function get_comment_object(context $context, $itemid) {
$args = new stdClass();
protected function get_comment_object(\context $context, $itemid) {
$args = new \stdClass();
$args->context = $context;
$args->course = get_course(SITEID);
$args->area = 'glossary_entry';
$args->itemid = $itemid;
$args->component = 'mod_glossary';
$comment = new comment($args);
$comment = new \comment($args);
$comment->set_post_permission(true);
return $comment;
@@ -449,16 +451,16 @@ class mod_glossary_privacy_provider_testcase extends \core_privacy\tests\provide
* @param int $itemid The item ID.
* @return rating object
*/
protected function get_rating_object(context $context, $itemid) {
protected function get_rating_object(\context $context, $itemid) {
global $USER;
$ratingoptions = new stdClass;
$ratingoptions = new \stdClass;
$ratingoptions->context = $context;
$ratingoptions->ratingarea = 'entry';
$ratingoptions->component = 'mod_glossary';
$ratingoptions->itemid = $itemid;
$ratingoptions->scaleid = 2;
$ratingoptions->userid = $USER->id;
return new rating($ratingoptions);
return new \rating($ratingoptions);
}
}
mod/h5pactivity/tests/privacy_test.php → mod/h5pactivity/tests/privacy/provider_test.php
+1 -1
View File
@@ -38,7 +38,7 @@ use \core_privacy\tests\provider_testcase;
* @copyright 2020 Ferran Recio <ferran@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class privacy_test extends provider_testcase {
class provider_test extends provider_testcase {
/** @var stdClass User without any attempt. */
protected $student0;
mod/lesson/tests/privacy_test.php → mod/lesson/tests/privacy/provider_test.php
+36 -34
View File
@@ -23,12 +23,14 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_lesson\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
use core_privacy\tests\provider_testcase;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\approved_userlist;
use core_privacy\local\request\transform;
use core_privacy\local\request\writer;
use mod_lesson\privacy\provider;
@@ -42,7 +44,7 @@ use mod_lesson\privacy\provider;
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_lesson_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
global $PAGE;
@@ -65,9 +67,9 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$cm1 = $dg->create_module('lesson', ['course' => $c1]);
$cm2 = $dg->create_module('lesson', ['course' => $c1]);
$cm3 = $dg->create_module('lesson', ['course' => $c1]);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$cm3ctx = context_module::instance($cm3->cmid);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$cm3ctx = \context_module::instance($cm3->cmid);
$this->create_attempt($cm1, $u1);
$this->create_grade($cm2, $u2);
@@ -126,8 +128,8 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$cm1 = $dg->create_module('lesson', ['course' => $c1]);
$cm2 = $dg->create_module('lesson', ['course' => $c1]);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$this->create_attempt($cm1, $u1);
$this->create_grade($cm1, $u2);
@@ -141,7 +143,7 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$this->create_branch($cm2, $u6);
$this->create_override($cm2, $u6);
$context = context_module::instance($cm1->cmid);
$context = \context_module::instance($cm1->cmid);
$userlist = new \core_privacy\local\request\userlist($context, $component);
provider::get_users_in_context($userlist);
$userids = $userlist->get_userids();
@@ -153,7 +155,7 @@ class mod_lesson_privacy_testcase extends provider_testcase {
sort($actual);
$this->assertEquals($expected, $actual);
$context = context_module::instance($cm2->cmid);
$context = \context_module::instance($cm2->cmid);
$userlist = new \core_privacy\local\request\userlist($context, $component);
provider::get_users_in_context($userlist);
$userids = $userlist->get_userids();
@@ -173,10 +175,10 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$cm2 = $dg->create_module('lesson', ['course' => $c1]);
$cm3 = $dg->create_module('lesson', ['course' => $c1]);
$c1ctx = context_course::instance($c1->id);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$cm3ctx = context_module::instance($cm3->cmid);
$c1ctx = \context_course::instance($c1->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$cm3ctx = \context_module::instance($cm3->cmid);
$this->create_attempt($cm1, $u1);
$this->create_grade($cm1, $u1);
@@ -231,17 +233,17 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$assertcm2nochange();
// Delete the course: no change.
provider::delete_data_for_all_users_in_context(context_course::instance($c1->id));
provider::delete_data_for_all_users_in_context(\context_course::instance($c1->id));
$assertcm1nochange();
$assertcm2nochange();
// Delete another module: no change.
provider::delete_data_for_all_users_in_context(context_module::instance($cm3->cmid));
provider::delete_data_for_all_users_in_context(\context_module::instance($cm3->cmid));
$assertcm1nochange();
$assertcm2nochange();
// Delete cm1: no change in cm2.
provider::delete_data_for_all_users_in_context(context_module::instance($cm1->cmid));
provider::delete_data_for_all_users_in_context(\context_module::instance($cm1->cmid));
$assertcm2nochange();
$this->assertFalse($DB->record_exists('lesson_attempts', ['userid' => $u1->id, 'lessonid' => $cm1->id]));
$this->assertFalse($DB->record_exists('lesson_grades', ['userid' => $u1->id, 'lessonid' => $cm1->id]));
@@ -266,10 +268,10 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$cm2 = $dg->create_module('lesson', ['course' => $c1]);
$cm3 = $dg->create_module('lesson', ['course' => $c1]);
$c1ctx = context_course::instance($c1->id);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$cm3ctx = context_module::instance($cm3->cmid);
$c1ctx = \context_course::instance($c1->id);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$cm3ctx = \context_module::instance($cm3->cmid);
$this->create_attempt($cm1, $u1);
$this->create_grade($cm1, $u1);
@@ -323,17 +325,17 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$assertu2nochange();
// Delete the course: no change.
provider::delete_data_for_user(new approved_contextlist($u1, 'mod_lesson', [context_course::instance($c1->id)->id]));
provider::delete_data_for_user(new approved_contextlist($u1, 'mod_lesson', [\context_course::instance($c1->id)->id]));
$assertu1nochange();
$assertu2nochange();
// Delete another module: no change.
provider::delete_data_for_user(new approved_contextlist($u1, 'mod_lesson', [context_module::instance($cm3->cmid)->id]));
provider::delete_data_for_user(new approved_contextlist($u1, 'mod_lesson', [\context_module::instance($cm3->cmid)->id]));
$assertu1nochange();
$assertu2nochange();
// Delete u1 in cm1: no change for u2 and in cm2.
provider::delete_data_for_user(new approved_contextlist($u1, 'mod_lesson', [context_module::instance($cm1->cmid)->id]));
provider::delete_data_for_user(new approved_contextlist($u1, 'mod_lesson', [\context_module::instance($cm1->cmid)->id]));
$assertu2nochange();
$this->assertFalse($DB->record_exists('lesson_attempts', ['userid' => $u1->id, 'lessonid' => $cm1->id]));
$this->assertFalse($DB->record_exists('lesson_grades', ['userid' => $u1->id, 'lessonid' => $cm1->id]));
@@ -360,8 +362,8 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$cm1 = $dg->create_module('lesson', ['course' => $c1]);
$cm2 = $dg->create_module('lesson', ['course' => $c1]);
$cm3 = $dg->create_module('lesson', ['course' => $c1]);
$context1 = context_module::instance($cm1->cmid);
$context3 = context_module::instance($cm3->cmid);
$context1 = \context_module::instance($cm1->cmid);
$context3 = \context_module::instance($cm3->cmid);
$this->create_attempt($cm1, $u1);
$this->create_grade($cm1, $u1);
@@ -408,7 +410,7 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$assertnochange($u2, $cm2);
// Delete another module: no change.
$approveduserlist = new core_privacy\local\request\approved_userlist($context3, 'mod_lesson', [$u1->id]);
$approveduserlist = new approved_userlist($context3, 'mod_lesson', [$u1->id]);
provider::delete_data_for_users($approveduserlist);
$assertnochange($u1, $cm1);
@@ -417,7 +419,7 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$assertnochange($u2, $cm2);
// Delete cm1 for u1: no change for u2 and in cm2.
$approveduserlist = new core_privacy\local\request\approved_userlist($context1, 'mod_lesson', [$u1->id]);
$approveduserlist = new approved_userlist($context1, 'mod_lesson', [$u1->id]);
provider::delete_data_for_users($approveduserlist);
$assertdeleted($u1, $cm1);
@@ -434,8 +436,8 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$cm1 = $dg->create_module('lesson', ['course' => $c1]);
$cm2 = $dg->create_module('lesson', ['course' => $c1]);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$now = time();
$this->create_override($cm1, $u1); // All null.
@@ -505,8 +507,8 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$cm1 = $dg->create_module('lesson', ['course' => $c1]);
$cm2 = $dg->create_module('lesson', ['course' => $c1]);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$now = time();
$this->create_grade($cm2, $u1, ['grade' => 33.33, 'completed' => $now - 3600]);
@@ -546,8 +548,8 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$cm1 = $dg->create_module('lesson', ['course' => $c1]);
$cm2 = $dg->create_module('lesson', ['course' => $c1]);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$now = time();
$this->create_timer($cm2, $u1, ['starttime' => $now - 2000, 'lessontime' => $now + 3600, 'completed' => 0,
@@ -600,8 +602,8 @@ class mod_lesson_privacy_testcase extends provider_testcase {
$cm1 = $dg->create_module('lesson', ['course' => $c1]);
$cm2 = $dg->create_module('lesson', ['course' => $c1]);
$cm1ctx = context_module::instance($cm1->cmid);
$cm2ctx = context_module::instance($cm2->cmid);
$cm1ctx = \context_module::instance($cm1->cmid);
$cm2ctx = \context_module::instance($cm2->cmid);
$page1 = $lg->create_content($cm1);
$page2 = $lg->create_question_truefalse($cm1);
mod/lti/service/gradebookservices/tests/privacy_provider_test.php → mod/lti/service/gradebookservices/tests/privacy/provider_test.php
+3 -2
View File
@@ -20,10 +20,11 @@
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace ltiservice_gradebookservices\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\tests\provider_testcase;
use core_privacy\tests\provider_testcase;
/**
* Unit tests for ltiservice_gradebookservices privacy provider.
@@ -31,7 +32,7 @@ use \core_privacy\tests\provider_testcase;
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class ltiservice_gradebookservices_privacy_provider_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Basic setup for these tests.
mod/lti/service/memberships/tests/privacy_provider_test.php → mod/lti/service/memberships/tests/privacy/provider_test.php
+3 -2
View File
@@ -20,10 +20,11 @@
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace ltiservice_memberships\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\tests\provider_testcase;
use core_privacy\tests\provider_testcase;
/**
* Unit tests for ltiservice_memberships privacy provider.
@@ -31,7 +32,7 @@ use \core_privacy\tests\provider_testcase;
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class ltiservice_memberships_privacy_provider_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Basic setup for these tests.
mod/lti/tests/privacy_provider_test.php → mod/lti/tests/privacy/provider_test.php
+22 -19
View File
@@ -21,8 +21,11 @@
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_lti\privacy;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\approved_userlist;
use mod_lti\privacy\provider;
defined('MOODLE_INTERNAL') || die();
@@ -34,7 +37,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Test for provider::get_metadata().
@@ -104,7 +107,7 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
$this->assertCount(2, $contextlist);
$contextformodule = $contextlist->current();
$cmcontext = context_module::instance($lti->cmid);
$cmcontext = \context_module::instance($lti->cmid);
$this->assertEquals($cmcontext->id, $contextformodule->id);
$contextlist->next();
@@ -134,7 +137,7 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
$this->create_lti_submission($lti1->id, $user1->id);
$this->create_lti_submission($lti1->id, $user2->id);
$context = context_module::instance($lti1->cmid);
$context = \context_module::instance($lti1->cmid);
$userlist = new \core_privacy\local\request\userlist($context, $component);
provider::get_users_in_context($userlist);
@@ -146,7 +149,7 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
$this->assertEquals($expected, $actual);
$context = context_module::instance($lti2->cmid);
$context = \context_module::instance($lti2->cmid);
$userlist = new \core_privacy\local\request\userlist($context, $component);
provider::get_users_in_context($userlist);
@@ -172,7 +175,7 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
$this->create_lti_submission($lti->id, $user2->id);
// Export all of the data for the context for user 1.
$cmcontext = context_module::instance($lti->cmid);
$cmcontext = \context_module::instance($lti->cmid);
$this->export_context_data_for_user($user1->id, $cmcontext, 'mod_lti');
$writer = \core_privacy\local\request\writer::with_context($cmcontext);
@@ -198,23 +201,23 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
// Create a user that will not make a tool type.
$this->getDataGenerator()->create_user();
$type = new stdClass();
$type = new \stdClass();
$type->baseurl = 'http://moodle.org';
$type->course = $course1->id;
lti_add_type($type, new stdClass());
lti_add_type($type, new \stdClass());
$type = new stdClass();
$type = new \stdClass();
$type->baseurl = 'http://moodle.org';
$type->course = $course1->id;
lti_add_type($type, new stdClass());
lti_add_type($type, new \stdClass());
$type = new stdClass();
$type = new \stdClass();
$type->baseurl = 'http://moodle.org';
$type->course = $course2->id;
lti_add_type($type, new stdClass());
lti_add_type($type, new \stdClass());
// Export all of the data for the context.
$coursecontext = context_course::instance($course1->id);
$coursecontext = \context_course::instance($course1->id);
$this->export_context_data_for_user($user->id, $coursecontext, 'mod_lti');
$writer = \core_privacy\local\request\writer::with_context($coursecontext);
@@ -223,7 +226,7 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
$data = $writer->get_data();
$this->assertCount(2, $data->lti_types);
$coursecontext = context_course::instance($course2->id);
$coursecontext = \context_course::instance($course2->id);
$this->export_context_data_for_user($user->id, $coursecontext, 'mod_lti');
$writer = \core_privacy\local\request\writer::with_context($coursecontext);
@@ -243,12 +246,12 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
$user = $this->getDataGenerator()->create_user();
$this->setUser($user);
$toolproxy = new stdClass();
$toolproxy = new \stdClass();
$toolproxy->createdby = $user;
lti_add_tool_proxy($toolproxy);
// Export all of the data for the context.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$this->export_context_data_for_user($user->id, $systemcontext, 'mod_lti');
$writer = \core_privacy\local\request\writer::with_context($systemcontext);
@@ -282,7 +285,7 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
$this->assertEquals(2, $count);
// Delete data based on context.
$cmcontext = context_module::instance($lti->cmid);
$cmcontext = \context_module::instance($lti->cmid);
provider::delete_data_for_all_users_in_context($cmcontext);
// After deletion, the lti submissions for that lti activity should have been deleted.
@@ -314,8 +317,8 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
$this->assertEquals(2, $count);
$context = \context_module::instance($lti->cmid);
$contextlist = new \core_privacy\local\request\approved_contextlist($user1, 'lti',
[context_system::instance()->id, $context->id]);
$contextlist = new approved_contextlist($user1, 'lti',
[\context_system::instance()->id, $context->id]);
provider::delete_data_for_user($contextlist);
// After deletion the lti submission for the first user should have been deleted.
@@ -357,7 +360,7 @@ class mod_lti_privacy_provider_testcase extends \core_privacy\tests\provider_tes
$context = \context_module::instance($lti->cmid);
$approveduserids = [$user1->id, $user2->id];
$approvedlist = new core_privacy\local\request\approved_userlist($context, $component, $approveduserids);
$approvedlist = new approved_userlist($context, $component, $approveduserids);
provider::delete_data_for_users($approvedlist);
// After deletion the lti submission for the first two users should have been deleted.
mod/quiz/accessrule/seb/tests/privacy_provider_test.php → mod/quiz/accessrule/seb/tests/privacy/provider_test.php
+11 -9
View File
@@ -23,6 +23,8 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace quizaccess_seb\privacy;
use core_privacy\local\request\approved_userlist;
use core_privacy\local\request\userlist;
use core_privacy\local\request\writer;
@@ -33,7 +35,7 @@ use quizaccess_seb\quiz_settings;
defined('MOODLE_INTERNAL') || die();
require_once(__DIR__ . '/test_helper_trait.php');
require_once(__DIR__ . '/../test_helper_trait.php');
/**
* PHPUnit tests for privacy provider.
@@ -41,8 +43,8 @@ require_once(__DIR__ . '/test_helper_trait.php');
* @copyright 2020 Catalyst IT
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class quizaccess_seb_provider_testcase extends provider_testcase {
use quizaccess_seb_test_helper_trait;
class provider_test extends provider_testcase {
use \quizaccess_seb_test_helper_trait;
/**
* Setup the user, the quiz and ensure that the user is the last user to modify the SEB quiz settings.
@@ -77,7 +79,7 @@ class quizaccess_seb_provider_testcase extends provider_testcase {
$contexts = provider::get_contexts_for_userid($this->user->id);
$contextids = $contexts->get_contextids();
$this->assertEquals(context_module::instance($this->quiz->cmid)->id, reset($contextids));
$this->assertEquals(\context_module::instance($this->quiz->cmid)->id, reset($contextids));
}
/**
@@ -98,7 +100,7 @@ class quizaccess_seb_provider_testcase extends provider_testcase {
public function test_export_user_data() {
$this->setup_test_data();
$context = context_module::instance($this->quiz->cmid);
$context = \context_module::instance($this->quiz->cmid);
// Add another course_module of a differenty type - doing this lets us
// test that the data exporter is correctly limiting its selection to
@@ -161,7 +163,7 @@ class quizaccess_seb_provider_testcase extends provider_testcase {
$this->setup_test_data();
// Create empty userlist with quiz module context.
$userlist = new userlist(context_module::instance($this->quiz->cmid), 'quizaccess_seb');
$userlist = new userlist(\context_module::instance($this->quiz->cmid), 'quizaccess_seb');
// Test that the userlist is populated with expected user/s.
provider::get_users_in_context($userlist);
@@ -174,7 +176,7 @@ class quizaccess_seb_provider_testcase extends provider_testcase {
public function test_delete_data_for_users() {
$this->setup_test_data();
$approveduserlist = new approved_userlist(context_module::instance($this->quiz->cmid),
$approveduserlist = new approved_userlist(\context_module::instance($this->quiz->cmid),
'quizaccess_seb', [$this->user->id]);
// Test data exists.
@@ -195,7 +197,7 @@ class quizaccess_seb_provider_testcase extends provider_testcase {
public function test_delete_data_for_user() {
$this->setup_test_data();
$context = context_module::instance($this->quiz->cmid);
$context = \context_module::instance($this->quiz->cmid);
$approvedcontextlist = new approved_contextlist($this->user,
'quizaccess_seb', [$context->id]);
@@ -217,7 +219,7 @@ class quizaccess_seb_provider_testcase extends provider_testcase {
public function test_delete_data_for_all_users_in_context() {
$this->setup_test_data();
$context = context_module::instance($this->quiz->cmid);
$context = \context_module::instance($this->quiz->cmid);
// Test data exists.
$record = quiz_settings::get_record(['quizid' => $this->quiz->id]);
mod/quiz/report/grading/tests/privacy_provider_test.php → mod/quiz/report/grading/tests/privacy/provider_test.php
+2 -1
View File
@@ -21,6 +21,7 @@
* @copyright 2020 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace quiz_grading\privacy;
use core_privacy\local\metadata\collection;
use quiz_grading\privacy\provider;
@@ -35,7 +36,7 @@ require_once($CFG->dirroot . '/question/engine/questionattempt.php');
/**
* Privacy provider tests class.
*/
class quiz_grading_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* When no preference exists, there should be no export.
*/
mod/quiz/report/overview/tests/privacy_provider_test.php → mod/quiz/report/overview/tests/privacy/provider_test.php
+2 -1
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace quiz_overview\privacy;
use core_privacy\local\metadata\collection;
use quiz_overview\privacy\provider;
@@ -36,7 +37,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class quiz_overview_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* When no preference exists, there should be no export.
*/
mod/quiz/report/responses/tests/privacy_provider_test.php → mod/quiz/report/responses/tests/privacy/provider_test.php
+3 -2
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace quiz_responses\privacy;
use core_privacy\local\metadata\collection;
use quiz_responses\privacy\provider;
@@ -39,7 +40,7 @@ require_once($CFG->dirroot . '/question/engine/questionattempt.php');
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class quiz_responses_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* When no preference exists, there should be no export.
*/
@@ -123,7 +124,7 @@ class quiz_responses_privacy_provider_testcase extends \core_privacy\tests\provi
$this->resetAfterTest();
$this->setAdminUser();
set_user_preference('quiz_report_responses_which_tries', question_attempt::FIRST_TRY);
set_user_preference('quiz_report_responses_which_tries', \question_attempt::FIRST_TRY);
provider::export_user_preferences($USER->id);
mod/quiz/tests/privacy_provider_test.php → mod/quiz/tests/privacy/provider_test.php
+12 -11
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_quiz\privacy;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\deletion_criteria;
@@ -40,9 +41,9 @@ require_once($CFG->dirroot . '/question/tests/privacy_helper.php');
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_quiz_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
use core_question_privacy_helper;
use \core_question_privacy_helper;
/**
* Test that a user who has no data gets no contexts
@@ -245,10 +246,10 @@ class mod_quiz_privacy_provider_testcase extends \core_privacy\tests\provider_te
// Run as the user and make an attempt on the quiz.
$this->setUser($user);
$starttime = time();
$quizobj = quiz::create($quiz->id, $user->id);
$quizobj = \quiz::create($quiz->id, $user->id);
$context = $quizobj->get_context();
$quba = question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
$quba = \question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
$quba->set_preferred_behaviour($quizobj->get_quiz()->preferredbehaviour);
// Start the attempt.
@@ -257,7 +258,7 @@ class mod_quiz_privacy_provider_testcase extends \core_privacy\tests\provider_te
quiz_attempt_save_started($quizobj, $quba, $attempt);
// Answer the questions.
$attemptobj = quiz_attempt::create($attempt->id);
$attemptobj = \quiz_attempt::create($attempt->id);
$tosubmit = [
1 => ['answer' => 'frog'],
@@ -267,7 +268,7 @@ class mod_quiz_privacy_provider_testcase extends \core_privacy\tests\provider_te
$attemptobj->process_submitted_actions($starttime, false, $tosubmit);
// Finish the attempt.
$attemptobj = quiz_attempt::create($attempt->id);
$attemptobj = \quiz_attempt::create($attempt->id);
$this->assertTrue($attemptobj->has_response_to_at_least_one_graded_question());
$attemptobj->process_finish($starttime, false);
@@ -428,10 +429,10 @@ class mod_quiz_privacy_provider_testcase extends \core_privacy\tests\provider_te
$this->setUser($user);
$starttime = time();
$quizobj = quiz::create($quiz->id, $user->id);
$quizobj = \quiz::create($quiz->id, $user->id);
$context = $quizobj->get_context();
$quba = question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
$quba = \question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
$quba->set_preferred_behaviour($quizobj->get_quiz()->preferredbehaviour);
// Start the attempt.
@@ -440,7 +441,7 @@ class mod_quiz_privacy_provider_testcase extends \core_privacy\tests\provider_te
quiz_attempt_save_started($quizobj, $quba, $attempt);
// Answer the questions.
$attemptobj = quiz_attempt::create($attempt->id);
$attemptobj = \quiz_attempt::create($attempt->id);
$tosubmit = [
1 => ['answer' => 'frog'],
@@ -450,7 +451,7 @@ class mod_quiz_privacy_provider_testcase extends \core_privacy\tests\provider_te
$attemptobj->process_submitted_actions($starttime, false, $tosubmit);
// Finish the attempt.
$attemptobj = quiz_attempt::create($attempt->id);
$attemptobj = \quiz_attempt::create($attempt->id);
$attemptobj->process_finish($starttime, false);
$this->setUser();
@@ -488,7 +489,7 @@ class mod_quiz_privacy_provider_testcase extends \core_privacy\tests\provider_te
// Fetch users - user1 and user2 should be returned.
$userlist = new \core_privacy\local\request\userlist($context, 'mod_quiz');
\mod_quiz\privacy\provider::get_users_in_context($userlist);
provider::get_users_in_context($userlist);
$this->assertEqualsCanonicalizing(
[$user->id, $anotheruser->id],
$userlist->get_userids());
mod/scorm/report/basic/tests/privacy_test.php → mod/scorm/report/basic/tests/privacy/provider_test.php
+2 -1
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace scormreport_basic\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -34,7 +35,7 @@ use scormreport_basic\privacy\provider;
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class scormreport_basic_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Basic setup for these tests.
mod/scorm/report/interactions/tests/privacy_test.php → mod/scorm/report/interactions/tests/privacy/provider_test.php
+2 -1
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace scormreport_interactions\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -34,7 +35,7 @@ use scormreport_interactions\privacy\provider;
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class scormreport_interactions_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Basic setup for these tests.
mod/scorm/report/objectives/tests/privacy_test.php → mod/scorm/report/objectives/tests/privacy/provider_test.php
+2 -1
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace scormreport_objectives\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -34,7 +35,7 @@ use scormreport_objectives\privacy\provider;
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class scormreport_objectives_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Basic setup for these tests.
mod/scorm/tests/privacy_test.php → mod/scorm/tests/privacy/provider_test.php
+2 -1
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_scorm\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -37,7 +38,7 @@ use core_privacy\tests\provider_testcase;
* @copyright 2018 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_scorm_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/** @var stdClass User without any AICC/SCORM attempt. */
protected $student0;
mod/survey/tests/privacy_test.php → mod/survey/tests/privacy/provider_test.php
+23 -22
View File
@@ -23,6 +23,7 @@
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_survey\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -45,7 +46,7 @@ require_once($CFG->dirroot . '/mod/survey/lib.php');
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_survey_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
public function setUp(): void {
global $PAGE;
@@ -75,15 +76,15 @@ class mod_survey_privacy_testcase extends provider_testcase {
$contextids = provider::get_contexts_for_userid($u1->id)->get_contextids();
$this->assertCount(3, $contextids);
$this->assertTrue(in_array(context_module::instance($cm1a->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm2a->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm2b->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm1a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm2a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm2b->cmid)->id, $contextids));
$contextids = provider::get_contexts_for_userid($u2->id)->get_contextids();
$this->assertCount(3, $contextids);
$this->assertTrue(in_array(context_module::instance($cm1a->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm1b->cmid)->id, $contextids));
$this->assertTrue(in_array(context_module::instance($cm1c->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm1a->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm1b->cmid)->id, $contextids));
$this->assertTrue(in_array(\context_module::instance($cm1c->cmid)->id, $contextids));
}
/**
@@ -98,9 +99,9 @@ class mod_survey_privacy_testcase extends provider_testcase {
$cm1a = $dg->create_module('survey', ['template' => 1, 'course' => $c1]);
$cm1b = $dg->create_module('survey', ['template' => 2, 'course' => $c1]);
$cm2 = $dg->create_module('survey', ['template' => 1, 'course' => $c2]);
$cm1acontext = context_module::instance($cm1a->cmid);
$cm1bcontext = context_module::instance($cm1b->cmid);
$cm2context = context_module::instance($cm2->cmid);
$cm1acontext = \context_module::instance($cm1a->cmid);
$cm1bcontext = \context_module::instance($cm1b->cmid);
$cm2context = \context_module::instance($cm2->cmid);
$u1 = $dg->create_user();
$u2 = $dg->create_user();
@@ -169,7 +170,7 @@ class mod_survey_privacy_testcase extends provider_testcase {
$this->assertTrue($DB->record_exists('survey_analysis', ['userid' => $u2->id, 'survey' => $cm1c->id]));
// Deleting the course does nothing.
provider::delete_data_for_all_users_in_context(context_course::instance($c1->id));
provider::delete_data_for_all_users_in_context(\context_course::instance($c1->id));
$this->assertTrue($DB->record_exists('survey_answers', ['userid' => $u1->id, 'survey' => $cm1a->id]));
$this->assertTrue($DB->record_exists('survey_answers', ['userid' => $u1->id, 'survey' => $cm1c->id]));
$this->assertTrue($DB->record_exists('survey_answers', ['userid' => $u2->id, 'survey' => $cm1a->id]));
@@ -179,7 +180,7 @@ class mod_survey_privacy_testcase extends provider_testcase {
$this->assertTrue($DB->record_exists('survey_analysis', ['userid' => $u2->id, 'survey' => $cm1a->id]));
$this->assertTrue($DB->record_exists('survey_analysis', ['userid' => $u2->id, 'survey' => $cm1c->id]));
provider::delete_data_for_all_users_in_context(context_module::instance($cm1c->cmid));
provider::delete_data_for_all_users_in_context(\context_module::instance($cm1c->cmid));
$this->assertTrue($DB->record_exists('survey_answers', ['userid' => $u1->id, 'survey' => $cm1a->id]));
$this->assertFalse($DB->record_exists('survey_answers', ['userid' => $u1->id, 'survey' => $cm1c->id]));
$this->assertTrue($DB->record_exists('survey_answers', ['userid' => $u2->id, 'survey' => $cm1a->id]));
@@ -189,7 +190,7 @@ class mod_survey_privacy_testcase extends provider_testcase {
$this->assertTrue($DB->record_exists('survey_analysis', ['userid' => $u2->id, 'survey' => $cm1a->id]));
$this->assertFalse($DB->record_exists('survey_analysis', ['userid' => $u2->id, 'survey' => $cm1c->id]));
provider::delete_data_for_all_users_in_context(context_module::instance($cm1a->cmid));
provider::delete_data_for_all_users_in_context(\context_module::instance($cm1a->cmid));
$this->assertFalse($DB->record_exists('survey_answers', ['userid' => $u1->id, 'survey' => $cm1a->id]));
$this->assertFalse($DB->record_exists('survey_answers', ['userid' => $u1->id, 'survey' => $cm1c->id]));
$this->assertFalse($DB->record_exists('survey_answers', ['userid' => $u2->id, 'survey' => $cm1a->id]));
@@ -230,9 +231,9 @@ class mod_survey_privacy_testcase extends provider_testcase {
$this->assertTrue($DB->record_exists('survey_analysis', ['userid' => $u2->id, 'survey' => $cm1c->id]));
provider::delete_data_for_user(new approved_contextlist($u1, 'mod_survey', [
context_course::instance($c1->id)->id,
context_module::instance($cm1a->cmid)->id,
context_module::instance($cm1b->cmid)->id,
\context_course::instance($c1->id)->id,
\context_module::instance($cm1a->cmid)->id,
\context_module::instance($cm1b->cmid)->id,
]));
$this->assertFalse($DB->record_exists('survey_answers', ['userid' => $u1->id, 'survey' => $cm1a->id]));
$this->assertTrue($DB->record_exists('survey_answers', ['userid' => $u1->id, 'survey' => $cm1c->id]));
@@ -256,8 +257,8 @@ class mod_survey_privacy_testcase extends provider_testcase {
$cm1a = $dg->create_module('survey', ['template' => 1, 'course' => $c1]);
$cm1b = $dg->create_module('survey', ['template' => 2, 'course' => $c1]);
$cm1c = $dg->create_module('survey', ['template' => 2, 'course' => $c1]);
$cm1acontext = context_module::instance($cm1a->cmid);
$cm1bcontext = context_module::instance($cm1b->cmid);
$cm1acontext = \context_module::instance($cm1a->cmid);
$cm1bcontext = \context_module::instance($cm1b->cmid);
$u1 = $dg->create_user();
$u2 = $dg->create_user();
@@ -315,9 +316,9 @@ class mod_survey_privacy_testcase extends provider_testcase {
$u1 = $dg->create_user();
$u2 = $dg->create_user();
$s1actx = context_module::instance($s1a->cmid);
$s1bctx = context_module::instance($s1b->cmid);
$s1cctx = context_module::instance($s1c->cmid);
$s1actx = \context_module::instance($s1a->cmid);
$s1bctx = \context_module::instance($s1b->cmid);
$s1cctx = \context_module::instance($s1c->cmid);
$this->answer_survey($s1a, $u1, $c1, $s1actx);
$this->answer_survey($s1b, $u1, $c1, $s1bctx);
@@ -376,7 +377,7 @@ class mod_survey_privacy_testcase extends provider_testcase {
* @param context_module $context The module context.
* @return void
*/
protected function answer_survey($survey, $user, $course, context_module $context) {
protected function answer_survey($survey, $user, $course, \context_module $context) {
global $USER;
$userid = $user->id;
mod/wiki/tests/privacy_test.php → mod/wiki/tests/privacy/provider_test.php
+10 -9
View File
@@ -22,6 +22,7 @@
* @copyright 2018 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_wiki\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -42,7 +43,7 @@ require_once($CFG->dirroot.'/mod/wiki/locallib.php');
* @copyright 2018 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_wiki_privacy_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/** @var array */
protected $users = [];
@@ -149,10 +150,10 @@ class mod_wiki_privacy_testcase extends provider_testcase {
];
$this->contexts = [
1 => context_module::instance($cm1->cmid),
2 => context_module::instance($cm2->cmid),
3 => context_module::instance($cm3->cmid),
4 => context_module::instance($cm4->cmid),
1 => \context_module::instance($cm1->cmid),
2 => \context_module::instance($cm2->cmid),
3 => \context_module::instance($cm3->cmid),
4 => \context_module::instance($cm4->cmid),
];
$this->pagepaths = [
@@ -231,7 +232,7 @@ class mod_wiki_privacy_testcase extends provider_testcase {
$fs = get_file_storage();
return $fs->create_file_from_string([
'contextid' => context_module::instance($wiki->cmid)->id,
'contextid' => \context_module::instance($wiki->cmid)->id,
'component' => 'mod_wiki',
'filearea' => 'attachments',
'itemid' => $subwikiid,
@@ -498,14 +499,14 @@ class mod_wiki_privacy_testcase extends provider_testcase {
JOIN {wiki} w ON cm.instance = w.id
JOIN {wiki_subwikis} s ON s.wikiid = w.id
WHERE s.id=?', ['wiki', $page->subwikiid]);
$context = context_module::instance($record->id);
$args = new stdClass;
$context = \context_module::instance($record->id);
$args = new \stdClass;
$args->context = $context;
$args->courseid = $record->course;
$args->area = 'wiki_page';
$args->itemid = $page->id;
$args->component = 'mod_wiki';
$comment = new comment($args);
$comment = new \comment($args);
$comment->set_post_permission(true);
$comment->add($text);
return $comment;
mod/workshop/allocation/manual/tests/privacy_provider_test.php → mod/workshop/allocation/manual/tests/privacy/provider_test.php
+3 -2
View File
@@ -15,13 +15,14 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Provides the {@link workshopallocation_manual_privacy_provider_testcase} class.
* Provides the {@see workshopallocation_manual\privacy\provider_test} class.
*
* @package workshopallocation_manual
* @category test
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace workshopallocation_manual\privacy;
use core_privacy\local\request\writer;
@@ -33,7 +34,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class workshopallocation_manual_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* When no preference exists, there should be no export.
mod/workshop/form/accumulative/tests/privacy_provider_test.php → mod/workshop/form/accumulative/tests/privacy/provider_test.php
+3 -2
View File
@@ -15,13 +15,14 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Provides the {@link workshopform_accumulative_privacy_provider_testcase} class.
* Provides the {@see workshopform_accumulative\provider_test} class.
*
* @package workshopform_accumulative
* @category test
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace workshopform_accumulative\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -36,7 +37,7 @@ use core_privacy\tests\provider_testcase;
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class workshopform_accumulative_privacy_provider_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test {@link workshopform_accumulative\privacy\provider::export_assessment_form()} implementation.
mod/workshop/form/comments/tests/privacy_provider_test.php → mod/workshop/form/comments/tests/privacy/provider_test.php
+3 -2
View File
@@ -15,13 +15,14 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Provides the {@link workshopform_comments_privacy_provider_testcase} class.
* Provides the {@see workshopform_comments\privacy\provider_test} class.
*
* @package workshopform_comments
* @category test
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace workshopform_comments\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -36,7 +37,7 @@ use core_privacy\tests\provider_testcase;
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class workshopform_comments_privacy_provider_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test {@link workshopform_comments\privacy\provider::export_assessment_form()} implementation.
mod/workshop/form/numerrors/tests/privacy_provider_test.php → mod/workshop/form/numerrors/tests/privacy/provider_test.php
+3 -2
View File
@@ -15,13 +15,14 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Provides the {@link workshopform_numerrors_privacy_provider_testcase} class.
* Provides the {@see workshopform_numerrors\privacy\provider_test} class.
*
* @package workshopform_numerrors
* @category test
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace workshopform_numerrors\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -36,7 +37,7 @@ use core_privacy\tests\provider_testcase;
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class workshopform_numerrors_privacy_provider_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test {@link workshopform_numerrors\privacy\provider::export_assessment_form()} implementation.
mod/workshop/form/rubric/tests/privacy_provider_test.php → mod/workshop/form/rubric/tests/privacy/provider_test.php
+3 -2
View File
@@ -15,13 +15,14 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Provides the {@link workshopform_rubric_privacy_provider_testcase} class.
* Provides the {@see workshopform_rubric\privacy\provider_test} class.
*
* @package workshopform_rubric
* @category test
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace workshopform_rubric\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -36,7 +37,7 @@ use core_privacy\tests\provider_testcase;
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class workshopform_rubric_privacy_provider_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/**
* Test {@link workshopform_rubric\privacy\provider::export_assessment_form()} implementation.
mod/workshop/tests/privacy_provider_test.php → mod/workshop/tests/privacy/provider_test.php
+9 -8
View File
@@ -15,13 +15,14 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Provides the {@link mod_workshop_privacy_provider_testcase} class.
* Provides the {@see mod_workshop\privacy\provider_test} class.
*
* @package mod_workshop
* @category test
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace mod_workshop\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -36,7 +37,7 @@ use core_privacy\tests\provider_testcase;
* @copyright 2018 David Mudrák <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_workshop_privacy_provider_testcase extends provider_testcase {
class provider_test extends provider_testcase {
/** @var testing_data_generator */
protected $generator;
@@ -183,9 +184,9 @@ class mod_workshop_privacy_provider_testcase extends provider_testcase {
$cm12 = get_coursemodule_from_instance('workshop', $this->workshop12->id);
$cm21 = get_coursemodule_from_instance('workshop', $this->workshop21->id);
$context11 = context_module::instance($cm11->id);
$context12 = context_module::instance($cm12->id);
$context21 = context_module::instance($cm21->id);
$context11 = \context_module::instance($cm11->id);
$context12 = \context_module::instance($cm12->id);
$context21 = \context_module::instance($cm21->id);
// Student1 has data in workshop11 (author + self reviewer), workshop12 (author) and workshop21 (reviewer).
$contextlist = \mod_workshop\privacy\provider::get_contexts_for_userid($this->student1->id);
@@ -214,9 +215,9 @@ class mod_workshop_privacy_provider_testcase extends provider_testcase {
$cm12 = get_coursemodule_from_instance('workshop', $this->workshop12->id);
$cm21 = get_coursemodule_from_instance('workshop', $this->workshop21->id);
$context11 = context_module::instance($cm11->id);
$context12 = context_module::instance($cm12->id);
$context21 = context_module::instance($cm21->id);
$context11 = \context_module::instance($cm11->id);
$context12 = \context_module::instance($cm12->id);
$context21 = \context_module::instance($cm21->id);
// Users in the workshop11.
$userlist11 = new \core_privacy\local\request\userlist($context11, 'mod_workshop');
my/tests/privacy_test.php → my/tests/privacy/provider_test.php
+5 -4
View File
@@ -22,11 +22,12 @@
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_my\privacy;
defined('MOODLE_INTERNAL') || die();
use \core_privacy\local\request\writer;
use \core_my\privacy\provider;
use core_privacy\local\request\writer;
use core_my\privacy\provider;
/**
* Unit tests for the core_my implementation of the privacy API.
@@ -34,7 +35,7 @@ use \core_my\privacy\provider;
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_my_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Test for provider::test_export_user_preferences().
@@ -61,7 +62,7 @@ class core_my_privacy_testcase extends \core_privacy\tests\provider_testcase {
// Test the user preferences export contains 1 user preference record for the User.
provider::export_user_preferences($user->id);
$contextuser = context_user::instance($user->id);
$contextuser = \context_user::instance($user->id);
$writer = writer::with_context($contextuser);
$this->assertTrue($writer->has_any_data());
notes/tests/privacy_test.php → notes/tests/privacy/provider_test.php
+15 -14
View File
@@ -22,16 +22,17 @@
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_notes\privacy;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . "/notes/lib.php");
use \core_notes\privacy\provider;
use \core_privacy\local\request\writer;
use \core_privacy\local\request\approved_contextlist;
use \core_privacy\local\request\approved_userlist;
use core_notes\privacy\provider;
use core_privacy\local\request\writer;
use core_privacy\local\request\approved_contextlist;
use core_privacy\local\request\approved_userlist;
/**
* Unit tests for the core_notes implementation of the privacy API.
@@ -39,7 +40,7 @@ use \core_privacy\local\request\approved_userlist;
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Test for provider::get_contexts_for_userid().
@@ -65,7 +66,7 @@ class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase
$coursecontextids = [];
for ($c = 1; $c <= $nocourses; $c++) {
$course = $this->getDataGenerator()->create_course();
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
role_assign($teacherrole->id, $teacher1->id, $coursecontext->id);
role_assign($studentrole->id, $student->id, $coursecontext->id);
@@ -167,7 +168,7 @@ class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase
for ($c = 1; $c <= $nocourses; $c++) {
// Create a Course, then enrol a teacher and enrol 2 students.
$course = $this->getDataGenerator()->create_course();
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
role_assign($teacherrole->id, $teacher1->id, $coursecontext->id);
@@ -204,7 +205,7 @@ class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase
"Test site-wide user note about the teacher in Course 4 by another teacher"
);
// Store the Course context for those which have test notes added for verification.
$coursecontextids[] = context_course::instance($course->id)->id;
$coursecontextids[] = \context_course::instance($course->id)->id;
// Add a private user note for Teacher 1 by another Teacher 2 in Course 5.
$course = $courses[5];
@@ -257,7 +258,7 @@ class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase
for ($c = 0; $c < $nocourses; $c++) {
// Create a Course, then enrol a teacher and enrol 2 students.
$course = $this->getDataGenerator()->create_course();
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
role_assign($teacherrole->id, $teacher->id, $coursecontext->id);
@@ -320,7 +321,7 @@ class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase
for ($c = 0; $c < $nocourses; $c++) {
// Create a Course, then enrol a teacher and enrol 2 students.
$course = $this->getDataGenerator()->create_course();
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
role_assign($teacherrole->id, $teacher->id, $coursecontext->id);
@@ -384,7 +385,7 @@ class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase
$nocourses = 3;
for ($c = 1; $c <= $nocourses; $c++) {
${'course' . $c} = $this->getDataGenerator()->create_course();
${'coursecontext' . $c} = context_course::instance(${'course' . $c}->id);
${'coursecontext' . $c} = \context_course::instance(${'course' . $c}->id);
role_assign($teacherrole->id, $teacher1->id, ${'coursecontext' . $c}->id);
role_assign($studentrole->id, $student->id, ${'coursecontext' . $c}->id);
@@ -444,7 +445,7 @@ class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase
$this->assertTrue(in_array($student2->id, $userlist3->get_userids()));
// The list of users should not return any users in a different context than course context.
$contextsystem = context_system::instance();
$contextsystem = \context_system::instance();
$userlist4 = new \core_privacy\local\request\userlist($contextsystem, $component);
provider::get_users_in_context($userlist4);
$this->assertCount(0, $userlist4);
@@ -474,7 +475,7 @@ class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase
$nocourses = 3;
for ($c = 1; $c <= $nocourses; $c++) {
${'course' . $c} = $this->getDataGenerator()->create_course();
${'coursecontext' . $c} = context_course::instance(${'course' . $c}->id);
${'coursecontext' . $c} = \context_course::instance(${'course' . $c}->id);
role_assign($teacherrole->id, $teacher1->id, ${'coursecontext' . $c}->id);
role_assign($studentrole->id, $student->id, ${'coursecontext' . $c}->id);
@@ -556,7 +557,7 @@ class core_notes_privacy_testcase extends \core_privacy\tests\provider_testcase
$this->assertCount(1, $userlist2);
// The list of users should not return any users for contexts different than course context.
$systemcontext = context_system::instance();
$systemcontext = \context_system::instance();
$userlist4 = new \core_privacy\local\request\userlist($systemcontext, $component);
provider::get_users_in_context($userlist4);
$this->assertCount(0, $userlist4);
portfolio/flickr/tests/privacy_provider_test.php → portfolio/flickr/tests/privacy/provider_test.php
+2 -1
View File
@@ -21,6 +21,7 @@
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace portfolio_flickr\privacy;
defined('MOODLE_INTERNAL') || die();
@@ -30,7 +31,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class portfolio_flickr_privacy_provider_test extends \core_privacy\tests\provider_testcase {
class provider_test extends \core_privacy\tests\provider_testcase {
/**
* Verify that a collection of metadata is returned for this component and that it just links to an external location.

Some files were not shown because too many files have changed in this diff Show More