Added tests

JanGalek · Dec 9, 2017 · 25d40d0 · 25d40d0
1 parent 5285816
commit 25d40d0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/src/Galek/Utils/Calendar/Calendar.php b/src/Galek/Utils/Calendar/Calendar.php
@@ -430,8 +430,6 @@ public function timeBetween($firstHour, $firstMinute, $lastHour, $lastMinute)
             } elseif ($this <= $lastDate) {
                 return TRUE;
             }
-
-            return FALSE;
         }
 
         return ($this->timeBellow($lastHour, $lastMinute) ? $this->timeOver($firstHour, $firstMinute) : FALSE);
@@ -498,22 +496,11 @@ public function werbDif($werb = [], $date = NULL)
     public function werbDif2($date = null, $date2 = null)
     {
 		trigger_error('werbDif2 is deprecated, use werbDif($werb, $date).', E_USER_DEPRECATED);
-        $curDate = ($date ? $date : new \DateTime());
         $date2 = ($date2 ? $date2 : $this->date);
-        $diff = $date2->diff($curDate)->days;
 
-        $werbs = (empty($werb) ? $this->difWerbs : $werb);
+        $werbs = $this->difWerbs;
 
-        if ($diff <= 2) {
-            $format = $werbs[$diff];
-        } elseif ($diff < 5) {
-            $format = $werbs['<5>'] . ' ' . $diff . ' ' . $werbs['<5'];
-        } elseif ($diff >= 5) {
-            $format = $werbs['<5>'] . ' ' . $diff . ' ' . $werbs['>=5'];
-        } else {
-            return FALSE;
-        }
-        return $format;
+        return $this->werbDif($werbs, $date2);
     }
 
 	/**

diff --git a/tests/CalendarTests/Calendar.phpt b/tests/CalendarTests/Calendar.phpt
@@ -165,6 +165,20 @@ class CalendarTest extends \Tester\TestCase
         Assert::equal('03.05.2016', $date2->format('d.m.Y'), 'dneska pracovni den 4');
         Assert::equal(TRUE, $date2->isWorkDay());*/
       }
+
+	public function testSklonovani()
+	{
+		$date = new Calendar('2017-12-09 00:00:00');
+
+		Assert::equal('sobota', $date->sklonovaniDays($date),'sklonovani');
+	}
+
+	public function testFormat()
+	{
+		$date = new Calendar('2017-12-09 1:02:01');
+
+		Assert::equal($date->format('d.m.Y H:i:s'), $date->getDateTimeFormat(),'dateFormat');
+	}
 }
 
 (new CalendarTest())->run();
diff --git a/tests/CalendarTests/WorkTime.phpt b/tests/CalendarTests/WorkTime.phpt
@@ -178,6 +178,14 @@ class WorkTimeTest extends \Tester\TestCase
 		$date2 = new Calendar('25.03.2016');
 		Assert::equal(TRUE, $date2->isHoliday());
 	}
+
+
+	public function testNotWorkTIme()
+	{
+		$date = new Calendar('09.12.2017 18:00:00');
+		$date->setWorkTime(8,0,16,30);
+		Assert::equal(FALSE, $date->isWorkTime());
+	}
 }
 
 $testCase = new WorkTimeTest();