Merge pull request #470 from gemal/master

minor fixes to unit test

Author: markstory

tests/TestCase/DebugMemoryTest.php

@@ -62,18 +62,18 @@ public function testMemorySettingAndGetting()
         $this->assertTrue($result);
 
         $result = DebugMemory::getAll(true);
-        $this->assertEquals(count($result), 1);
+        $this->assertCount(1, $result);
         $this->assertTrue(isset($result['test marker']));
         $this->assertTrue(is_numeric($result['test marker']));
 
         $result = DebugMemory::getAll();
-        $this->assertTrue(empty($result));
+        $this->assertEmpty($result);
 
         DebugMemory::record('test marker');
         DebugMemory::record('test marker');
         $result = DebugMemory::getAll();
 
-        $this->assertEquals(count($result), 2);
+        $this->assertCount(2, $result);
         $this->assertTrue(isset($result['test marker']));
         $this->assertTrue(isset($result['test marker #2']));
     }

tests/TestCase/DebugTimerTest.php

@@ -70,7 +70,7 @@ public function testAnonymousTimers()
         $this->assertTrue(DebugTimer::stop());
         $timers = DebugTimer::getAll();
 
-        $this->assertEquals(2, count($timers));
+        $this->assertCount(2, $timers);
         end($timers);
         $key = key($timers);
         $lineNo = __LINE__ - 8;
@@ -181,7 +181,7 @@ public function testGetTimers()
         DebugTimer::stop('test2');
         $timers = DebugTimer::getAll();
 
-        $this->assertEquals(3, count($timers));
+        $this->assertCount(3, $timers);
         $this->assertTrue(is_float($timers['test1']['time']));
         $this->assertTrue(isset($timers['test1']['message']));
         $this->assertTrue(isset($timers['test2']['message']));

tests/TestCase/Model/Behavior/TimedBehaviorTest.php

@@ -68,15 +68,15 @@ public function tearDown()
     public function testFindTimers()
     {
         $timers = DebugTimer::getAll();
-        $this->assertEquals(count($timers), 1);
+        $this->assertCount(1, $timers);
 
         $this->Article->find('all')->first();
         $result = DebugTimer::getAll();
-        $this->assertEquals(count($result), 2);
+        $this->assertCount(2, $result);
 
         $this->Article->find('all')->first();
         $result = DebugTimer::getAll();
-        $this->assertEquals(count($result), 3);
+        $this->assertCount(3, $result);
     }
 
     /**
@@ -87,11 +87,11 @@ public function testFindTimers()
     public function testSaveTimers()
     {
         $timers = DebugTimer::getAll();
-        $this->assertEquals(count($timers), 1);
+        $this->assertCount(1, $timers);
 
         $article = $this->Article->newEntity(['user_id' => 1, 'title' => 'test', 'body' => 'test']);
         $this->Article->save($article);
         $result = DebugTimer::getAll();
-        $this->assertEquals(count($result), 2);
+        $this->assertCount(2, $result);
     }
 }