minor #57947 [ExpressionLanguage] Improve test coverage (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit bae6fa5cf44d · 2024-08-12T11:26:29.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [ExpressionLanguage] Improve test coverage | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Commits ------- 1c6f020 [ExpressionLanguage] Improve test coverage
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -287,4 +287,11 @@ function (ExpressionLanguage $el) {
             ],
         ];
     }
+
+    public function testParseAlreadyParsedExpressionReturnsSameObject()
+    {
+        $el = new ExpressionLanguage();
+        $parsed = $el->parse('1 + 1', []);
+        $this->assertSame($parsed, $el->parse($parsed, []));
+    }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
@@ -207,4 +207,24 @@ public function testCompileMatchesWithInvalidRegexpAsExpression()
         $node->compile($compiler);
         eval('$regexp = "this is not a regexp"; '.$compiler->getSource().';');
     }
+
+    public function testDivisionByZero()
+    {
+        $node = new BinaryNode('/', new ConstantNode(1), new ConstantNode(0));
+
+        $this->expectException(\DivisionByZeroError::class);
+        $this->expectExceptionMessage('Division by zero.');
+
+        $node->evaluate([], []);
+    }
+
+    public function testModuloByZero()
+    {
+        $node = new BinaryNode('%', new ConstantNode(1), new ConstantNode(0));
+
+        $this->expectException(\DivisionByZeroError::class);
+        $this->expectExceptionMessage('Modulo by zero.');
+
+        $node->evaluate([], []);
+    }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/NodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/NodeTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\ExpressionLanguage\Compiler;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 use Symfony\Component\ExpressionLanguage\Node\Node;
 
@@ -38,4 +39,33 @@ public function testSerialization()
 
         $this->assertEquals($node, $unserializedNode);
     }
+
+    public function testCompileActuallyCompilesAllNodes()
+    {
+        $nodes = [];
+        foreach (range(1, 10) as $ignored) {
+            $node = $this->createMock(Node::class);
+            $node->expects($this->once())->method('compile');
+
+            $nodes[] = $node;
+        }
+
+        $node = new Node($nodes);
+        $node->compile($this->createMock(Compiler::class));
+    }
+
+    public function testEvaluateActuallyEvaluatesAllNodes()
+    {
+        $nodes = [];
+        foreach (range(1, 3) as $i) {
+            $node = $this->createMock(Node::class);
+            $node->expects($this->once())->method('evaluate')
+                ->willReturn($i);
+
+            $nodes[] = $node;
+        }
+
+        $node = new Node($nodes);
+        $this->assertSame([1, 2, 3], $node->evaluate([], []));
+    }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
@@ -37,6 +37,17 @@ public function testParseWithZeroInNames()
         $parser->parse($lexer->tokenize('foo'), [0]);
     }
 
+    public function testParsePrimaryExpressionWithUnknownFunctionThrows()
+    {
+        $parser = new Parser([]);
+        $stream = (new Lexer())->tokenize('foo()');
+
+        $this->expectException(SyntaxError::class);
+        $this->expectExceptionMessage('The function "foo" does not exist around position 1 for expression `foo()`.');
+
+        $parser->parse($stream);
+    }
+
     /**
      * @dataProvider getParseData
      */

Original file line number	Diff line number	Diff line change
`@@ -287,4 +287,11 @@ function (ExpressionLanguage $el) {`
`287`	`287`	`],`
`288`	`288`	`];`
`289`	`289`	`}`
	`290`	`+`
	`291`	`+ public function testParseAlreadyParsedExpressionReturnsSameObject()`
	`292`	`+ {`
	`293`	`+ $el = new ExpressionLanguage();`
	`294`	`+ $parsed = $el->parse('1 + 1', []);`
	`295`	`+ $this->assertSame($parsed, $el->parse($parsed, []));`
	`296`	`+ }`
`290`	`297`	`}`