diff options
author | sten <stenmarsh938@gmail.com> | 2016-03-21 16:13:57 +0300 |
---|---|---|
committer | sten <stenmarsh938@gmail.com> | 2016-03-21 16:13:57 +0300 |
commit | 85cd482e4ebe095700c2c89b1ed89519431c4370 (patch) | |
tree | 21c3c08beaac689ab347b226b6cbeaf723f0c56a | |
parent | 0683a777989c4cf9a7e000bae53a2e285d0f20c9 (diff) | |
download | scheduler-helper-php-85cd482e4ebe095700c2c89b1ed89519431c4370.zip scheduler-helper-php-85cd482e4ebe095700c2c89b1ed89519431c4370.tar.gz scheduler-helper-php-85cd482e4ebe095700c2c89b1ed89519431c4370.tar.bz2 |
Add getData dey recurrings data.
-rw-r--r-- | tests/Data_getData/DayRecurrings/source.json | 114 | ||||
-rw-r--r-- | tests/Data_getData/DayRecurrings/target.json | 573 | ||||
-rw-r--r-- | tests/TestDataHelper.php | 13 |
3 files changed, 676 insertions, 24 deletions
diff --git a/tests/Data_getData/DayRecurrings/source.json b/tests/Data_getData/DayRecurrings/source.json index a5620bc..fd59358 100644 --- a/tests/Data_getData/DayRecurrings/source.json +++ b/tests/Data_getData/DayRecurrings/source.json @@ -1,18 +1,118 @@ { "settings": { - "start_date": "2016-03-09 00:00:00", - "end_date": "2016-03-13 23:00:00" + "start_date": "2016-03-01 00:00:00", + "end_date": "2016-03-31 24:00:00" }, "data": [ { - "id": "497", - "start_date": "2016-03-09 00:00:00", - "end_date": "2016-03-15 00:00:00", - "text": "Rec Ev", - "rec_type": "day_2___#3", + "id": "1", + "start_date": "2016-03-02 10:05:00", + "end_date": "2016-03-05 10:05:00", + "text": "Daily Test 1", + "rec_type": "day_1___#3", + "event_pid": "0", + "event_length": "10500", + "rec_pattern": "day_1___" + }, + { + "id": "2", + "start_date": "2016-03-07 00:00:00", + "end_date": "2016-05-26 00:00:00", + "text": "Daily Test 2 End after ", + "rec_type": "day_2___#40", + "event_pid": "0", + "event_length": "300", + "rec_pattern": "day_2___" + }, + { + "id": "3", + "start_date": "2016-02-10 00:00:00", + "end_date": "2016-03-11 00:00:00", + "text": "Daily Test 3 start before", + "rec_type": "day_3___#10", + "event_pid": "0", + "event_length": "300", + "rec_pattern": "day_3___" + }, + { + "id": "4", + "start_date": "2016-02-23 00:00:00", + "end_date": "9999-02-01 00:00:00", + "text": "Daily Test 4 (work)", + "rec_type": "week_1___1,2,3,4,5#no", "event_pid": "0", "event_length": "300", + "rec_pattern": "week_1___1,2,3,4,5" + }, + { + "id": "5", + "start_date": "2016-03-03 01:10:00", + "end_date": "2016-03-31 00:00:00", + "text": "Daily Test 5 (end by)", + "rec_type": "day_6___#", + "event_pid": "", + "event_length": "51600", + "rec_pattern": "day_6___" + }, + { + "id": "6", + "start_date": "2016-03-04 21:30:00", + "end_date": "9999-02-01 00:00:00", + "text": "Daily test 6", + "rec_type": "day_2___#no", + "event_pid": "", + "event_length": "2400", "rec_pattern": "day_2___" + }, + { + "id": "7", + "start_date": "2016-02-29 23:25:00", + "end_date": "2016-03-01 00:00:00", + "text": "Common event 1", + "rec_type": "", + "event_pid": "", + "event_length": "", + "rec_pattern": "" + }, + { + "id": "8", + "start_date": "2016-03-10 13:30:00", + "end_date": "2016-03-10 17:00:00", + "text": "Common event 2", + "rec_type": "", + "event_pid": "", + "event_length": "", + "rec_pattern": "" + }, + { + "id": "9", + "start_date": "2016-04-01 00:00:00", + "end_date": "2016-04-01 00:05:00", + "text": "Common event 3", + "rec_type": "", + "event_pid": "", + "event_length": "", + "rec_pattern": "" + }, + { + "id": "10", + "start_date": "2016-03-01 00:00:00", + "end_date": "2016-03-01 04:35:00", + "text": "Common event 4", + "rec_type": "", + "event_pid": "", + "event_length": "", + "rec_pattern": "" + }, + { + "id": "11", + "start_date": "2016-03-31 00:00:00", + "end_date": "2016-04-01 00:00:00", + "text": "Common End 6", + "rec_type": "", + "event_pid": "", + "event_length": "", + "rec_pattern": "" } ] }
\ No newline at end of file diff --git a/tests/Data_getData/DayRecurrings/target.json b/tests/Data_getData/DayRecurrings/target.json index 71e73a7..682c288 100644 --- a/tests/Data_getData/DayRecurrings/target.json +++ b/tests/Data_getData/DayRecurrings/target.json @@ -1,34 +1,583 @@ { "data": [ { + "start_date": "2016-03-02 10:05:00", + "end_date": "2016-03-02 13:00:00", + "event_pid": "0", + "text": "Daily Test 1", + "id": "1", + "rec_type": "day_1___#3", + "event_length": "10500" + }, + { + "start_date": "2016-03-03 10:05:00", + "end_date": "2016-03-03 13:00:00", + "event_pid": "0", + "text": "Daily Test 1", + "id": "1", + "rec_type": "day_1___#3", + "event_length": "10500" + }, + { + "start_date": "2016-03-04 10:05:00", + "end_date": "2016-03-04 13:00:00", + "event_pid": "0", + "text": "Daily Test 1", + "id": "1", + "rec_type": "day_1___#3", + "event_length": "10500" + }, + { + "start_date": "2016-03-07 00:00:00", + "end_date": "2016-03-07 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { "start_date": "2016-03-09 00:00:00", "end_date": "2016-03-09 00:05:00", "event_pid": "0", - "text": "Rec Ev", - "id": "497", - "_timed": true, - "rec_type": "day_2___#3", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", "event_length": "300" }, { "start_date": "2016-03-11 00:00:00", "end_date": "2016-03-11 00:05:00", "event_pid": "0", - "text": "Rec Ev", - "id": "497", - "_timed": true, - "rec_type": "day_2___#3", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", "event_length": "300" }, { "start_date": "2016-03-13 00:00:00", "end_date": "2016-03-13 00:05:00", "event_pid": "0", - "text": "Rec Ev", - "id": "497", - "_timed": true, - "rec_type": "day_2___#3", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-15 00:00:00", + "end_date": "2016-03-15 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-17 00:00:00", + "end_date": "2016-03-17 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-19 00:00:00", + "end_date": "2016-03-19 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-21 00:00:00", + "end_date": "2016-03-21 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-23 00:00:00", + "end_date": "2016-03-23 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-25 00:00:00", + "end_date": "2016-03-25 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-27 00:00:00", + "end_date": "2016-03-27 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-29 00:00:00", + "end_date": "2016-03-29 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-31 00:00:00", + "end_date": "2016-03-31 00:05:00", + "event_pid": "0", + "text": "Daily Test 2 End after ", + "id": "2", + "rec_type": "day_2___#40", + "event_length": "300" + }, + { + "start_date": "2016-03-02 00:00:00", + "end_date": "2016-03-02 00:05:00", + "event_pid": "0", + "text": "Daily Test 3 start before", + "id": "3", + "rec_type": "day_3___#10", + "event_length": "300" + }, + { + "start_date": "2016-03-05 00:00:00", + "end_date": "2016-03-05 00:05:00", + "event_pid": "0", + "text": "Daily Test 3 start before", + "id": "3", + "rec_type": "day_3___#10", + "event_length": "300" + }, + { + "start_date": "2016-03-08 00:00:00", + "end_date": "2016-03-08 00:05:00", + "event_pid": "0", + "text": "Daily Test 3 start before", + "id": "3", + "rec_type": "day_3___#10", + "event_length": "300" + }, + { + "start_date": "2016-03-01 00:00:00", + "end_date": "2016-03-01 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-02 00:00:00", + "end_date": "2016-03-02 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-03 00:00:00", + "end_date": "2016-03-03 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-04 00:00:00", + "end_date": "2016-03-04 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-07 00:00:00", + "end_date": "2016-03-07 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-08 00:00:00", + "end_date": "2016-03-08 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-09 00:00:00", + "end_date": "2016-03-09 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-10 00:00:00", + "end_date": "2016-03-10 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-11 00:00:00", + "end_date": "2016-03-11 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-14 00:00:00", + "end_date": "2016-03-14 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-15 00:00:00", + "end_date": "2016-03-15 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-16 00:00:00", + "end_date": "2016-03-16 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-17 00:00:00", + "end_date": "2016-03-17 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-18 00:00:00", + "end_date": "2016-03-18 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-21 00:00:00", + "end_date": "2016-03-21 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-22 00:00:00", + "end_date": "2016-03-22 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-23 00:00:00", + "end_date": "2016-03-23 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", "event_length": "300" + }, + { + "start_date": "2016-03-24 00:00:00", + "end_date": "2016-03-24 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-25 00:00:00", + "end_date": "2016-03-25 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-28 00:00:00", + "end_date": "2016-03-28 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-29 00:00:00", + "end_date": "2016-03-29 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-30 00:00:00", + "end_date": "2016-03-30 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-31 00:00:00", + "end_date": "2016-03-31 00:05:00", + "event_pid": "0", + "text": "Daily Test 4 (work)", + "id": "4", + "rec_type": "week_1___1,2,3,4,5#no", + "event_length": "300" + }, + { + "start_date": "2016-03-03 01:10:00", + "end_date": "2016-03-03 15:30:00", + "event_pid": "0", + "text": "Daily Test 5 (end by)", + "id": "5", + "rec_type": "day_6___#", + "event_length": 51600 + }, + { + "start_date": "2016-03-09 01:10:00", + "end_date": "2016-03-09 15:30:00", + "event_pid": "0", + "text": "Daily Test 5 (end by)", + "id": "5", + "rec_type": "day_6___#", + "event_length": 51600 + }, + { + "start_date": "2016-03-15 01:10:00", + "end_date": "2016-03-15 15:30:00", + "event_pid": "0", + "text": "Daily Test 5 (end by)", + "id": "5", + "rec_type": "day_6___#", + "event_length": 51600 + }, + { + "start_date": "2016-03-21 01:10:00", + "end_date": "2016-03-21 15:30:00", + "event_pid": "0", + "text": "Daily Test 5 (end by)", + "id": "5", + "rec_type": "day_6___#", + "event_length": 51600 + }, + { + "start_date": "2016-03-27 01:10:00", + "end_date": "2016-03-27 15:30:00", + "event_pid": "0", + "text": "Daily Test 5 (end by)", + "id": "5", + "rec_type": "day_6___#", + "event_length": 51600 + }, + { + "start_date": "2016-03-04 21:30:00", + "end_date": "2016-03-04 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-06 21:30:00", + "end_date": "2016-03-06 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-08 21:30:00", + "end_date": "2016-03-08 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-10 21:30:00", + "end_date": "2016-03-10 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-12 21:30:00", + "end_date": "2016-03-12 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-14 21:30:00", + "end_date": "2016-03-14 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-16 21:30:00", + "end_date": "2016-03-16 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-18 21:30:00", + "end_date": "2016-03-18 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-20 21:30:00", + "end_date": "2016-03-20 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-22 21:30:00", + "end_date": "2016-03-22 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-24 21:30:00", + "end_date": "2016-03-24 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-26 21:30:00", + "end_date": "2016-03-26 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-28 21:30:00", + "end_date": "2016-03-28 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-30 21:30:00", + "end_date": "2016-03-30 22:10:00", + "event_pid": "0", + "text": "Daily test 6", + "id": "6", + "rec_type": "day_2___#no", + "event_length": 2400 + }, + { + "start_date": "2016-03-10 13:30:00", + "end_date": "2016-03-10 17:00:00", + "text": "Common event 2", + "id": "8", + "event_pid": "", + "event_length": "", + "rec_pattern": "", + "rec_type": "" + }, + { + "start_date": "2016-03-01 00:00:00", + "end_date": "2016-03-01 04:35:00", + "text": "Common event 4", + "id": "10", + "event_pid": "", + "event_length": "", + "rec_pattern": "", + "rec_type": "" + }, + { + "start_date": "2016-03-31 00:00:00", + "end_date": "2016-04-01 00:00:00", + "text": "Common End 6", + "id": "11", + "event_pid": "", + "event_length": "", + "rec_pattern": "", + "rec_type": "" } ] }
\ No newline at end of file diff --git a/tests/TestDataHelper.php b/tests/TestDataHelper.php index 42577ab..99acc1c 100644 --- a/tests/TestDataHelper.php +++ b/tests/TestDataHelper.php @@ -56,14 +56,17 @@ class TestDataHelper public function compareDataObjects($helperObj, $schedObj, $fields) { - foreach($fields as $key=>$value){ - $hVal = isset($helperObj[$key]) ? $helperObj[$key]: ""; - $sVal = isset($schedObj[$key])? $schedObj[$key] : ""; - if($key == "rec_type"){ + foreach($fields as $key=>$value) { + $hVal = isset($helperObj[$key]) ? $helperObj[$key] : ""; + $sVal = isset($schedObj[$key]) ? $schedObj[$key] : ""; + if ($key == "rec_type") { $sVal = $this->correctNoEndRecType($sVal); $hVal = $this->correctNoEndRecType($hVal); + } elseif ($key == "event_length" || $key == "event_pid") { + $sVal = $sVal == 0 ? "" : $sVal; + $hVal = $hVal == 0 ? "" : $hVal; } - if($hVal != $sVal) { + if ($hVal != $sVal) { return false; } } |