Fixes cycle time calculation when the start date is defined in the future

2 files changed, 11 insertions, 9 deletions

diff --git a/tests/units/Analytic/AverageLeadCycleTimeAnalyticTest.php b/tests/units/Analytic/AverageLeadCycleTimeAnalyticTest.php
index b8faec6c..b87e9573 100644
--- a/tests/units/Analytic/AverageLeadCycleTimeAnalyticTest.php
+++ b/tests/units/Analytic/AverageLeadCycleTimeAnalyticTest.php
@@ -23,6 +23,7 @@ class AverageLeadCycleTimeAnalyticTest extends Base
         $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(4, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
+        $this->assertEquals(5, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
         // LT=3600 CT=1800
         $this->container['db']->table(Task::TABLE)->eq('id', 1)->update(array('date_completed' => $now + 3600, 'date_started' => $now + 1800));
@@ -36,21 +37,22 @@ class AverageLeadCycleTimeAnalyticTest extends Base
         // LT=2*3600 CT=0
         $this->container['db']->table(Task::TABLE)->eq('id', 4)->update(array('date_completed' => $now + 2 * 3600));
 
+        // CT=0
+        $this->container['db']->table(Task::TABLE)->eq('id', 5)->update(array('date_started' => $now + 900));
+
         $stats = $averageLeadCycleTimeAnalytic->build(1);
 
-        $this->assertEquals(4, $stats['count']);
+        $this->assertEquals(5, $stats['count']);
         $this->assertEquals(3600 + 1800 + 3600 + 2*3600, $stats['total_lead_time'], '', 5);
         $this->assertEquals(1800 + 900, $stats['total_cycle_time'], '', 5);
-        $this->assertEquals((3600 + 1800 + 3600 + 2*3600) / 4, $stats['avg_lead_time'], '', 5);
-        $this->assertEquals((1800 + 900) / 4, $stats['avg_cycle_time'], '', 5);
+        $this->assertEquals((3600 + 1800 + 3600 + 2*3600) / 5, $stats['avg_lead_time'], '', 5);
+        $this->assertEquals((1800 + 900) / 5, $stats['avg_cycle_time'], '', 5);
     }
 
     public function testBuildWithNoTasks()
     {
-        $taskCreationModel = new TaskCreation($this->container);
         $projectModel = new Project($this->container);
         $averageLeadCycleTimeAnalytic = new AverageLeadCycleTimeAnalytic($this->container);
-        $now = time();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test1')));
diff --git a/tests/units/Model/ProjectDailyStatsTest.php b/tests/units/Model/ProjectDailyStatsTest.php
index c3b20cb9..60afc4c3 100644
--- a/tests/units/Model/ProjectDailyStatsTest.php
+++ b/tests/units/Model/ProjectDailyStatsTest.php
@@ -45,10 +45,10 @@ class ProjectDailyStatsTest extends Base
         $this->assertEquals($expected[0]['day'], $metrics[0]['day']);
         $this->assertEquals($expected[1]['day'], $metrics[1]['day']);
 
-        $this->assertEquals($expected[0]['avg_lead_time'], $metrics[0]['avg_lead_time'], '', 2);
-        $this->assertEquals($expected[1]['avg_lead_time'], $metrics[1]['avg_lead_time'], '', 2);
+        $this->assertSame($expected[0]['avg_lead_time'], $metrics[0]['avg_lead_time'], '', 2);
+        $this->assertSame($expected[1]['avg_lead_time'], $metrics[1]['avg_lead_time'], '', 2);
 
-        $this->assertEquals($expected[0]['avg_cycle_time'], $metrics[0]['avg_cycle_time'], '', 2);
-        $this->assertEquals($expected[1]['avg_cycle_time'], $metrics[1]['avg_cycle_time'], '', 2);
+        $this->assertSame($expected[0]['avg_cycle_time'], $metrics[0]['avg_cycle_time'], '', 2);
+        $this->assertSame($expected[1]['avg_cycle_time'], $metrics[1]['avg_cycle_time'], '', 2);
     }
 }