Update unit tests to include later versions of Moodle and PHP (#829)

* prep for new release and adding 3.11 support * adding moodle4.0 * @Covers for core tests * @Covers for remaining tests Co-authored-by: David Pesce <david.pesce@exputo.com>
xAPI-vle · Oct 19, 2022 · 1850df7 · 1850df7
1 parent f8c5a08
commit 1850df7
Show file tree

Hide file tree

Showing 93 changed files with 134 additions and 69 deletions.
diff --git a/.github/workflows/moodle-plugin-ci.yml b/.github/workflows/moodle-plugin-ci.yml
@@ -30,9 +30,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4']
-        moodle-branch: ['MOODLE_39_STABLE']
-        database: [pgsql, mariadb]
+        include:
+          - php: '7.4'
+            moodle-branch: 'MOODLE_39_STABLE'
+            database: 'pgsql'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_39_STABLE'
+            database: 'mariadb'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_311_STABLE'
+            database: 'pgsql'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_311_STABLE'
+            database: 'mariadb'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_311_STABLE'
+            database: 'pgsql'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_311_STABLE'
+            database: 'mariadb'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_400_STABLE'
+            database: 'pgsql'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_400_STABLE'
+            database: 'mariadb'
 
     steps:
       - name: Check out repository code
@@ -63,10 +85,19 @@ jobs:
           cd plugin
           composer install
 
-      - name: Install moodle-plugin-ci
+      - name: Install additional supported plugins (Moodle 3.9-3.11)
+        if: ${{ matrix.moodle-branch == 'MOODLE_39_STABLE' || matrix.moodle-branch == 'MOODLE_310_STABLE' || matrix.moodle-branch == 'MOODLE_311_STABLE' }}
         run: |
           moodle-plugin-ci add-plugin --branch MOODLE_34_STABLE catalyst/moodle-mod_facetoface
           moodle-plugin-ci add-plugin --branch v3.0-stable blindsidenetworks/moodle-mod_bigbluebuttonbn
+
+      - name: Install additional supported plugins (Moodle 4.0)
+        if: ${{ matrix.moodle-branch == 'MOODLE_400_STABLE' }}
+        run: |
+          moodle-plugin-ci add-plugin --branch MOODLE_400_STABLE catalyst/moodle-mod_facetoface
+
+      - name: Install the plugin.
+        run: |
           moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
         env:
           DB: ${{ matrix.database }}

diff --git a/classes/log/store.php b/classes/log/store.php
@@ -154,7 +154,7 @@ protected function get_event_id($event) {
      * Insert events in bulk to the database. Overrides helper_writer.
      * @param array $events raw event data
      */
-    protected function insert_event_entries(array $events) {
+    protected function insert_event_entries($events) {
         global $DB;
 
         // If in background mode, just save them in the database.

diff --git a/tests/core/course_completed/completing_existing_course/completing_existing_course_test.php b/tests/core/course_completed/completing_existing_course/completing_existing_course_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_completed
      * @return void
      */
     public function test_init() {

diff --git a/tests/core/course_completed/send_jisc_data/send_jisc_data_test.php b/tests/core/course_completed/send_jisc_data/send_jisc_data_test.php
@@ -58,6 +58,7 @@ protected function get_transformer_config() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_completed
      * @return void
      */
     public function test_init() {

diff --git a/...e_module_completion_update/completing_existing_module/completing_existing_module_test.php b/...e_module_completion_update/completing_existing_module/completing_existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_completion_updated
      * @return void
      */
     public function test_init() {

diff --git a/tests/core/course_viewed/viewing_existing_course/viewing_existing_course_test.php b/tests/core/course_viewed/viewing_existing_course/viewing_existing_course_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_viewed
      * @return void
      */
     public function test_init() {

diff --git a/tests/core/unknown_event/data.json b/tests/core/unknown_event/data.json
diff --git a/tests/core/unknown_event/event.json b/tests/core/unknown_event/event.json
diff --git a/tests/core/unknown_event/statements.json b/tests/core/unknown_event/statements.json
diff --git a/tests/core/unknown_event/unknown_event_test.php b/tests/core/unknown_event/unknown_event_test.php
diff --git a/tests/core/user_created/existing_user_created/existing_user_created_test.php b/tests/core/user_created/existing_user_created/existing_user_created_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_created
      * @return void
      */
     public function test_init() {

diff --git a/tests/core/user_created/send_jisc_data/send_jisc_data_test.php b/tests/core/user_created/send_jisc_data/send_jisc_data_test.php
@@ -58,6 +58,7 @@ protected function get_transformer_config() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_created
      * @return void
      */
     public function test_init() {

diff --git a/tests/core/user_enrolment_created/existing_user_enrolled/existing_user_enrolled_test.php b/tests/core/user_enrolment_created/existing_user_enrolled/existing_user_enrolled_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_enrolment_created
      * @return void
      */
     public function test_init() {

diff --git a/tests/core/user_loggedin/existing_user_loggedin/existing_user_loggedin_test.php b/tests/core/user_loggedin/existing_user_loggedin/existing_user_loggedin_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_loggedin
      * @return void
      */
     public function test_init() {

diff --git a/tests/core/user_loggedout/existing_user_loggedout/existing_user_loggedout_test.php b/tests/core/user_loggedout/existing_user_loggedout/existing_user_loggedout_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_loggedout
      * @return void
      */
     public function test_init() {

diff --git a/tests/failed_report_test.php b/tests/failed_report_test.php
@@ -71,6 +71,8 @@ protected function get_validated_form() {
     /**
      * Creating minimum a single course view event to xapi logstore.
      * Submit form and validate form data.
+     *
+     * @covers \form\tool_logstore_xapi_reportfilter_form
      */
     public function test_single_element() {
         global $DB;
@@ -90,6 +92,8 @@ public function test_single_element() {
      * Creating multiple course view events to xapi logstore.
      * Record number depends on $multipletestnumber.
      * Submit form and validate form data.
+     *
+     * @covers \form\tool_logstore_xapi_reportfilter_form
      */
     public function test_multiple_elements() {
         global $DB;

diff --git a/tests/history_report_test.php b/tests/history_report_test.php
@@ -69,6 +69,8 @@ protected function get_validated_form() {
     /**
      * Creating minimum a single course view event to xapi logstore.
      * Submit form and validate form data.
+     *
+     * @covers \form\tool_logstore_xapi_reportfilter_form
      */
     public function test_single_element() {
         global $DB;
@@ -88,6 +90,8 @@ public function test_single_element() {
      * Creating multiple course view events to xapi logstore.
      * Record number depends on $multipletestnumber.
      * Submit form and validate form data.
+     *
+     * @covers \form\tool_logstore_xapi_reportfilter_form
      */
     public function test_multiple_elements() {
         global $DB;

diff --git a/...ent_graded/existing_assignment_graded_comment/existing_assignment_graded_comment_test.php b/...ent_graded/existing_assignment_graded_comment/existing_assignment_graded_comment_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::assignment_graded
      * @return void
      */
     public function test_init() {

diff --git a/...graded/existing_assignment_graded_nocomment/existing_assignment_graded_nocomment_test.php b/...graded/existing_assignment_graded_nocomment/existing_assignment_graded_nocomment_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::assignment_graded
      * @return void
      */
     public function test_init() {

diff --git a/...assignment_submitted/existing_assignment_submitted/existing_assignment_submitted_test.php b/...assignment_submitted/existing_assignment_submitted/existing_assignment_submitted_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::assignment_submitted
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/activity_management_viewed/activity_management_viewed_test.php b/tests/mod_bigbluebuttonbn/activity_management_viewed/activity_management_viewed_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::activity_management_viewed
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/live_session/live_session_test.php b/tests/mod_bigbluebuttonbn/live_session/live_session_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::live_session
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/meeting_created/meeting_created_test.php b/tests/mod_bigbluebuttonbn/meeting_created/meeting_created_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::meeting_created
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/meeting_ended/meeting_ended_test.php b/tests/mod_bigbluebuttonbn/meeting_ended/meeting_ended_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::meeting_ended
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/meeting_joined/meeting_joined_test.php b/tests/mod_bigbluebuttonbn/meeting_joined/meeting_joined_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::meeting_joined
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/meeting_left/meeting_left_test.php b/tests/mod_bigbluebuttonbn/meeting_left/meeting_left_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::meeting_left
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/recording_deleted/recording_deleted_test.php b/tests/mod_bigbluebuttonbn/recording_deleted/recording_deleted_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_deleted
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/recording_edited/recording_edited_test.php b/tests/mod_bigbluebuttonbn/recording_edited/recording_edited_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_edited
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/recording_imported/recording_imported_test.php b/tests/mod_bigbluebuttonbn/recording_imported/recording_imported_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_imported
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/recording_protected/recording_protected_test.php b/tests/mod_bigbluebuttonbn/recording_protected/recording_protected_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_protected
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/recording_published/recording_published_test.php b/tests/mod_bigbluebuttonbn/recording_published/recording_published_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_published
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/recording_unprotected/recording_unprotected_test.php b/tests/mod_bigbluebuttonbn/recording_unprotected/recording_unprotected_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_unprotected
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/recording_unpublished/recording_unpublished_test.php b/tests/mod_bigbluebuttonbn/recording_unpublished/recording_unpublished_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_unpublished
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_bigbluebuttonbn/recording_viewed/recording_viewed_test.php b/tests/mod_bigbluebuttonbn/recording_viewed/recording_viewed_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_viewed
      * @return void
      */
     public function test_init() {

diff --git a/...r_viewed/existing_chapter_viewed_with_parent/existing_chapter_viewed_with_parent_test.php b/...r_viewed/existing_chapter_viewed_with_parent/existing_chapter_viewed_with_parent_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::chapter_viewed
      * @return void
      */
     public function test_init() {

diff --git a/...ed/existing_chapter_viewed_without_parent/existing_chapter_viewed_without_parent_test.php b/...ed/existing_chapter_viewed_without_parent/existing_chapter_viewed_without_parent_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::chapter_viewed
      * @return void
      */
     public function test_init() {

diff --git a/tests/mod_book/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_book/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {