[Tests] Streamline CompiledUrlGenerator tests

OskarStark · OskarStark · commit 35dec945c1f6 · 2023-11-07T12:02:21.000+01:00
diff --git a/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php b/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php
@@ -104,14 +104,16 @@ public function testDumpWithSimpleLocalizedRoutes()
 
     public function testDumpWithRouteNotFoundLocalizedRoutes()
     {
-        $this->expectException(RouteNotFoundException::class);
-        $this->expectExceptionMessage('Unable to generate a URL for the named route "test" as such route does not exist.');
         $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test')->setRequirement('_locale', 'en'));
 
         $code = $this->generatorDumper->dump();
         file_put_contents($this->testTmpFilepath, $code);
 
         $projectUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext('/app.php'), null, 'pl_PL');
+
+        $this->expectException(RouteNotFoundException::class);
+        $this->expectExceptionMessage('Unable to generate a URL for the named route "test" as such route does not exist.');
+
         $projectUrlGenerator->generate('test');
     }
 
@@ -163,22 +165,25 @@ public function testDumpWithTooManyRoutes()
 
     public function testDumpWithoutRoutes()
     {
-        $this->expectException(\InvalidArgumentException::class);
         file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump());
 
         $projectUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext('/app.php'));
 
+        $this->expectException(\InvalidArgumentException::class);
+
         $projectUrlGenerator->generate('Test', []);
     }
 
     public function testGenerateNonExistingRoute()
     {
-        $this->expectException(RouteNotFoundException::class);
         $this->routeCollection->add('Test', new Route('/test'));
 
         file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump());
 
         $projectUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext());
+
+        $this->expectException(RouteNotFoundException::class);
+
         $projectUrlGenerator->generate('NonExisting', []);
     }
 
@@ -267,21 +272,18 @@ public function testAliases()
 
     public function testTargetAliasNotExisting()
     {
-        $this->expectException(RouteNotFoundException::class);
-
         $this->routeCollection->addAlias('a', 'not-existing');
 
         file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump());
 
-        $compiledUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext());
+        $this->expectException(RouteNotFoundException::class);
 
+        $compiledUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext());
         $compiledUrlGenerator->generate('a');
     }
 
     public function testTargetAliasWithNamePrefixNotExisting()
     {
-        $this->expectException(RouteNotFoundException::class);
-
         $subCollection = new RouteCollection();
         $subCollection->addAlias('a', 'not-existing');
         $subCollection->addNamePrefix('sub_');
@@ -290,43 +292,44 @@ public function testTargetAliasWithNamePrefixNotExisting()
 
         file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump());
 
-        $compiledUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext());
+        $this->expectException(RouteNotFoundException::class);
 
+        $compiledUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext());
         $compiledUrlGenerator->generate('sub_a');
     }
 
     public function testCircularReferenceShouldThrowAnException()
     {
-        $this->expectException(RouteCircularReferenceException::class);
-        $this->expectExceptionMessage('Circular reference detected for route "b", path: "b -> a -> b".');
-
         $this->routeCollection->addAlias('a', 'b');
         $this->routeCollection->addAlias('b', 'a');
 
+        $this->expectException(RouteCircularReferenceException::class);
+        $this->expectExceptionMessage('Circular reference detected for route "b", path: "b -> a -> b".');
+
         $this->generatorDumper->dump();
     }
 
     public function testDeepCircularReferenceShouldThrowAnException()
     {
-        $this->expectException(RouteCircularReferenceException::class);
-        $this->expectExceptionMessage('Circular reference detected for route "b", path: "b -> c -> b".');
-
         $this->routeCollection->addAlias('a', 'b');
         $this->routeCollection->addAlias('b', 'c');
         $this->routeCollection->addAlias('c', 'b');
 
+        $this->expectException(RouteCircularReferenceException::class);
+        $this->expectExceptionMessage('Circular reference detected for route "b", path: "b -> c -> b".');
+
         $this->generatorDumper->dump();
     }
 
     public function testIndirectCircularReferenceShouldThrowAnException()
     {
-        $this->expectException(RouteCircularReferenceException::class);
-        $this->expectExceptionMessage('Circular reference detected for route "b", path: "b -> c -> a -> b".');
-
         $this->routeCollection->addAlias('a', 'b');
         $this->routeCollection->addAlias('b', 'c');
         $this->routeCollection->addAlias('c', 'a');
 
+        $this->expectException(RouteCircularReferenceException::class);
+        $this->expectExceptionMessage('Circular reference detected for route "b", path: "b -> c -> a -> b".');
+
         $this->generatorDumper->dump();
     }
 
