Changeset 3743 for framework

Timestamp:

03/07/11 10:12:03 (15 months ago)

Author:

elemoine

Message:

add tests to verify that Boolean columns/properties are dealt with correctly, no functional change

Location:

framework/server/trunk/mapfish/tests

Files:

• test_decorators.py (modified) (4 diffs)
• test_postgis.py (modified) (6 diffs)

framework/server/trunk/mapfish/tests/test_decorators.py

@@ -50 +50 @@
         return Feature(id=1,
                        geometry=Point(1, 2),
-                       properties={"key": "val"}
+                       properties={"strkey": "strval", "boolkey": True}
                        )
 
@@ -65 +65 @@
         return Feature(id=1,
                        geometry=Point(1, 2),
-                       properties={"key": "val"}
+                       properties={"strkey": "strval", "boolkey": True}
                        )
 
@@ -88 +88 @@
         assert response.status == 200
         assert response.response.content_type == 'application/json'
-        assert response.body == '{"geometry": {"type": "Point", "coordinates": [1.0, 2.0]}, "type": "Feature", "properties": {"key": "val"}, "id": 1}'
+        assert response.body == '{"geometry": {"type": "Point", "coordinates": [1.0, 2.0]}, "type": "Feature", "properties": {"boolkey": true, "strkey": "strval"}, "id": 1}'
 
     def test_feature_collection(self):
@@ -101 +101 @@
         assert response.status == 200
         assert response.response.content_type == 'text/javascript'
-        assert response.body == 'jsfunc({"geometry": {"type": "Point", "coordinates": [1.0, 2.0]}, "type": "Feature", "properties": {"key": "val"}, "id": 1});'
+        assert response.body == 'jsfunc({"geometry": {"type": "Point", "coordinates": [1.0, 2.0]}, "type": "Feature", "properties": {"boolkey": true, "strkey": "strval"}, "id": 1});'

framework/server/trunk/mapfish/tests/test_postgis.py

@@ -33 +33 @@
 
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import (create_engine, MetaData, Column, Integer, Numeric)
+from sqlalchemy import (create_engine, MetaData, Column, Integer, Numeric, Boolean)
 from sqlalchemy import orm
 
@@ -60 +60 @@
     spot_id = Column(Integer, primary_key=True)
     spot_height = Column(Numeric(asdecimal=False))
+    spot_goodness = Column(Boolean)
     spot_location = GeometryColumn(Point(2))
 
@@ -83 +84 @@
         # Insert some points into the database
         session.add_all([
-            Spot(spot_height=420.40, spot_location='POINT(0 0)'),
-            Spot(spot_height=102.34, spot_location='POINT(10 10)'),
-            Spot(spot_height=388.62, spot_location='POINT(10 11)'),
-            Spot(spot_height=1454.66, spot_location='POINT(40 34)'),
-            Spot(spot_height=54.66, spot_location='POINT(5 5)'),
-            Spot(spot_height=333.12, spot_location='POINT(2 3)'),
-            Spot(spot_height=783.55, spot_location='POINT(38 34)'),
-            Spot(spot_height=3454.67, spot_location='POINT(-134 45)'),
-            Spot(spot_height=6454.23, spot_location=None)
+            Spot(spot_height=420.40, spot_location='POINT(0 0)', spot_goodness=True),
+            Spot(spot_height=102.34, spot_location='POINT(10 10)', spot_goodness=True),
+            Spot(spot_height=388.62, spot_location='POINT(10 11)', spot_goodness=True),
+            Spot(spot_height=1454.66, spot_location='POINT(40 34)', spot_goodness=True),
+            Spot(spot_height=54.66, spot_location='POINT(5 5)', spot_goodness=True),
+            Spot(spot_height=333.12, spot_location='POINT(2 3)', spot_goodness=True),
+            Spot(spot_height=783.55, spot_location='POINT(38 34)', spot_goodness=True),
+            Spot(spot_height=3454.67, spot_location='POINT(-134 45)', spot_goodness=True),
+            Spot(spot_height=6454.23, spot_location=None, spot_goodness=False)
             ])
         
@@ -107 +108 @@
         
         request = FakeRequest({})
-        request.body = '{"type": "FeatureCollection", "features": [{"type": "Feature", "properties": {"spot_height": 12.0}, "geometry": {"type": "Point", "coordinates": [45, 5]}}]}'
+        request.body = '{"type": "FeatureCollection", "features": [{"type": "Feature", "properties": {"spot_height": 12.0, "spot_goodness": true}, "geometry": {"type": "Point", "coordinates": [45, 5]}}]}'
         
         response = FakeResponse()
@@ -117 +118 @@
         eq_(feature0.geometry.coordinates, (45.0, 5.0))
         eq_(feature0.properties["spot_height"], 12)
+        eq_(feature0.properties["spot_goodness"], True)
 
         new_spot = session.query(Spot).filter(Spot.spot_height==12.0).one()
         ok_(new_spot is not None)
         eq_(session.scalar(new_spot.spot_location.wkt), u'POINT(45 5)')
+        eq_(new_spot.spot_goodness, True)
         
 
@@ -329 +332 @@
         eq_(feature.geometry.coordinates, (0.0, 0.0))
         eq_(feature.properties["spot_height"], 420.39999999999998)
+        eq_(feature.properties["spot_goodness"], True)