reorganized *HttpExceptionTest classes to prevent code duplication

smatyas · smatyas · commit c86ace08d497 · 2015-12-28T19:38:29.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/AccessdeniedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/AccessdeniedHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the AccessDeniedHttpException class.
  */
-class AccessDeniedHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class AccessDeniedHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is an empty array.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the BadRequestHttpException class.
  */
-class BadRequestHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class BadRequestHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is an empty array.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the ConflictHttpException class.
  */
-class ConflictHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class ConflictHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is an empty array.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the GoneHttpException class.
  */
-class GoneHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class GoneHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is an empty array.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the LengthRequiredHttpException class.
  */
-class LengthRequiredHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class LengthRequiredHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is an empty array.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the MethodNotAllowedHttpException class.
  */
-class MethodNotAllowedHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class MethodNotAllowedHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is set as expected.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the NotAcceptableHttpException class.
  */
-class NotAcceptableHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class NotAcceptableHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is an empty array.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the NotFoundHttpException class.
  */
-class NotFoundHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class NotFoundHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is an empty array.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the PreconditionFailedHttpException class.
  */
-class PreconditionFailedHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class PreconditionFailedHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is an empty array.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php
@@ -7,27 +7,8 @@
 /**
  * Test the PreconditionRequiredHttpException class.
  */
-class PreconditionRequiredHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class PreconditionRequiredHttpExceptionTest extends HttpExceptionTest
 {
-    /**
-     * Provides header data for the tests.
-     *
-     * @return array
-     */
-    public function headerDataProvider()
-    {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
-    }
-
     /**
      * Test that the default headers is an empty array.
      */
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
@@ -7,34 +7,25 @@
 /**
  * Test the ServiceUnavailableHttpException class.
  */
-class ServiceUnavailableHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class ServiceUnavailableHttpExceptionTest extends HttpExceptionTest
 {
     /**
-     * Provides header data for the tests.
-     *
-     * @return array
+     * Test that the default headers is an empty array.
      */
-    public function headerDataProvider()
+    public function testHeadersDefault()
     {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
+        $exception = new ServiceUnavailableHttpException();
+        $this->assertSame(array(), $exception->getHeaders());
     }
 
     /**
-     * Test that the default headers is an empty array.
+     * Test that the default headers are set correctly
+     * when the retryAfter parameter is set.
      */
-    public function testHeadersDefault()
+    public function testHeadersDefaultRetryAfter()
     {
-        $exception = new ServiceUnavailableHttpException();
-        $this->assertSame(array(), $exception->getHeaders());
+        $exception = new ServiceUnavailableHttpException(10);
+        $this->assertSame(array('Retry-After' => 10), $exception->getHeaders());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
@@ -7,34 +7,25 @@
 /**
  * Test the TooManyRequestsHttpException class.
  */
-class TooManyRequestsHttpExceptionTest extends \PHPUnit_Framework_TestCase
+class TooManyRequestsHttpExceptionTest extends HttpExceptionTest
 {
     /**
-     * Provides header data for the tests.
-     *
-     * @return array
+     * Test that the default headers is an empty array.
      */
-    public function headerDataProvider()
+    public function testHeadersDefault()
     {
-        return array(
-            array(array('X-Test' => 'Test')),
-            array(array('X-Test' => 1)),
-            array(
-                array(
-                    array('X-Test' => 'Test'),
-                    array('X-Test-2' => 'Test-2'),
-                ),
-            ),
-        );
+        $exception = new TooManyRequestsHttpException();
+        $this->assertSame(array(), $exception->getHeaders());
     }
 
     /**
-     * Test that the default headers is an empty array.
+     * Test that the default headers are set correctly
+     * when the retryAfter parameter is set.
      */
-    public function testHeadersDefault()
+    public function testHeadersDefaultRertyAfter()
     {
-        $exception = new TooManyRequestsHttpException();
-        $this->assertSame(array(), $exception->getHeaders());
+        $exception = new TooManyRequestsHttpException(10);
+        $this->assertSame(array('Retry-After' => 10), $exception->getHeaders());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php
