[mapserver-commits] r10824 - in trunk/msautotest/query: . expected

[svn at osgeo.org]

Author: sdlime
Date: 2011-01-02 15:08:37 -0800 (Sun, 02 Jan 2011)
New Revision: 10824

Added:
   trunk/msautotest/query/expected/filters_test005.gif
   trunk/msautotest/query/expected/filters_test006.gif
Modified:
   trunk/msautotest/query/filters.map
Log:
Added a couple of very basic logical expression tests.

Added: trunk/msautotest/query/expected/filters_test005.gif
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/query/expected/filters_test005.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/query/expected/filters_test006.gif
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/query/expected/filters_test006.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/msautotest/query/filters.map
===================================================================
--- trunk/msautotest/query/filters.map	2011-01-02 23:00:16 UTC (rev 10823)
+++ trunk/msautotest/query/filters.map	2011-01-02 23:08:37 UTC (rev 10824)
@@ -7,6 +7,8 @@
 # RUN_PARMS: filters_test002.gif [SHP2IMG] -m [MAPFILE] -l filters_test002 -o [RESULT]
 # RUN_PARMS: filters_test003.gif [SHP2IMG] -m [MAPFILE] -l filters_test003 -o [RESULT]
 # RUN_PARMS: filters_test004.gif [SHP2IMG] -m [MAPFILE] -l filters_test004 -o [RESULT]
+# RUN_PARMS: filters_test005.gif [SHP2IMG] -m [MAPFILE] -l filters_test005 -o [RESULT]
+# RUN_PARMS: filters_test006.gif [SHP2IMG] -m [MAPFILE] -l filters_test006 -o [RESULT]
 #
 MAP
   NAME 'filters'
@@ -16,6 +18,7 @@
   SIZE 300 300
   IMAGETYPE GIF
 
+  # Simple string comparison
   LAYER
     NAME 'filters_test001'
     FILTER 'Aitkin'
@@ -23,6 +26,7 @@
     INCLUDE 'include/bdry_counpy2_shapefile.map'
   END
 
+  # Simple string comparison (case insensitive)
   LAYER
     NAME 'filters_test002'
     FILTER 'aitkin'i
@@ -30,6 +34,7 @@
     INCLUDE 'include/bdry_counpy2_shapefile.map'
   END
 
+  # Simple regex comparison
   LAYER
     NAME 'filters_test003'
     FILTER /^S/
@@ -37,6 +42,7 @@
     INCLUDE 'include/bdry_counpy2_shapefile.map'
   END
 
+  # Simple regex comparison (case insensitive)
   LAYER
     NAME 'filters_test004'
     FILTER /^s/i
@@ -44,7 +50,21 @@
     INCLUDE 'include/bdry_counpy2_shapefile.map'
   END
 
+  # Logical expression, string equality
   LAYER
+    NAME 'filters_test005'
+    FILTER ('[CTY_NAME]' = 'Itasca')
+    INCLUDE 'include/bdry_counpy2_shapefile.map'
+  END
+
+  # Logical expression, string equality (case insensitive)
+  LAYER
+    NAME 'filters_test006'
+    FILTER ('[CTY_NAME]' =* 'wadena')
+    INCLUDE 'include/bdry_counpy2_shapefile.map'
+  END
+
+  LAYER
     NAME 'bdry_counpy2'
     TYPE LINE
     DATA 'data/bdry_counpy2.shp'