add tests about QOM with spaces in paths

Author: dbu

tests/06_Query/QOM/QomToSql2ConverterTest.php

@@ -86,10 +86,20 @@ public function testSameNodeJoin()
         $condition = new QOM\SameNodeJoinCondition('sel1', 'sel2');
         $this->assertQuery($this->queries['6.7.9.SameNodeJoinCondition.Simple'], $this->factory->join($left, $right, Constants::JCR_JOIN_TYPE_INNER, $condition));
 
-        //TODO: should path be surronded by quotes?
         $condition = new QOM\SameNodeJoinCondition('sel1', 'sel2', '/home');
         $this->assertQuery($this->queries['6.7.9.SameNodeJoinCondition.Path'], $this->factory->join($left, $right, Constants::JCR_JOIN_TYPE_INNER, $condition));
+    }
+
+    /**
+     * 6.7.9. SameNodeJoinCondition with space in path
+     */
+    public function testSameNodeJoinSpace()
+    {
+        $left = $this->factory->selector('nt:file');
+        $right = $this->factory->selector('nt:folder');
 
+        $condition = new QOM\SameNodeJoinCondition('sel1', 'sel2', '/home node');
+        $this->assertQuery($this->queries['6.7.9.SameNodeJoinCondition.Path_Space'], $this->factory->join($left, $right, Constants::JCR_JOIN_TYPE_INNER, $condition));
     }
 
     /**
@@ -188,6 +198,16 @@ public function testSameNode()
         $this->assertQuery($this->queries['6.7.20.SameNode.Selector'], $selector, array(), $this->factory->sameNode('/home', 'sel1'), array());
     }
 
+    /**
+     * 6.7.20. SameNode with space in path
+     */
+    public function testSameNodeSpace()
+    {
+        $selector = $this->factory->selector('nt:file');
+        $this->assertQuery($this->queries['6.7.20.SameNode.Simple_Space'], $selector, array(), $this->factory->sameNode('/home node'), array());
+        $this->assertQuery($this->queries['6.7.20.SameNode.Selector_Space'], $selector, array(), $this->factory->sameNode('/home node', 'sel1'), array());
+    }
+
     /**
      * 6.7.21. ChildNode
      */
@@ -198,6 +218,16 @@ public function testChildNode()
         $this->assertQuery($this->queries['6.7.21.ChildNode.Selector'], $selector, array(), $this->factory->childNode('/home', 'sel1'), array());
     }
 
+    /**
+     * 6.7.21. ChildNode with space in path
+     */
+    public function testChildNodeSpace()
+    {
+        $selector = $this->factory->selector('nt:file');
+        $this->assertQuery($this->queries['6.7.21.ChildNode.Simple_Space'], $selector, array(), $this->factory->childNode('/home node'), array());
+        $this->assertQuery($this->queries['6.7.21.ChildNode.Selector_Space'], $selector, array(), $this->factory->childNode('/home node', 'sel1'), array());
+    }
+
     /**
      * 6.7.22. DescendantNode
      */
@@ -208,6 +238,16 @@ public function testDescendantNode()
         $this->assertQuery($this->queries['6.7.22.DescendantNode.Selector'], $selector, array(), $this->factory->descendantNode('/home', 'sel1'), array());
     }
 
+    /**
+     * 6.7.22. DescendantNode with space in path
+     */
+    public function testDescendantNodeSpace()
+    {
+        $selector = $this->factory->selector('nt:file');
+        $this->assertQuery($this->queries['6.7.22.DescendantNode.Simple_Space'], $selector, array(), $this->factory->descendantNode('/home node'), array());
+        $this->assertQuery($this->queries['6.7.22.DescendantNode.Selector_Space'], $selector, array(), $this->factory->descendantNode('/home node', 'sel1'), array());
+    }
+
     /**
      * 6.7.23. Path
      */

tests/06_Query/QOM/Sql2TestQueries.php

@@ -31,6 +31,7 @@ public static function getQueries() {
         */
         $queries['6.7.9.SameNodeJoinCondition.Simple'] = 'SELECT * FROM [nt:file] INNER JOIN [nt:folder] ON ISSAMENODE(sel1, sel2)';
         $queries['6.7.9.SameNodeJoinCondition.Path'] = 'SELECT * FROM [nt:file] INNER JOIN [nt:folder] ON ISSAMENODE(sel1, sel2, [/home])';
+        $queries['6.7.9.SameNodeJoinCondition.Path_Space'] = 'SELECT * FROM [nt:file] INNER JOIN [nt:folder] ON ISSAMENODE(sel1, sel2, ["/home node"])';
 
         /**
         * 6.7.10 ChildNodeJoinCondition
@@ -77,18 +78,24 @@ public static function getQueries() {
         */
         $queries['6.7.20.SameNode.Simple'] = 'SELECT * FROM [nt:file] WHERE ISSAMENODE([/home])';
         $queries['6.7.20.SameNode.Selector'] = 'SELECT * FROM [nt:file] WHERE ISSAMENODE(sel1, [/home])';
+        $queries['6.7.20.SameNode.Simple_Space'] = 'SELECT * FROM [nt:file] WHERE ISSAMENODE(["/home node"])';
+        $queries['6.7.20.SameNode.Selector_Space'] = 'SELECT * FROM [nt:file] WHERE ISSAMENODE(sel1, ["/home node"])';
 
         /**
         * 6.7.21. ChildNode
         */
         $queries['6.7.21.ChildNode.Simple'] = 'SELECT * FROM [nt:file] WHERE ISCHILDNODE([/home])';
         $queries['6.7.21.ChildNode.Selector'] = 'SELECT * FROM [nt:file] WHERE ISCHILDNODE(sel1, [/home])';
+        $queries['6.7.21.ChildNode.Simple_Space'] = 'SELECT * FROM [nt:file] WHERE ISCHILDNODE(["/home node"])';
+        $queries['6.7.21.ChildNode.Selector_Space'] = 'SELECT * FROM [nt:file] WHERE ISCHILDNODE(sel1, ["/home node"])';
 
         /**
         * 6.7.22. DescendantNode
         */
         $queries['6.7.22.DescendantNode.Simple'] = 'SELECT * FROM [nt:file] WHERE ISDESCENDANTNODE([/home])';
         $queries['6.7.22.DescendantNode.Selector'] = 'SELECT * FROM [nt:file] WHERE ISDESCENDANTNODE(sel1, [/home])';
+        $queries['6.7.22.DescendantNode.Simple_Space'] = 'SELECT * FROM [nt:file] WHERE ISDESCENDANTNODE(["/home node"])';
+        $queries['6.7.22.DescendantNode.Selector_Space'] = 'SELECT * FROM [nt:file] WHERE ISDESCENDANTNODE(sel1, ["/home node"])';
 
         /**
         * 6.7.27. ProperyValue