joey: thuban/Extensions/wms/test test_parser.py,1.5,1.6

[cvs@intevation.de]

Author: joey

Update of /thubanrepository/thuban/Extensions/wms/test
In directory doto:/tmp/cvs-serv12056

Modified Files:
	test_parser.py 
Log Message:
SRS are stored in strings and Python has strong typechecking, so a
number is either a cardinal number or a string, but the string has to
be enclosed in quotes, different to how Perl works, my fault.

Index: test_parser.py
===================================================================
RCS file: /thubanrepository/thuban/Extensions/wms/test/test_parser.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test_parser.py	24 Mar 2004 16:38:21 -0000	1.5
+++ test_parser.py	24 Mar 2004 16:42:45 -0000	1.6
@@ -147,25 +147,22 @@
             self.load_frida()
 
         # SRS of main layer
-        self.compareLists (self.getLayerSRS('Osnabrueck'),[31493])
+        self.compareLists (self.getLayerSRS('Osnabrueck'),['31493'])
 
         # Single SRS of layer without inheritance
-        self.compareLists (self.getLayerSRS('gruenflaechen'),[31493])
-
-        # Multiple SRS (new/1.1.1) of layer without inheritance
-        self.compareLists (self.getLayerSRS('gewaesserpolyl'),[31493, 31494])
+        self.compareLists (self.getLayerSRS('gruenflaechen'),['31493'])
 
-        # Multiple SRS (old/1.0.0) of layer without inheritance
-        self.compareLists (self.getLayerSRS('gewaesserlinien'),[31493, 31494])
+        # Multiple SRS of layer without inheritance, but overwriting
+        self.compareLists (self.getLayerSRS('gewaesserpolyl'),['31493', '31494'])
 
-        # Multiple SRS of layer with inheritance
-        self.compareLists (self.getLayerSRS('strassenhinten'),[31493, 31494])
+        # Multiple SRS of layer with inheritance, one new locally
+        self.compareLists (self.getLayerSRS('gewaesserlinien'),['31493', '31492'])
 
-        # Multiple SRS (old/1.0.0) with inheritance
-        self.compareLists (self.getLayerSRS('strassen'),[31493, 31494, 31495])
+        # Multiple SRS with inheritance, two new locally
+        self.compareLists (self.getLayerSRS('strassen'),['31493', '31494', '31495'])
 
-        # Multiple SRS (new/1.1.1) with inheritance
-        self.compareLists (self.getLayerSRS('beschriftung'),[31493, 31494, 31495])
+        # Single SRS with inheritance but overwriting
+        self.compareLists (self.getLayerSRS('beschriftung'),['31493'])
 
 
     def test_LatLonBoundingBoxes (self):
@@ -203,23 +200,23 @@
         # main BoundingBox
         bbox = {'minx': "3.427e+06",  'miny': "5.787e+06",
                 'maxx': "3.4442e+06", 'maxy': "5.801e+06"}
-        self.compareDicts (self.getLayerBBox('Osnabrueck', 31493),bbox)
+        self.compareDicts (self.getLayerBBox('Osnabrueck', '31493'),bbox)
 
         # inherited BoundingBox
-        self.compareDicts (self.getLayerBBox('gewaesser', 31493),bbox)
+        self.compareDicts (self.getLayerBBox('gewaesser', '31493'),bbox)
 
         # overwritten BoundingBox
         bbox = {'minx': "3.427e+06",   'miny': "5.78901e+06",
                 'maxx': "3.44173e+06", 'maxy': "5.79952e+06"}
-        self.compareDicts (self.getLayerBBox('gewaesserlinien', 31493),bbox)
+        self.compareDicts (self.getLayerBBox('gewaesserlinien', '31492'),bbox)
 
         # multiple BoundingBoxes
         bbox = {'minx': "3.42743e+06", 'miny': "5.78919e+06",
                 'maxx': "3.44381e+06", 'maxy': "5.80038e+06"}
-        self.compareDicts (self.getLayerBBox('gewaesserpolyl', 31493),bbox)
+        self.compareDicts (self.getLayerBBox('gewaesserpolyl', '31493'),bbox)
         bbox = {'minx': "3.42742e+06", 'miny': "5.78918e+06",
                 'maxx': "3.44380e+06", 'maxy': "5.80037e+06"}
-        self.compareDicts (self.getLayerBBox('gewaesserpolyl', 31494),bbox)
+        self.compareDicts (self.getLayerBBox('gewaesserpolyl', '31494'),bbox)
 
 
     def test_queryable (self):