Fix printer log tests

Author: cedric-anne

src/PrinterLog.php

@@ -138,7 +138,8 @@ public function getMetrics(
             'FROM'   => $this->getTable(),
             'WHERE'  => [
                 'printers_id'  => $printer->fields['id']
-            ] + $filters
+            ] + $filters,
+            'ORDER'  => 'date ASC',
         ]);
 
         $series = iterator_to_array($iterator, false);

tests/functional/PrinterLog.php

@@ -54,8 +54,7 @@ public function testGetMetrics()
 
         $log = new \PrinterLog();
 
-        $cdate1 = clone $now;
-        $cdate1->sub(new \DateInterval('P14M'));
+        $cdate1 = new \DateTime('-14 months');
         $input = [
             'printers_id' => $printers_id,
             'total_pages' => 5132,
@@ -67,8 +66,7 @@ public function testGetMetrics()
         ];
         $this->integer($log->add($input))->isGreaterThan(0);
 
-        $cdate2 = clone $now;
-        $cdate2->sub(new \DateInterval('P6M'));
+        $cdate2 = new \DateTime('-6 months');
         $input = [
             'printers_id' => $printers_id,
             'total_pages' => 6521,
@@ -80,6 +78,18 @@ public function testGetMetrics()
         ];
         $this->integer($log->add($input))->isGreaterThan(0);
 
+        $cdate3 = new \DateTime('first day of previous month');
+        $input = [
+            'printers_id' => $printers_id,
+            'total_pages' => 3464,
+            'bw_pages' => 2154,
+            'color_pages' => 1310,
+            'rv_pages' => 548,
+            'scanned' => 4657,
+            'date' => $cdate3->format('Y-m-d')
+        ];
+        $this->integer($log->add($input))->isGreaterThan(0);
+
         $input = [
             'printers_id' => $printers_id,
             'total_pages' => 9299,
@@ -91,41 +101,42 @@ public function testGetMetrics()
         ];
         $this->integer($log->add($input))->isGreaterThan(0);
 
-       //per default, get 1Y old, first not included
-        $this->array($log->getMetrics($printer))->hasSize(2);
+        //per default, get 1Y old, first not included
+        $this->array($log->getMetrics($printer))->hasSize(3);
 
-       //same with start_date parameter
-        $this->array($log->getMetrics($printer, start_date: $cdate1))->hasSize(3);
-       //same with interval parameter
-        $this->array($log->getMetrics($printer, interval: 'P14M'))->hasSize(3);
+        //same with start_date parameter
+        $this->array($log->getMetrics($printer, start_date: $cdate1))->hasSize(4);
+        //same with interval parameter
+        $this->array($log->getMetrics($printer, interval: 'P14M'))->hasSize(4);
 
-       //use end_date parameter to exclude last report
-        $this->array($log->getMetrics($printer, start_date: $cdate1, end_date: $now->sub(new \DateInterval('P1D'))))->hasSize(2);
+        //use end_date parameter to exclude last report
+        $this->array($log->getMetrics($printer, start_date: $cdate1, end_date: $now->sub(new \DateInterval('P1D'))))->hasSize(3);
 
-        for ($i = 0; $i < 20; $i++) {
-            $now->sub(new \DateInterval('P1D'));
+        $datex = new \DateTime();
+        for ($i = 0; $i < 21; $i++) {
+            $datex->sub(new \DateInterval('P1D'));
             $input = [
                 'printers_id' => $printers_id,
                 'total_pages' => 9299,
                 'bw_pages' => 6258,
                 'color_pages' => 3041,
                 'rv_pages' => 7654,
                 'scanned' => 28177,
-                'date' => $now->format('Y-m-d')
+                'date' => $datex->format('Y-m-d')
             ];
             $this->integer($log->add($input))->isGreaterThan(0);
         }
 
-       // check working of daily format
-        $this->array($log->getMetrics($printer, interval: 'P2M', format: 'daily'))->hasSize(21);
+        // check working of daily format
+        $this->array($log->getMetrics($printer, interval: 'P2M', format: 'daily'))->hasSize(23);
 
-       // check working of weekly format
-        $this->array($log->getMetrics($printer, interval: 'P1M', format: 'weekly'))->hasSize(4);
+        // check working of weekly format
+        $this->array($log->getMetrics($printer, interval: 'P28D', format: 'weekly'))->hasSize(4);
 
-       // check working of monthly format
-        $this->array($log->getMetrics($printer, format: 'monthly', interval: 'P2Y'))->hasSize(3);
+        // check working of monthly format
+        $this->array($log->getMetrics($printer, format: 'monthly', interval: 'P2Y'))->hasSize(4);
 
-       // check working of yearly format
+        // check working of yearly format
         $this->array($log->getMetrics($printer, format: 'yearly', interval: 'P2Y'))->hasSize(2);
     }
 }