Fixed unit tests

Signed-off-by: Mua N. Laurent <[email protected]>

Author: muarachmann

src/DataTypes/Calendar.php

@@ -106,18 +106,18 @@ protected function buildCalendarString()
         if (isset($this->summary)) {
             $calendar .= "SUMMARY:".$this->summary.$this->separator;
         }
-        if (isset($this->location)) {
-            $calendar .= "LOCATION:".$this->location.$this->separator;
-        }
-        if (isset($this->url)) {
-            $calendar .= "URL:".$this->url.$this->separator;
-        }
         if (isset($this->startDateTime)) {
             $calendar .= "DTSTART:".$this->startDateTime.$this->separator;
         }
         if (isset($this->endDateTime)) {
             $calendar .= "DTEND:".$this->endDateTime.$this->separator;
         }
+        if (isset($this->location)) {
+            $calendar .= "LOCATION:".$this->location.$this->separator;
+        }
+        if (isset($this->url)) {
+            $calendar .= "URL:".$this->url.$this->separator;
+        }
 
         $calendar .= $this->suffix;
 
@@ -145,15 +145,15 @@ protected function setProperties(array $arguments)
             $this->summary = $arguments['summary'];
             $this->setEventDateTime($arguments['startDateTime'], "start");
 
+            if (isset($arguments['endDateTime'])) {
+                $this->setEventDateTime($arguments['endDateTime'], "end");
+            }
             if (isset($arguments['location'])) {
                 $this->location = $arguments['location'];
             }
             if (isset($arguments['url'])) {
                 $this->setUrl($arguments['url']);
             }
-            if (isset($arguments['endDateTime'])) {
-                $this->setEventDateTime($arguments['endDateTime'], "end");
-            }
         }
     }
 

tests/DataTypes/CalendarTest.php

@@ -127,14 +127,14 @@ public function test_it_generates_a_proper_format_with_summary_start_date_time_a
             0 => [
                 'summary' => 'My FooBar Event',
                 'startDateTime' => '2020-10-08 16:00',
-                'location' => 'Foo Location'
+                'location' => 'Fooon'
             ],
         ]);
 
         $properFormat = "BEGIN:VEVENT".$this->separator.
             "SUMMARY:My FooBar Event".$this->separator.
             "DTSTART:20201008UTC161000".$this->separator.
-            "LOCATION:Foo Location".$this->separator.
+            "LOCATION:Fooon".$this->separator.
             "END:VEVENT";
 
         $this->assertEquals($properFormat, strval($this->calendar));
@@ -159,4 +159,28 @@ public function test_it_generates_a_proper_format_with_summary_start_date_time_a
         $this->assertEquals($properFormat, strval($this->calendar));
     }
 
+    public function test_it_generates_a_proper_format_with_calendar_parameters()
+    {
+        $this->calendar->create([
+            0 => [
+                'summary' => 'My FooBar Event',
+                'startDateTime' => '2020-10-08 16:00',
+                'endDateTime' => '2020-10-08 18:00',
+                'location' => 'Foo Location',
+                'url' => 'https://www.google.com',
+                'dateTimeFormat' => 'Y-m-d H:i'
+            ],
+        ]);
+
+        $properFormat = "BEGIN:VEVENT".$this->separator.
+            "SUMMARY:My FooBar Event".$this->separator.
+            "DTSTART:20201008UTC161000".$this->separator.
+            "DTEND:20201008UTC181000".$this->separator.
+            "LOCATION:Foo Location".$this->separator.
+            "URL:https://www.google.com".$this->separator.
+            "END:VEVENT";
+
+        $this->assertEquals($properFormat, strval($this->calendar));
+    }
+
 }