merged branch aboks/mimetype_test (PR #1775)

fabpot · fabpot · commit 422522bcf8cf · 2011-07-27T08:24:12.000+02:00
Commits ------- 1283c47 [HttpFoundation] Fixed incorrect test; MimeTypeGuesser should be (and is) able to detect a path that is not a file also without the 'fileinfo' extension Discussion ---------- [HttpFoundation] Fixed incorrect test when 'fileinfo' extension is not enabled This test failed on my box with `fileinfo` disabled. The `FileNotFoundException` is thrown also when the `fileinfo`-extension is not enabled, so it should be expected.
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/File/MimeType/MimeTypeTest.php b/tests/Symfony/Tests/Component/HttpFoundation/File/MimeType/MimeTypeTest.php
@@ -33,13 +33,9 @@ public function testGuessImageWithoutExtension()
 
     public function testGuessImageWithDirectory()
     {
-        if (extension_loaded('fileinfo')) {
-            $this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+        $this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
 
-            $this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory'));
-        } else {
-            $this->assertNull(MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory'));
-        }
+        MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory');
     }
 
     public function testGuessImageWithContentTypeMimeTypeGuesser()

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,9 @@ public function testGuessImageWithoutExtension()`
`33`	`33`
`34`	`34`	`public function testGuessImageWithDirectory()`
`35`	`35`	`{`
`36`		`- if (extension_loaded('fileinfo')) {`
`37`		`- $this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');`
	`36`	`+ $this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');`
`38`	`37`
`39`		`- $this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory'));`
`40`		`- } else {`
`41`		`- $this->assertNull(MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory'));`
`42`		`- }`
	`38`	`+ MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory');`
`43`	`39`	`}`
`44`	`40`
`45`	`41`	`public function testGuessImageWithContentTypeMimeTypeGuesser()`