minor #22380 fix risky tests (xabbuh)

fabpot · fabpot · commit 8d34959fe9f7 · 2017-04-11T09:38:31.000-07:00
This PR was merged into the 3.2 branch. Discussion ---------- fix risky tests | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 9125911 fix risky tests
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
@@ -55,7 +55,7 @@ public function testTypeConversionsWithNativePhp($key, $value, $supported)
         }
 
         if (!$supported) {
-            return;
+            $this->markTestSkipped(sprintf('Converting the value "%s" to "%s" is not supported by the IniFileLoader.', $key, $value));
         }
 
         $this->loader->load('types.ini');
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -593,7 +593,10 @@ public function testChownLink()
 
         $this->filesystem->hardlink($file, $link);
 
-        $this->filesystem->chown($link, $this->getFileOwner($link));
+        $owner = $this->getFileOwner($link);
+        $this->filesystem->chown($link, $owner);
+
+        $this->assertSame($owner, $this->getFileOwner($link));
     }
 
     /**
@@ -699,7 +702,10 @@ public function testChgrpLink()
 
         $this->filesystem->hardlink($file, $link);
 
-        $this->filesystem->chgrp($link, $this->getFileGroup($link));
+        $group = $this->getFileGroup($link);
+        $this->filesystem->chgrp($link, $group);
+
+        $this->assertSame($group, $this->getFileGroup($link));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Form\Extension\Core\Type\DateIntervalType;
 use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\FormInterface;
 
 class DateIntervalTypeTest extends BaseTypeTest
 {
@@ -195,7 +196,7 @@ public function testInitializeWithDateInterval()
     {
         // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
-        $this->factory->create(static::TESTED_TYPE, new \DateInterval('P0Y'));
+        $this->assertInstanceOf(FormInterface::class, $this->factory->create(static::TESTED_TYPE, new \DateInterval('P0Y')));
     }
 
     public function testPassDefaultPlaceholderToViewIfNotRequired()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -295,7 +295,7 @@ public function testDuplicateWithFormat()
     }
 
     /**
-     * @dataProvider getFormatToMimeTypeMapProvider
+     * @dataProvider getFormatToMimeTypeMapProviderWithAdditionalNullFormat
      */
     public function testGetFormatFromMimeType($format, $mimeTypes)
     {
@@ -313,6 +313,14 @@ public function testGetFormatFromMimeType($format, $mimeTypes)
         }
     }
 
+    public function getFormatToMimeTypeMapProviderWithAdditionalNullFormat()
+    {
+        return array_merge(
+            array(array(null, array(null, 'unexistent-mime-type'))),
+            $this->getFormatToMimeTypeMapProvider()
+        );
+    }
+
     public function testGetFormatFromMimeTypeWithParameters()
     {
         $request = new Request();
@@ -324,20 +332,16 @@ public function testGetFormatFromMimeTypeWithParameters()
      */
     public function testGetMimeTypeFromFormat($format, $mimeTypes)
     {
-        if (null !== $format) {
-            $request = new Request();
-            $this->assertEquals($mimeTypes[0], $request->getMimeType($format));
-        }
+        $request = new Request();
+        $this->assertEquals($mimeTypes[0], $request->getMimeType($format));
     }
 
     /**
      * @dataProvider getFormatToMimeTypeMapProvider
      */
     public function testGetMimeTypesFromFormat($format, $mimeTypes)
     {
-        if (null !== $format) {
-            $this->assertEquals($mimeTypes, Request::getMimeTypes($format));
-        }
+        $this->assertEquals($mimeTypes, Request::getMimeTypes($format));
     }
 
     public function testGetMimeTypesFromInexistentFormat()
@@ -357,7 +361,6 @@ public function testGetFormatWithCustomMimeType()
     public function getFormatToMimeTypeMapProvider()
     {
         return array(
-            array(null, array(null, 'unexistent-mime-type')),
             array('txt', array('text/plain')),
             array('js', array('application/javascript', 'application/x-javascript', 'text/javascript')),
             array('css', array('text/css')),
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -849,6 +849,10 @@ public function testNoDeprecationsAreTriggered()
     {
         new DefaultResponse();
         $this->getMockBuilder(Response::class)->getMock();
+
+        // we just need to ensure that subclasses of Response can be created without any deprecations
+        // being triggered if the subclass does not override any final methods
+        $this->addToAssertionCount(1);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -36,7 +36,8 @@ public function testInstantiateObjectDenormalizer()
         $context = array();
 
         $normalizer = new AbstractObjectNormalizerDummy();
-        $normalizer->instantiateObject($data, $class, $context, new \ReflectionClass($class), array());
+
+        $this->assertInstanceOf(__NAMESPACE__.'\Dummy', $normalizer->instantiateObject($data, $class, $context, new \ReflectionClass($class), array()));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function testTypeConversionsWithNativePhp($key, $value, $supported)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if (!$supported) {`
`58`		`- return;`
	`58`	`+ $this->markTestSkipped(sprintf('Converting the value "%s" to "%s" is not supported by the IniFileLoader.', $key, $value));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`$this->loader->load('types.ini');`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Form\Extension\Core\Type\DateIntervalType;`
`15`	`15`	`use Symfony\Component\Form\FormError;`
	`16`	`+use Symfony\Component\Form\FormInterface;`
`16`	`17`
`17`	`18`	`class DateIntervalTypeTest extends BaseTypeTest`
`18`	`19`	`{`
`@@ -195,7 +196,7 @@ public function testInitializeWithDateInterval()`
`195`	`196`	`{`
`196`	`197`	`// Throws an exception if "data_class" option is not explicitly set`
`197`	`198`	`// to null in the type`
`198`		`- $this->factory->create(static::TESTED_TYPE, new \DateInterval('P0Y'));`
	`199`	`+ $this->assertInstanceOf(FormInterface::class, $this->factory->create(static::TESTED_TYPE, new \DateInterval('P0Y')));`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	`public function testPassDefaultPlaceholderToViewIfNotRequired()`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public function testDuplicateWithFormat()`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`/**`
`298`		`- * @dataProvider getFormatToMimeTypeMapProvider`
	`298`	`+ * @dataProvider getFormatToMimeTypeMapProviderWithAdditionalNullFormat`
`299`	`299`	`*/`
`300`	`300`	`public function testGetFormatFromMimeType($format, $mimeTypes)`
`301`	`301`	`{`
`@@ -313,6 +313,14 @@ public function testGetFormatFromMimeType($format, $mimeTypes)`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`
	`316`	`+ public function getFormatToMimeTypeMapProviderWithAdditionalNullFormat()`
	`317`	`+ {`
	`318`	`+ return array_merge(`
	`319`	`+ array(array(null, array(null, 'unexistent-mime-type'))),`
	`320`	`+ $this->getFormatToMimeTypeMapProvider()`
	`321`	`+ );`
	`322`	`+ }`
	`323`	`+`
`316`	`324`	`public function testGetFormatFromMimeTypeWithParameters()`
`317`	`325`	`{`
`318`	`326`	`$request = new Request();`
`@@ -324,20 +332,16 @@ public function testGetFormatFromMimeTypeWithParameters()`
`324`	`332`	`*/`
`325`	`333`	`public function testGetMimeTypeFromFormat($format, $mimeTypes)`
`326`	`334`	`{`
`327`		`- if (null !== $format) {`
`328`		`- $request = new Request();`
`329`		`- $this->assertEquals($mimeTypes[0], $request->getMimeType($format));`
`330`		`- }`
	`335`	`+ $request = new Request();`
	`336`	`+ $this->assertEquals($mimeTypes[0], $request->getMimeType($format));`
`331`	`337`	`}`
`332`	`338`
`333`	`339`	`/**`
`334`	`340`	`* @dataProvider getFormatToMimeTypeMapProvider`
`335`	`341`	`*/`
`336`	`342`	`public function testGetMimeTypesFromFormat($format, $mimeTypes)`
`337`	`343`	`{`
`338`		`- if (null !== $format) {`
`339`		`- $this->assertEquals($mimeTypes, Request::getMimeTypes($format));`
`340`		`- }`
	`344`	`+ $this->assertEquals($mimeTypes, Request::getMimeTypes($format));`
`341`	`345`	`}`
`342`	`346`
`343`	`347`	`public function testGetMimeTypesFromInexistentFormat()`
`@@ -357,7 +361,6 @@ public function testGetFormatWithCustomMimeType()`
`357`	`361`	`public function getFormatToMimeTypeMapProvider()`
`358`	`362`	`{`
`359`	`363`	`return array(`
`360`		`- array(null, array(null, 'unexistent-mime-type')),`
`361`	`364`	`array('txt', array('text/plain')),`
`362`	`365`	`array('js', array('application/javascript', 'application/x-javascript', 'text/javascript')),`
`363`	`366`	`array('css', array('text/css')),`
Original file line number	Diff line number	Diff line change
`@@ -849,6 +849,10 @@ public function testNoDeprecationsAreTriggered()`
`849`	`849`	`{`
`850`	`850`	`new DefaultResponse();`
`851`	`851`	`$this->getMockBuilder(Response::class)->getMock();`
	`852`	`+`
	`853`	`+ // we just need to ensure that subclasses of Response can be created without any deprecations`
	`854`	`+ // being triggered if the subclass does not override any final methods`
	`855`	`+ $this->addToAssertionCount(1);`
`852`	`856`	`}`
`853`	`857`
`854`	`858`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ public function testInstantiateObjectDenormalizer()`
`36`	`36`	`$context = array();`
`37`	`37`
`38`	`38`	`$normalizer = new AbstractObjectNormalizerDummy();`
`39`		`- $normalizer->instantiateObject($data, $class, $context, new \ReflectionClass($class), array());`
	`39`	`+`
	`40`	`+ $this->assertInstanceOf(__NAMESPACE__.'\Dummy', $normalizer->instantiateObject($data, $class, $context, new \ReflectionClass($class), array()));`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`