diff options
| author | sten <stenmarsh938@gmail.com> | 2016-03-17 14:30:56 +0300 |
|---|---|---|
| committer | sten <stenmarsh938@gmail.com> | 2016-03-17 14:30:56 +0300 |
| commit | f6d1bfdcc04e09fee3f01bfaf45114475eab03ed (patch) | |
| tree | aedb1401b7d9d53705d5ce5c87e073dba0c8eeff | |
| parent | 61650522ee83433656535a48dde9be2d9b86bd35 (diff) | |
| download | scheduler-helper-php-f6d1bfdcc04e09fee3f01bfaf45114475eab03ed.zip scheduler-helper-php-f6d1bfdcc04e09fee3f01bfaf45114475eab03ed.tar.gz scheduler-helper-php-f6d1bfdcc04e09fee3f01bfaf45114475eab03ed.tar.bz2 | |
Fix test events comparsion.
| -rw-r--r-- | tests/Data_getData/DayRecurrings/source.json | 9 | ||||
| -rw-r--r-- | tests/Data_getData/DayRecurrings/target.json | 6 | ||||
| -rw-r--r-- | tests/SchedulerHelperTest.php | 2 | ||||
| -rw-r--r-- | tests/TestDataHelper.php | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/tests/Data_getData/DayRecurrings/source.json b/tests/Data_getData/DayRecurrings/source.json index 345ba0f..a5620bc 100644 --- a/tests/Data_getData/DayRecurrings/source.json +++ b/tests/Data_getData/DayRecurrings/source.json @@ -5,15 +5,14 @@ }, "data": [ { + "id": "497", "start_date": "2016-03-09 00:00:00", "end_date": "2016-03-15 00:00:00", "text": "Rec Ev", - "id": "497", - "event_pid": "", - "event_length": "300", - "rec_pattern": "day_2___", "rec_type": "day_2___#3", - "!nativeeditor_status": "" + "event_pid": "0", + "event_length": "300", + "rec_pattern": "day_2___" } ] }
\ No newline at end of file diff --git a/tests/Data_getData/DayRecurrings/target.json b/tests/Data_getData/DayRecurrings/target.json index 3d7c4d3..71e73a7 100644 --- a/tests/Data_getData/DayRecurrings/target.json +++ b/tests/Data_getData/DayRecurrings/target.json @@ -3,7 +3,7 @@ { "start_date": "2016-03-09 00:00:00", "end_date": "2016-03-09 00:05:00", - "event_pid": "497", + "event_pid": "0", "text": "Rec Ev", "id": "497", "_timed": true, @@ -13,7 +13,7 @@ { "start_date": "2016-03-11 00:00:00", "end_date": "2016-03-11 00:05:00", - "event_pid": "497", + "event_pid": "0", "text": "Rec Ev", "id": "497", "_timed": true, @@ -23,7 +23,7 @@ { "start_date": "2016-03-13 00:00:00", "end_date": "2016-03-13 00:05:00", - "event_pid": "497", + "event_pid": "0", "text": "Rec Ev", "id": "497", "_timed": true, diff --git a/tests/SchedulerHelperTest.php b/tests/SchedulerHelperTest.php index 42a1111..b53a120 100644 --- a/tests/SchedulerHelperTest.php +++ b/tests/SchedulerHelperTest.php @@ -65,7 +65,7 @@ class SchedulerHelperTest extends \PHPUnit_Framework_TestCase $this->_baseHelper->insertDataFromJSON($source->{'data'}); $helperData = $schedHelper->getData($source->settings->start_date, $source->settings->end_date); - var_dump($helperData); exit; + $this->assertTrue($dataHelp->compareDataBunches($helperData, $target->data, TestConfig::$fields), "Helper and Scheduler data has difference"); } diff --git a/tests/TestDataHelper.php b/tests/TestDataHelper.php index 7f9f8d9..93a304d 100644 --- a/tests/TestDataHelper.php +++ b/tests/TestDataHelper.php @@ -49,9 +49,9 @@ class TestDataHelper public function compareDataObjects($helperObj, $schedObj, $fields) { foreach($fields as $key=>$value){ - print($helperObj[$key]." _ ".$schedObj -> {$key}."\n"); - if($helperObj[$key] !== $schedObj -> {$key}) + if($helperObj[$key] !== $schedObj -> {$key}) { return false; + } } return true; } |