Duplicate logic for test

pierredup · pierredup · commit 0fa35ae07d74 · 2015-09-23T09:14:01.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -101,8 +101,13 @@ public function testGetControllerInvokableService()
      */
     public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
     {
+        // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excetion and not use the regex
+        $resolver = $this->createControllerResolver();
         $this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);
-        parent::testGetControllerOnNonUndefinedFunction($controller, $exceptionName, $exceptionMessage);
+
+        $request = Request::create('/');
+        $request->attributes->set('_controller', $controller);
+        $resolver->getController($request);
     }
 
     public function getUndefinedControllers()

Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,13 @@ public function testGetControllerInvokableService()`
`101`	`101`	`*/`
`102`	`102`	`public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)`
`103`	`103`	`{`
	`104`	`+ // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excetion and not use the regex`
	`105`	`+ $resolver = $this->createControllerResolver();`
`104`	`106`	`$this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);`
`105`		`- parent::testGetControllerOnNonUndefinedFunction($controller, $exceptionName, $exceptionMessage);`
	`107`	`+`
	`108`	`+ $request = Request::create('/');`
	`109`	`+ $request->attributes->set('_controller', $controller);`
	`110`	`+ $resolver->getController($request);`
`106`	`111`	`}`
`107`	`112`
`108`	`113`	`public function getUndefinedControllers()`