Add update events test data.

6 files changed, 153 insertions, 31 deletions

diff --git a/tests/Data_deleteById/CommonEvents/source.json b/tests/Data_deleteById/CommonEvents/source.json
index 2751ca6..619f738 100644
--- a/tests/Data_deleteById/CommonEvents/source.json
+++ b/tests/Data_deleteById/CommonEvents/source.json
@@ -65,17 +65,6 @@
       "rec_pattern": "year_1___",
       "rec_type": "year_1___#no",
       "!nativeeditor_status": ""
-    },
-    {
-      "start_date": "2016-04-01 00:00:00",
-      "end_date": "9999-02-01 00:00:00",
-      "text": "Test Event 6",
-      "id": "7",
-      "event_pid": "",
-      "event_length": "300",
-      "rec_pattern": "year_1_5_4_",
-      "rec_type": "year_1_5_4_#no",
-      "!nativeeditor_status": ""
     }
   ],
   "data": [
diff --git a/tests/Data_saveDataUpdate/DayRecurrings/source.json b/tests/Data_saveDataUpdate/DayRecurrings/source.json
index 7cb1ca4..304593e 100644
--- a/tests/Data_saveDataUpdate/DayRecurrings/source.json
+++ b/tests/Data_saveDataUpdate/DayRecurrings/source.json
@@ -15,6 +15,14 @@
       "text": "Event X2",
       "rec_type": "day_1___#3",
       "event_length": "600"
+    },
+    {
+      "id": "3",
+      "start_date": "2014-04-09 18:00:00",
+      "end_date": "2014-04-09 19:25:00",
+      "text": "Event X3",
+      "rec_type": "",
+      "event_length": ""
     }
   ],
   "data": [
@@ -22,23 +30,35 @@
       "id": 1,
       "recurring_type": {
         "each": "day",
-        "step": 1,
-        "repeat": 10
+        "step": 1
       },
-      "start_date": "2016-03-08 10:15:00",
-      "length": 600,
+      "start_date": "2016-03-08 11:35:00",
+      "end_date": "9999-02-01 00:00:00",
+      "length": 19200,
       "text": "Test Event 1"
     },
     {
       "id": 2,
       "recurring_type": {
         "each": "day",
-        "step": 1,
-        "repeat": 5
+        "step": 2,
+        "repeat": 33
       },
-      "start_date": "2016-03-08 10:15:00",
+      "start_date": "2016-03-03 00:00:00",
       "length": 300,
       "text": "Test Event 2"
+    },
+    {
+      "id": 3,
+      "recurring_type": {
+        "each": "week",
+        "step": 1,
+        "days_of_week": "monday,tuesday,wednesday,thursday,friday"
+      },
+      "start_date": "2016-03-01 00:00:00",
+      "end_date": "2016-08-21 00:00:00",
+      "length": 300,
+      "text": "Test Event 3"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/Data_saveDataUpdate/DayRecurrings/target.json b/tests/Data_saveDataUpdate/DayRecurrings/target.json
index 815d400..fc46634 100644
--- a/tests/Data_saveDataUpdate/DayRecurrings/target.json
+++ b/tests/Data_saveDataUpdate/DayRecurrings/target.json
@@ -1,20 +1,34 @@
 {
   "data": [
     {
-      "id": 1,
-      "rec_type": "day_1___#10",
-      "start_date": "2016-03-08 10:15:00",
-      "end_date": "2016-03-18 10:25:00",
-      "event_length": 600,
-      "text": "Test Event 1"
+      "start_date": "2016-03-08 11:35:00",
+      "end_date": "9999-02-01 00:00:00",
+      "text": "Test Event 1",
+      "id": "1",
+      "event_pid": "",
+      "event_length": "19200",
+      "rec_pattern": "day_1___",
+      "rec_type": "day_1___#no"
     },
     {
-      "id": 2,
-      "rec_type": "day_1___#5",
-      "start_date": "2016-03-08 10:15:00",
-      "end_date": "2016-03-13 10:20:00",
-      "event_length": 300,
-      "text": "Test Event 2"
+      "start_date": "2016-03-03 00:00:00",
+      "end_date": "2016-05-08 00:00:00",
+      "text": "Test Event 2",
+      "id": "2",
+      "event_pid": "",
+      "event_length": "300",
+      "rec_pattern": "day_2___",
+      "rec_type": "day_2___#33"
+    },
+    {
+      "start_date": "2016-03-01 00:00:00",
+      "end_date": "2016-08-21 00:00:00",
+      "text": "Test Event 3",
+      "id": "3",
+      "event_pid": "",
+      "event_length": "300",
+      "rec_pattern": "week_1___1,2,3,4,5",
+      "rec_type": "week_1___1,2,3,4,5#"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/Data_saveDataUpdate/WeekRecurrings/source.json b/tests/Data_saveDataUpdate/WeekRecurrings/source.json
new file mode 100644
index 0000000..b66c9c6
--- /dev/null
+++ b/tests/Data_saveDataUpdate/WeekRecurrings/source.json
@@ -0,0 +1,65 @@
+{
+  "insert_data": [
+    {
+      "id": "1",
+      "start_date": "2015-02-04 11:00:00",
+      "end_date": "2015-02-04 19:30:00",
+      "text": "Event X1",
+      "rec_type": "",
+      "event_length": ""
+    },
+    {
+      "id": "2",
+      "start_date": "2020-07-09 11:00:00",
+      "end_date": "2020-07-09 19:20:00",
+      "text": "Event X2",
+      "rec_type": "day_1___#3",
+      "event_length": "600"
+    },
+    {
+      "id": "3",
+      "start_date": "2014-04-09 18:00:00",
+      "end_date": "2014-04-09 19:25:00",
+      "text": "Event X3",
+      "rec_type": "",
+      "event_length": ""
+    }
+  ],
+  "data": [
+    {
+      "id": 1,
+      "recurring_type": {
+        "each": "week",
+        "step": 2,
+        "days_of_week": "sunday,monday,tuesday,wednesday,thursday,friday,saturday"
+      },
+      "start_date": "2016-03-01 12:20:00",
+      "length": 11400,
+      "text": "Test Week Event 1"
+    },
+    {
+      "id": 2,
+      "recurring_type": {
+        "each": "week",
+        "repeat": 17,
+        "days_of_week": "monday,wednesday,friday"
+
+      },
+      "start_date": "2016-03-02 20:00:00",
+      "length": 11400,
+      "text": "Test Week Event 2"
+    },
+    {
+      "id": 3,
+      "recurring_type": {
+        "each": "week",
+        "step": 3,
+        "days_of_week": "monday,wednesday"
+      },
+      "start_date": "2016-03-02 15:55:00",
+      "end_date": "2016-08-21 00:00:00",
+      "length": 6000,
+      "text": "Test Week Event 3"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/Data_saveDataUpdate/WeekRecurrings/target.json b/tests/Data_saveDataUpdate/WeekRecurrings/target.json
new file mode 100644
index 0000000..fca6190
--- /dev/null
+++ b/tests/Data_saveDataUpdate/WeekRecurrings/target.json
@@ -0,0 +1,34 @@
+{
+  "data": [
+    {
+      "start_date": "2016-03-01 00:00:00",
+      "end_date": "9999-02-01 00:00:00",
+      "text": "Test Week Event 1",
+      "id": "4",
+      "event_pid": "",
+      "event_length": "300",
+      "rec_pattern": "week_2___0,1,2,3,4,5,6",
+      "rec_type": "week_2___0,1,2,3,4,5,6#no"
+    },
+    {
+      "start_date": "2016-03-02 00:00:00",
+      "end_date": "2016-03-31 00:00:00",
+      "text": "Test Week Event 2",
+      "id": "5",
+      "event_pid": "",
+      "event_length": "300",
+      "rec_pattern": "week_1___1,3,4,5",
+      "rec_type": "week_1___1,3,4,5#17"
+    },
+    {
+      "start_date": "2016-03-02 00:00:00",
+      "end_date": "2016-08-21 00:00:00",
+      "text": "Test Week Event 3",
+      "id": "6",
+      "event_pid": "",
+      "event_length": "300",
+      "rec_pattern": "week_3___1,3",
+      "rec_type": "week_3___1,3#"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/TestDataHelper.php b/tests/TestDataHelper.php
index 3ed09cf..91183cb 100644
--- a/tests/TestDataHelper.php
+++ b/tests/TestDataHelper.php
@@ -97,7 +97,7 @@ class TestDataHelper
     public function prepateDataForHelper($data, $helper)
     {
         foreach ($data as &$event) {
-            if (!isset($event["end_date"])) {
+            if (!isset($event["end_date"]) && isset($event["recurring_type"]) && isset($event["length"])) {
                 $event["end_date"] = $helper->getRecurringEndDateStr($event["recurring_type"], $event["start_date"], $event["length"]);
             }
         }