joey: thuban/Extensions/wms/test test_parser.py,1.11,1.12

[cvs@intevation.de]

Author: joey

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

Modified Files:
	test_parser.py 
Log Message:
Added a space after a comma in arguments

Index: test_parser.py
===================================================================
RCS file: /thubanrepository/thuban/Extensions/wms/test/test_parser.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- test_parser.py	24 Mar 2004 19:13:54 -0000	1.11
+++ test_parser.py	24 Mar 2004 19:35:21 -0000	1.12
@@ -109,18 +109,19 @@
         Test general attributes extracted from Capabilities XML
         """
 
-        self.assertEquals(self.getTitle().encode('latin-1'),'Frida - Freie Vektor-Geodaten Osnabrück')
-        self.assertEquals(self.getAbstract(),'')
-        self.assertEquals(self.getFees(),'')
-        self.assertEquals(self.getAccessConstraints(),'')
+        self.assertEquals(self.getTitle().encode('latin-1'),
+                          'Frida - Freie Vektor-Geodaten Osnabrück')
+        self.assertEquals(self.getAbstract(), '')
+        self.assertEquals(self.getFees(), '')
+        self.assertEquals(self.getAccessConstraints(), '')
         formats = ['image/gif', 'image/png', 'image/jpeg', 'image/wbmp']
-        self.compareLists(self.getFormats(),formats)
+        self.compareLists(self.getFormats(), formats)
         layers = ['Osnabrueck', 'gruenflaechen', 'gewaesser',
                   'gewaesserpolyl','gewaesserlinien', 'strassen_all',
                   'strassenhinten', 'strassen', 'beschriftung',
                   'hauptbeschriftung', 'sehenswuerdigkeiten']
-        self.compareLists(self.getLayers(),layers)
-        self.compareLists(self.getSRS(),['31493'])
+        self.compareLists(self.getLayers(), layers)
+        self.compareLists(self.getSRS(), ['31493'])
 
 
     def test_LayerTitle(self):
@@ -129,16 +130,20 @@
         """
 
         # main layer
-        self.assertEquals(self.getLayerTitle('Osnabrueck').encode('latin-1'),'Frida - Freie Vektor-Geodaten Osnabrück')
+        self.assertEquals(self.getLayerTitle('Osnabrueck').encode('latin-1'),
+                          'Frida - Freie Vektor-Geodaten Osnabrück')
 
         # first nested layer
-        self.assertEquals(self.getLayerTitle('gruenflaechen').encode('latin-1'),'Grünflächen')
+        self.assertEquals(self.getLayerTitle('gruenflaechen').encode('latin-1'),
+                          'Grünflächen')
 
         # first nested layer
-        self.assertEquals(self.getLayerTitle('gewaesser').encode('latin-1'),'Gewässer')
+        self.assertEquals(self.getLayerTitle('gewaesser').encode('latin-1'),
+                          'Gewässer')
 
         # second nested layer
-        self.assertEquals(self.getLayerTitle('gewaesserpolyl').encode('latin-1'),'Gewässerflächen')
+        self.assertEquals(self.getLayerTitle('gewaesserpolyl').encode('latin-1'),
+                          'Gewässerflächen')
 
 
     def test_LayerSRS(self):
@@ -147,22 +152,22 @@
         """
 
         # 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'])
+        self.compareLists(self.getLayerSRS('gruenflaechen'), ['31493'])
 
         # Multiple SRS of layer without inheritance, but overwriting
-        self.compareLists(self.getLayerSRS('gewaesserpolyl'),['31493', '31494'])
+        self.compareLists(self.getLayerSRS('gewaesserpolyl'), ['31493', '31494'])
 
         # Multiple SRS of layer with inheritance, one new locally
-        self.compareLists(self.getLayerSRS('gewaesserlinien'),['31493', '31492'])
+        self.compareLists(self.getLayerSRS('gewaesserlinien'), ['31493', '31492'])
 
         # Multiple SRS with inheritance, two new locally
-        self.compareLists(self.getLayerSRS('strassen'),['31493', '31494', '31495'])
+        self.compareLists(self.getLayerSRS('strassen'), ['31493', '31494', '31495'])
 
         # Single SRS with inheritance but overwriting
-        self.compareLists(self.getLayerSRS('beschriftung'),['31493'])
+        self.compareLists(self.getLayerSRS('beschriftung'), ['31493'])
 
 
     def test_LatLonBoundingBoxes(self):
@@ -173,17 +178,17 @@
         # main LatLonBoundingBox
         bbox = {'minx': "7.92881", 'miny': "52.2131",
                 'maxx': "8.18349", 'maxy': "52.341"}
-        self.compareDicts(self.getLayerLatLonBBox('Osnabrueck'),bbox)
+        self.compareDicts(self.getLayerLatLonBBox('Osnabrueck'), bbox)
 
         # inherited LatLonBoundingBox
         bbox = {'minx': "7.92881", 'miny': "52.2131",
                 'maxx': "8.18349", 'maxy': "52.341"}
-        self.compareDicts(self.getLayerLatLonBBox('gewaesser'),bbox)
+        self.compareDicts(self.getLayerLatLonBBox('gewaesser'), bbox)
 
         # third layer non-inherited LatLonBoundingBox
         bbox = {'minx': "7.93531", 'miny': "52.2328",
                 'maxx': "8.17739", 'maxy': "52.3353"}
-        self.compareDicts(self.getLayerLatLonBBox('gewaesserpolyl'),bbox)
+        self.compareDicts(self.getLayerLatLonBBox('gewaesserpolyl'), bbox)
 
 
     def test_BoundingBoxes(self):
@@ -194,23 +199,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', '31492'),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):
@@ -219,19 +224,19 @@
         """
 
         # implicit setting in main layer
-        self.assertEquals(self.isQueryable('Osnabrueck'),0)
+        self.assertEquals(self.isQueryable('Osnabrueck'), 0)
 
         # explicit setting in second layer
-        self.assertEquals(self.isQueryable('gruenflaechen'),0)
+        self.assertEquals(self.isQueryable('gruenflaechen'), 0)
         
         # inherited setting in second layer
-        self.assertEquals(self.isQueryable('gewaesser'),0)
+        self.assertEquals(self.isQueryable('gewaesser'), 0)
         
         # explicit setting in second layer
-        self.assertEquals(self.isQueryable('sehenswuerdigkeiten'),1)
+        self.assertEquals(self.isQueryable('sehenswuerdigkeiten'), 1)
         
         # explicit setting in third layer
-        self.assertEquals(self.isQueryable('strassen'),1)
+        self.assertEquals(self.isQueryable('strassen'), 1)
 
 
 if __name__ == "__main__":