svn commit: r1908846 - in /db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria: CriteriaTest.java CriterionTest.java

Author: gk
Date: Fri Mar 31 09:36:08 2023
New Revision: 1908846

URL: http://svn.apache.org/viewvc?rev=1908846&view=rev
Log:
- TORQUE-363. Adding Criterion isNull test

Modified:
    db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
    db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java

Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java?rev=1908846&r1=1908845&r2=1908846&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java (original)
+++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java Fri Mar 31 09:36:08 2023
@@ -180,6 +180,28 @@ public class CriteriaTest extends BaseTe
 
         // execute
         c.where(column, operator);
+        
+        assertTrue(
+                c.toString().contains( "FROM myTable WHERE myTable.myColumn IS NOT NULL" ));
+
+        // Verify that what we get out is what we put in
+        assertEquals(column, c.getTopLevelCriterion().getLValue());
+        assertEquals(null, c.getTopLevelCriterion().getRValue());
+        assertEquals(operator, c.getTopLevelCriterion().getComparison());
+    }
+    
+    @Test
+    public void testIsNullOperator()
+    {
+        // prepare
+        final Column column = new ColumnImpl("myTable", "myColumn");
+        final SqlEnum operator = Criteria.ISNULL;
+
+        // execute
+        c.where(column, operator);
+        
+        assertTrue(
+                c.toString().contains( "FROM myTable WHERE myTable.myColumn IS NULL" ));
 
         // Verify that what we get out is what we put in
         assertEquals(column, c.getTopLevelCriterion().getLValue());

Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java?rev=1908846&r1=1908845&r2=1908846&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java (original)
+++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java Fri Mar 31 09:36:08 2023
@@ -84,6 +84,26 @@ public class CriterionTest extends BaseT
     }
 
     /**
+     * Tests that a criterion is null
+     * checks TORQUE-363.
+     */
+    @Test
+    public void testIsNullInCriterion()
+    {
+        
+        Criterion criterion1 = new Criterion(
+                new ColumnImpl("myTable", "myColumn"), null, Criteria.ISNULL);
+        assertEquals("myTable.myColumn IS NULL",
+                criterion1.toString());
+
+        // fails and sets "="
+//        Criterion criterion2 = new Criterion(
+//                new ColumnImpl("myTable", "myColumn"), Criteria.ISNULL);
+//        assertEquals("myTable.myColumn IS NULL",
+//                criterion2.toString());
+    }
+
+    /**
      * Tests that a criterion is copied when being anded to a top level
      * criterion.
      * checks TORQUE-243.