changed PHPUnit assertions to use 'better' assert methods whenever possible

fabpot · fabpot · commit 67b257e660f1 · 2012-05-20T04:52:57.000+02:00
diff --git a/book/testing.rst b/book/testing.rst
@@ -144,7 +144,7 @@ for its ``DemoController`` (`DemoControllerTest`_) that reads as follows::
 
             $crawler = $client->request('GET', '/demo/hello/Fabien');
 
-            $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0);
+            $this->assertGreaterThan(0, $crawler->filter('html:contains("Hello Fabien")')->count());
         }
     }
 
@@ -210,7 +210,7 @@ that it actually does what you expect it to. Use the Crawler to make assertions
 on the DOM::
 
     // Assert that the response matches a given CSS selector.
-    $this->assertTrue($crawler->filter('h1')->count() > 0);
+    $this->assertGreaterThan(0, $crawler->filter('h1')->count());
 
 Or, test against the Response content directly if you just want to assert that
 the content contains some text, or if the Response is not an XML/HTML
@@ -258,10 +258,10 @@ document::
     useful test assertions::
 
         // Assert that there is more than one h2 tag with the class "subtitle"
-        $this->assertTrue($crawler->filter('h2.subtitle')->count() > 0);
+        $this->assertGreaterThan(0, $crawler->filter('h2.subtitle')->count());
 
         // Assert that there are exactly 4 h2 tags on the page
-        $this->assertEquals(4, $crawler->filter('h2')->count());
+        $this->assertCount(4, $crawler->filter('h2')->count());
 
         // Assert the the "Content-Type" header is "application/json"
         $this->assertTrue($client->getResponse()->headers->contains('Content-Type', 'application/json'));
diff --git a/cookbook/testing/profiling.rst b/cookbook/testing/profiling.rst
@@ -28,10 +28,10 @@ environment)::
             // Check that the profiler is enabled
             if ($profile = $client->getProfile()) {
                 // check the number of requests
-                $this->assertTrue($profile->getCollector('db')->getQueryCount() < 10);
+                $this->assertLessThan(10, $profile->getCollector('db')->getQueryCount());
 
                 // check the time spent in the framework
-                $this->assertTrue( $profile->getCollector('timer')->getTime() < 0.5);
+                $this->assertLessThan(0.5, $profile->getCollector('timer')->getTime());
             }
         }
     }
@@ -40,8 +40,9 @@ If a test fails because of profiling data (too many DB queries for instance),
 you might want to use the Web Profiler to analyze the request after the tests
 finish. It's easy to achieve if you embed the token in the error message::
 
-    $this->assertTrue(
-        $profile->get('db')->getQueryCount() < 30,
+    $this->assertLessThan(
+        30,
+        $profile->get('db')->getQueryCount(),
         sprintf('Checks that query count is less than 30 (token %s)', $profile->getToken())
     );
 
