fix risky tests

Author: xabbuh

Tests/EventListener/BodyListenerTest.php

@@ -36,7 +36,7 @@ class BodyListenerTest extends TestCase
      * @param string  $contentType                            the request header content type
      * @param bool    $throwExceptionOnUnsupportedContentType
      *
-     * @dataProvider testOnKernelRequestDataProvider
+     * @dataProvider onKernelRequestDataProvider
      */
     public function testOnKernelRequest($decode, Request $request, $method, $expectedParameters, $contentType = null, $throwExceptionOnUnsupportedContentType = false)
     {
@@ -76,7 +76,7 @@ public function testOnKernelRequest($decode, Request $request, $method, $expecte
         $this->assertEquals($request->request->all(), $expectedParameters);
     }
 
-    public static function testOnKernelRequestDataProvider()
+    public static function onKernelRequestDataProvider()
     {
         return [
             'Empty POST request' => [true, new Request([], [], [], [], [], [], ['foo']), 'POST', ['foo'], 'application/json'],

Tests/Functional/ConfigurationTest.php

@@ -18,18 +18,23 @@ class ConfigurationTest extends WebTestCase
 {
     public function testDisabledTemplating()
     {
-        $this->createClient(['test_case' => 'Templating']);
+        $kernel = self::bootKernel(['test_case' => 'Templating']);
+        $container = $kernel->getContainer();
+
+        $this->assertFalse($container->has('fos_rest.templating'));
     }
 
     public function testToolbar()
     {
-        $this->createClient(['test_case' => 'Configuration'])
-            ->request(
+        $client = $this->createClient(['test_case' => 'Configuration']);
+        $client->request(
                 'GET',
                 '/_profiler/empty/search/results?limit=10',
                 [],
                 [],
                 ['HTTP_Accept' => 'application/json']
             );
+
+        $this->assertSame('text/html; charset=UTF-8', $client->getResponse()->headers->get('Content-Type'));
     }
 }

Tests/Functional/ParamFetcherTest.php

@@ -194,6 +194,8 @@ public function testFileParamImageConstraintArrayException()
     public function testValidQueryParameter()
     {
         $this->client->request('POST', '/params?foz=val1');
+
+        $this->assertArraySubset(array('foz' => ''), $this->getData());
     }
 
     public function testIncompatibleQueryParameter()

Tests/Functional/SerializerErrorTest.php

@@ -19,7 +19,7 @@
 class SerializerErrorTest extends WebTestCase
 {
     /**
-     * @dataProvider testCaseProvider
+     * @dataProvider invalidFormJsonProvider
      */
     public function testSerializeExceptionJson($testCase)
     {
@@ -88,7 +88,7 @@ public function serializeExceptionXmlProvider()
     }
 
     /**
-     * @dataProvider testCaseProvider
+     * @dataProvider invalidFormJsonProvider
      */
     public function testSerializeInvalidFormJson($testCase)
     {
@@ -98,7 +98,7 @@ public function testSerializeInvalidFormJson($testCase)
         $this->assertEquals('{"code":400,"message":"Validation Failed","errors":{"children":{"name":{"errors":["This value should not be blank."]}}}}', $client->getResponse()->getContent());
     }
 
-    public function testCaseProvider()
+    public function invalidFormJsonProvider()
     {
         return [
             ['Serializer'],