[Tests] Add coverage to Guzzle\Guzzle

guzzle · Apr 15, 2011 · 99264d1 · 99264d1
1 parent 330bf7b
commit 99264d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/Guzzle/Guzzle.php b/src/Guzzle/Guzzle.php
@@ -34,7 +34,6 @@ class Guzzle
      */
     public static function getDefaultUserAgent()
     {
-        // @codeCoverageIgnoreStart
         if (!self::$userAgent) {
             $version = self::getCurlInfo();
             self::$userAgent = sprintf('Guzzle/%s (Language=PHP/%s; curl=%s; Host=%s)',
@@ -44,8 +43,7 @@ public static function getDefaultUserAgent()
                 $version['host']
             );
         }
-        // @codeCoverageIgnoreEnd
-
+
         return self::$userAgent;
     }
 
@@ -69,14 +67,12 @@ public static function getDefaultUserAgent()
      */
     public static function getCurlInfo($type = null)
     {
-        // @codeCoverageIgnoreStart
         if (!self::$curl) {
             self::$curl = curl_version();
             // Check if CURLOPT_FOLLOWLOCATION is available
             self::$curl['follow_location'] = !ini_get('open_basedir');
         }
-        // @codeCoverageIgnoreEnd
-
+
         if (!$type) {
             return self::$curl;
         } else if (isset(self::$curl[$type])) {

diff --git a/tests/Guzzle/Tests/GuzzleTest.php b/tests/Guzzle/Tests/GuzzleTest.php
@@ -19,11 +19,10 @@ class GuzzleTest extends GuzzleTestCase
      */
     public function testGetDefaultUserAgent()
     {
+        Guzzle::reset();
         $version = curl_version();
         $agent = sprintf('Guzzle/%s (Language=PHP/%s; curl=%s; Host=%s)', Guzzle::VERSION, \PHP_VERSION, $version['version'], $version['host']);
-
         $this->assertEquals($agent, Guzzle::getDefaultUserAgent());
-
         // Get it from cache this time
         $this->assertEquals($agent, Guzzle::getDefaultUserAgent());
     }
@@ -34,7 +33,6 @@ public function testGetDefaultUserAgent()
     public function testGetHttpDate()
     {
         $fmt = 'D, d M Y H:i:s \G\M\T';
-
         $this->assertEquals(gmdate($fmt), Guzzle::getHttpDate('now'));
         $this->assertEquals(gmdate($fmt), Guzzle::getHttpDate(strtotime('now')));
         $this->assertEquals(gmdate($fmt, strtotime('+1 day')), Guzzle::getHttpDate('+1 day'));
@@ -76,10 +74,13 @@ public function testInjectsConfigData($output, $input, $config)
      */
     public function testCachesCurlInfo()
     {
+        Guzzle::reset();
         $c = curl_version();
-        $this->assertInternalType('array', Guzzle::getCurlInfo());
+        $info = Guzzle::getCurlInfo();
+        $this->assertInternalType('array', $info);
         $this->assertEquals(false, Guzzle::getCurlInfo('ewfewfewfe'));
         $this->assertEquals($c['version'], Guzzle::getCurlInfo('version'));
+        $this->assertSame(Guzzle::getCurlInfo(), $info);
     }
 
     /**