[Tests] Streamline CompiledUrlGenerator tests
#52481
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
OskarStark
commented
Nov 7, 2023
|
|
||
| $compiledUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext()); | ||
| $compiledUrlGenerator->generate('a'); | ||
| } | ||
|
|
||
| public function testTargetAliasWithNamePrefixNotExisting() |
There was a problem hiding this comment.
after investigating why testTargetAliasWithNamePrefixNotExisting are now failing I found out, that both, CompiledUrlGeneratorDUMPER and CompiledUrlGenerator throw a RouteNotFoundException. We are testing $compiledUrlGenerator->generate('sub_a) here, but the exception is already thrown in file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump()); when generating the dump to prepare a file.
So now after moving the expectedException method call down, I can say, that we are actually not testing the behavior of CompiledUrlGenerator in this test 🤷♂️
Same applies to testTargetAliasNotExisting
CompiledUrlGenerator tests
35dec94 to
9aaf1f0
Compare
|
What about: diff --git a/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php b/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php
index 8603ab6d98..572f524a05 100644
--- a/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php
+++ b/src/Symfony/Component/Routing/Tests/Generator/Dumper/CompiledUrlGeneratorDumperTest.php
@@ -267,66 +272,72 @@ class CompiledUrlGeneratorDumperTest extends TestCase
public function testTargetAliasNotExisting()
{
- $this->expectException(RouteNotFoundException::class);
-
- $this->routeCollection->addAlias('a', 'not-existing');
+ $this->routeCollection->add('not-existing', new Route('/not-existing'));
+ $this->routeCollection->addAlias('alias', 'not-existing');
file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump());
- $compiledUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext());
+ $compiledRoutes = require $this->testTmpFilepath;
+ unset($compiledRoutes['alias']);
+ $this->expectException(RouteNotFoundException::class);
+
+ $compiledUrlGenerator = new CompiledUrlGenerator($compiledRoutes, new RequestContext());
$compiledUrlGenerator->generate('a');
}
public function testTargetAliasWithNamePrefixNotExisting()
{
- $this->expectException(RouteNotFoundException::class);
-
$subCollection = new RouteCollection();
- $subCollection->addAlias('a', 'not-existing');
+ $subCollection->add('not-existing', new Route('/not-existing'));
+ $subCollection->addAlias('alias', 'not-existing');
$subCollection->addNamePrefix('sub_');
$this->routeCollection->addCollection($subCollection);
file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump());
- $compiledUrlGenerator = new CompiledUrlGenerator(require $this->testTmpFilepath, new RequestContext());
+ $compiledRoutes = require $this->testTmpFilepath;
+ unset($compiledRoutes['sub_alias']);
- $compiledUrlGenerator->generate('sub_a');
+ $this->expectException(RouteNotFoundException::class);
+
+ $compiledUrlGenerator = new CompiledUrlGenerator($compiledRoutes, new RequestContext());
+ $compiledUrlGenerator->generate('sub_alias');
}We generate the file with the existing route then we remove it from compiled ones. This way, we ensure that we test the exception coming from route generation. Works on my computer 😄 |
|
Thanks, lets see |
|
Seems to do the job! |
cdc20fb to
a778254
Compare
|
@nicolas-grekas I think this should be merged into |
|
Works for me, please rebase. |
a778254 to
807d70e
Compare
|
Rebased ✅ |
fabpot
approved these changes
Dec 29, 2023
|
Thank you @OskarStark. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
weird, it looks like the expected exception is thrown in $this->generatorDumper->dump() 🤔 So the following code with the CompiledUrlGenerator is not needed, so maybe the test is not needed anymore or the test must be adjusted somehow to test the behavior of CompiledUrlgenerator....