From e4a2d9c1d46b50b3628546abd4da0d50987bb874 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Mon, 13 Dec 2021 23:40:08 +0100 Subject: [PATCH] MDL-73348 phpunit: normalize all privacy provider tests As far as now all them have correct privacy level2 namespace: - Move them to "privacy" subdir. - Rename the files to "provider_test.php", this includes old privacy_test.php and privacy_provider_test.php files - Rename the testcase to provider_test too (to match file name) Also, change some relative paths and comments to point to new locations. --- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 10 +++++----- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 4 ++-- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 13 ++++++------- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 4 ++-- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 4 ++-- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 3 +-- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- ...{privacy_provider_test.php => provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 4 ++-- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 4 ++-- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 4 ++-- .../provider_test.php} | 4 ++-- .../provider_test.php} | 4 ++-- .../provider_test.php} | 4 ++-- .../provider_test.php} | 4 ++-- .../provider_test.php} | 4 ++-- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 4 ++-- ...{privacy_provider_test.php => provider_test.php} | 2 +- .../provider_test.php} | 6 +++--- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 4 ++-- ...{privacy_provider_test.php => provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 2 +- .../{privacy_test.php => privacy/provider_test.php} | 7 +++++-- .../{privacy_test.php => privacy/provider_test.php} | 2 +- 135 files changed, 174 insertions(+), 173 deletions(-) rename admin/roles/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename admin/tool/admin_presets/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename admin/tool/cohortroles/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename admin/tool/dataprivacy/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename admin/tool/log/store/database/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename admin/tool/log/store/legacy/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename admin/tool/log/store/standard/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename admin/tool/log/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename admin/tool/messageinbound/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename admin/tool/mobile/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename admin/tool/monitor/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename admin/tool/policy/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename admin/tool/usertours/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename analytics/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename auth/manual/tests/{privacy_provider_test.php => privacy/provider_test.php} (97%) rename auth/mnet/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename auth/oauth2/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename auth/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename backup/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename badges/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename blocks/comments/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename blocks/html/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename blocks/myoverview/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename blocks/recentlyaccesseditems/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename blocks/rss_client/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename blocks/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename blocks/timeline/tests/{privacy_test.php => privacy/provider_test.php} (97%) rename blog/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename calendar/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename cohort/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename comment/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename competency/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename completion/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename contentbank/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename course/format/tests/{privacy_test.php => privacy/provider_test.php} (97%) rename course/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename customfield/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename enrol/cohort/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename enrol/flatfile/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename enrol/lti/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename enrol/meta/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename enrol/paypal/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename enrol/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename favourites/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename files/converter/googledrive/tests/{privacy_test.php => privacy/provider_test.php} (97%) rename files/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename grade/grading/form/guide/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename grade/grading/form/rubric/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename grade/grading/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename grade/report/grader/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename grade/report/user/tests/{privacy_test.php => privacy/provider_test.php} (97%) rename grade/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename group/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename lib/editor/atto/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename lib/editor/tests/{privacy_provider_test.php => privacy/provider_test.php} (97%) rename lib/form/tests/{privacy_provider_test.php => privacy/provider_test.php} (96%) rename lib/userkey/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename message/output/airnotifier/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename message/output/email/tests/{privacy_test.php => privacy/provider_test.php} (97%) rename message/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename mnet/service/enrol/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/assign/feedback/comments/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/assign/feedback/editpdf/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/assign/feedback/file/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename mod/assign/submission/comments/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/assign/submission/file/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename mod/assign/submission/onlinetext/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename mod/assign/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/assignment/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/bigbluebuttonbn/tests/privacy/{privacy_provider_test.php => provider_test.php} (99%) rename mod/chat/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/choice/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename mod/data/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename mod/feedback/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/forum/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename mod/glossary/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename mod/h5pactivity/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/lesson/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/lti/service/gradebookservices/tests/{privacy_provider_test.php => privacy/provider_test.php} (96%) rename mod/lti/service/memberships/tests/{privacy_provider_test.php => privacy/provider_test.php} (96%) rename mod/lti/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename mod/quiz/accessrule/seb/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename mod/quiz/report/grading/tests/{privacy_provider_test.php => privacy/provider_test.php} (97%) rename mod/quiz/report/overview/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename mod/quiz/report/responses/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename mod/quiz/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename mod/scorm/report/basic/tests/{privacy_test.php => privacy/provider_test.php} (97%) rename mod/scorm/report/interactions/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename mod/scorm/report/objectives/tests/{privacy_test.php => privacy/provider_test.php} (97%) rename mod/scorm/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/survey/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/wiki/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename mod/workshop/allocation/manual/tests/{privacy_provider_test.php => privacy/provider_test.php} (94%) rename mod/workshop/form/accumulative/tests/{privacy_provider_test.php => privacy/provider_test.php} (96%) rename mod/workshop/form/comments/tests/{privacy_provider_test.php => privacy/provider_test.php} (96%) rename mod/workshop/form/numerrors/tests/{privacy_provider_test.php => privacy/provider_test.php} (97%) rename mod/workshop/form/rubric/tests/{privacy_provider_test.php => privacy/provider_test.php} (97%) rename mod/workshop/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename my/tests/{privacy_test.php => privacy/provider_test.php} (97%) rename notes/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename portfolio/flickr/tests/{privacy_provider_test.php => privacy/provider_test.php} (95%) rename portfolio/googledocs/tests/{privacy_provider_test.php => privacy/provider_test.php} (95%) rename portfolio/mahara/tests/{privacy_provider_test.php => privacy/provider_test.php} (95%) rename portfolio/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename privacy/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename question/bank/comment/tests/privacy/{privacy_provider_test.php => provider_test.php} (99%) rename question/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename question/type/ddimageortext/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename question/type/ddmarker/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename question/type/ddwtos/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename question/type/essay/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename question/type/gapselect/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename question/type/match/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename question/type/multichoice/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename question/type/numerical/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename question/type/shortanswer/tests/{privacy_provider_test.php => privacy/provider_test.php} (98%) rename rating/tests/{privacy_provider_test.php => privacy/provider_test.php} (99%) rename report/stats/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename reportbuilder/tests/privacy/{privacy_provider_test.php => provider_test.php} (98%) rename repository/flickr/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename repository/onedrive/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename repository/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename rss/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename search/engine/simpledb/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename search/engine/solr/tests/{privacy_test.php => privacy/provider_test.php} (96%) rename tag/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename theme/boost/tests/{privacy_test.php => privacy/provider_test.php} (97%) rename user/profile/field/checkbox/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename user/profile/field/datetime/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename user/profile/field/menu/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename user/profile/field/social/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename user/profile/field/text/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename user/profile/field/textarea/tests/{privacy_test.php => privacy/provider_test.php} (99%) rename user/tests/{privacy_test.php => privacy/provider_test.php} (98%) rename webservice/tests/{privacy_test.php => privacy/provider_test.php} (99%) diff --git a/admin/roles/tests/privacy_test.php b/admin/roles/tests/privacy/provider_test.php similarity index 99% rename from admin/roles/tests/privacy_test.php rename to admin/roles/tests/privacy/provider_test.php index 6612823b1e0..659a1ef2869 100644 --- a/admin/roles/tests/privacy_test.php +++ b/admin/roles/tests/privacy/provider_test.php @@ -40,7 +40,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Carlos Escobedo * @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 to check export_user_preferences. * returns user preferences data. diff --git a/admin/tool/admin_presets/tests/privacy_provider_test.php b/admin/tool/admin_presets/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/admin_presets/tests/privacy_provider_test.php rename to admin/tool/admin_presets/tests/privacy/provider_test.php index 695b60b244d..3a11ab9301a 100644 --- a/admin/tool/admin_presets/tests/privacy_provider_test.php +++ b/admin/tool/admin_presets/tests/privacy/provider_test.php @@ -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(). diff --git a/admin/tool/cohortroles/tests/privacy_test.php b/admin/tool/cohortroles/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/cohortroles/tests/privacy_test.php rename to admin/tool/cohortroles/tests/privacy/provider_test.php index 73ce7ec65b8..deb05db61fa 100644 --- a/admin/tool/cohortroles/tests/privacy_test.php +++ b/admin/tool/cohortroles/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Zig Tan * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Overriding setUp() function to always reset after tests. diff --git a/admin/tool/dataprivacy/tests/privacy_provider_test.php b/admin/tool/dataprivacy/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/dataprivacy/tests/privacy_provider_test.php rename to admin/tool/dataprivacy/tests/privacy/provider_test.php index a731a12f8b8..97397816505 100644 --- a/admin/tool/dataprivacy/tests/privacy_provider_test.php +++ b/admin/tool/dataprivacy/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ use tool_dataprivacy\privacy\provider; * @copyright 2020 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Test provider get_contexts_for_userid method diff --git a/admin/tool/log/store/database/tests/privacy_test.php b/admin/tool/log/store/database/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/log/store/database/tests/privacy_test.php rename to admin/tool/log/store/database/tests/privacy/provider_test.php index 44a41f9418c..31d9f2bb328 100644 --- a/admin/tool/log/store/database/tests/privacy_test.php +++ b/admin/tool/log/store/database/tests/privacy/provider_test.php @@ -35,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. @@ -49,7 +49,7 @@ require_once(__DIR__ . '/fixtures/event.php'); * @author Frédéric Massart * @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 { global $CFG; diff --git a/admin/tool/log/store/legacy/tests/privacy_test.php b/admin/tool/log/store/legacy/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/log/store/legacy/tests/privacy_test.php rename to admin/tool/log/store/legacy/tests/privacy/provider_test.php index e04d2c882e8..f42a19d4bbb 100644 --- a/admin/tool/log/store/legacy/tests/privacy_test.php +++ b/admin/tool/log/store/legacy/tests/privacy/provider_test.php @@ -36,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. @@ -47,7 +47,7 @@ require_once(__DIR__ . '/fixtures/event.php'); * @author Frédéric Massart * @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(); diff --git a/admin/tool/log/store/standard/tests/privacy_test.php b/admin/tool/log/store/standard/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/log/store/standard/tests/privacy_test.php rename to admin/tool/log/store/standard/tests/privacy/provider_test.php index 6dab8521c2e..670039668e7 100644 --- a/admin/tool/log/store/standard/tests/privacy_test.php +++ b/admin/tool/log/store/standard/tests/privacy/provider_test.php @@ -35,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. @@ -46,7 +46,7 @@ require_once(__DIR__ . '/fixtures/event.php'); * @author Frédéric Massart * @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(); diff --git a/admin/tool/log/tests/privacy_test.php b/admin/tool/log/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/log/tests/privacy_test.php rename to admin/tool/log/tests/privacy/provider_test.php index 8e4ac05fe27..0d078ee1c1c 100644 --- a/admin/tool/log/tests/privacy_test.php +++ b/admin/tool/log/tests/privacy/provider_test.php @@ -50,7 +50,7 @@ require_once($CFG->dirroot . '/admin/tool/log/store/standard/tests/fixtures/even * @author Frédéric Massart * @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(); diff --git a/admin/tool/messageinbound/tests/privacy_test.php b/admin/tool/messageinbound/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/messageinbound/tests/privacy_test.php rename to admin/tool/messageinbound/tests/privacy/provider_test.php index 2350aa972f4..9feca9ad908 100644 --- a/admin/tool/messageinbound/tests/privacy_test.php +++ b/admin/tool/messageinbound/tests/privacy/provider_test.php @@ -45,7 +45,7 @@ use tool_messageinbound\privacy\provider; * @author Frédéric Massart * @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 { global $CFG; diff --git a/admin/tool/mobile/tests/privacy_provider_test.php b/admin/tool/mobile/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/mobile/tests/privacy_provider_test.php rename to admin/tool/mobile/tests/privacy/provider_test.php index a8060c1da8d..6d2fd7d324d 100644 --- a/admin/tool/mobile/tests/privacy_provider_test.php +++ b/admin/tool/mobile/tests/privacy/provider_test.php @@ -37,7 +37,7 @@ use tool_mobile\privacy\provider; * @copyright 2018 Carlos Escobedo * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Basic setup for these tests. diff --git a/admin/tool/monitor/tests/privacy_test.php b/admin/tool/monitor/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/monitor/tests/privacy_test.php rename to admin/tool/monitor/tests/privacy/provider_test.php index f0b5edcae4b..5d75717a3dc 100644 --- a/admin/tool/monitor/tests/privacy_test.php +++ b/admin/tool/monitor/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 Adrian Greeve * @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 { /** * Set up method. diff --git a/admin/tool/policy/tests/privacy_provider_test.php b/admin/tool/policy/tests/privacy/provider_test.php similarity index 99% rename from admin/tool/policy/tests/privacy_provider_test.php rename to admin/tool/policy/tests/privacy/provider_test.php index 1392d52c23d..3b70138f9c2 100644 --- a/admin/tool/policy/tests/privacy_provider_test.php +++ b/admin/tool/policy/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Sara Arjona * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** @var stdClass The user object. */ protected $user; diff --git a/admin/tool/usertours/tests/privacy_provider_test.php b/admin/tool/usertours/tests/privacy/provider_test.php similarity index 98% rename from admin/tool/usertours/tests/privacy_provider_test.php rename to admin/tool/usertours/tests/privacy/provider_test.php index 5128bdb8f1e..bc70e6bc924 100644 --- a/admin/tool/usertours/tests/privacy_provider_test.php +++ b/admin/tool/usertours/tests/privacy/provider_test.php @@ -37,7 +37,7 @@ use tool_usertours\privacy\provider; * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Helper method for creating a tour diff --git a/analytics/tests/privacy_test.php b/analytics/tests/privacy/provider_test.php similarity index 98% rename from analytics/tests/privacy_test.php rename to analytics/tests/privacy/provider_test.php index 99d014f280d..de9cb4dadf2 100644 --- a/analytics/tests/privacy_test.php +++ b/analytics/tests/privacy/provider_test.php @@ -31,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. @@ -43,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 privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { public function setUp(): void { diff --git a/auth/manual/tests/privacy_provider_test.php b/auth/manual/tests/privacy/provider_test.php similarity index 97% rename from auth/manual/tests/privacy_provider_test.php rename to auth/manual/tests/privacy/provider_test.php index 3c900afa336..178f3673368 100644 --- a/auth/manual/tests/privacy_provider_test.php +++ b/auth/manual/tests/privacy/provider_test.php @@ -38,7 +38,7 @@ use auth_manual\privacy\provider; * @copyright 2018 Carlos Escobedo * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** @var \auth_plugin_manual Keeps the authentication plugin. */ protected $authplugin; diff --git a/auth/mnet/tests/privacy_provider_test.php b/auth/mnet/tests/privacy/provider_test.php similarity index 99% rename from auth/mnet/tests/privacy_provider_test.php rename to auth/mnet/tests/privacy/provider_test.php index cfacc70ccc2..097077f61d3 100644 --- a/auth/mnet/tests/privacy_provider_test.php +++ b/auth/mnet/tests/privacy/provider_test.php @@ -40,7 +40,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Victor Deniz * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Set up method. */ diff --git a/auth/oauth2/tests/privacy_provider_test.php b/auth/oauth2/tests/privacy/provider_test.php similarity index 99% rename from auth/oauth2/tests/privacy_provider_test.php rename to auth/oauth2/tests/privacy/provider_test.php index ae484d6ba3a..d398182fac0 100644 --- a/auth/oauth2/tests/privacy_provider_test.php +++ b/auth/oauth2/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Carlos Escobedo * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Set up method. */ diff --git a/auth/tests/privacy_test.php b/auth/tests/privacy/provider_test.php similarity index 98% rename from auth/tests/privacy_test.php rename to auth/tests/privacy/provider_test.php index 82797745dba..6e041552087 100644 --- a/auth/tests/privacy_test.php +++ b/auth/tests/privacy/provider_test.php @@ -42,7 +42,7 @@ use core_auth\privacy\provider; * @author Frédéric Massart * @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(); diff --git a/backup/tests/privacy_provider_test.php b/backup/tests/privacy/provider_test.php similarity index 99% rename from backup/tests/privacy_provider_test.php rename to backup/tests/privacy/provider_test.php index 8d11cd41f23..11627c5e26e 100644 --- a/backup/tests/privacy_provider_test.php +++ b/backup/tests/privacy/provider_test.php @@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Mark Nelson * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test 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. diff --git a/badges/tests/privacy_test.php b/badges/tests/privacy/provider_test.php similarity index 99% rename from badges/tests/privacy_test.php rename to badges/tests/privacy/provider_test.php index efda6861ce2..128a6fd8dac 100644 --- a/badges/tests/privacy_test.php +++ b/badges/tests/privacy/provider_test.php @@ -47,7 +47,7 @@ require_once($CFG->libdir . '/badgeslib.php'); * @author Frédéric Massart * @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(); diff --git a/blocks/comments/tests/privacy_provider_test.php b/blocks/comments/tests/privacy/provider_test.php similarity index 99% rename from blocks/comments/tests/privacy_provider_test.php rename to blocks/comments/tests/privacy/provider_test.php index d185b33d738..8cecd1380ac 100644 --- a/blocks/comments/tests/privacy_provider_test.php +++ b/blocks/comments/tests/privacy/provider_test.php @@ -30,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 * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test 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; diff --git a/blocks/html/tests/privacy_provider_test.php b/blocks/html/tests/privacy/provider_test.php similarity index 99% rename from blocks/html/tests/privacy_provider_test.php rename to blocks/html/tests/privacy/provider_test.php index 101f5ceb73c..1348d130a1a 100644 --- a/blocks/html/tests/privacy_provider_test.php +++ b/blocks/html/tests/privacy/provider_test.php @@ -37,7 +37,7 @@ use block_html\privacy\provider; * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Get the list of standard format options for comparison. * diff --git a/blocks/myoverview/tests/privacy_test.php b/blocks/myoverview/tests/privacy/provider_test.php similarity index 98% rename from blocks/myoverview/tests/privacy_test.php rename to blocks/myoverview/tests/privacy/provider_test.php index a83ccba111d..12ae75763fe 100644 --- a/blocks/myoverview/tests/privacy_test.php +++ b/blocks/myoverview/tests/privacy/provider_test.php @@ -33,7 +33,7 @@ use block_myoverview\privacy\provider; * @copyright 2018 Peter Dias * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test 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. */ diff --git a/blocks/recentlyaccesseditems/tests/privacy_test.php b/blocks/recentlyaccesseditems/tests/privacy/provider_test.php similarity index 99% rename from blocks/recentlyaccesseditems/tests/privacy_test.php rename to blocks/recentlyaccesseditems/tests/privacy/provider_test.php index a02ca4ab85a..de95e8bcfc5 100644 --- a/blocks/recentlyaccesseditems/tests/privacy_test.php +++ b/blocks/recentlyaccesseditems/tests/privacy/provider_test.php @@ -38,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 privacy_test 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. diff --git a/blocks/rss_client/tests/privacy_test.php b/blocks/rss_client/tests/privacy/provider_test.php similarity index 99% rename from blocks/rss_client/tests/privacy_test.php rename to blocks/rss_client/tests/privacy/provider_test.php index f5e1c4faae8..e04f0b4fd3a 100644 --- a/blocks/rss_client/tests/privacy_test.php +++ b/blocks/rss_client/tests/privacy/provider_test.php @@ -34,7 +34,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Mihail Geshoski * @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 { /** * Basic setup for these tests. diff --git a/blocks/tests/privacy_test.php b/blocks/tests/privacy/provider_test.php similarity index 99% rename from blocks/tests/privacy_test.php rename to blocks/tests/privacy/provider_test.php index a21f26baf9b..b292847b203 100644 --- a/blocks/tests/privacy_test.php +++ b/blocks/tests/privacy/provider_test.php @@ -43,7 +43,7 @@ use core_block\privacy\provider; * @author Frédéric Massart * @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(); diff --git a/blocks/timeline/tests/privacy_test.php b/blocks/timeline/tests/privacy/provider_test.php similarity index 97% rename from blocks/timeline/tests/privacy_test.php rename to blocks/timeline/tests/privacy/provider_test.php index 6d8b69c455d..4850b9ea82b 100644 --- a/blocks/timeline/tests/privacy_test.php +++ b/blocks/timeline/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use block_timeline\privacy\provider; * @copyright 2018 Peter Dias * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test 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. diff --git a/blog/tests/privacy_test.php b/blog/tests/privacy/provider_test.php similarity index 99% rename from blog/tests/privacy_test.php rename to blog/tests/privacy/provider_test.php index 69f4c0deedf..a2fe8eb0de0 100644 --- a/blog/tests/privacy_test.php +++ b/blog/tests/privacy/provider_test.php @@ -46,7 +46,7 @@ require_once($CFG->dirroot . '/comment/lib.php'); * @author Frédéric Massart * @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(); diff --git a/calendar/tests/privacy_test.php b/calendar/tests/privacy/provider_test.php similarity index 99% rename from calendar/tests/privacy_test.php rename to calendar/tests/privacy/provider_test.php index fc368f96bd2..8645f0d5966 100644 --- a/calendar/tests/privacy_test.php +++ b/calendar/tests/privacy/provider_test.php @@ -43,7 +43,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Zig Tan * @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 { /** * Overriding setUp() function to always reset after tests. diff --git a/cohort/tests/privacy_test.php b/cohort/tests/privacy/provider_test.php similarity index 99% rename from cohort/tests/privacy_test.php rename to cohort/tests/privacy/provider_test.php index 2fc06110299..7f1fc5a8b0f 100644 --- a/cohort/tests/privacy_test.php +++ b/cohort/tests/privacy/provider_test.php @@ -38,7 +38,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Sara Arjona * @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 { /** * Basic setup for these tests. diff --git a/comment/tests/privacy_test.php b/comment/tests/privacy/provider_test.php similarity index 99% rename from comment/tests/privacy_test.php rename to comment/tests/privacy/provider_test.php index c063c8d939e..4e49cf29a56 100644 --- a/comment/tests/privacy_test.php +++ b/comment/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ use core_privacy\tests\request\approved_contextlist; * @copyright 2018 Adrian Greeve * @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 { protected function setUp(): void { $this->resetAfterTest(); diff --git a/competency/tests/privacy_test.php b/competency/tests/privacy/provider_test.php similarity index 99% rename from competency/tests/privacy_test.php rename to competency/tests/privacy/provider_test.php index e56db062a83..6ec1f8e03a1 100644 --- a/competency/tests/privacy_test.php +++ b/competency/tests/privacy/provider_test.php @@ -47,7 +47,7 @@ use core_competency\privacy\provider; * @author Frédéric Massart * @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 { global $PAGE; diff --git a/completion/tests/privacy_test.php b/completion/tests/privacy/provider_test.php similarity index 99% rename from completion/tests/privacy_test.php rename to completion/tests/privacy/provider_test.php index 8198e8fb247..6d1d81948a6 100644 --- a/completion/tests/privacy_test.php +++ b/completion/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ require_once($CFG->dirroot . '/completion/tests/fixtures/completion_creation.php * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { use \completion_creation; diff --git a/contentbank/tests/privacy_test.php b/contentbank/tests/privacy/provider_test.php similarity index 99% rename from contentbank/tests/privacy_test.php rename to contentbank/tests/privacy/provider_test.php index eb9655219d5..61e31e93d3d 100644 --- a/contentbank/tests/privacy_test.php +++ b/contentbank/tests/privacy/provider_test.php @@ -43,7 +43,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2020 Carlos Escobedo * @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. diff --git a/course/format/tests/privacy_test.php b/course/format/tests/privacy/provider_test.php similarity index 97% rename from course/format/tests/privacy_test.php rename to course/format/tests/privacy/provider_test.php index 4348d120e31..ada7676399e 100644 --- a/course/format/tests/privacy_test.php +++ b/course/format/tests/privacy/provider_test.php @@ -14,6 +14,11 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +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 * @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(). diff --git a/course/tests/privacy_test.php b/course/tests/privacy/provider_test.php similarity index 99% rename from course/tests/privacy_test.php rename to course/tests/privacy/provider_test.php index 0232fea5dde..872bd12d986 100644 --- a/course/tests/privacy_test.php +++ b/course/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ use core_privacy\local\request\transform; * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { use \completion_creation; diff --git a/customfield/tests/privacy_test.php b/customfield/tests/privacy/provider_test.php similarity index 99% rename from customfield/tests/privacy_test.php rename to customfield/tests/privacy/provider_test.php index ec6c95002ea..8ee9c414ada 100644 --- a/customfield/tests/privacy_test.php +++ b/customfield/tests/privacy/provider_test.php @@ -37,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 privacy_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Generate data. diff --git a/enrol/cohort/tests/privacy_test.php b/enrol/cohort/tests/privacy/provider_test.php similarity index 99% rename from enrol/cohort/tests/privacy_test.php rename to enrol/cohort/tests/privacy/provider_test.php index 1896f445ca3..a31f2a24984 100644 --- a/enrol/cohort/tests/privacy_test.php +++ b/enrol/cohort/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ use enrol_cohort\privacy\provider; * @copyright 2018 Carlos Escobedo * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test 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. diff --git a/enrol/flatfile/tests/privacy_provider_test.php b/enrol/flatfile/tests/privacy/provider_test.php similarity index 99% rename from enrol/flatfile/tests/privacy_provider_test.php rename to enrol/flatfile/tests/privacy/provider_test.php index 11dbbc92ac8..c574c37f43c 100644 --- a/enrol/flatfile/tests/privacy_provider_test.php +++ b/enrol/flatfile/tests/privacy/provider_test.php @@ -38,7 +38,7 @@ use enrol_flatfile\privacy\provider; * @copyright 2018 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** @var \stdClass $user1 a test user.*/ protected $user1; diff --git a/enrol/lti/tests/privacy_provider_test.php b/enrol/lti/tests/privacy/provider_test.php similarity index 99% rename from enrol/lti/tests/privacy_provider_test.php rename to enrol/lti/tests/privacy/provider_test.php index b7636c186e3..33f1fea7ee0 100644 --- a/enrol/lti/tests/privacy_provider_test.php +++ b/enrol/lti/tests/privacy/provider_test.php @@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Mark Nelson * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * @var stdClass The user diff --git a/enrol/meta/tests/privacy_test.php b/enrol/meta/tests/privacy/provider_test.php similarity index 99% rename from enrol/meta/tests/privacy_test.php rename to enrol/meta/tests/privacy/provider_test.php index 3a65a4efa84..1a278df8a38 100644 --- a/enrol/meta/tests/privacy_test.php +++ b/enrol/meta/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ use enrol_meta\privacy\provider; * @copyright 2018 Carlos Escobedo * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Enable enrol_meta plugin. diff --git a/enrol/paypal/tests/privacy_provider_test.php b/enrol/paypal/tests/privacy/provider_test.php similarity index 99% rename from enrol/paypal/tests/privacy_provider_test.php rename to enrol/paypal/tests/privacy/provider_test.php index f53aa629dfc..e2a17899e8d 100644 --- a/enrol/paypal/tests/privacy_provider_test.php +++ b/enrol/paypal/tests/privacy/provider_test.php @@ -31,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 * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test 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; diff --git a/enrol/tests/privacy_test.php b/enrol/tests/privacy/provider_test.php similarity index 99% rename from enrol/tests/privacy_test.php rename to enrol/tests/privacy/provider_test.php index a9290fcd07f..37b3efad19d 100644 --- a/enrol/tests/privacy_test.php +++ b/enrol/tests/privacy/provider_test.php @@ -40,7 +40,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Carlos Escobedo * @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 { /** * Check that a course context is returned if there is any user data for this user. */ diff --git a/favourites/tests/privacy_test.php b/favourites/tests/privacy/provider_test.php similarity index 99% rename from favourites/tests/privacy_test.php rename to favourites/tests/privacy/provider_test.php index 9838a0187cd..6e8583b4e06 100644 --- a/favourites/tests/privacy_test.php +++ b/favourites/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ use core_privacy\local\request\transform; * @copyright 2018 Jake Dallimore * @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); diff --git a/files/converter/googledrive/tests/privacy_test.php b/files/converter/googledrive/tests/privacy/provider_test.php similarity index 97% rename from files/converter/googledrive/tests/privacy_test.php rename to files/converter/googledrive/tests/privacy/provider_test.php index 1dbd8ffa348..664fdf87452 100644 --- a/files/converter/googledrive/tests/privacy_test.php +++ b/files/converter/googledrive/tests/privacy/provider_test.php @@ -33,7 +33,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 Mihail Geshoski * @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 getting the context for the user ID related to this plugin. diff --git a/files/tests/privacy_test.php b/files/tests/privacy/provider_test.php similarity index 99% rename from files/tests/privacy_test.php rename to files/tests/privacy/provider_test.php index dda567fa45e..9b413fea53a 100644 --- a/files/tests/privacy_test.php +++ b/files/tests/privacy/provider_test.php @@ -38,7 +38,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Mihail Geshoski * @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 getting the context for the user ID related to this plugin. diff --git a/grade/grading/form/guide/tests/privacy_test.php b/grade/grading/form/guide/tests/privacy/provider_test.php similarity index 99% rename from grade/grading/form/guide/tests/privacy_test.php rename to grade/grading/form/guide/tests/privacy/provider_test.php index 6684ee3ca0e..7348ba18adb 100644 --- a/grade/grading/form/guide/tests/privacy_test.php +++ b/grade/grading/form/guide/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ use gradingform_guide\privacy\provider; * @copyright 2018 Sara Arjona * @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 { /** * Ensure that export_user_preferences returns no data if the user has no data. diff --git a/grade/grading/form/rubric/tests/privacy_test.php b/grade/grading/form/rubric/tests/privacy/provider_test.php similarity index 99% rename from grade/grading/form/rubric/tests/privacy_test.php rename to grade/grading/form/rubric/tests/privacy/provider_test.php index 77b812a1da1..be18d4391b8 100644 --- a/grade/grading/form/rubric/tests/privacy_test.php +++ b/grade/grading/form/rubric/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ use context_module; * @copyright 2018 Adrian Greeve * @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. diff --git a/grade/grading/tests/privacy_test.php b/grade/grading/tests/privacy/provider_test.php similarity index 99% rename from grade/grading/tests/privacy_test.php rename to grade/grading/tests/privacy/provider_test.php index f547e68e074..40823d75980 100644 --- a/grade/grading/tests/privacy_test.php +++ b/grade/grading/tests/privacy/provider_test.php @@ -40,7 +40,7 @@ use core_grading\privacy\provider; * @copyright 2018 Sara Arjona * @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 data. */ protected $user0; diff --git a/grade/report/grader/tests/privacy_test.php b/grade/report/grader/tests/privacy/provider_test.php similarity index 98% rename from grade/report/grader/tests/privacy_test.php rename to grade/report/grader/tests/privacy/provider_test.php index b7f3d3d7c43..84e0c99315d 100644 --- a/grade/report/grader/tests/privacy_test.php +++ b/grade/report/grader/tests/privacy/provider_test.php @@ -38,7 +38,7 @@ use gradereport_grader\privacy\provider; * @copyright 2018 Sara Arjona * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Basic setup for these tests. diff --git a/grade/report/user/tests/privacy_test.php b/grade/report/user/tests/privacy/provider_test.php similarity index 97% rename from grade/report/user/tests/privacy_test.php rename to grade/report/user/tests/privacy/provider_test.php index 67362637535..2874e51ecf3 100644 --- a/grade/report/user/tests/privacy_test.php +++ b/grade/report/user/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ use gradereport_user\privacy\provider; * @copyright 2018 Sara Arjona * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Basic setup for these tests. diff --git a/grade/tests/privacy_test.php b/grade/tests/privacy/provider_test.php similarity index 99% rename from grade/tests/privacy_test.php rename to grade/tests/privacy/provider_test.php index cd5b7019a6f..58990e2c20e 100644 --- a/grade/tests/privacy_test.php +++ b/grade/tests/privacy/provider_test.php @@ -45,7 +45,7 @@ require_once($CFG->libdir . '/gradelib.php'); * @author Frédéric Massart * @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 { global $PAGE; diff --git a/group/tests/privacy_provider_test.php b/group/tests/privacy/provider_test.php similarity index 99% rename from group/tests/privacy_provider_test.php rename to group/tests/privacy/provider_test.php index f058c2e3f0c..af30c2ec835 100644 --- a/group/tests/privacy_provider_test.php +++ b/group/tests/privacy/provider_test.php @@ -32,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 * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Test for provider::get_metadata(). diff --git a/lib/editor/atto/tests/privacy_provider_test.php b/lib/editor/atto/tests/privacy/provider_test.php similarity index 99% rename from lib/editor/atto/tests/privacy_provider_test.php rename to lib/editor/atto/tests/privacy/provider_test.php index 13007c4ad63..258d0385f3f 100644 --- a/lib/editor/atto/tests/privacy_provider_test.php +++ b/lib/editor/atto/tests/privacy/provider_test.php @@ -37,7 +37,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test 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. */ diff --git a/lib/editor/tests/privacy_provider_test.php b/lib/editor/tests/privacy/provider_test.php similarity index 97% rename from lib/editor/tests/privacy_provider_test.php rename to lib/editor/tests/privacy/provider_test.php index 36e53b2370b..79fb31da8b9 100644 --- a/lib/editor/tests/privacy_provider_test.php +++ b/lib/editor/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * When no preference exists, there should be no export. diff --git a/lib/form/tests/privacy_provider_test.php b/lib/form/tests/privacy/provider_test.php similarity index 96% rename from lib/form/tests/privacy_provider_test.php rename to lib/form/tests/privacy/provider_test.php index f7a80b9c2dc..dc42e39b204 100644 --- a/lib/form/tests/privacy_provider_test.php +++ b/lib/form/tests/privacy/provider_test.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Provides the {@link core_form_privacy_provider_testcase} class. + * Provides the {@see \core_form\privacy\provider_test} class. * * @package core_form * @category test @@ -35,7 +35,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 David Mudrák * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * When no preference exists, there should be no export. diff --git a/lib/userkey/tests/privacy_provider_test.php b/lib/userkey/tests/privacy/provider_test.php similarity index 99% rename from lib/userkey/tests/privacy_provider_test.php rename to lib/userkey/tests/privacy/provider_test.php index 989ddad38be..8eeeaf526b0 100644 --- a/lib/userkey/tests/privacy_provider_test.php +++ b/lib/userkey/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ use core_userkey\privacy\provider; * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test 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. */ diff --git a/message/output/airnotifier/tests/privacy_test.php b/message/output/airnotifier/tests/privacy/provider_test.php similarity index 99% rename from message/output/airnotifier/tests/privacy_test.php rename to message/output/airnotifier/tests/privacy/provider_test.php index c80249f1158..87b638e71d8 100644 --- a/message/output/airnotifier/tests/privacy_test.php +++ b/message/output/airnotifier/tests/privacy/provider_test.php @@ -34,7 +34,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Adrian Greeve * @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 { /** * Basic setup for these tests. diff --git a/message/output/email/tests/privacy_test.php b/message/output/email/tests/privacy/provider_test.php similarity index 97% rename from message/output/email/tests/privacy_test.php rename to message/output/email/tests/privacy/provider_test.php index fbce31e4c76..0b4ed4204cc 100644 --- a/message/output/email/tests/privacy_test.php +++ b/message/output/email/tests/privacy/provider_test.php @@ -31,7 +31,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 Mihail Geshoski * @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 { /** * Basic setup for these tests. */ @@ -58,4 +58,3 @@ class privacy_test extends provider_testcase { $this->assertEmpty($contextlist); } } - diff --git a/message/tests/privacy_provider_test.php b/message/tests/privacy/provider_test.php similarity index 99% rename from message/tests/privacy_provider_test.php rename to message/tests/privacy/provider_test.php index 86e70cfc8e0..f3e19c0fa1d 100644 --- a/message/tests/privacy_provider_test.php +++ b/message/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Mark Nelson * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Test for provider::get_metadata(). diff --git a/mnet/service/enrol/tests/privacy_test.php b/mnet/service/enrol/tests/privacy/provider_test.php similarity index 99% rename from mnet/service/enrol/tests/privacy_test.php rename to mnet/service/enrol/tests/privacy/provider_test.php index ebfbfdd01f9..c9f61804152 100644 --- a/mnet/service/enrol/tests/privacy_test.php +++ b/mnet/service/enrol/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Carlos Escobedo * @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 the mnet host we are using to test. */ protected $mnethost; diff --git a/mod/assign/feedback/comments/tests/privacy_test.php b/mod/assign/feedback/comments/tests/privacy/provider_test.php similarity index 99% rename from mod/assign/feedback/comments/tests/privacy_test.php rename to mod/assign/feedback/comments/tests/privacy/provider_test.php index f9bcb19c11a..19685771315 100644 --- a/mod/assign/feedback/comments/tests/privacy_test.php +++ b/mod/assign/feedback/comments/tests/privacy/provider_test.php @@ -27,7 +27,7 @@ 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/ @@ -35,7 +35,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php'); * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \mod_assign\privacy\privacy_test { +class provider_test extends \mod_assign\privacy\provider_test { /** * Convenience function for creating feedback data. diff --git a/mod/assign/feedback/editpdf/tests/privacy_test.php b/mod/assign/feedback/editpdf/tests/privacy/provider_test.php similarity index 99% rename from mod/assign/feedback/editpdf/tests/privacy_test.php rename to mod/assign/feedback/editpdf/tests/privacy/provider_test.php index 0fe7aa79248..0b6f8b9d4ea 100644 --- a/mod/assign/feedback/editpdf/tests/privacy_test.php +++ b/mod/assign/feedback/editpdf/tests/privacy/provider_test.php @@ -27,7 +27,7 @@ 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; @@ -38,7 +38,7 @@ use mod_assign\privacy\assign_plugin_request_data; * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \mod_assign\privacy\privacy_test { +class provider_test extends \mod_assign\privacy\provider_test { public function setUp(): void { // Skip this test if ghostscript is not supported. diff --git a/mod/assign/feedback/file/tests/privacy_test.php b/mod/assign/feedback/file/tests/privacy/provider_test.php similarity index 98% rename from mod/assign/feedback/file/tests/privacy_test.php rename to mod/assign/feedback/file/tests/privacy/provider_test.php index c1c34c3a7e5..96928247662 100644 --- a/mod/assign/feedback/file/tests/privacy_test.php +++ b/mod/assign/feedback/file/tests/privacy/provider_test.php @@ -27,7 +27,7 @@ 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; @@ -37,7 +37,7 @@ use mod_assign\privacy\assign_plugin_request_data; * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \mod_assign\privacy\privacy_test { +class provider_test extends \mod_assign\privacy\provider_test { /** * Convenience function for creating feedback data. diff --git a/mod/assign/submission/comments/tests/privacy_test.php b/mod/assign/submission/comments/tests/privacy/provider_test.php similarity index 99% rename from mod/assign/submission/comments/tests/privacy_test.php rename to mod/assign/submission/comments/tests/privacy/provider_test.php index b25138d8131..3963c50b458 100644 --- a/mod/assign/submission/comments/tests/privacy_test.php +++ b/mod/assign/submission/comments/tests/privacy/provider_test.php @@ -26,7 +26,7 @@ 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; @@ -36,7 +36,7 @@ use mod_assign\privacy\useridlist; * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \mod_assign\privacy\privacy_test { +class provider_test extends \mod_assign\privacy\provider_test { /** * Convenience function for creating feedback data. diff --git a/mod/assign/submission/file/tests/privacy_test.php b/mod/assign/submission/file/tests/privacy/provider_test.php similarity index 98% rename from mod/assign/submission/file/tests/privacy_test.php rename to mod/assign/submission/file/tests/privacy/provider_test.php index 26c1dd84857..8b127bb95a2 100644 --- a/mod/assign/submission/file/tests/privacy_test.php +++ b/mod/assign/submission/file/tests/privacy/provider_test.php @@ -26,7 +26,7 @@ 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/ @@ -34,7 +34,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php'); * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \mod_assign\privacy\privacy_test { +class provider_test extends \mod_assign\privacy\provider_test { /** * Convenience function for creating feedback data. diff --git a/mod/assign/submission/onlinetext/tests/privacy_test.php b/mod/assign/submission/onlinetext/tests/privacy/provider_test.php similarity index 98% rename from mod/assign/submission/onlinetext/tests/privacy_test.php rename to mod/assign/submission/onlinetext/tests/privacy/provider_test.php index e8ef7250d90..3535e23451d 100644 --- a/mod/assign/submission/onlinetext/tests/privacy_test.php +++ b/mod/assign/submission/onlinetext/tests/privacy/provider_test.php @@ -26,7 +26,7 @@ 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/ @@ -34,7 +34,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php'); * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \mod_assign\privacy\privacy_test { +class provider_test extends \mod_assign\privacy\provider_test { /** * Convenience function for creating feedback data. diff --git a/mod/assign/tests/privacy_test.php b/mod/assign/tests/privacy/provider_test.php similarity index 99% rename from mod/assign/tests/privacy_test.php rename to mod/assign/tests/privacy/provider_test.php index d3d88b50f33..a3efabce75c 100644 --- a/mod/assign/tests/privacy_test.php +++ b/mod/assign/tests/privacy/provider_test.php @@ -40,7 +40,7 @@ use mod_assign\privacy\provider; * @copyright 2018 Adrian Greeve * @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. diff --git a/mod/assignment/tests/privacy_test.php b/mod/assignment/tests/privacy/provider_test.php similarity index 99% rename from mod/assignment/tests/privacy_test.php rename to mod/assignment/tests/privacy/provider_test.php index 547da707f19..1fbe20dd502 100644 --- a/mod/assignment/tests/privacy_test.php +++ b/mod/assignment/tests/privacy/provider_test.php @@ -26,7 +26,7 @@ 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; @@ -42,7 +42,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 Zig Tan * @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 int array Array of test student ids associated for Course 1. diff --git a/mod/bigbluebuttonbn/tests/privacy/privacy_provider_test.php b/mod/bigbluebuttonbn/tests/privacy/provider_test.php similarity index 99% rename from mod/bigbluebuttonbn/tests/privacy/privacy_provider_test.php rename to mod/bigbluebuttonbn/tests/privacy/provider_test.php index a2cf12c1c9d..ead70ad2930 100644 --- a/mod/bigbluebuttonbn/tests/privacy/privacy_provider_test.php +++ b/mod/bigbluebuttonbn/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ use core_privacy\local\request\userlist; * @author Jesus Federico (jesus [at] blindsidenetworks [dt] com) * @covers \mod_bigbluebuttonbn\privacy\provider */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Test for provider::get_metadata(). diff --git a/mod/chat/tests/privacy_test.php b/mod/chat/tests/privacy/provider_test.php similarity index 99% rename from mod/chat/tests/privacy_test.php rename to mod/chat/tests/privacy/provider_test.php index 00cde5e11c4..6fe54806be1 100644 --- a/mod/chat/tests/privacy_test.php +++ b/mod/chat/tests/privacy/provider_test.php @@ -46,7 +46,7 @@ require_once($CFG->dirroot . '/mod/chat/lib.php'); * @author Frédéric Massart * @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 { global $PAGE; diff --git a/mod/choice/tests/privacy_provider_test.php b/mod/choice/tests/privacy/provider_test.php similarity index 99% rename from mod/choice/tests/privacy_provider_test.php rename to mod/choice/tests/privacy/provider_test.php index 7e597d236cd..6a27b7c27b9 100644 --- a/mod/choice/tests/privacy_provider_test.php +++ b/mod/choice/tests/privacy/provider_test.php @@ -36,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 privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** @var stdClass The student object. */ protected $student; diff --git a/mod/data/tests/privacy_provider_test.php b/mod/data/tests/privacy/provider_test.php similarity index 99% rename from mod/data/tests/privacy_provider_test.php rename to mod/data/tests/privacy/provider_test.php index ccadb5077de..5a7a4d530aa 100644 --- a/mod/data/tests/privacy_provider_test.php +++ b/mod/data/tests/privacy/provider_test.php @@ -36,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 privacy_provider_test 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. */ diff --git a/mod/feedback/tests/privacy_test.php b/mod/feedback/tests/privacy/provider_test.php similarity index 99% rename from mod/feedback/tests/privacy_test.php rename to mod/feedback/tests/privacy/provider_test.php index 8a8f11525f9..de34617e633 100644 --- a/mod/feedback/tests/privacy_test.php +++ b/mod/feedback/tests/privacy/provider_test.php @@ -46,7 +46,7 @@ require_once($CFG->dirroot . '/mod/feedback/lib.php'); * @author Frédéric Massart * @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(); diff --git a/mod/forum/tests/privacy_provider_test.php b/mod/forum/tests/privacy/provider_test.php similarity index 99% rename from mod/forum/tests/privacy_provider_test.php rename to mod/forum/tests/privacy/provider_test.php index 60618600ed5..f60af987559 100644 --- a/mod/forum/tests/privacy_provider_test.php +++ b/mod/forum/tests/privacy/provider_test.php @@ -27,7 +27,7 @@ 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; @@ -38,7 +38,7 @@ use mod_forum\privacy\provider; * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test 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. diff --git a/mod/glossary/tests/privacy_provider_test.php b/mod/glossary/tests/privacy/provider_test.php similarity index 99% rename from mod/glossary/tests/privacy_provider_test.php rename to mod/glossary/tests/privacy/provider_test.php index 0ce5d0856c8..9acb2ee7bb2 100644 --- a/mod/glossary/tests/privacy_provider_test.php +++ b/mod/glossary/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/rating/lib.php'); * @copyright 2018 Simey Lameze * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** @var stdClass The student object. */ protected $student; diff --git a/mod/h5pactivity/tests/privacy_test.php b/mod/h5pactivity/tests/privacy/provider_test.php similarity index 99% rename from mod/h5pactivity/tests/privacy_test.php rename to mod/h5pactivity/tests/privacy/provider_test.php index f12350349db..ae7dc492c9a 100644 --- a/mod/h5pactivity/tests/privacy_test.php +++ b/mod/h5pactivity/tests/privacy/provider_test.php @@ -38,7 +38,7 @@ use \core_privacy\tests\provider_testcase; * @copyright 2020 Ferran Recio * @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; diff --git a/mod/lesson/tests/privacy_test.php b/mod/lesson/tests/privacy/provider_test.php similarity index 99% rename from mod/lesson/tests/privacy_test.php rename to mod/lesson/tests/privacy/provider_test.php index 5ace3dcf43e..9a94eae7526 100644 --- a/mod/lesson/tests/privacy_test.php +++ b/mod/lesson/tests/privacy/provider_test.php @@ -44,7 +44,7 @@ use mod_lesson\privacy\provider; * @author Frédéric Massart * @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 { global $PAGE; diff --git a/mod/lti/service/gradebookservices/tests/privacy_provider_test.php b/mod/lti/service/gradebookservices/tests/privacy/provider_test.php similarity index 96% rename from mod/lti/service/gradebookservices/tests/privacy_provider_test.php rename to mod/lti/service/gradebookservices/tests/privacy/provider_test.php index 8a455737601..398aeb71d9f 100644 --- a/mod/lti/service/gradebookservices/tests/privacy_provider_test.php +++ b/mod/lti/service/gradebookservices/tests/privacy/provider_test.php @@ -32,7 +32,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 Mark Nelson * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Basic setup for these tests. diff --git a/mod/lti/service/memberships/tests/privacy_provider_test.php b/mod/lti/service/memberships/tests/privacy/provider_test.php similarity index 96% rename from mod/lti/service/memberships/tests/privacy_provider_test.php rename to mod/lti/service/memberships/tests/privacy/provider_test.php index 393cada991f..3f8ae108bbd 100644 --- a/mod/lti/service/memberships/tests/privacy_provider_test.php +++ b/mod/lti/service/memberships/tests/privacy/provider_test.php @@ -32,7 +32,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 Mark Nelson * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Basic setup for these tests. diff --git a/mod/lti/tests/privacy_provider_test.php b/mod/lti/tests/privacy/provider_test.php similarity index 99% rename from mod/lti/tests/privacy_provider_test.php rename to mod/lti/tests/privacy/provider_test.php index f9553155bcb..9a4732bdc4c 100644 --- a/mod/lti/tests/privacy_provider_test.php +++ b/mod/lti/tests/privacy/provider_test.php @@ -37,7 +37,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Mark Nelson * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Test for provider::get_metadata(). diff --git a/mod/quiz/accessrule/seb/tests/privacy_provider_test.php b/mod/quiz/accessrule/seb/tests/privacy/provider_test.php similarity index 98% rename from mod/quiz/accessrule/seb/tests/privacy_provider_test.php rename to mod/quiz/accessrule/seb/tests/privacy/provider_test.php index c87bd5ffad7..c817df65e1c 100644 --- a/mod/quiz/accessrule/seb/tests/privacy_provider_test.php +++ b/mod/quiz/accessrule/seb/tests/privacy/provider_test.php @@ -35,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. @@ -43,7 +43,7 @@ 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 privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { use \quizaccess_seb_test_helper_trait; /** diff --git a/mod/quiz/report/grading/tests/privacy_provider_test.php b/mod/quiz/report/grading/tests/privacy/provider_test.php similarity index 97% rename from mod/quiz/report/grading/tests/privacy_provider_test.php rename to mod/quiz/report/grading/tests/privacy/provider_test.php index ff4efcb9348..cce967d1749 100644 --- a/mod/quiz/report/grading/tests/privacy_provider_test.php +++ b/mod/quiz/report/grading/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ require_once($CFG->dirroot . '/question/engine/questionattempt.php'); /** * Privacy provider tests class. */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * When no preference exists, there should be no export. */ diff --git a/mod/quiz/report/overview/tests/privacy_provider_test.php b/mod/quiz/report/overview/tests/privacy/provider_test.php similarity index 98% rename from mod/quiz/report/overview/tests/privacy_provider_test.php rename to mod/quiz/report/overview/tests/privacy/provider_test.php index 80630088e9e..289edd58499 100644 --- a/mod/quiz/report/overview/tests/privacy_provider_test.php +++ b/mod/quiz/report/overview/tests/privacy/provider_test.php @@ -37,7 +37,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * When no preference exists, there should be no export. */ diff --git a/mod/quiz/report/responses/tests/privacy_provider_test.php b/mod/quiz/report/responses/tests/privacy/provider_test.php similarity index 98% rename from mod/quiz/report/responses/tests/privacy_provider_test.php rename to mod/quiz/report/responses/tests/privacy/provider_test.php index 9dfd4e56f46..6801cd59b8e 100644 --- a/mod/quiz/report/responses/tests/privacy_provider_test.php +++ b/mod/quiz/report/responses/tests/privacy/provider_test.php @@ -40,7 +40,7 @@ require_once($CFG->dirroot . '/question/engine/questionattempt.php'); * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * When no preference exists, there should be no export. */ diff --git a/mod/quiz/tests/privacy_provider_test.php b/mod/quiz/tests/privacy/provider_test.php similarity index 99% rename from mod/quiz/tests/privacy_provider_test.php rename to mod/quiz/tests/privacy/provider_test.php index 23d49d8602b..a7292e7170e 100644 --- a/mod/quiz/tests/privacy_provider_test.php +++ b/mod/quiz/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/tests/privacy_helper.php'); * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { use \core_question_privacy_helper; diff --git a/mod/scorm/report/basic/tests/privacy_test.php b/mod/scorm/report/basic/tests/privacy/provider_test.php similarity index 97% rename from mod/scorm/report/basic/tests/privacy_test.php rename to mod/scorm/report/basic/tests/privacy/provider_test.php index 32bf0f57032..da05406c1e7 100644 --- a/mod/scorm/report/basic/tests/privacy_test.php +++ b/mod/scorm/report/basic/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use scormreport_basic\privacy\provider; * @copyright 2018 Sara Arjona * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Basic setup for these tests. diff --git a/mod/scorm/report/interactions/tests/privacy_test.php b/mod/scorm/report/interactions/tests/privacy/provider_test.php similarity index 98% rename from mod/scorm/report/interactions/tests/privacy_test.php rename to mod/scorm/report/interactions/tests/privacy/provider_test.php index bfcf90e6d53..6add72fe501 100644 --- a/mod/scorm/report/interactions/tests/privacy_test.php +++ b/mod/scorm/report/interactions/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use scormreport_interactions\privacy\provider; * @copyright 2018 Sara Arjona * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Basic setup for these tests. diff --git a/mod/scorm/report/objectives/tests/privacy_test.php b/mod/scorm/report/objectives/tests/privacy/provider_test.php similarity index 97% rename from mod/scorm/report/objectives/tests/privacy_test.php rename to mod/scorm/report/objectives/tests/privacy/provider_test.php index 0196cfa4f66..25d4d35e48b 100644 --- a/mod/scorm/report/objectives/tests/privacy_test.php +++ b/mod/scorm/report/objectives/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use scormreport_objectives\privacy\provider; * @copyright 2018 Sara Arjona * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Basic setup for these tests. diff --git a/mod/scorm/tests/privacy_test.php b/mod/scorm/tests/privacy/provider_test.php similarity index 99% rename from mod/scorm/tests/privacy_test.php rename to mod/scorm/tests/privacy/provider_test.php index ea45c3cb2df..7d272d39047 100644 --- a/mod/scorm/tests/privacy_test.php +++ b/mod/scorm/tests/privacy/provider_test.php @@ -38,7 +38,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 Sara Arjona * @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 AICC/SCORM attempt. */ protected $student0; diff --git a/mod/survey/tests/privacy_test.php b/mod/survey/tests/privacy/provider_test.php similarity index 99% rename from mod/survey/tests/privacy_test.php rename to mod/survey/tests/privacy/provider_test.php index a71d06614dc..ef3e32c035f 100644 --- a/mod/survey/tests/privacy_test.php +++ b/mod/survey/tests/privacy/provider_test.php @@ -46,7 +46,7 @@ require_once($CFG->dirroot . '/mod/survey/lib.php'); * @author Frédéric Massart * @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 { global $PAGE; diff --git a/mod/wiki/tests/privacy_test.php b/mod/wiki/tests/privacy/provider_test.php similarity index 99% rename from mod/wiki/tests/privacy_test.php rename to mod/wiki/tests/privacy/provider_test.php index 2022e972e90..be61e2e21b6 100644 --- a/mod/wiki/tests/privacy_test.php +++ b/mod/wiki/tests/privacy/provider_test.php @@ -43,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 privacy_test extends provider_testcase { +class provider_test extends provider_testcase { /** @var array */ protected $users = []; diff --git a/mod/workshop/allocation/manual/tests/privacy_provider_test.php b/mod/workshop/allocation/manual/tests/privacy/provider_test.php similarity index 94% rename from mod/workshop/allocation/manual/tests/privacy_provider_test.php rename to mod/workshop/allocation/manual/tests/privacy/provider_test.php index 772e789f8d3..c3a05324daa 100644 --- a/mod/workshop/allocation/manual/tests/privacy_provider_test.php +++ b/mod/workshop/allocation/manual/tests/privacy/provider_test.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Provides the {@link workshopallocation_manual_privacy_provider_testcase} class. + * Provides the {@see workshopallocation_manual\privacy\provider_test} class. * * @package workshopallocation_manual * @category test @@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 David Mudrák * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * When no preference exists, there should be no export. diff --git a/mod/workshop/form/accumulative/tests/privacy_provider_test.php b/mod/workshop/form/accumulative/tests/privacy/provider_test.php similarity index 96% rename from mod/workshop/form/accumulative/tests/privacy_provider_test.php rename to mod/workshop/form/accumulative/tests/privacy/provider_test.php index 9e6051b08b3..2cd05e9dcc9 100644 --- a/mod/workshop/form/accumulative/tests/privacy_provider_test.php +++ b/mod/workshop/form/accumulative/tests/privacy/provider_test.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Provides the {@link workshopform_accumulative_privacy_provider_testcase} class. + * Provides the {@see workshopform_accumulative\provider_test} class. * * @package workshopform_accumulative * @category test @@ -37,7 +37,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 David Mudrák * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Test {@link workshopform_accumulative\privacy\provider::export_assessment_form()} implementation. diff --git a/mod/workshop/form/comments/tests/privacy_provider_test.php b/mod/workshop/form/comments/tests/privacy/provider_test.php similarity index 96% rename from mod/workshop/form/comments/tests/privacy_provider_test.php rename to mod/workshop/form/comments/tests/privacy/provider_test.php index 267bf45c1c8..bfc37b773dc 100644 --- a/mod/workshop/form/comments/tests/privacy_provider_test.php +++ b/mod/workshop/form/comments/tests/privacy/provider_test.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Provides the {@link workshopform_comments_privacy_provider_testcase} class. + * Provides the {@see workshopform_comments\privacy\provider_test} class. * * @package workshopform_comments * @category test @@ -37,7 +37,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 David Mudrák * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Test {@link workshopform_comments\privacy\provider::export_assessment_form()} implementation. diff --git a/mod/workshop/form/numerrors/tests/privacy_provider_test.php b/mod/workshop/form/numerrors/tests/privacy/provider_test.php similarity index 97% rename from mod/workshop/form/numerrors/tests/privacy_provider_test.php rename to mod/workshop/form/numerrors/tests/privacy/provider_test.php index 38e6f350a44..a2f5b2b886d 100644 --- a/mod/workshop/form/numerrors/tests/privacy_provider_test.php +++ b/mod/workshop/form/numerrors/tests/privacy/provider_test.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Provides the {@link workshopform_numerrors_privacy_provider_testcase} class. + * Provides the {@see workshopform_numerrors\privacy\provider_test} class. * * @package workshopform_numerrors * @category test @@ -37,7 +37,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 David Mudrák * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Test {@link workshopform_numerrors\privacy\provider::export_assessment_form()} implementation. diff --git a/mod/workshop/form/rubric/tests/privacy_provider_test.php b/mod/workshop/form/rubric/tests/privacy/provider_test.php similarity index 97% rename from mod/workshop/form/rubric/tests/privacy_provider_test.php rename to mod/workshop/form/rubric/tests/privacy/provider_test.php index df56fecf310..e0359e74aec 100644 --- a/mod/workshop/form/rubric/tests/privacy_provider_test.php +++ b/mod/workshop/form/rubric/tests/privacy/provider_test.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Provides the {@link workshopform_rubric_privacy_provider_testcase} class. + * Provides the {@see workshopform_rubric\privacy\provider_test} class. * * @package workshopform_rubric * @category test @@ -37,7 +37,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 David Mudrák * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Test {@link workshopform_rubric\privacy\provider::export_assessment_form()} implementation. diff --git a/mod/workshop/tests/privacy_provider_test.php b/mod/workshop/tests/privacy/provider_test.php similarity index 99% rename from mod/workshop/tests/privacy_provider_test.php rename to mod/workshop/tests/privacy/provider_test.php index 3e2a178f2f3..a33272fab4e 100644 --- a/mod/workshop/tests/privacy_provider_test.php +++ b/mod/workshop/tests/privacy/provider_test.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Provides the {@link mod_workshop_privacy_provider_testcase} class. + * Provides the {@see mod_workshop\privacy\provider_test} class. * * @package mod_workshop * @category test @@ -37,7 +37,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 David Mudrák * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** @var testing_data_generator */ protected $generator; diff --git a/my/tests/privacy_test.php b/my/tests/privacy/provider_test.php similarity index 97% rename from my/tests/privacy_test.php rename to my/tests/privacy/provider_test.php index 284e54ca37a..88feb2f3862 100644 --- a/my/tests/privacy_test.php +++ b/my/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use core_my\privacy\provider; * @copyright 2018 Zig Tan * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -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(). diff --git a/notes/tests/privacy_test.php b/notes/tests/privacy/provider_test.php similarity index 99% rename from notes/tests/privacy_test.php rename to notes/tests/privacy/provider_test.php index 0e0d05e232c..e6832d18c84 100644 --- a/notes/tests/privacy_test.php +++ b/notes/tests/privacy/provider_test.php @@ -40,7 +40,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Zig Tan * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Test for provider::get_contexts_for_userid(). diff --git a/portfolio/flickr/tests/privacy_provider_test.php b/portfolio/flickr/tests/privacy/provider_test.php similarity index 95% rename from portfolio/flickr/tests/privacy_provider_test.php rename to portfolio/flickr/tests/privacy/provider_test.php index b09fcd9dbd5..99fac592a19 100644 --- a/portfolio/flickr/tests/privacy_provider_test.php +++ b/portfolio/flickr/tests/privacy/provider_test.php @@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class 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. diff --git a/portfolio/googledocs/tests/privacy_provider_test.php b/portfolio/googledocs/tests/privacy/provider_test.php similarity index 95% rename from portfolio/googledocs/tests/privacy_provider_test.php rename to portfolio/googledocs/tests/privacy/provider_test.php index bda6e30f170..e5e7e5d9934 100644 --- a/portfolio/googledocs/tests/privacy_provider_test.php +++ b/portfolio/googledocs/tests/privacy/provider_test.php @@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class 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. diff --git a/portfolio/mahara/tests/privacy_provider_test.php b/portfolio/mahara/tests/privacy/provider_test.php similarity index 95% rename from portfolio/mahara/tests/privacy_provider_test.php rename to portfolio/mahara/tests/privacy/provider_test.php index 6994e3cbae7..5b7e8c18907 100644 --- a/portfolio/mahara/tests/privacy_provider_test.php +++ b/portfolio/mahara/tests/privacy/provider_test.php @@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class 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. diff --git a/portfolio/tests/privacy_provider_test.php b/portfolio/tests/privacy/provider_test.php similarity index 99% rename from portfolio/tests/privacy_provider_test.php rename to portfolio/tests/privacy/provider_test.php index da1b59f313c..b654da1efd9 100644 --- a/portfolio/tests/privacy_provider_test.php +++ b/portfolio/tests/privacy/provider_test.php @@ -34,7 +34,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { protected function create_portfolio_data($plugin, $name, $user, $preference, $value) { global $DB; diff --git a/privacy/tests/privacy_provider_test.php b/privacy/tests/privacy/provider_test.php similarity index 99% rename from privacy/tests/privacy_provider_test.php rename to privacy/tests/privacy/provider_test.php index 6c628b86803..d49735378b2 100644 --- a/privacy/tests/privacy_provider_test.php +++ b/privacy/tests/privacy/provider_test.php @@ -21,7 +21,7 @@ * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_privacy; +namespace core_privacy\privacy; defined('MOODLE_INTERNAL') || die(); @@ -40,7 +40,7 @@ use core_privacy\local\metadata\types\user_preference; * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \advanced_testcase { +class provider_test extends \advanced_testcase { /** * Returns a list of frankenstyle names of core components (plugins and subsystems). * diff --git a/question/bank/comment/tests/privacy/privacy_provider_test.php b/question/bank/comment/tests/privacy/provider_test.php similarity index 99% rename from question/bank/comment/tests/privacy/privacy_provider_test.php rename to question/bank/comment/tests/privacy/provider_test.php index 83e49f760c1..c80e4939a63 100644 --- a/question/bank/comment/tests/privacy/privacy_provider_test.php +++ b/question/bank/comment/tests/privacy/provider_test.php @@ -32,7 +32,7 @@ use stdClass; * @author Safat Shahin * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** @var stdClass A teacher who is only enrolled in course1. */ protected $teacher1; diff --git a/question/tests/privacy_provider_test.php b/question/tests/privacy/provider_test.php similarity index 99% rename from question/tests/privacy_provider_test.php rename to question/tests/privacy/provider_test.php index 445c41d56e2..cafe94f5e38 100644 --- a/question/tests/privacy_provider_test.php +++ b/question/tests/privacy/provider_test.php @@ -32,8 +32,8 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->libdir . '/xmlize.php'); -require_once(__DIR__ . '/privacy_helper.php'); -require_once(__DIR__ . '/../engine/tests/helpers.php'); +require_once(__DIR__ . '/../privacy_helper.php'); +require_once(__DIR__ . '/../../engine/tests/helpers.php'); /** * Privacy provider tests class. @@ -42,7 +42,7 @@ require_once(__DIR__ . '/../engine/tests/helpers.php'); * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. use \core_question_privacy_helper; diff --git a/question/type/ddimageortext/tests/privacy_provider_test.php b/question/type/ddimageortext/tests/privacy/provider_test.php similarity index 98% rename from question/type/ddimageortext/tests/privacy_provider_test.php rename to question/type/ddimageortext/tests/privacy/provider_test.php index ff07fe8e4d7..e19bdfaeb5e 100644 --- a/question/type/ddimageortext/tests/privacy_provider_test.php +++ b/question/type/ddimageortext/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/type/ddimageortext/classes/privacy/provi * @copyright 2021 The Open university * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. public function test_get_metadata() { diff --git a/question/type/ddmarker/tests/privacy_provider_test.php b/question/type/ddmarker/tests/privacy/provider_test.php similarity index 98% rename from question/type/ddmarker/tests/privacy_provider_test.php rename to question/type/ddmarker/tests/privacy/provider_test.php index c9c89d1682d..fcf69c7d15e 100644 --- a/question/type/ddmarker/tests/privacy_provider_test.php +++ b/question/type/ddmarker/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/type/ddmarker/classes/privacy/provider.p * @copyright 2021 The Open university * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. public function test_get_metadata() { diff --git a/question/type/ddwtos/tests/privacy_provider_test.php b/question/type/ddwtos/tests/privacy/provider_test.php similarity index 98% rename from question/type/ddwtos/tests/privacy_provider_test.php rename to question/type/ddwtos/tests/privacy/provider_test.php index 81461f1bd61..711b7c1744c 100644 --- a/question/type/ddwtos/tests/privacy_provider_test.php +++ b/question/type/ddwtos/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/type/ddwtos/classes/privacy/provider.php * @copyright 2021 The Open university * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. public function test_get_metadata() { diff --git a/question/type/essay/tests/privacy_provider_test.php b/question/type/essay/tests/privacy/provider_test.php similarity index 98% rename from question/type/essay/tests/privacy_provider_test.php rename to question/type/essay/tests/privacy/provider_test.php index b0ed4671881..ef88678dc3b 100644 --- a/question/type/essay/tests/privacy_provider_test.php +++ b/question/type/essay/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/type/essay/classes/privacy/provider.php' * @copyright 2021 The Open university * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. public function test_get_metadata() { diff --git a/question/type/gapselect/tests/privacy_provider_test.php b/question/type/gapselect/tests/privacy/provider_test.php similarity index 98% rename from question/type/gapselect/tests/privacy_provider_test.php rename to question/type/gapselect/tests/privacy/provider_test.php index 6525f1d4d2f..85734954527 100644 --- a/question/type/gapselect/tests/privacy_provider_test.php +++ b/question/type/gapselect/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/type/gapselect/classes/privacy/provider. * @copyright 2021 The Open university * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. public function test_get_metadata() { diff --git a/question/type/match/tests/privacy_provider_test.php b/question/type/match/tests/privacy/provider_test.php similarity index 98% rename from question/type/match/tests/privacy_provider_test.php rename to question/type/match/tests/privacy/provider_test.php index f9ef79aab75..41b0fc5147d 100644 --- a/question/type/match/tests/privacy_provider_test.php +++ b/question/type/match/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/type/match/classes/privacy/provider.php' * @copyright 2021 The Open university * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. public function test_get_metadata() { diff --git a/question/type/multichoice/tests/privacy_provider_test.php b/question/type/multichoice/tests/privacy/provider_test.php similarity index 98% rename from question/type/multichoice/tests/privacy_provider_test.php rename to question/type/multichoice/tests/privacy/provider_test.php index c847a82a97e..0f2dcb07918 100644 --- a/question/type/multichoice/tests/privacy_provider_test.php +++ b/question/type/multichoice/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/type/multichoice/classes/privacy/provide * @copyright 2021 The Open university * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. public function test_get_metadata() { diff --git a/question/type/numerical/tests/privacy_provider_test.php b/question/type/numerical/tests/privacy/provider_test.php similarity index 98% rename from question/type/numerical/tests/privacy_provider_test.php rename to question/type/numerical/tests/privacy/provider_test.php index 1279b693ede..d5fd8fd3059 100644 --- a/question/type/numerical/tests/privacy_provider_test.php +++ b/question/type/numerical/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/type/numerical/questiontype.php'); * @copyright 2021 The Open university * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. public function test_get_metadata() { diff --git a/question/type/shortanswer/tests/privacy_provider_test.php b/question/type/shortanswer/tests/privacy/provider_test.php similarity index 98% rename from question/type/shortanswer/tests/privacy_provider_test.php rename to question/type/shortanswer/tests/privacy/provider_test.php index 716c3dce3a2..4c1aed9fdaa 100644 --- a/question/type/shortanswer/tests/privacy_provider_test.php +++ b/question/type/shortanswer/tests/privacy/provider_test.php @@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/question/type/shortanswer/classes/privacy/provide * @copyright 2021 The Open university * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { // Include the privacy helper which has assertions on it. public function test_get_metadata() { diff --git a/rating/tests/privacy_provider_test.php b/rating/tests/privacy/provider_test.php similarity index 99% rename from rating/tests/privacy_provider_test.php rename to rating/tests/privacy/provider_test.php index b6d4861d4f4..c20540ed4e0 100644 --- a/rating/tests/privacy_provider_test.php +++ b/rating/tests/privacy/provider_test.php @@ -38,7 +38,7 @@ use core_privacy\local\request\writer; * @copyright 2018 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Rate something as a user. diff --git a/report/stats/tests/privacy_test.php b/report/stats/tests/privacy/provider_test.php similarity index 99% rename from report/stats/tests/privacy_test.php rename to report/stats/tests/privacy/provider_test.php index dcd13cfae86..f538eb61e13 100644 --- a/report/stats/tests/privacy_test.php +++ b/report/stats/tests/privacy/provider_test.php @@ -28,13 +28,13 @@ use core_privacy\local\request\approved_userlist; use core_privacy\tests\provider_testcase; /** - * Class report_stats_privacy_testcase + * Privacy provider test for report_stats. * * @package report_stats * @copyright 2018 Adrian Greeve * @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 function to create stats. diff --git a/reportbuilder/tests/privacy/privacy_provider_test.php b/reportbuilder/tests/privacy/provider_test.php similarity index 98% rename from reportbuilder/tests/privacy/privacy_provider_test.php rename to reportbuilder/tests/privacy/provider_test.php index 45992aefedf..dd881d2dfca 100644 --- a/reportbuilder/tests/privacy/privacy_provider_test.php +++ b/reportbuilder/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ use core_reportbuilder\local\models\report; * @copyright 2021 David Matamoros * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_provider_test extends provider_testcase { +class provider_test extends provider_testcase { /** * Test provider metadata diff --git a/repository/flickr/tests/privacy_test.php b/repository/flickr/tests/privacy/provider_test.php similarity index 98% rename from repository/flickr/tests/privacy_test.php rename to repository/flickr/tests/privacy/provider_test.php index f8cdde7462f..544cec329cf 100644 --- a/repository/flickr/tests/privacy_test.php +++ b/repository/flickr/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ use core_privacy\tests\provider_testcase; * @copyright 2018 Zig Tan * @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 { /** * Overriding setUp() function to always reset after tests. */ diff --git a/repository/onedrive/tests/privacy_test.php b/repository/onedrive/tests/privacy/provider_test.php similarity index 99% rename from repository/onedrive/tests/privacy_test.php rename to repository/onedrive/tests/privacy/provider_test.php index 1aa871a674a..6b988f24a93 100644 --- a/repository/onedrive/tests/privacy_test.php +++ b/repository/onedrive/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use repository_onedrive\privacy\provider; * @copyright 2018 Zig Tan * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Overriding setUp() function to always reset after tests. diff --git a/repository/tests/privacy_test.php b/repository/tests/privacy/provider_test.php similarity index 99% rename from repository/tests/privacy_test.php rename to repository/tests/privacy/provider_test.php index 24ae53204e1..85dcd5a5356 100644 --- a/repository/tests/privacy_test.php +++ b/repository/tests/privacy/provider_test.php @@ -37,7 +37,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Zig Tan * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { /** * Overriding setUp() function to always reset after tests. diff --git a/rss/tests/privacy_test.php b/rss/tests/privacy/provider_test.php similarity index 99% rename from rss/tests/privacy_test.php rename to rss/tests/privacy/provider_test.php index 22250944aee..406db4ba938 100644 --- a/rss/tests/privacy_test.php +++ b/rss/tests/privacy/provider_test.php @@ -36,7 +36,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Sara Arjona * @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 { /** * Basic setup for these tests. diff --git a/search/engine/simpledb/tests/privacy_test.php b/search/engine/simpledb/tests/privacy/provider_test.php similarity index 99% rename from search/engine/simpledb/tests/privacy_test.php rename to search/engine/simpledb/tests/privacy/provider_test.php index 4cad9c29cbf..17d250a6da4 100644 --- a/search/engine/simpledb/tests/privacy_test.php +++ b/search/engine/simpledb/tests/privacy/provider_test.php @@ -40,7 +40,7 @@ require_once($CFG->dirroot . '/search/tests/fixtures/mock_search_area.php'); * @copyright 2018 David Monllaó {@link http://www.davidmonllao.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_test extends \core_privacy\tests\provider_testcase { +class provider_test extends \core_privacy\tests\provider_testcase { public function setUp(): void { global $DB; diff --git a/search/engine/solr/tests/privacy_test.php b/search/engine/solr/tests/privacy/provider_test.php similarity index 96% rename from search/engine/solr/tests/privacy_test.php rename to search/engine/solr/tests/privacy/provider_test.php index f8088cc6110..e6b0f879f0e 100644 --- a/search/engine/solr/tests/privacy_test.php +++ b/search/engine/solr/tests/privacy/provider_test.php @@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die(); * @copyright 2018 David Monllao * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class privacy_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. diff --git a/tag/tests/privacy_test.php b/tag/tests/privacy/provider_test.php similarity index 99% rename from tag/tests/privacy_test.php rename to tag/tests/privacy/provider_test.php index d24be479184..03e1cbe9437 100644 --- a/tag/tests/privacy_test.php +++ b/tag/tests/privacy/provider_test.php @@ -40,7 +40,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Zig Tan * @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 { /** * Check the exporting of tags for a user id in a context. diff --git a/theme/boost/tests/privacy_test.php b/theme/boost/tests/privacy/provider_test.php similarity index 97% rename from theme/boost/tests/privacy_test.php rename to theme/boost/tests/privacy/provider_test.php index cb9746609fb..18f13df989c 100644 --- a/theme/boost/tests/privacy_test.php +++ b/theme/boost/tests/privacy/provider_test.php @@ -34,7 +34,7 @@ use theme_boost\privacy\provider; * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -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(). diff --git a/user/profile/field/checkbox/tests/privacy_test.php b/user/profile/field/checkbox/tests/privacy/provider_test.php similarity index 99% rename from user/profile/field/checkbox/tests/privacy_test.php rename to user/profile/field/checkbox/tests/privacy/provider_test.php index 43c2b27b28f..37cf9e50621 100644 --- a/user/profile/field/checkbox/tests/privacy_test.php +++ b/user/profile/field/checkbox/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Mihail Geshoski * @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 { /** * Basic setup for these tests. diff --git a/user/profile/field/datetime/tests/privacy_test.php b/user/profile/field/datetime/tests/privacy/provider_test.php similarity index 99% rename from user/profile/field/datetime/tests/privacy_test.php rename to user/profile/field/datetime/tests/privacy/provider_test.php index f563776337a..640a67851ea 100644 --- a/user/profile/field/datetime/tests/privacy_test.php +++ b/user/profile/field/datetime/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Mihail Geshoski * @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 { /** * Basic setup for these tests. diff --git a/user/profile/field/menu/tests/privacy_test.php b/user/profile/field/menu/tests/privacy/provider_test.php similarity index 99% rename from user/profile/field/menu/tests/privacy_test.php rename to user/profile/field/menu/tests/privacy/provider_test.php index 4ccc8a2a5cb..dc6f30b9c68 100644 --- a/user/profile/field/menu/tests/privacy_test.php +++ b/user/profile/field/menu/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Mihail Geshoski * @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 { /** * Basic setup for these tests. diff --git a/user/profile/field/social/tests/privacy_test.php b/user/profile/field/social/tests/privacy/provider_test.php similarity index 99% rename from user/profile/field/social/tests/privacy_test.php rename to user/profile/field/social/tests/privacy/provider_test.php index 6ed1f07f197..fec6b397ca5 100644 --- a/user/profile/field/social/tests/privacy_test.php +++ b/user/profile/field/social/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2020 Bas Brands * @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 { /** * Basic setup for these tests. diff --git a/user/profile/field/text/tests/privacy_test.php b/user/profile/field/text/tests/privacy/provider_test.php similarity index 99% rename from user/profile/field/text/tests/privacy_test.php rename to user/profile/field/text/tests/privacy/provider_test.php index a79e2a00b31..8b85f37cdc3 100644 --- a/user/profile/field/text/tests/privacy_test.php +++ b/user/profile/field/text/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Mihail Geshoski * @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 { /** * Basic setup for these tests. diff --git a/user/profile/field/textarea/tests/privacy_test.php b/user/profile/field/textarea/tests/privacy/provider_test.php similarity index 99% rename from user/profile/field/textarea/tests/privacy_test.php rename to user/profile/field/textarea/tests/privacy/provider_test.php index d958154b761..a4c020c6b0a 100644 --- a/user/profile/field/textarea/tests/privacy_test.php +++ b/user/profile/field/textarea/tests/privacy/provider_test.php @@ -35,7 +35,7 @@ use core_privacy\local\request\approved_userlist; * @copyright 2018 Mihail Geshoski * @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 { /** * Basic setup for these tests. diff --git a/user/tests/privacy_test.php b/user/tests/privacy/provider_test.php similarity index 98% rename from user/tests/privacy_test.php rename to user/tests/privacy/provider_test.php index 1cea387828d..ffba864a7b4 100644 --- a/user/tests/privacy_test.php +++ b/user/tests/privacy/provider_test.php @@ -39,7 +39,7 @@ require_once($CFG->dirroot . "/user/lib.php"); * @copyright 2018 Adrian Greeve * @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 { /** * Check that context information is returned correctly. @@ -229,7 +229,10 @@ class privacy_test extends provider_testcase { $this->create_data_for_user($user2, $course); // Provide multiple different context to check that only the correct user is deleted. - $contexts = [\context_user::instance($user->id)->id, \context_user::instance($user2->id)->id, \context_system::instance()->id]; + $contexts = [ + \context_user::instance($user->id)->id, + \context_user::instance($user2->id)->id, + \context_system::instance()->id]; $approvedlist = new \core_privacy\local\request\approved_contextlist($user, 'core_user', $contexts); provider::delete_data_for_user($approvedlist); diff --git a/webservice/tests/privacy_test.php b/webservice/tests/privacy/provider_test.php similarity index 99% rename from webservice/tests/privacy_test.php rename to webservice/tests/privacy/provider_test.php index 906d6bd472b..990357c6ac0 100644 --- a/webservice/tests/privacy_test.php +++ b/webservice/tests/privacy/provider_test.php @@ -46,7 +46,7 @@ require_once($CFG->dirroot . '/webservice/lib.php'); * @author Frédéric Massart * @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();