Skip to content

Commit

Permalink
fix: set all phpunit tests to the "optiondateid_0" pattern (Wunderbyt…
Browse files Browse the repository at this point in the history 
…e-GmbH#807)
  • Loading branch information
@semteacher
semteacher committed Jan 21, 2025
1 parent 3c3e52b commit 530cf49
Show file tree
Hide file tree
Showing 9 changed files with 146 additions and 146 deletions.
32 changes: 16 additions & 16 deletions tests/backup/backup_restore_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,23 +174,23 @@ public function test_backup_restore_bookings_with_options_quiz_into_other_course
$this->assertCount(2, $options2);
$option20 = array_shift($options2);
$this->assertEquals($options[0]->text, $option20->text);
$this->assertEquals($options[0]->coursestarttime_1, $option20->coursestarttime);
$this->assertEquals($options[0]->courseendtime_2, $option20->courseendtime);
$this->assertEquals($options[0]->coursestarttime_0, $option20->coursestarttime);
$this->assertEquals($options[0]->courseendtime_1, $option20->courseendtime);
$this->assertEquals($options[0]->customfield_spt1, $option20->spt1);
$optionsettings = singleton_service::get_instance_of_booking_option_settings($option20->id);
$sessions = $optionsettings->sessions;
$this->assertCount(2, $sessions);
$session1 = array_shift($sessions);
$this->assertEquals($options[0]->coursestarttime_1, $session1->coursestarttime);
$this->assertEquals($options[0]->courseendtime_1, $session1->courseendtime);
$this->assertEquals($options[0]->coursestarttime_0, $session1->coursestarttime);
$this->assertEquals($options[0]->courseendtime_0, $session1->courseendtime);
$session2 = array_shift($sessions);
$this->assertEquals($options[0]->coursestarttime_2, $session2->coursestarttime);
$this->assertEquals($options[0]->courseendtime_2, $session2->courseendtime);
$this->assertEquals($options[0]->coursestarttime_1, $session2->coursestarttime);
$this->assertEquals($options[0]->courseendtime_1, $session2->courseendtime);

$option21 = array_shift($options2);
$this->assertEquals($options[1]->text, $option21->text);
$this->assertEquals($options[1]->coursestarttime_1, $option21->coursestarttime);
$this->assertEquals($options[1]->courseendtime_1, $option21->courseendtime);
$this->assertEquals($options[1]->coursestarttime_0, $option21->coursestarttime);
$this->assertEquals($options[1]->courseendtime_0, $option21->courseendtime);
$this->assertEquals($options[1]->customfield_spt1, $option21->spt1);
$optionsettings = singleton_service::get_instance_of_booking_option_settings($option21->id);
$this->assertCount(1, $optionsettings->sessions);
Expand All @@ -203,23 +203,23 @@ public function test_backup_restore_bookings_with_options_quiz_into_other_course
$this->assertCount(2, $options2);
$option22 = array_shift($options2);
$this->assertEquals($options[2]->text, $option22->text);
$this->assertEquals($options[2]->coursestarttime_1, $option22->coursestarttime);
$this->assertEquals($options[2]->courseendtime_2, $option22->courseendtime);
$this->assertEquals($options[2]->coursestarttime_0, $option22->coursestarttime);
$this->assertEquals($options[2]->courseendtime_1, $option22->courseendtime);
$this->assertEquals($options[2]->customfield_spt1, $option22->spt1);
$optionsettings = singleton_service::get_instance_of_booking_option_settings($option22->id);
$sessions = $optionsettings->sessions;
$this->assertCount(2, $sessions);
$session1 = array_shift($sessions);
$this->assertEquals($options[2]->coursestarttime_1, $session1->coursestarttime);
$this->assertEquals($options[2]->courseendtime_1, $session1->courseendtime);
$this->assertEquals($options[2]->coursestarttime_0, $session1->coursestarttime);
$this->assertEquals($options[2]->courseendtime_0, $session1->courseendtime);
$session2 = array_shift($sessions);
$this->assertEquals($options[2]->coursestarttime_2, $session2->coursestarttime);
$this->assertEquals($options[2]->courseendtime_2, $session2->courseendtime);
$this->assertEquals($options[2]->coursestarttime_1, $session2->coursestarttime);
$this->assertEquals($options[2]->courseendtime_1, $session2->courseendtime);

$option23 = array_shift($options2);
$this->assertEquals($options[3]->text, $option23->text);
$this->assertEquals($options[3]->coursestarttime_1, $option23->coursestarttime);
$this->assertEquals($options[3]->courseendtime_1, $option23->courseendtime);
$this->assertEquals($options[3]->coursestarttime_0, $option23->coursestarttime);
$this->assertEquals($options[3]->courseendtime_0, $option23->courseendtime);
$this->assertEquals($options[3]->customfield_spt1, $option23->spt1);
$optionsettings = singleton_service::get_instance_of_booking_option_settings($option23->id);
$this->assertCount(1, $optionsettings->sessions);
Expand Down
44 changes: 22 additions & 22 deletions tests/bo_availability/condition_all_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1871,43 +1871,43 @@ public function test_booking_bookit_overlapping_sessions(array $bdata): void {
$record->courseid = 0;
$record->maxanswers = 2;
$record->disablebookingusers = 0;
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now + 3 day');
$record->courseendtime_0 = strtotime('now + 4 day');
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now + 3 day');
$record->courseendtime_1 = strtotime('now + 4 day');
$record->optiondateid_2 = "0";
$record->daystonotify_2 = "0";
$record->coursestarttime_2 = strtotime('now + 6 day');
$record->courseendtime_2 = strtotime('now + 7 day');
$record->coursestarttime_1 = strtotime('now + 6 day');
$record->courseendtime_1 = strtotime('now + 7 day');

/** @var mod_booking_generator $plugingenerator */
$plugingenerator = self::getDataGenerator()->get_plugin_generator('mod_booking');
$option1 = $plugingenerator->create_option($record);

// Times are overlapping, so expected to be blocked by this condtion.
$record->coursestarttime_1 = strtotime('now + 2 day');
$record->courseendtime_1 = strtotime('now + 3 day');
$record->coursestarttime_2 = strtotime('now + 5 day');
$record->courseendtime_2 = strtotime('now + 8 day');
$record->coursestarttime_0 = strtotime('now + 2 day');
$record->courseendtime_0 = strtotime('now + 3 day');
$record->coursestarttime_1 = strtotime('now + 5 day');
$record->courseendtime_1 = strtotime('now + 8 day');
$record->bo_cond_nooverlapping_restrict = 1;
$record->bo_cond_nooverlapping_handling = MOD_BOOKING_COND_OVERLAPPING_HANDLING_BLOCK;
$option2 = $plugingenerator->create_option($record);

// Not overlapping.
$record->text = '2 sessions should overlap';
$record->coursestarttime_1 = strtotime('now + 10 day');
$record->courseendtime_1 = strtotime('now + 11 day');
$record->coursestarttime_2 = strtotime('now + 14 day');
$record->courseendtime_2 = strtotime('now + 15 day');
$record->coursestarttime_0 = strtotime('now + 10 day');
$record->courseendtime_0 = strtotime('now + 11 day');
$record->coursestarttime_1 = strtotime('now + 14 day');
$record->courseendtime_1 = strtotime('now + 15 day');
$record->bo_cond_nooverlapping_restrict = 1;
$record->bo_cond_nooverlapping_handling = MOD_BOOKING_COND_OVERLAPPING_HANDLING_BLOCK;
$option3 = $plugingenerator->create_option($record);

// Overlapping without flag. Should trigger NOOVERLAPPINGPROXY.
$record->coursestarttime_1 = strtotime('now + 1 day');
$record->courseendtime_1 = strtotime('now + 11 day');
$record->coursestarttime_2 = strtotime('now + 8 day');
$record->courseendtime_2 = strtotime('now + 15 day');
$record->coursestarttime_0 = strtotime('now + 1 day');
$record->courseendtime_0 = strtotime('now + 11 day');
$record->coursestarttime_1 = strtotime('now + 8 day');
$record->courseendtime_1 = strtotime('now + 15 day');
$record->bo_cond_nooverlapping_restrict = 0;
unset($record->bo_cond_nooverlapping_handling);
$option4 = $plugingenerator->create_option($record);
Expand All @@ -1918,14 +1918,14 @@ public function test_booking_bookit_overlapping_sessions(array $bdata): void {
$record->coursestarttime = strtotime('now + 12 day');
$record->courseendtime = strtotime('now + 13 day');
$record->bo_cond_nooverlapping_restrict = 1;
unset($record->coursestarttime_0);
unset($record->courseendtime_0);
unset($record->coursestarttime_1);
unset($record->courseendtime_1);
unset($record->coursestarttime_2);
unset($record->courseendtime_2);
unset($record->optiondateid_0);
unset($record->daystonotify_0);
unset($record->optiondateid_1);
unset($record->daystonotify_1);
unset($record->optiondateid_2);
unset($record->daystonotify_2);
$record->bo_cond_nooverlapping_handling = MOD_BOOKING_COND_OVERLAPPING_HANDLING_BLOCK;
$option5 = $plugingenerator->create_option($record);

Expand Down
8 changes: 4 additions & 4 deletions tests/bo_availability/condition_allowupdate_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,10 @@ public function test_booking_bookit_subbookings(array $bdata): void {
$record->courseid = $course->id;
$record->useprice = 0;
$record->maxanswers = 3;
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now + 3 day');
$record->courseendtime_1 = strtotime('now + 6 day');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now + 3 day');
$record->courseendtime_0 = strtotime('now + 6 day');

/** @var mod_booking_generator $plugingenerator */
$plugingenerator = self::getDataGenerator()->get_plugin_generator('mod_booking');
Expand Down
48 changes: 24 additions & 24 deletions tests/booking_campaigns/booking_campaigns_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@ public function test_booking_bookit_campaign_blockbooking(array $bdata): void {
$record->courseid = $course->id;
$record->useprice = 0;
$record->maxanswers = 3;
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now + 3 day');
$record->courseendtime_1 = strtotime('now + 6 day');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now + 3 day');
$record->courseendtime_0 = strtotime('now + 6 day');
$record->customfield_spt1 = 'tennis';
$option1 = $plugingenerator->create_option($record);
singleton_service::destroy_booking_option_singleton($option1->id); // Mandatory there.
Expand Down Expand Up @@ -547,10 +547,10 @@ public function test_booking_campaign_blockbooking_customfields(array $bdata): v
$record->courseid = $course2->id;
$record->useprice = 0;
$record->maxanswers = 6;
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now + 1 day');
$record->courseendtime_1 = strtotime('now + 2 day');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now + 1 day');
$record->courseendtime_0 = strtotime('now + 2 day');
$record->customfield_bcustom1 = 'exclude';

$option1 = $plugingenerator->create_option($record);
Expand All @@ -563,10 +563,10 @@ public function test_booking_campaign_blockbooking_customfields(array $bdata): v
$record->courseid = $course2->id;
$record->useprice = 0;
$record->maxanswers = 6;
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now + 1 day');
$record->courseendtime_1 = strtotime('now + 3 day');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now + 1 day');
$record->courseendtime_0 = strtotime('now + 3 day');
$record->customfield_bcustom1 = '';

$option2 = $plugingenerator->create_option($record);
Expand All @@ -579,10 +579,10 @@ public function test_booking_campaign_blockbooking_customfields(array $bdata): v
$record->courseid = $course2->id;
$record->useprice = 0;
$record->maxanswers = 6;
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now + 1 day');
$record->courseendtime_1 = strtotime('now + 4 day');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now + 1 day');
$record->courseendtime_0 = strtotime('now + 4 day');
$record->customfield_bcustom1 = 'include';

$option3 = $plugingenerator->create_option($record);
Expand Down Expand Up @@ -834,10 +834,10 @@ public function test_booking_bookit_campaign_blockbooking_extended_cases(array $
$record->courseid = $course->id;
$record->useprice = 0;
$record->maxanswers = 3;
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now + 3 day');
$record->courseendtime_1 = strtotime('now + 6 day');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now + 3 day');
$record->courseendtime_0 = strtotime('now + 6 day');
$record->customfield_spt1 = 'tennis';
$option1 = $plugingenerator->create_option($record);
singleton_service::destroy_booking_option_singleton($option1->id); // Mandatory there.
Expand Down Expand Up @@ -987,10 +987,10 @@ public function test_booking_bookit_campaign_blockbooking_extended_cases1(array
$record->courseid = $course->id;
$record->useprice = 0;
$record->maxanswers = 3;
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now + 3 day');
$record->courseendtime_1 = strtotime('now + 6 day');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now + 3 day');
$record->courseendtime_0 = strtotime('now + 6 day');
$record->customfield_spt1 = 'tennis';
$option1 = $plugingenerator->create_option($record);
singleton_service::destroy_booking_option_singleton($option1->id); // Mandatory there.
Expand Down
32 changes: 16 additions & 16 deletions tests/booking_option_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ public function test_option_changes(array $bdata): void {
$record->courseid = $course->id;
$record->description = 'Deskr-created';
$record->teachersforoption = $user1->username;
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('20 June 2050');
$record->courseendtime_1 = strtotime('20 July 2050');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('20 June 2050');
$record->courseendtime_0 = strtotime('20 July 2050');

/** @var mod_booking_generator $plugingenerator */
$plugingenerator = self::getDataGenerator()->get_plugin_generator('mod_booking');
Expand All @@ -136,8 +136,8 @@ public function test_option_changes(array $bdata): void {
$record->description = 'Deskr-updated';
$record->limitanswers = 1;
$record->maxanswers = 5;
$record->coursestarttime_1 = strtotime('10 April 2055');
$record->courseendtime_1 = strtotime('10 May 2055');
$record->coursestarttime_0 = strtotime('10 April 2055');
$record->courseendtime_0 = strtotime('10 May 2055');
$record->teachersforoption = [$user2->id];
booking_option::update($record);

Expand Down Expand Up @@ -332,14 +332,14 @@ public function test_delete_responses_activitycompletion(array $bdata): void {
$record->chooseorcreatecourse = 1; // Reqiured.
$record->courseid = $course->id;
$record->description = 'Test description';
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now - 2 day');
$record->courseendtime_0 = strtotime('now + 1 day');
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now - 2 day');
$record->courseendtime_1 = strtotime('now + 1 day');
$record->optiondateid_2 = "0";
$record->daystonotify_2 = "0";
$record->coursestarttime_2 = strtotime('now + 2 day');
$record->courseendtime_2 = strtotime('now + 3 day');
$record->coursestarttime_1 = strtotime('now + 2 day');
$record->courseendtime_1 = strtotime('now + 3 day');

/** @var mod_booking_generator $plugingenerator */
$plugingenerator = self::getDataGenerator()->get_plugin_generator('mod_booking');
Expand Down Expand Up @@ -448,10 +448,10 @@ public function test_course_connection_enrollemnt(array $bdata): void {
$record->chooseorcreatecourse = 1; // Reqiured.
$record->courseid = $course2->id;
$record->enrolmentstatus = 0; // Enrol at coursestart.
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('now + 3 day');
$record->courseendtime_1 = strtotime('now + 4 day');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('now + 3 day');
$record->courseendtime_0 = strtotime('now + 4 day');

/** @var mod_booking_generator $plugingenerator */
$plugingenerator = self::getDataGenerator()->get_plugin_generator('mod_booking');
Expand Down
8 changes: 4 additions & 4 deletions tests/booking_rules/rules_enrollink_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ public function test_rule_on_enrollink_and_enroll(array $bdata): void {
$record->bookingid = $booking->id;
$record->text = 'Option-2050';
$record->description = 'Will start 2050';
$record->optiondateid_1 = "0";
$record->daystonotify_1 = "0";
$record->coursestarttime_1 = strtotime('20 June 2050 15:00');
$record->courseendtime_1 = strtotime('20 July 2050 14:00');
$record->optiondateid_0 = "0";
$record->daystonotify_0 = "0";
$record->coursestarttime_0 = strtotime('20 June 2050 15:00');
$record->courseendtime_0 = strtotime('20 July 2050 14:00');
$record->teachersforoption = $teacher1->username;
// Set test objective setting(s).
$record->chooseorcreatecourse = 1; // Connected existing course.
Expand Down
Loading

0 comments on commit 530cf49

Please sign in to comment.