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

cvs@intevation.de cvs at intevation.de
Wed Mar 24 17:59:04 CET 2004


Author: joey

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

Modified Files:
	test_parser.py 
Log Message:
Move loading the sample file into the setUp method.

Index: test_parser.py
===================================================================
RCS file: /thubanrepository/thuban/Extensions/wms/test/test_parser.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- test_parser.py	24 Mar 2004 16:42:45 -0000	1.6
+++ test_parser.py	24 Mar 2004 16:59:02 -0000	1.7
@@ -76,7 +76,7 @@
                 self.fail ("%s has different value in second dictionary" % key);
 
 
-    def load_frida(self):
+    def setUp(self):
         """
         Load the locally stored frida capabilities.
         http://frida.intevation.org/cgi-bin/frida_wms?
@@ -100,9 +100,6 @@
         Test general attributes extracted from Capabilities XML
         """
 
-        if not self.capabilities:
-            self.load_frida()
-
         self.assertEquals (self.getTitle().encode('latin-1'),'Frida - Freie Vektor-Geodaten Osnabrück')
         self.assertEquals (self.getAbstract(),'')
         self.assertEquals (self.getFees(),'')
@@ -122,9 +119,6 @@
         Check if layer titles are recognised properly
         """
 
-        if not self.capabilities:
-            self.load_frida()
-
         # main layer
         self.assertEquals (self.getLayerTitle('Osnabrueck').encode('latin-1'),'Frida - Freie Vektor-Geodaten Osnabrück')
 
@@ -143,9 +137,6 @@
         Check if the SRS are returned properly
         """
 
-        if not self.capabilities:
-            self.load_frida()
-
         # SRS of main layer
         self.compareLists (self.getLayerSRS('Osnabrueck'),['31493'])
 
@@ -170,9 +161,6 @@
         Check if the LatLonBoundingBoxes are returned properly
         """
 
-        if not self.capabilities:
-            self.load_frida()
-
         # main LatLonBoundingBox
         bbox = {'minx': "7.92881", 'miny': "52.2131",
                 'maxx': "8.18349", 'maxy': "52.341"}
@@ -194,9 +182,6 @@
         Check if the BoundingBoxes are returned properly
         """
 
-        if not self.capabilities:
-            self.load_frida()
-
         # main BoundingBox
         bbox = {'minx': "3.427e+06",  'miny': "5.787e+06",
                 'maxx': "3.4442e+06", 'maxy': "5.801e+06"}
@@ -224,9 +209,6 @@
         Check if layers are properly classified queryable or not
         """
 
-        if not self.capabilities:
-            self.load_frida()
-
         # implicit setting in main layer
         self.assertEquals (self.isQueryable('Osnabrueck'),0)
 
@@ -241,7 +223,6 @@
         
         # explicit setting in third layer
         self.assertEquals (self.isQueryable('strassen'),1)
-
 
 
 if __name__ == "__main__":





More information about the Thuban-devel mailing list

This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)