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.
andelacruz · Dec 17, 2021 · e4a2d9c · e4a2d9c
1 parent 57e6fb7
commit e4a2d9c
Show file tree

Hide file tree

Showing 135 changed files with 174 additions and 173 deletions.
diff --git a/admin/roles/tests/privacy_test.php → admin/roles/tests/privacy/provider_test.php b/admin/roles/tests/privacy_test.php → admin/roles/tests/privacy/provider_test.php
@@ -40,7 +40,7 @@
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+class provider_test extends provider_testcase {
     /**
      * Test to check export_user_preferences.
      * returns user preferences data.

diff --git a/...n_presets/tests/privacy_provider_test.php → ...n_presets/tests/privacy/provider_test.php b/...n_presets/tests/privacy_provider_test.php → ...n_presets/tests/privacy/provider_test.php
@@ -30,7 +30,7 @@
  * @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/...n/tool/cohortroles/tests/privacy_test.php → ...hortroles/tests/privacy/provider_test.php b/...n/tool/cohortroles/tests/privacy_test.php → ...hortroles/tests/privacy/provider_test.php
@@ -39,7 +39,7 @@
  * @copyright  2018 Zig Tan <zig@moodle.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 {
 
     /**
      * Overriding setUp() function to always reset after tests.

diff --git a/...taprivacy/tests/privacy_provider_test.php → ...taprivacy/tests/privacy/provider_test.php b/...taprivacy/tests/privacy_provider_test.php → ...taprivacy/tests/privacy/provider_test.php
@@ -39,7 +39,7 @@
  * @copyright  2020 Paul Holden <paulh@moodle.com>
  * @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/...log/store/database/tests/privacy_test.php → .../database/tests/privacy/provider_test.php b/...log/store/database/tests/privacy_test.php → .../database/tests/privacy/provider_test.php
@@ -35,7 +35,7 @@
 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 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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/...l/log/store/legacy/tests/privacy_test.php → ...re/legacy/tests/privacy/provider_test.php b/...l/log/store/legacy/tests/privacy_test.php → ...re/legacy/tests/privacy/provider_test.php
@@ -36,7 +36,7 @@
 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 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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/...log/store/standard/tests/privacy_test.php → .../standard/tests/privacy/provider_test.php b/...log/store/standard/tests/privacy_test.php → .../standard/tests/privacy/provider_test.php
@@ -35,7 +35,7 @@
 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 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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 → .../tool/log/tests/privacy/provider_test.php b/admin/tool/log/tests/privacy_test.php → .../tool/log/tests/privacy/provider_test.php
@@ -50,7 +50,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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/...ool/messageinbound/tests/privacy_test.php → ...geinbound/tests/privacy/provider_test.php b/...ool/messageinbound/tests/privacy_test.php → ...geinbound/tests/privacy/provider_test.php
@@ -45,7 +45,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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/...ol/mobile/tests/privacy_provider_test.php → ...ol/mobile/tests/privacy/provider_test.php b/...ol/mobile/tests/privacy_provider_test.php → ...ol/mobile/tests/privacy/provider_test.php
@@ -37,7 +37,7 @@
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @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 → ...l/monitor/tests/privacy/provider_test.php b/admin/tool/monitor/tests/privacy_test.php → ...l/monitor/tests/privacy/provider_test.php
@@ -39,7 +39,7 @@
  * @copyright  2018 Adrian Greeve <adriangreeve.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+class provider_test extends provider_testcase {
 
     /**
      * Set up method.

diff --git a/...ol/policy/tests/privacy_provider_test.php → ...ol/policy/tests/privacy/provider_test.php b/...ol/policy/tests/privacy_provider_test.php → ...ol/policy/tests/privacy/provider_test.php
@@ -39,7 +39,7 @@
  * @copyright  2018 Sara Arjona <sara@moodle.com>
  * @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/...usertours/tests/privacy_provider_test.php → ...usertours/tests/privacy/provider_test.php b/...usertours/tests/privacy_provider_test.php → ...usertours/tests/privacy/provider_test.php
@@ -37,7 +37,7 @@
  * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
  * @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 → analytics/tests/privacy/provider_test.php b/analytics/tests/privacy_test.php → analytics/tests/privacy/provider_test.php
@@ -31,10 +31,10 @@
 
 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 @@
  * @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 → auth/manual/tests/privacy/provider_test.php b/auth/manual/tests/privacy_provider_test.php → auth/manual/tests/privacy/provider_test.php
@@ -38,7 +38,7 @@
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @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 → auth/mnet/tests/privacy/provider_test.php b/auth/mnet/tests/privacy_provider_test.php → auth/mnet/tests/privacy/provider_test.php
@@ -40,7 +40,7 @@
  * @copyright  2018 Victor Deniz <victor@moodle.com>
  * @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 → auth/oauth2/tests/privacy/provider_test.php b/auth/oauth2/tests/privacy_provider_test.php → auth/oauth2/tests/privacy/provider_test.php
@@ -39,7 +39,7 @@
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @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 → auth/tests/privacy/provider_test.php b/auth/tests/privacy_test.php → auth/tests/privacy/provider_test.php
@@ -42,7 +42,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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 → backup/tests/privacy/provider_test.php b/backup/tests/privacy_provider_test.php → backup/tests/privacy/provider_test.php
@@ -34,7 +34,7 @@
  * @copyright  2018 Mark Nelson <markn@moodle.com>
  * @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 → badges/tests/privacy/provider_test.php b/badges/tests/privacy_test.php → badges/tests/privacy/provider_test.php
@@ -47,7 +47,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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/.../comments/tests/privacy_provider_test.php → .../comments/tests/privacy/provider_test.php b/.../comments/tests/privacy_provider_test.php → .../comments/tests/privacy/provider_test.php
@@ -30,12 +30,12 @@
 defined('MOODLE_INTERNAL') || die();
 
 /**
- * Class block_comments_privacy_provider_testcase.
+ * Privacy provider test for block_comments.
  *
  * @copyright  2018 Shamim Rezaie <shamim@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class 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 → blocks/html/tests/privacy/provider_test.php b/blocks/html/tests/privacy_provider_test.php → blocks/html/tests/privacy/provider_test.php
@@ -37,7 +37,7 @@
  * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
  * @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 → ...yoverview/tests/privacy/provider_test.php b/blocks/myoverview/tests/privacy_test.php → ...yoverview/tests/privacy/provider_test.php
@@ -33,7 +33,7 @@
  * @copyright  2018 Peter Dias <peter@moodle.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 {
     /**
      * Ensure that export_user_preferences returns no data if the user has not visited the myoverview block.
      */

diff --git a/...entlyaccesseditems/tests/privacy_test.php → ...sseditems/tests/privacy/provider_test.php b/...entlyaccesseditems/tests/privacy_test.php → ...sseditems/tests/privacy/provider_test.php
@@ -38,7 +38,7 @@
  * @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 → ...ss_client/tests/privacy/provider_test.php b/blocks/rss_client/tests/privacy_test.php → ...ss_client/tests/privacy/provider_test.php
@@ -34,7 +34,7 @@
  * @copyright  2018 Mihail Geshoski <mihail@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+class provider_test extends provider_testcase {
 
     /**
      * Basic setup for these tests.

diff --git a/blocks/tests/privacy_test.php → blocks/tests/privacy/provider_test.php b/blocks/tests/privacy_test.php → blocks/tests/privacy/provider_test.php
@@ -43,7 +43,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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 → .../timeline/tests/privacy/provider_test.php b/blocks/timeline/tests/privacy_test.php → .../timeline/tests/privacy/provider_test.php
@@ -35,7 +35,7 @@
  * @copyright  2018 Peter Dias <peter@moodle.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 {
 
     /**
      * 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 → blog/tests/privacy/provider_test.php b/blog/tests/privacy_test.php → blog/tests/privacy/provider_test.php
@@ -46,7 +46,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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 → calendar/tests/privacy/provider_test.php b/calendar/tests/privacy_test.php → calendar/tests/privacy/provider_test.php
@@ -43,7 +43,7 @@
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+class provider_test extends provider_testcase {
 
     /**
      * Overriding setUp() function to always reset after tests.

diff --git a/cohort/tests/privacy_test.php → cohort/tests/privacy/provider_test.php b/cohort/tests/privacy_test.php → cohort/tests/privacy/provider_test.php
@@ -38,7 +38,7 @@
  * @copyright  2018 Sara Arjona <sara@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+class provider_test extends provider_testcase {
 
     /**
      * Basic setup for these tests.

diff --git a/comment/tests/privacy_test.php → comment/tests/privacy/provider_test.php b/comment/tests/privacy_test.php → comment/tests/privacy/provider_test.php
@@ -39,7 +39,7 @@
  * @copyright  2018 Adrian Greeve <adrian@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+class provider_test extends provider_testcase {
 
     protected function setUp(): void {
         $this->resetAfterTest();

diff --git a/competency/tests/privacy_test.php → competency/tests/privacy/provider_test.php b/competency/tests/privacy_test.php → competency/tests/privacy/provider_test.php
@@ -47,7 +47,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @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 → completion/tests/privacy/provider_test.php b/completion/tests/privacy_test.php → completion/tests/privacy/provider_test.php
@@ -36,7 +36,7 @@
  * @copyright   2018 Adrian Greeve <adriangreeve.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 {
 
     use \completion_creation;
 

diff --git a/contentbank/tests/privacy_test.php → contentbank/tests/privacy/provider_test.php b/contentbank/tests/privacy_test.php → contentbank/tests/privacy/provider_test.php
@@ -43,7 +43,7 @@
  * @copyright  2020 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+class provider_test extends provider_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.

diff --git a/course/format/tests/privacy_test.php → ...se/format/tests/privacy/provider_test.php b/course/format/tests/privacy_test.php → ...se/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 <http://www.gnu.org/licenses/>.
 
+namespace core_courseformat\privacy;
+
+use context_course;
+use core_privacy\local\request\writer;
+
 /**
  * Privacy tests for core_courseformat.
  *
@@ -22,13 +27,7 @@
  * @copyright  2021 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-
-namespace core_courseformat\privacy;
-
-use context_course;
-use core_privacy\local\request\writer;
-
-class privacy_test extends \core_privacy\tests\provider_testcase {
+class provider_test extends \core_privacy\tests\provider_testcase {
 
     /**
      * Test for provider::test_export_user_preferences().

diff --git a/course/tests/privacy_test.php → course/tests/privacy/provider_test.php b/course/tests/privacy_test.php → course/tests/privacy/provider_test.php
@@ -36,7 +36,7 @@
  * @copyright  2018 Adrian Greeve <adrian@moodle.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 {
 
     use \completion_creation;
 

diff --git a/customfield/tests/privacy_test.php → customfield/tests/privacy/provider_test.php b/customfield/tests/privacy_test.php → customfield/tests/privacy/provider_test.php
@@ -37,7 +37,7 @@
  * @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.