backport some test expectations to have a working build of jackalope-doctrine-dbal again

Author: dbu

tests/06_Query/QOM/ConvertQueriesBackAndForthTest.php

@@ -53,6 +53,7 @@ public function testBackAndForth()
         foreach ($this->qomQueries as $name => $originalQomQuery) {
             $originalSql2Query = $this->sql2Queries[$name];
             if (is_array($originalSql2Query)) {
+                $this->assertGreaterThan(0, count($originalSql2Query), 'empty list of queries');
                 $passed = false;
                 foreach ($originalSql2Query as $query) {
                     $qom = $this->sql2Parser->parse($query);
@@ -64,7 +65,7 @@ public function testBackAndForth()
                         }
                     }
                 }
-                $this->assertTrue($passed, "QOM-->SQL2->QOM: Original query variation = ".$query);
+                $this->assertTrue($passed, "QOM-->SQL2->QOM: Query variation $name resulted in SQL2 that is not found: $sql2");
             } else {
                 $qom = $this->sql2Parser->parse($originalSql2Query);
                 $this->assertEquals($originalQomQuery, $qom, "QOM-->SQL2: Original query = $originalSql2Query");

tests/06_Query/QOM/Sql2TestQueries.php

@@ -59,7 +59,7 @@ public static function getQueries()
 
         $queries['6.7.12.Constraint.Precedence.3'] = array(
             'SELECT * FROM [nt:file] AS file WHERE NOT file.prop1 = \'1\' OR file.prop2 = \'2\' AND NOT file.prop3 = \'3\'',
-            'SELECT * FROM [nt:file] AS file WHERE (NOT file.prop1 = \'1\' OR (file.prop2 = \'2\' AND NOT file.prop3 = \'3\'))',
+            'SELECT * FROM [nt:file] AS file WHERE ((NOT file.prop1 = \'1\') OR (file.prop2 = \'2\' AND (NOT file.prop3 = \'3\')))',
         );
 
         $queries['6.7.12.Constraint.Precedence.4'] = array(
@@ -76,8 +76,8 @@ public static function getQueries()
             'SELECT * FROM [nt:file] AS file WHERE
                 NOT file.prop1 IS NOT NULL AND NOT NOT file.prop2 IS NOT NULL
                 OR NOT file.prop3 = \'hello\' AND file.prop4 <> \'hello\'',
-
             'SELECT * FROM [nt:file] AS file WHERE ((NOT file.prop1 IS NOT NULL AND NOT NOT file.prop2 IS NOT NULL) OR (NOT file.prop3 = \'hello\' AND file.prop4 <> \'hello\'))',
+            'SELECT * FROM [nt:file] AS file WHERE (((NOT file.prop1 IS NOT NULL) AND (NOT (NOT file.prop2 IS NOT NULL))) OR ((NOT file.prop3 = \'hello\') AND file.prop4 <> \'hello\'))',
         );
 
         /**
@@ -99,7 +99,10 @@ public static function getQueries()
         /**
         * 6.7.15. NotConstraint
         */
-        $queries['6.7.15.Not'] = 'SELECT * FROM [nt:file] AS file WHERE NOT file.prop1 IS NOT NULL';
+        $queries['6.7.15.Not'] = array(
+            'SELECT * FROM [nt:file] AS file WHERE NOT file.prop1 IS NOT NULL',
+            'SELECT * FROM [nt:file] AS file WHERE (NOT file.prop1 IS NOT NULL)',
+        );
 
         /**
         * 6.7.16. Comparison