[mapserver-commits] r10076 - trunk/msautotest/mspython

[svn at osgeo.org]

Author: warmerdam
Date: 2010-04-07 17:24:59 -0400 (Wed, 07 Apr 2010)
New Revision: 10076

Modified:
   trunk/msautotest/mspython/rqtest.py
Log:
update for classified raster query fix (#1021)

Modified: trunk/msautotest/mspython/rqtest.py
===================================================================
--- trunk/msautotest/mspython/rqtest.py	2010-04-07 21:21:27 UTC (rev 10075)
+++ trunk/msautotest/mspython/rqtest.py	2010-04-07 21:24:59 UTC (rev 10076)
@@ -560,17 +560,12 @@
     pmstestlib.layer.queryByPoint( pmstestlib.map, pnt, mapscript.MS_SINGLE,
                                    10.0 )
 
-    dumpResultSet( pmstestlib.layer )
-
     return 'success'
 
 ###############################################################################
 # Scan results.  This query is for a pixel at a grid intersection.  This
-# pixel should be classified as grid and returned, but currently it is
-# misclassified as transparent and discarded.  The reasons are described in:
-# http://mapserver.gis.umn.edu/bugs/show_bug.cgi?id=1021
+# pixel should be classified as grid and returned.
 #
-# Till this is fixed, we consider returning zero shapes an acceptable result.
 
 def rqtest_13():
     layer = pmstestlib.layer
@@ -586,11 +581,24 @@
     
         count = count + 1
 
-    if count != 0:
+    if count != 1:
         pmstestlib.post_reason( 'got %d results instead of expected %d.' \
-                             % (count, 0) )
+                             % (count, 1) )
         return 'fail'
 
+    result = layer.getResult( 0 )
+    s = layer.getFeature( result.shapeindex, result.tileindex )
+    
+    if pmstestlib.check_items( layer, s,
+                               [('value_0','1'),
+                                ('red','255'),
+                                ('green','0'),
+                                ('blue','0'),
+                                ('class','Grid'),
+                                ('x','13.5'),
+                                ('y','36.5')] ) == 0:
+        return 'fail'
+    
     layer.close() 
     layer.close() # discard resultset.