Added more tests to test more edgecases

Author: Willem-Jan Zijderveld

fixtures/06_Query/characters.xml

@@ -47,9 +47,17 @@
                     <sv:value>PHPCR\Query\QueryInterface</sv:value>
                 </sv:property>
 
+                <sv:property sv:name="doublebackslash" sv:type="String">
+                    <sv:value>PHPCR\\Query\\QueryInterface</sv:value>
+                </sv:property>
+
                 <sv:property sv:name="quotes" sv:type="String">
                     <sv:value>"'</sv:value>
                 </sv:property>
+
+                <sv:property sv:name="quoteandbackslash" sv:type="String">
+                    <sv:value>"\'</sv:value>
+                </sv:property>
             </sv:node>
         </sv:node>
     </sv:node>

tests/06_Query/CharacterTest.php

@@ -36,6 +36,27 @@ public function testPropertyWithBackslash()
         $this->assertEquals('PHPCR\Query\QueryInterface', $rows->current()->getValue('class'));
     }
 
+    /**
+     * Using /tests_general_base/propertyCharacterComparison/jcr:content
+     */
+    public function testPropertyWithDoubleBackslash()
+    {
+        /** @var QueryManager $queryManager */
+        $queryManager = $this->sharedFixture['qm'];
+        $query = $queryManager->createQuery('
+            SELECT data.doublebackslash
+            FROM [nt:unstructured] AS data
+            WHERE data.doublebackslash = "PHPCR\\\\Query\\\\QueryInterface"',
+            QueryInterface::JCR_SQL2
+        );
+
+        $result = $query->execute();
+
+        $rows = $result->getRows();
+        $this->assertCount(1, $rows);
+        $this->assertEquals('PHPCR\\\\Query\\\\QueryInterface', $rows->current()->getValue('doublebackslash'));
+    }
+
     /**
      * Using /tests_general_base/propertyCharacterComparison/jcr:content
      */
@@ -46,7 +67,7 @@ public function testPropertyWithQuotes()
         $query = $queryManager->createQuery('
             SELECT data.quotes
             FROM [nt:unstructured] AS data
-            WHERE data.quotes = "\\"\'"
+            WHERE data.quotes = "\"\'"
             ',
             QueryInterface::JCR_SQL2
         );
@@ -57,4 +78,26 @@ public function testPropertyWithQuotes()
         $this->assertCount(1, $rows);
         $this->assertEquals('"\'', $rows->current()->getValue('quotes'));
     }
+
+    /**
+     * Using /tests_general_base/propertyCharacterComparison/jcr:content
+     */
+    public function testPropertyWithQuotesAndBackslash()
+    {
+        /** @var QueryManager $queryManager */
+        $queryManager = $this->sharedFixture['qm'];
+        $query = $queryManager->createQuery('
+            SELECT data.quoteandbackslash
+            FROM [nt:unstructured] AS data
+            WHERE data.quotes = "\\"\\\'"
+            ',
+            QueryInterface::JCR_SQL2
+        );
+
+        $result = $query->execute();
+
+        $rows = $result->getRows();
+        $this->assertCount(1, $rows);
+        $this->assertEquals('"\\\'', $rows->current()->getValue('quoteandbackslash'));
+    }
 }