Changeset 2594 for TI05-delivery/ows_framework

Timestamp:

15/06/07 14:51:13 (12 years ago)

Author:

spascoe

Message:

Various changes. Some test data is generated with make_data.py and this
is used to test the csml_wms controller. These tests pass.

Also there are some subsetToGridSeries tests. These fail at the moment. They need refining to check they are valid tests.

Location:

TI05-delivery/ows_framework/trunk

Files:

• ows_protocol.wiki (added)
• ows_server/ows_server/controllers/dummy.py (deleted)
• ows_server/ows_server/lib/csml_util.py (modified) (1 diff)
• ows_server/ows_server/lib/render.py (modified) (1 diff)
• ows_server/ows_server/lib/validators.py (modified) (1 diff)
• ows_server/ows_server/tests/__init__.py (modified) (1 diff)
• ows_server/ows_server/tests/data (added)
• ows_server/ows_server/tests/functional/test_csml_api.py (modified) (1 diff)
• ows_server/ows_server/tests/functional/test_csml_wms.py (modified) (1 diff)
• ows_server/ows_server/tests/functional/test_dummy.py (deleted)
• ows_server/ows_server/tests/make_data.py (added)
• ows_server/ows_server/tests/test_extract.py (added)
• ows_server/test.ini (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/csml_util.py

@@ -38 +38 @@
     return d
 
-#THIS FUNCTION CAN BE DELETED AFTER extractToVariable HAS BEEN TESTED:
-#----------------------------------------------------------------------------------------------------
-def extract(feature, sel):
-    # Get temporary extract dir
-    extract_dir = request.environ['paste.config']['app_conf']['tmp_dir']
-    
-    # Subset the feature
-    (fd, filename) = tempfile.mkstemp('.nc', 'csml_wms_', extract_dir); os.close(fd)
-    feature.subsetToGridSeries(ncname=os.path.basename(filename),
-                               outputdir=os.path.dirname(filename),
-                               time=sel['time'] # work around for CSML bug
-                               #**sel
-                               )
-    d = cdms.open(filename)
-    #var = d(feature.name.CONTENT, squeeze=1)
-    # Work around for CSML bug
-    var = d(feature.name.CONTENT, longitude=sel['longitude'], latitude=sel['latitude'],
-            squeeze=1)
-
-    d.close()
-    os.remove(filename)
-    return var
-#----------------------------------------------------------------------------------------------------
         
 def extractToNetCDF(feature, sel):

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/render.py

@@ -138 +138 @@
             img = img.transpose(Image.FLIT_LEFT_RIGHT)
 
-        return img
+        return img.resize((width, height))
 
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/validators.py

@@ -33 +33 @@
         bbox_t = [float(x) for x in bbox.split(',')]
     except ValueError:
-        raise InvalidParameterValue("Incorrect BBOX specification %s" % bboxStr, 'bbox')
+        raise InvalidParameterValue("Incorrect BBOX specification %s" % bbox, 'bbox')
 
     if len(bbox_t) != 4:
-        raise InvalidParameterValue("Incorrect BBOX specification %s" % bboxStr, 'bbox')
+        raise InvalidParameterValue("Incorrect BBOX specification %s" % bbox, 'bbox')
 
     return bbox_t

TI05-delivery/ows_framework/trunk/ows_server/ows_server/tests/__init__.py

@@ -32 +32 @@
         TestCase.__init__(self, *args)
 
+
+
+# Generate test data
+import make_data
+make_data.main()
+
 __all__ = ['url_for', 'TestController']

TI05-delivery/ows_framework/trunk/ows_server/ows_server/tests/functional/test_csml_api.py

@@ -1 +1 @@
 from ows_server.tests import *
 
-class TestCsmlApiController(TestController):
-    def test_index(self):
-        response = self.app.get(url_for(controller='csml_api'))
-        # Test response...
+#class TestCsmlApiController(TestController):
+#    def test_index(self):
+#        response = self.app.get(url_for(controller='csml_api'))
+#        # Test response...

TI05-delivery/ows_framework/trunk/ows_server/ows_server/tests/functional/test_csml_wms.py

@@ -1 +1 @@
 from ows_server.tests import *
+import cElementTree as ET
+from cStringIO import StringIO
+import Image
 
-class TestCsmlWmsController(TestController):
-    def test_index(self):
-        response = self.app.get(url_for(controller='csml_wms'))
-        # Test response...
+wms_ns = 'http://www.opengis.net/wms'
+
+# This depends on the value randomly generated by csmlscan.
+# However make_data.py sets the random seed so this shoukd work.
+test_feature_id = 'DVVhDIq2'
+
+class TestGetCapabilities(TestController):
+    def setUp(self):
+        url = url_for(controller='csml_wms',
+                      file='test',
+                      request='GetCapabilities',
+                      service='WMS',
+                      version='1.3.0',
+                      )
+        
+        print 'Capabilities URL = %s' % url
+
+        self.response = self.app.get(url)
+        self.xml = ET.XML(self.response.body)
+
+    def testRootNode(self):
+        assert self.xml.tag == '{%s}WMS_Capabilities' % wms_ns
+
+    def testLayers(self):
+        layers = self.xml.findall('./{%(ns)s}Service/{%(ns)s}Capability/{%(ns)s}Layer' % dict(ns=wms_ns))
+
+        # Assert there is one base layer
+        assert len(layers) == 1
+
+        # With 4 sub-layers
+        layers = layers[0].findall('./{%(ns)s}Layer' % dict(ns=wms_ns))
+        assert len(layers) == 4
+
+class TestGetMap(TestController):
+    def setUp(self):
+        url = url_for(controller='csml_wms', file='test',
+                      request='GetMap',
+                      layers=test_feature_id,
+                      bbox='-180,-90,180,90',
+                      time='1980-01-01T00:00:00.0',
+                      crs='CRS:84', width='100', height='100', styles='',
+                      version='1.3.0', format='image/png')
+
+        self.response = self.app.get(url)
+
+    def testContentType(self):
+        assert self.response.header('Content-type') == 'image/png'
+
+    def testImage(self):
+        img = Image.open(StringIO(self.response.body))
+
+        assert img.format == 'PNG'
+        assert img.size == (100, 100)
+        

TI05-delivery/ows_framework/trunk/ows_server/test.ini

@@ -13 +13 @@
 use = egg:Paste#http
 host = 0.0.0.0
-port = 5000
+port = 8080
 
 [app:main]
 use = config:development.ini
+csml_dir = %(here)s/ows_server/tests/data
 
 # Add additional test specific configuration options as necessary.