fix phpunit tests

bluetom · bluetom · commit 40b1fd798b16 · 2025-11-16T21:54:12.000+01:00
diff --git a/classes/local/manager/delayed_courses_manager.php b/classes/local/manager/delayed_courses_manager.php
@@ -155,15 +155,30 @@ public static function get_course_delayed_workflow($courseid, $workflowid) {
     }
 
     /**
-     * Build where sql for the processor to select only delayed courses.
-     * @return array
+     * Build where SQL for the processor to select delayed courses.
+     * @return array sql-where-clause and params
      */
     public static function get_course_delayed_wheresql() {
         $where = "{course}.id IN (SELECT courseid FROM {tool_lifecycle_delayed} WHERE delayeduntil > :now)";
         $params = ["now" => time()];
         return [$where, $params];
     }
 
+    /**
+     * Build where SQL for the processor to select courses delayed for workflow.
+     * @return array sql-where-clause and params
+     */
+    public static function get_course_delayed_all_wheresql($workflowid) {
+        $where = "(";
+        $where .= "c.id IN (SELECT courseid FROM {tool_lifecycle_delayed_workf} WHERE delayeduntil > :now1
+            AND workflowid = :workflowid)";
+        $where .= " OR c.id IN (SELECT courseid FROM {tool_lifecycle_delayed} WHERE delayeduntil > :now2)";
+        $where .= ")";
+        $now = time();
+        $params = ["now1" => $now, "workflowid" => $workflowid, "now2" => $now];
+        return [$where, $params];
+    }
+
     /**
      * Get the globally delayed courses.
      * @return array array of course ids.
diff --git a/step/adminapprove/lang/de/lifecyclestep_adminapprove.php b/step/adminapprove/lang/de/lifecyclestep_adminapprove.php
@@ -39,22 +39,19 @@
 $string['plugindescription'] = 'In diesem Schritt wird die Bestätigung eines Systemadministrators eingeholt bevor die Ausführung des Workflows fortgesetzt werden kann.';
 $string['pluginname'] = 'Adminbestätigungs-Schritt';
 $string['proceed'] = 'Fortführen';
-$string['proceedall'] = 'Alle fortführen';
 $string['proceedbuttonlabel'] = 'Beschriftung des Fortsetzen-Buttons';
 $string['proceedbuttonlabel_help'] = 'Ändert die Beschriftung des Fortsetzen-Buttons. Wenn das Feld leer bleibt, wird die Standardbeschriftung beibehalten.';
 $string['proceedselected'] = 'Ausgewählte fortführen';
 $string['proceedselectedbuttonlabel'] = 'Ausgewählte fortführen';
 $string['proceedselectedbuttonlabel_help'] = 'Ändert die Beschriftung des Buttons \'Ausgewählte fortführen\'. Wenn das Feld leer bleibt, wird die Standardbeschriftung beibehalten.';
 $string['rollback'] = 'Zurücksetzten';
-$string['rollbackall'] = 'Alle zurücksetzten';
-$string['rollbackallbuttonlabel'] = 'Alle zurücksetzten';
-$string['rollbackallbuttonlabel_help'] = 'Ändert die Beschriftung des Buttons \'Alle zurücksetzten\'. Wenn das Feld leer bleibt, wird die Standardbeschriftung beibehalten.';
 $string['rollbackbuttonlabel'] = 'Beschriftung des Zurücksetzten-Buttons';
 $string['rollbackbuttonlabel_help'] = 'Ändert die Beschriftung des Zurücksetzten-Buttons. Wenn das Feld leer bleibt, wird die Standardbeschriftung beibehalten.';
 $string['rollbackselected'] = 'Ausgewählte zurücksetzten';
 $string['rollbackselectedbuttonlabel'] = 'Ausgewählte zurücksetzten';
 $string['rollbackselectedbuttonlabel_help'] = 'Ändert die Beschriftung des Buttons \'Ausgewählte zurücksetzten\'. Wenn das Feld leer bleibt, wird die Standardbeschriftung beibehalten.';
 $string['statusmessage'] = 'Statusnachricht';
 $string['statusmessage_help'] = 'Statusnachricht, welche dem Lehrer angezeigt wird, wenn ein Prozess eines Kurses den Adminbestätigungs-Schritt bearbeitet.';
+$string['statusmessagedefault'] = 'In Admin-Bestätigungs-Schritt';
 $string['tools'] = 'Aktionen';
 $string['workflow'] = 'Workflow';
diff --git a/step/adminapprove/lang/en/lifecyclestep_adminapprove.php b/step/adminapprove/lang/en/lifecyclestep_adminapprove.php
@@ -47,15 +47,13 @@
 $string['proceedselectedbuttonlabel'] = 'Label of the proceed selected button';
 $string['proceedselectedbuttonlabel_help'] = 'Option to customize the label of the button \'Proceed selected\'. Leave it empty if you are ok with the default value.';
 $string['rollback'] = 'Rollback';
-$string['rollbackall'] = 'Rollback all';
-$string['rollbackallbuttonlabel'] = 'Label of the rollback all button';
-$string['rollbackallbuttonlabel_help'] = 'Option to customize the label of the button \'Rollback all\'. Leave it empty if you are ok with the default value.';
 $string['rollbackbuttonlabel'] = 'Label of the rollback button';
 $string['rollbackbuttonlabel_help'] = 'Option to customize the label of the button \'Rollback\'. Leave it empty if you are ok with the default value.';
 $string['rollbackselected'] = 'Rollback selected';
 $string['rollbackselectedbuttonlabel'] = 'Label of the rollback selected button';
 $string['rollbackselectedbuttonlabel_help'] = 'Option to customize the label of the button \'Rollback selected\'. Leave it empty if you are ok with the default value.';
 $string['statusmessage'] = 'Status message';
 $string['statusmessage_help'] = 'Status message, which is displayed to a teacher, if a process of a course is at this admin approve step.';
+$string['statusmessagedefault'] = 'In Admin Approve step';
 $string['tools'] = 'Tools';
 $string['workflow'] = 'Workflow';
diff --git a/step/adminapprove/lib.php b/step/adminapprove/lib.php
@@ -159,21 +159,29 @@ public function extend_add_instance_form_definition($mform) {
         $mform->addElement('text', $elementname, get_string('statusmessage', 'lifecyclestep_adminapprove'));
         $mform->addHelpButton($elementname, 'statusmessage', 'lifecyclestep_adminapprove');
         $mform->setType($elementname, PARAM_TEXT);
+        $mform->setDefault($elementname, get_string('statusmessagedefault', 'lifecyclestep_adminapprove'));
+
+        $mform->addElement('static', 'statusmsgdefault', " ",
+            get_string('default').": ".get_string('statusmessagedefault', 'lifecyclestep_adminapprove'));
 
         $buttons = [
-            'proceedbuttonlabel',
-            'rollbackbuttonlabel',
-            'proceedselectedbuttonlabel',
-            'rollbackselectedbuttonlabel',
+            ['proceedbuttonlabel', get_string('proceed', 'lifecyclestep_adminapprove')],
+            ['rollbackbuttonlabel', get_string('rollback', 'lifecyclestep_adminapprove')],
+            ['proceedselectedbuttonlabel', get_string('proceedselected', 'lifecyclestep_adminapprove')],
+            ['rollbackselectedbuttonlabel', get_string('rollbackselected', 'lifecyclestep_adminapprove')],
         ];
 
         foreach ($buttons as $button) {
-            $elementname = $button;
+            $elementname = $button[0];
+
             $mform->addElement('text', $elementname,
                 get_string($elementname, 'lifecyclestep_adminapprove'));
             $mform->addHelpButton($elementname, $elementname, 'lifecyclestep_adminapprove');
             $mform->setType($elementname, PARAM_TEXT);
-            // Default: empty in order to keep translation.
+            $mform->setDefault($elementname, $button[1]);
+
+            $mform->addElement('static', $elementname."default", " ",
+                get_string('default').": ".$button[1]);
         }
     }
 
diff --git a/step/adminapprove/tests/admin_approve_test.php b/step/adminapprove/tests/admin_approve_test.php
@@ -28,23 +28,18 @@
  * Tests the admin approve step.
  *
  * @package    lifecyclestep_adminapprove
- * @group      lifecyclestep_adminapprove
- * @group      lifecyclestep
- * @category   test
- * @covers     \tool_lifecycle\step\adminapprove
  * @copyright  2019 Justus Dieckmann
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 final class admin_approve_test extends \advanced_testcase {
 
     /**
      * Starts a manual trigger and checks that one mail is send.
-     * @covers \tool_lifecycle\step\adminapprove
      * @return void
-     * @throws coding_exception
-     * @throws dml_exception
-     * @throws dml_transaction_exception
-     * @throws moodle_exception
+     * @throws \coding_exception
+     * @throws \dml_exception
+     * @throws \dml_transaction_exception
+     * @throws \moodle_exception
      */
     public function test_admin_mail(): void {
         $this->resetAfterTest(true);
@@ -65,14 +60,12 @@ public function test_admin_mail(): void {
         process_manager::manually_trigger_process($course3->id, $trigger->id);
         process_manager::manually_trigger_process($course4->id, $trigger->id);
 
-        // Prevent output from the task execution.
-        $this->setOutputCallback(function() {
-        });
-
         // Create an email sink to query it after the processing.
         $sink = $this->redirectEmails();
         $task = new lifecycle_task();
+        ob_start();
         $task->execute();
+        ob_end_clean();
         $this->assertCount(1, $sink->get_messages());
         $sink->close();
     }
diff --git a/step/email/tests/lib_test.php b/step/email/tests/lib_test.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Unit tests for the lifecyclestep_email lib.php.
+ * Unit tests for the lifecyclestep_email.
  *
  * @package    lifecyclestep_email
  * @copyright  2024 Justus Dieckmann, University of Münster.
@@ -41,7 +41,6 @@ final class lib_test extends \advanced_testcase {
     /**
      * Tests \tool_lifecycle\step\email::replace_placeholders.
      *
-     * @covers \tool_lifecycle\step\email::replace_placeholders
      */
     public function test_replace_placeholders(): void {
         $this->resetAfterTest();
diff --git a/step/makeinvisible/tests/make_invisible_test.php b/step/makeinvisible/tests/make_invisible_test.php
@@ -29,8 +29,6 @@
  * Tests the make invisible step.
  *
  * @package    lifecyclestep_makeinvisible
- * @group      lifecyclestep_makeinvisible
- * @category   test
  * @copyright  2019 Justus Dieckmann
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -53,12 +51,11 @@ public function setUp(): void {
     /**
      * Test the visibility of courses after the step is executed.
      *
-     * @covers \tool_lifecycle\step\makeinvisible
      * @return void
-     * @throws coding_exception
-     * @throws dml_exception
-     * @throws dml_transaction_exception
-     * @throws moodle_exception
+     * @throws \coding_exception
+     * @throws \dml_exception
+     * @throws \dml_transaction_exception
+     * @throws \moodle_exception
      */
     public function test_make_invisible(): void {
         $generator = $this->getDataGenerator()->get_plugin_generator('tool_lifecycle');
diff --git a/trigger/byrole/tests/lifecycletrigger_byrole_test.php b/trigger/byrole/tests/lifecycletrigger_byrole_test.php
@@ -45,7 +45,7 @@ final class lifecycletrigger_byrole_test extends \advanced_testcase {
 
     /**
      * Set up environment for phpunit test.
-     * @return mixed data for test
+     * @return void data for test
      */
     protected function setUp(): void {
         // Recommended in Moodle docs to always include CFG.
@@ -58,7 +58,7 @@ protected function setUp(): void {
 
     /**
      * Test the locallib function for valid courses.
-     * @covers \tool_lifecycle\trigger\byrole
+     *
      * @return void
      * @throws \coding_exception
      * @throws \dml_exception
@@ -78,7 +78,7 @@ public function test_lib_validcourse(): void {
 
     /**
      * Test the locallib function for a invalid course that is recognized for the first time.
-     * @covers \tool_lifecycle\trigger\byrole
+     *
      * @return void
      * @throws \coding_exception
      * @throws \dml_exception
@@ -99,7 +99,7 @@ public function test_lib_norolecourse(): void {
 
     /**
      * Test the locallib function for a invalid course that is old enough to be triggered.
-     * @covers \tool_lifecycle\trigger\byrole
+     *
      * @return void
      * @throws \coding_exception
      * @throws \dml_exception
@@ -124,7 +124,7 @@ public function test_lib_norolefoundcourse(): void {
 
     /**
      * Test the locallib function for a course that was invalid and has a responsible person again.
-     * @covers \tool_lifecycle\trigger\byrole
+     *
      * @return void
      * @throws \coding_exception
      * @throws \dml_exception
diff --git a/trigger/categories/tests/trigger_test.php b/trigger/categories/tests/trigger_test.php
@@ -18,7 +18,6 @@
  * Trigger test for categories trigger.
  *
  * @package    lifecycletrigger_categories
- * @group      lifecycletrigger
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -37,7 +36,6 @@
  * Trigger test for categories trigger.
  *
  * @package    lifecycletrigger_categories
- * @group      lifecycletrigger
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -85,7 +83,6 @@ public function setUp(): void {
 
     /**
      * Tests if courses, which are in the category are correctly triggered.
-     * @covers \tool_lifecycle\processor \tool_lifecycle\trigger\categories
      */
     public function test_course_has_cat(): void {
 
@@ -110,7 +107,6 @@ public function test_course_has_cat(): void {
 
     /**
      * Tests if courses, which are in the category are correctly triggered.
-     * @covers \tool_lifecycle\processor \tool_lifecycle\trigger\categories
      */
     public function test_course_within_cat(): void {
 
@@ -135,7 +131,6 @@ public function test_course_within_cat(): void {
 
     /**
      * Tests if courses, which are not in the category are correctly triggered.
-     * @covers \tool_lifecycle\processor \tool_lifecycle\trigger\categories
      */
     public function test_course_not_within_cat(): void {
         $course = $this->getDataGenerator()->create_course();
diff --git a/trigger/customfielddelay/tests/trigger_test.php b/trigger/customfielddelay/tests/trigger_test.php
@@ -18,7 +18,6 @@
  * Trigger test for start date delay trigger.
  *
  * @package    lifecycletrigger_customfielddelay
- * @group      lifecycletrigger
  * @copyright  2020 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -36,7 +35,6 @@
  * Trigger test for start date delay trigger.
  *
  * @package    lifecycletrigger_customfielddelay
- * @group      lifecycletrigger
  * @copyright  2020 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -78,7 +76,7 @@ public function setUp(): void {
 
     /**
      * Tests if courses, which have a customfield date in the future are not triggered by this plugin.
-     * @covers \tool_lifecycle\trigger\customfielddelay
+     *
      * @return void
      * @throws \coding_exception
      * @throws \dml_exception
@@ -102,7 +100,7 @@ public function test_young_course(): void {
     /**
      * Tests if courses, which have a customfield date in the future are not triggered by this plugin.
      * In addition a second custom course field is added to the course, which has a value that could trigger the course.
-     * @covers \tool_lifecycle\trigger\customfielddelay
+     *
      * @return void
      * @throws \coding_exception
      * @throws \dml_exception
@@ -132,7 +130,7 @@ public function test_young_course_with_second_customcourse_field(): void {
 
     /**
      * Tests if courses, which are older than the default of 190 days are triggered by this plugin.
-     * @covers \tool_lifecycle\trigger\customfielddelay
+     *
      * @return void
      * @throws \coding_exception
      * @throws \dml_exception
diff --git a/trigger/delayedcourses/lang/de/lifecycletrigger_delayedcourses.php b/trigger/delayedcourses/lang/de/lifecycletrigger_delayedcourses.php
@@ -18,12 +18,14 @@
  * Lang strings for delayed course trigger
  *
  * @package lifecycletrigger_delayedcourses
+ * @copyright  2025 Thomas Niedermaier University of Münster
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['delay'] = 'Dieser Trigger wird alle Kurse ausschließen, die durch Nutzerinteraktion verzögert wurden.';
-$string['plugindescription'] = 'Schließt Kurse von diesem Workflow aus, die durch Nutzeraktion verzögert wurden.';
-$string['pluginname'] = 'Verzögerte Kurse ausschließen - Trigger';
+$string['includegenerallydelayed'] = 'Generell verzögerte Kurse einschliessen';
+$string['includegenerallydelayed_help'] = 'Neben den im Rahmen des Workflows verzögerten Kursen werden auch generell verzögerte Kurse getriggered.';
+$string['plugindescription'] = 'Schließt im Rahmen des Workflows verzögerte und optional auch generell verzögerte Kurse in die Verarbeitung ein.';
+$string['pluginname'] = 'Verzögerte Kurse Trigger';
 $string['privacy:metadata'] = 'Dieses Subplugin speichert keine persönlichen Daten.';
 
diff --git a/trigger/delayedcourses/lang/en/lifecycletrigger_delayedcourses.php b/trigger/delayedcourses/lang/en/lifecycletrigger_delayedcourses.php
@@ -15,14 +15,16 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Lang strings for delayed course trigger
+ * Lang strings for delayed courses trigger
  *
  * @package lifecycletrigger_delayedcourses
+ * @copyright  2025 Thomas Niedermaier University of Münster
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['delay'] = 'This module will exclude all courses, which were delayed by user interaction';
-$string['plugindescription'] = 'Exludes all courses which were delayed by user interaction.';
-$string['pluginname'] = 'Exclude delayed courses trigger';
+$string['includegenerallydelayed'] = 'Include generally delayed courses';
+$string['includegenerallydelayed_help'] = 'Include not only courses delayed for workflow but also generally delayed courses.';
+$string['plugindescription'] = 'Includes courses delayed for workflow and optionally generally delayed courses.';
+$string['pluginname'] = 'Include delayed courses trigger';
 $string['privacy:metadata'] = 'This subplugin does not store any personal data.';
diff --git a/trigger/delayedcourses/lib.php b/trigger/delayedcourses/lib.php
diff --git a/trigger/delayedcourses/tests/generator/lib.php b/trigger/delayedcourses/tests/generator/lib.php
diff --git a/trigger/delayedcourses/tests/trigger_test.php b/trigger/delayedcourses/tests/trigger_test.php
diff --git a/trigger/semindependent/.travis.yml b/trigger/semindependent/.travis.yml
diff --git a/trigger/semindependent/tests/trigger_test.php b/trigger/semindependent/tests/trigger_test.php
diff --git a/trigger/startdatedelay/tests/trigger_test.php b/trigger/startdatedelay/tests/trigger_test.php
