added tests for CALL

Author: transistive

src/Clauses/CallClause.php

@@ -14,37 +14,43 @@ class CallClause extends Clause
     /**
      * @var Query The query to call.
      */
-    private Query $query;
+    private Query $subQuery;
 
     /**
-     * @param Query $query The query to call.
+     * @param Query $subQuery The query to call.
      */
-    public function __construct(Query $query)
+    public function __construct(Query $subQuery)
     {
-        $this->query = $query;
-    }
-
-    public function toQuery(): string
-    {
-        return sprintf('CALL { %s }', $this->getSubject());
+        $this->subQuery = $subQuery;
     }
 
     /**
      * Returns the query that is being called.
      *
      * @return Query
      */
-    public function getQuery(): Query
+    public function getSubQuery(): Query
+    {
+        return $this->subQuery;
+    }
+
+    public function toQuery(): string
     {
-        return $this->query;
+        $subQuery = trim($this->subQuery->toQuery());
+
+        if ($subQuery === '') {
+            return '';
+        }
+
+        return sprintf('CALL { %s }', $subQuery);
     }
 
     /**
      * @inheritDoc
      */
     protected function getSubject(): string
     {
-        return $this->query->toQuery();
+        return '{ ' . $this->subQuery->toQuery() . ' }';
     }
 
     /**

tests/Unit/Clauses/CallClauseTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace WikibaseSolutions\CypherDSL\Tests\Unit\Clauses;
+
+use PHPUnit\Framework\TestCase;
+use WikibaseSolutions\CypherDSL\Clauses\CallClause;
+use WikibaseSolutions\CypherDSL\Query;
+
+class CallClauseTest extends TestCase
+{
+    public function testCallClauseEmpty(): void
+    {
+        $query = Query::new();
+
+        $clause = new CallClause($query);
+
+        $this->assertEquals('', $clause->toQuery());
+        $this->assertEquals(Query::new(), $clause->getSubQuery());
+    }
+
+    public function testCallClauseFilled(): void
+    {
+        $query = Query::new()->match(Query::node('X')->named('x'))->returning(Query::rawExpression('*'));
+
+        $clause = new CallClause($query);
+
+        $this->assertEquals('CALL { MATCH (x:X) RETURN * }', $clause->toQuery());
+        $this->assertEquals($query, $clause->getSubQuery());
+    }
+}