Changeset 14396

Timestamp:

05/08/08 12:27:19 (2 months ago)

Author:

rouault

Message:

Improve SQLite test coverage (blob columns, GetFeatureCount?)

Files:

• trunk/autotest/ogr/ogr_sqlite.py (modified) (8 diffs)

trunk/autotest/ogr/ogr_sqlite.py

@@ -122 +122 @@
-        return 'skip'
-
+    if gdaltest.sl_lyr.GetFeatureCount() != 10:
+        gdaltest.post_reason( 'GetFeatureCount() returned %d instead of 10' % gdaltest.sl_lyr.GetFeatureCount() )
+        return 'fail'
+
-    expect = [168, 169, 166, 158, 165]
-
@@ -127 +131 @@
-    tr = ogrtest.check_features_against_list( gdaltest.sl_lyr,
-                                              'eas_id', expect )
+
+    if gdaltest.sl_lyr.GetFeatureCount() != 5:
+        gdaltest.post_reason( 'GetFeatureCount() returned %d instead of 5' % gdaltest.sl_lyr.GetFeatureCount() )
+        return 'fail'
+
-    gdaltest.sl_lyr.SetAttributeFilter( None )
-
@@ -214 +223 @@
-    
-    sql_lyr = gdaltest.sl_ds.ExecuteSQL( 'select distinct eas_id from tpoly order by eas_id desc' )
+
+    if sql_lyr.GetFeatureCount() != 11:
+        gdaltest.post_reason( 'GetFeatureCount() returned %d instead of 11' % sql_lyr.GetFeatureCount() )
+        return 'fail'
-
-    tr = ogrtest.check_features_against_list( sql_lyr, 'eas_id', expect )
@@ -263 +276 @@
-    gdaltest.sl_lyr.SetSpatialFilter( geom )
-    geom.Destroy()
-
+
+
+
+
+
-    tr = ogrtest.check_features_against_list( gdaltest.sl_lyr, 'eas_id',
-                                              [ 158 ] )
+
+    gdaltest.sl_lyr.SetAttributeFilter( 'eas_id = 158' )
+
+    if gdaltest.sl_lyr.GetFeatureCount() != 1:
+        gdaltest.post_reason( 'GetFeatureCount() returned %d instead of 1' % gdaltest.sl_lyr.GetFeatureCount() )
+        return 'fail'
+
+    gdaltest.sl_lyr.SetAttributeFilter( None )
-
-    gdaltest.sl_lyr.SetSpatialFilter( None )
@@ -490 +515 @@
-    feat_read.Destroy()
-
+    feat_read = sql_lyr.GetFeature(0)
+    if ogrtest.check_feature_geometry(feat_read,geom,max_error = 0.001 ) != 0:
+        return 'fail'
+    feat_read.Destroy()
+
-    gdaltest.sl_ds.ReleaseResultSet( sql_lyr )
-
@@ -532 +562 @@
-    return 'success'
-
+
+###############################################################################
+# Test all column types
+
+def ogr_sqlite_14():
+
+    if gdaltest.sl_ds is None:
+        return 'skip'
+
+    gdaltest.sl_lyr = gdaltest.sl_ds.CreateLayer( 'testtypes' )
+    ogrtest.quick_create_layer_def( gdaltest.sl_lyr,
+                                    [ ('INTEGER', ogr.OFTInteger),
+                                      ('FLOAT', ogr.OFTReal),
+                                      ('STRING', ogr.OFTString),
+                                      ('BLOB', ogr.OFTBinary),
+                                      ('BLOB2', ogr.OFTBinary) ] )
+
+    dst_feat = ogr.Feature( feature_def = gdaltest.sl_lyr.GetLayerDefn() )
+
+    dst_feat.SetField('INTEGER', 1)
+    dst_feat.SetField('FLOAT', 1.2)
+    dst_feat.SetField('STRING', 'myString\'a')
+
+    gdaltest.sl_lyr.CreateFeature( dst_feat )
+
+    dst_feat.Destroy()
+
+    # Set the BLOB attribute via SQL UPDATE instructions as there's no binding
+    # for OGR_F_SetFieldBinary
+    gdaltest.sl_ds.ExecuteSQL("UPDATE testtypes SET BLOB = x'0001FF' WHERE OGC_FID = 1")
+
+    ######################################################
+    # Reopen DB
+    gdaltest.sl_ds.Destroy()
+    gdaltest.sl_ds = ogr.Open( 'tmp/sqlite_test.db'  )
+    gdaltest.sl_lyr = gdaltest.sl_ds.GetLayerByName('testtypes')
+
+    # Duplicate the first record
+    dst_feat = ogr.Feature( feature_def = gdaltest.sl_lyr.GetLayerDefn() )
+    feat_read = gdaltest.sl_lyr.GetNextFeature()
+    dst_feat.SetFrom(feat_read)
+    gdaltest.sl_lyr.CreateFeature( dst_feat )
+    dst_feat.Destroy()
+
+    # Check the 2 records
+    gdaltest.sl_lyr.ResetReading()
+    for i in range(2):
+        feat_read = gdaltest.sl_lyr.GetNextFeature()
+        if feat_read.GetField('INTEGER') != 1 or \
+           feat_read.GetField('FLOAT') != 1.2 or \
+           feat_read.GetField('STRING') != 'myString\'a' or \
+           feat_read.GetFieldAsString('BLOB') != '0001FF':
+            return 'fail'
+
+    gdaltest.sl_lyr.ResetReading()
+
+    return 'success'
-
-###############################################################################
@@ -546 +633 @@
-    gdaltest.sl_ds.ExecuteSQL( 'DELLAYER:wgs84layer' )
-    gdaltest.sl_ds.ExecuteSQL( 'DELLAYER:wgs84layer_approx' )
+    gdaltest.sl_ds.ExecuteSQL( 'DELLAYER:testtypes' )
-
-    gdaltest.sl_ds.Destroy()
@@ -571 +659 @@
-    ogr_sqlite_12,
-    ogr_sqlite_13,
+    ogr_sqlite_14,
-    ogr_sqlite_cleanup ]
-