minor #12017 [Validator] Fixed StaticMethodLoaderTest to actually test something (webmozart)

fabpot · fabpot · commit d671406ae57d · 2014-09-25T09:03:01.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Validator] Fixed StaticMethodLoaderTest to actually test something | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This test is not testing anything, except for whether PHP throws a strict standards error when invalid code is loaded. I disabled error reporting for this test, so that the actual functionality (ignoring static+abstract functions) is tested. Commits ------- 1b1303a [Validator] Fixed StaticMethodLoaderTest to actually test something
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AbstractStaticMethodLoader.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/AbstractStaticMethodLoader.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
-abstract class AbstractMethodStaticLoader
+abstract class AbstractStaticMethodLoader
 {
     abstract public static function loadMetadata(ClassMetadata $metadata);
 }
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php
@@ -90,22 +90,19 @@ public function testLoadClassMetadataInAbstractClasses()
 
     public function testLoadClassMetadataIgnoresAbstractMethods()
     {
-        error_reporting(E_ALL | E_STRICT);
+        // Disable error reporting, as AbstractStaticMethodLoader produces a
+        // strict standards error
+        error_reporting(0);
 
-        $loader = new StaticMethodLoader('loadMetadata');
-        $caught = false;
-        try {
-            include __DIR__.'/AbstractMethodStaticLoader.php';
-        } catch (\Exception $e) {
-            // catching the PHP notice that is converted to an exception by PHPUnit
-            $caught = true;
+        if (0 !== error_reporting()) {
+            $this->markTestSkipped('Could not disable error reporting');
         }
 
-        if (!$caught) {
-            $this->fail('AbstractMethodStaticLoader should produce a strict standard error.');
-        }
+        include __DIR__.'/AbstractStaticMethodLoader.php';
 
-        $metadata = new ClassMetadata(__NAMESPACE__.'\AbstractMethodStaticLoader');
+        $metadata = new ClassMetadata(__NAMESPACE__.'\AbstractStaticMethodLoader');
+
+        $loader = new StaticMethodLoader('loadMetadata');
         $loader->loadClassMetadata($metadata);
 
         $this->assertCount(0, $metadata->getConstraints());

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Symfony\Component\Validator\Mapping\ClassMetadata;`
`6`	`6`
`7`		`-abstract class AbstractMethodStaticLoader`
	`7`	`+abstract class AbstractStaticMethodLoader`
`8`	`8`	`{`
`9`	`9`	`abstract public static function loadMetadata(ClassMetadata $metadata);`
`10`	`10`	`}`