/[thuban]/branches/WIP-pyshapelib-bramz/test/test_load.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/test/test_load.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1282 by bh, Mon Jun 23 09:47:18 2003 UTC revision 1931 by bh, Tue Nov 11 13:24:45 2003 UTC
# Line 34  import unittest Line 34  import unittest
34  import support  import support
35  support.initthuban()  support.initthuban()
36    
37    import postgissupport
38  from xmlsupport import sax_eventlist  from xmlsupport import sax_eventlist
39    
40  import dbflib  import dbflib
41    
42  from Thuban.Model.save import save_session  from Thuban.Model.save import save_session
43  from Thuban.Model.load import load_session, parse_color, LoadError  from Thuban.Model.load import load_session, parse_color, LoadError, \
44  from Thuban.Model.color import Color       LoadCancelled
45    from Thuban.Model.color import Transparent
46  from Thuban.Model.classification import ClassGroupProperties, ClassGroupRange,\  from Thuban.Model.classification import ClassGroupProperties, ClassGroupRange,\
47      ClassGroupSingleton, ClassGroupDefault      ClassGroupSingleton, ClassGroupDefault
48    from Thuban.Model.postgisdb import ConnectionError
49    
50  def filenames_equal(name1, name2):  def filenames_equal(name1, name2):
51      """Return true if the filenames name1 and name2 are equal.      """Return true if the filenames name1 and name2 are equal.
# Line 80  class LoadSessionTest(support.FileLoadTe Line 82  class LoadSessionTest(support.FileLoadTe
82          self.session = None          self.session = None
83    
84    
85      dtd = "http://thuban.intevation.org/dtds/thuban-0.8.dtd"      dtd = "http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
86      thubanids = [((dtd, n), (None, "id")) for n in      thubanids = [((dtd, n), (None, "id")) for n in
87                   ["fileshapesource", "filetable", "jointable",                   ["fileshapesource", "filetable", "jointable",
88                    "derivedshapesource"]]                    "derivedshapesource"]]
# Line 90  class LoadSessionTest(support.FileLoadTe Line 92  class LoadSessionTest(support.FileLoadTe
92                       ("jointable", "right"),                       ("jointable", "right"),
93                       ("derivedshapesource", "table"),                       ("derivedshapesource", "table"),
94                       ("derivedshapesource", "shapesource")]]                       ("derivedshapesource", "shapesource")]]
95        filenames = [((dtd, n), (None, m)) for n, m in
96                     [("fileshapesource", "filename"),
97                      ("rasterlayer", "filename"),
98                      ("filetable", "filename")]]
99      del n, m, dtd      del n, m, dtd
100    
101      def check_format(self):      def check_format(self):
# Line 100  class LoadSessionTest(support.FileLoadTe Line 106  class LoadSessionTest(support.FileLoadTe
106          filename = self.temp_file_name(self.id() + ".roundtrip.thuban")          filename = self.temp_file_name(self.id() + ".roundtrip.thuban")
107          save_session(self.session, filename)          save_session(self.session, filename)
108          el1 = sax_eventlist(filename = filename, ids = self.thubanids,          el1 = sax_eventlist(filename = filename, ids = self.thubanids,
109                              idrefs = self.thubanidrefs)                              idrefs = self.thubanidrefs,
110                                filenames = self.filenames)
111          el2 = sax_eventlist(filename = self.filename(), ids = self.thubanids,          el2 = sax_eventlist(filename = self.filename(), ids = self.thubanids,
112                              idrefs = self.thubanidrefs)                              idrefs = self.thubanidrefs,
113                                filenames = self.filenames)
114          if 0:          if 0:
115              for a, b in zip(el1, el2):              for a, b in zip(el1, el2):
116                  print a != b and "***************" or ""                  print a != b and "***************" or ""
# Line 150  class ClassificationTest(LoadSessionTest Line 158  class ClassificationTest(LoadSessionTest
158                  if data[CLASSES][i][GROUP_TYPE] == "default":                  if data[CLASSES][i][GROUP_TYPE] == "default":
159                      g = ClassGroupDefault(props, data[CLASSES][i][GROUP_LABEL])                      g = ClassGroupDefault(props, data[CLASSES][i][GROUP_LABEL])
160                  elif data[CLASSES][i][GROUP_TYPE] == "range":                  elif data[CLASSES][i][GROUP_TYPE] == "range":
161                      g = ClassGroupRange(data[CLASSES][i][GROUP_DATA][0],                      g = ClassGroupRange((data[CLASSES][i][GROUP_DATA][0],
162                                          data[CLASSES][i][GROUP_DATA][1],                                           data[CLASSES][i][GROUP_DATA][1]),
163                                          props, data[CLASSES][i][GROUP_LABEL])                                          props, data[CLASSES][i][GROUP_LABEL])
164                  elif data[CLASSES][i][GROUP_TYPE] == "single":                  elif data[CLASSES][i][GROUP_TYPE] == "single":
165                      g = ClassGroupSingleton(data[CLASSES][i][GROUP_DATA],                      g = ClassGroupSingleton(data[CLASSES][i][GROUP_DATA],
# Line 165  class ClassificationTest(LoadSessionTest Line 173  class ClassificationTest(LoadSessionTest
173    
174  class TestSingleLayer(LoadSessionTest):  class TestSingleLayer(LoadSessionTest):
175    
176        # Note: The use of & and non-ascii characters is deliberate. We
177        # want to test whether the loading code handles that correctly.
178      file_contents = '''\      file_contents = '''\
179  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
180  <!DOCTYPE session SYSTEM "thuban-0.8.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
181  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.8.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
182          title="single map&amp;layer">          title="Stra\xc3\x9fen &amp; Landmarken">
183      <fileshapesource filetype="shapefile" id="D1"      <fileshapesource filetype="shapefile" id="D1"
184          filename="../../Data/iceland/political.shp"/>          filename="../../Data/iceland/political.shp"/>
185      <map title="Test Map">      <map title="\xc3\x9cbersicht">
186          <projection name="Unknown">          <projection epsg="32627" name="WGS 84 / UTM zone 27N">
187              <parameter value="zone=26"/>              <parameter value="datum=WGS84"/>
188                <parameter value="ellps=WGS84"/>
189              <parameter value="proj=utm"/>              <parameter value="proj=utm"/>
190              <parameter value="ellps=clrk66"/>              <parameter value="units=m"/>
191                <parameter value="zone=27"/>
192          </projection>          </projection>
193          <layer shapestore="D1" visible="true"          <layer shapestore="D1" visible="true"
194                  stroke="#000000" title="My Layer" stroke_width="1"                  stroke="#000000" title="K\xc3\xbcste" stroke_width="1"
195                  fill="None"/>                  fill="None"/>
196      </map>      </map>
197  </session>  </session>
# Line 192  class TestSingleLayer(LoadSessionTest): Line 204  class TestSingleLayer(LoadSessionTest):
204          self.session = session          self.session = session
205    
206          # Check the title          # Check the title
207          eq(session.Title(), "single map&layer")          eq(session.Title(), "Stra\xdfen & Landmarken")
208    
209          # the session has one map.          # the session has one map.
210          maps = session.Maps()          maps = session.Maps()
# Line 200  class TestSingleLayer(LoadSessionTest): Line 212  class TestSingleLayer(LoadSessionTest):
212    
213          # Check the map's attributes          # Check the map's attributes
214          map = maps[0]          map = maps[0]
215          eq(map.Title(), "Test Map")          eq(map.Title(), "\xdcbersicht")
216            proj = map.GetProjection()
217            eq(proj.GetName(), "WGS 84 / UTM zone 27N")
218            eq(proj.EPSGCode(), "32627")
219            params = proj.GetAllParameters()
220            params.sort()
221            eq(params, ["datum=WGS84", "ellps=WGS84", "proj=utm", "units=m",
222                        "zone=27"])
223    
224          # the map has a single layer          # the map has a single layer
225          layers = map.Layers()          layers = map.Layers()
# Line 208  class TestSingleLayer(LoadSessionTest): Line 227  class TestSingleLayer(LoadSessionTest):
227    
228          # Check the layer attributes          # Check the layer attributes
229          layer = layers[0]          layer = layers[0]
230          eq(layer.Title(), "My Layer")          eq(layer.Title(), "K\xfcste")
231          self.failUnless(filenames_equal(layer.ShapeStore().FileName(),          self.failUnless(filenames_equal(layer.ShapeStore().FileName(),
232                                          os.path.join(self.temp_dir(),                                          os.path.join(self.temp_dir(),
233                                                       os.pardir, os.pardir,                                                       os.pardir, os.pardir,
234                                                       "Data", "iceland",                                                       "Data", "iceland",
235                                                       "political.shp")))                                                       "political.shp")))
236          eq(layer.GetClassification().GetDefaultFill(), Color.Transparent)          eq(layer.GetClassification().GetDefaultFill(), Transparent)
237          eq(layer.GetClassification().GetDefaultLineColor().hex(), "#000000")          eq(layer.GetClassification().GetDefaultLineColor().hex(), "#000000")
238          eq(layer.Visible(), True)          eq(layer.Visible(), True)
239    
# Line 223  class TestSingleLayer(LoadSessionTest): Line 242  class TestSingleLayer(LoadSessionTest):
242          self.session.Destroy()          self.session.Destroy()
243          self.session = None          self.session = None
244    
245        def test_leak(self):
246            """Test load_session for resource leaks
247    
248            The load_session function had a resource leak in that it created
249            cyclic references. The objects would have been eventually
250            collected by the garbage collector but too late. One symptom is
251            that when layers are removed so that the last normal reference
252            owned indirectly by the session to a shape store goes away, the
253            shape store is not actually removed from the session even though
254            the session only keeps weak references because there are still
255            references owned by the cyclic garbage.
256            """
257            session = load_session(self.filename())
258            self.session = session
259    
260            # sanity check
261            self.assertEquals(len(session.ShapeStores()), 1)
262    
263            # remove the map. The shapestore should go away too
264            session.RemoveMap(session.Maps()[0])
265            self.assertEquals(len(session.ShapeStores()), 0)
266    
267    
268  class TestLayerVisibility(LoadSessionTest):  class TestLayerVisibility(LoadSessionTest):
269    
270      file_contents = '''\      file_contents = '''\
271  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
272  <!DOCTYPE session SYSTEM "thuban-0.8.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
273  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.8.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
274          title="single map&amp;layer">          title="single map&amp;layer">
275      <fileshapesource filetype="shapefile" id="D1"      <fileshapesource filetype="shapefile" id="D1"
276          filename="../../Data/iceland/political.shp"/>          filename="../../Data/iceland/political.shp"/>
# Line 287  class TestClassification(ClassificationT Line 328  class TestClassification(ClassificationT
328                  <clpoint value="1">                  <clpoint value="1">
329                      <cldata stroke="#000000" stroke_width="10" fill="None"/>                      <cldata stroke="#000000" stroke_width="10" fill="None"/>
330                  </clpoint>                  </clpoint>
331                    <clpoint value="\xc3\xa4\xc3\xb6\xc3\xbc"
332                             label="\xc3\x9cml\xc3\xa4uts">
333                        <cldata fill="None" stroke="#000000" stroke_width="1"/>
334                    </clpoint>
335              </classification>              </classification>
336          </layer>          </layer>
337                  <layer title="My Layer 2" stroke_width="1" fill="None"                  <layer title="My Layer 2" stroke_width="1" fill="None"
# Line 321  class TestClassification(ClassificationT Line 366  class TestClassification(ClassificationT
366    
367          map = self.session.Maps()[0] # only one map in the sample          map = self.session.Maps()[0] # only one map in the sample
368    
369          expected = [("My Layer", 2,          expected = [("My Layer", 3,
370                          [("default", (), "",                          [("default", (), "",
371                              ("#000000", 1, "None")),                              ("#000000", 1, "None")),
372                           ("single", "1", "",                           ("single", "1", "",
373                              ("#000000", 2, "None")),                              ("#000000", 2, "None")),
374                           ("single", "1", "",                           ("single", "1", "",
375                              ("#000000", 10, "None"))]),                              ("#000000", 10, "None")),
376                             ("single", "\xe4\xf6\xfc", "\xdcml\xe4uts",
377                                ("#000000", 1, "None"))]),
378                       ("My Layer 2", 4,                       ("My Layer 2", 4,
379                           [("default", (), "",                           [("default", (), "",
380                              ("#000000", 2, "None")),                              ("#000000", 2, "None")),
# Line 347  class TestLabels(ClassificationTest): Line 394  class TestLabels(ClassificationTest):
394    
395      file_contents = '''\      file_contents = '''\
396  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
397  <!DOCTYPE session SYSTEM "thuban-0.8.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
398  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.8.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
399          title="single map&amp;layer">          title="single map&amp;layer">
400      <fileshapesource filetype="shapefile" id="D1"      <fileshapesource filetype="shapefile" id="D1"
401          filename="../../Data/iceland/political.shp"/>          filename="../../Data/iceland/political.shp"/>
# Line 395  class TestLayerProjection(LoadSessionTes Line 442  class TestLayerProjection(LoadSessionTes
442    
443      file_contents = '''\      file_contents = '''\
444  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
445  <!DOCTYPE session SYSTEM "thuban-0.8.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
446  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.8.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
447          title="single map&amp;layer">          title="single map&amp;layer">
448      <fileshapesource filetype="shapefile" id="D2"      <fileshapesource filetype="shapefile" id="D2"
449          filename="../../Data/iceland/roads-line.shp"/>          filename="../../Data/iceland/roads-line.shp"/>
# Line 428  class TestLayerProjection(LoadSessionTes Line 475  class TestLayerProjection(LoadSessionTes
475                  title="My Layer" stroke_width="1" fill="None">                  title="My Layer" stroke_width="1" fill="None">
476              <projection name="Unknown">              <projection name="Unknown">
477                  <parameter value="proj=lcc"/>                  <parameter value="proj=lcc"/>
478                    <parameter value="lat_1=10"/>
479                    <parameter value="lat_2=20"/>
480                  <parameter value="ellps=clrk66"/>                  <parameter value="ellps=clrk66"/>
481              </projection>              </projection>
482          </layer>          </layer>
# Line 460  class TestLayerProjection(LoadSessionTes Line 509  class TestLayerProjection(LoadSessionTes
509          neq(proj, None)          neq(proj, None)
510          eq(proj.GetName(), "Unknown")          eq(proj.GetName(), "Unknown")
511          eq(proj.GetParameter("proj"), "lcc")          eq(proj.GetParameter("proj"), "lcc")
512            eq(proj.GetParameter("lat_1"), "10")
513            eq(proj.GetParameter("lat_2"), "20")
514          eq(proj.GetParameter("ellps"), "clrk66")          eq(proj.GetParameter("ellps"), "clrk66")
515    
516          self.check_format()          self.check_format()
# Line 469  class TestRasterLayer(LoadSessionTest): Line 520  class TestRasterLayer(LoadSessionTest):
520    
521      file_contents = '''\      file_contents = '''\
522  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
523  <!DOCTYPE session SYSTEM "thuban-0.8.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
524  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.8.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
525          title="single map&amp;layer">          title="single map&amp;layer">
526      <map title="Test Map">      <map title="Test Map">
527          <rasterlayer visible="false" filename="../../Data/iceland/island.tif"          <rasterlayer visible="false" filename="../../Data/iceland/island.tif"
# Line 503  class TestRasterLayer(LoadSessionTest): Line 554  class TestRasterLayer(LoadSessionTest):
554  class TestJoinedTable(LoadSessionTest):  class TestJoinedTable(LoadSessionTest):
555    
556      file_contents = '''<?xml version="1.0" encoding="UTF-8"?>      file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
557  <!DOCTYPE session SYSTEM "thuban-0.8.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
558  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.8.dtd" title="A Joined Table session">  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd" title="A Joined Table session">
559      <fileshapesource filetype="shapefile" id="D137227612"      <fileshapesource filetype="shapefile" id="D137227612"
560          filename="../../Data/iceland/roads-line.shp"/>          filename="../../Data/iceland/roads-line.shp"/>
561      <filetable filetype="DBF" filename="load_joinedtable.dbf" id="D136171140"      <filetable filetype="DBF" filename="load_joinedtable.dbf" id="D136171140"
562          title="Some Title"/>          title="Some Title"/>
563      <jointable leftcolumn="RDLNTYPE" right="D136171140"      <jointable id="D136169900" title="Joined"
564          title="Joined" rightcolumn="RDTYPE" id="D136169900" left="D137227612"/>          right="D136171140" left="D137227612"
565            leftcolumn="RDLNTYPE" rightcolumn="RDTYPE"
566            jointype="LEFT OUTER"/>
567      <derivedshapesource table="D136169900" shapesource="D137227612"      <derivedshapesource table="D136169900" shapesource="D137227612"
568          id="D136170932"/>          id="D136170932"/>
569      <map title="Test Map">      <map title="Test Map">
# Line 542  class TestJoinedTable(LoadSessionTest): Line 595  class TestJoinedTable(LoadSessionTest):
595          # FIXME: The tests shouldn't assume a certain order of the tables          # FIXME: The tests shouldn't assume a certain order of the tables
596          self.assertEquals(tables[0].Title(), "Some Title")          self.assertEquals(tables[0].Title(), "Some Title")
597          self.assertEquals(tables[1].Title(), "Joined")          self.assertEquals(tables[1].Title(), "Joined")
598            self.assertEquals(tables[1].JoinType(), "LEFT OUTER")
599          self.check_format()          self.check_format()
600    
601    
602    
603    class TestPostGISLayer(LoadSessionTest):
604    
605        file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
606    <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
607    <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
608            title="unnamed session">
609        <dbconnection port="%(port)s" host="%(host)s" user="%(user)s"
610            dbtype="postgis" id="D142684948" dbname="%(dbname)s"/>
611        <dbshapesource tablename="landmarks" id="D143149420" dbconn="D142684948"/>
612        <map title="unnamed map">
613            <layer shapestore="D143149420" visible="true" stroke="#000000"
614                    title="landmarks" stroke_width="1" fill="None"/>
615        </map>
616    </session>
617    '''
618    
619        def setUp(self):
620            """Extend the inherited method to start the postgis server
621    
622            Furthermore, patch the file contents with the real postgis db
623            information
624            """
625            postgissupport.skip_if_no_postgis()
626            self.server = postgissupport.get_test_server()
627            self.postgisdb = self.server.get_default_static_data_db()
628    
629            self.file_contents = self.__class__.file_contents % {
630                "dbname": self.postgisdb.dbname,
631                "user": self.server.user_name,
632                "port": self.server.port,
633                "host": self.server.host}
634            LoadSessionTest.setUp(self)
635    
636        def test(self):
637            """Test loading a session containing a postgis shapestore"""
638            session = load_session(self.filename())
639            self.session = session
640            connections = session.DBConnections()
641            self.assertEquals(len(connections), 1)
642            conn = connections[0]
643            for attr, value in [("host", self.server.host),
644                                ("port", str(self.server.port)),
645                                ("user", self.server.user_name),
646                                ("dbname", self.postgisdb.dbname)]:
647                self.assertEquals(getattr(conn, attr), value)
648            layer = session.Maps()[0].Layers()[0]
649            self.failUnless(layer.ShapeStore().DBConnection() is conn)
650    
651    
652    class TestPostGISLayerPassword(LoadSessionTest):
653    
654        file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
655    <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
656    <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
657            title="unnamed session">
658        <dbconnection port="%(port)s" host="%(host)s" user="%(user)s"
659            dbtype="postgis" id="D142684948" dbname="%(dbname)s"/>
660        <dbshapesource tablename="landmarks" id="D143149420" dbconn="D142684948"/>
661        <map title="unnamed map">
662            <layer shapestore="D143149420" visible="true" stroke="#000000"
663                    title="landmarks" stroke_width="1" fill="None"/>
664        </map>
665    </session>
666    '''
667    
668        def setUp(self):
669            """Extend the inherited method to start the postgis server
670    
671            Furthermore, patch the file contents with the real postgis db
672            information
673            """
674            postgissupport.skip_if_no_postgis()
675            self.server = postgissupport.get_test_server()
676            self.postgisdb = self.server.get_default_static_data_db()
677    
678            self.file_contents = self.__class__.file_contents % {
679                "dbname": self.postgisdb.dbname,
680                "user": self.server.user_name,
681                "port": self.server.port,
682                "host": self.server.host}
683            LoadSessionTest.setUp(self)
684    
685            self.db_connection_callback_called = False
686            self.server.require_authentication(True)
687    
688        def tearDown(self):
689            """Extend the inherited method to switch off postgresql authentication
690            """
691            self.server.require_authentication(False)
692            LoadSessionTest.tearDown(self)
693    
694        def db_connection_callback(self, params, message):
695            """Implementation of Thuban.Model.hooks.query_db_connection_parameters
696            """
697            self.assertEquals(params,
698                              {"dbname": self.postgisdb.dbname,
699                               "user": self.server.user_name,
700                               "port": str(self.server.port),
701                               "host": self.server.host})
702            self.db_connection_callback_called = True
703            params = params.copy()
704            params["password"] = self.server.user_password
705            return params
706    
707        def test_with_callback(self):
708            """Test loading a session with postgis, authentication and a callback
709            """
710            session = load_session(self.filename(),
711                          db_connection_callback = self.db_connection_callback)
712            self.session = session
713            connections = session.DBConnections()
714            self.assertEquals(len(connections), 1)
715            conn = connections[0]
716            for attr, value in [("host", self.server.host),
717                                ("port", str(self.server.port)),
718                                ("user", self.server.user_name),
719                                ("dbname", self.postgisdb.dbname)]:
720                self.assertEquals(getattr(conn, attr), value)
721            layer = session.Maps()[0].Layers()[0]
722            self.failUnless(layer.ShapeStore().DBConnection() is conn)
723            self.failUnless(self.db_connection_callback_called)
724    
725        def test_without_callback(self):
726            """Test loading a session with postgis, authentication and no callback
727            """
728            # A password is required and there's no callback, so we should
729            # get a ConnectionError
730            self.assertRaises(ConnectionError, load_session, self.filename())
731    
732        def test_cancel(self):
733            """Test loading a session with postgis and cancelling authentication
734            """
735            def cancel(*args):
736                self.db_connection_callback_called = True
737                return None
738    
739            # If the user cancels, i.e. if the callbakc returns None, a
740            # LoadCancelled exception is raised.
741            self.assertRaises(LoadCancelled,
742                              load_session, self.filename(), cancel)
743            self.failUnless(self.db_connection_callback_called)
744    
745    
746  class TestLoadError(LoadSessionTest):  class TestLoadError(LoadSessionTest):
747    
748      file_contents = '''\      file_contents = '''\
749  <?xml version="1.0" encoding="UTF-8"?>  <?xml version="1.0" encoding="UTF-8"?>
750  <!DOCTYPE session SYSTEM "thuban-0.8.dtd">  <!DOCTYPE session SYSTEM "thuban-1.0.dtd">
751  <session xmlns="http://thuban.intevation.org/dtds/thuban-0.8.dtd"  <session xmlns="http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"
752          title="single map&amp;layer">          title="single map&amp;layer">
753      <fileshapesource id="D1" filename="../../Data/iceland/political.shp"/>      <fileshapesource id="D1" filename="../../Data/iceland/political.shp"/>
754      <map title="Test Map">      <map title="Test Map">
# Line 573  class TestLoadError(LoadSessionTest): Line 771  class TestLoadError(LoadSessionTest):
771          try:          try:
772              self.session = load_session(self.filename())              self.session = load_session(self.filename())
773          except LoadError, value:          except LoadError, value:
774              pass              # Check the actual messge in value to make sure the
775                # LoadError really was about the missing attribute
776                self.assertEquals(str(value),
777                  "Element "
778                  "(u'http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd',"
779                  " u'fileshapesource') requires an attribute 'filetype'")
780          else:          else:
781              self.fail("Missing filetype attribute doesn't raise LoadError")              self.fail("Missing filetype attribute doesn't raise LoadError")
782    
783  if __name__ == "__main__":  if __name__ == "__main__":
784      unittest.main()      support.run_tests()
Legend:
Removed from v.1282  
changed lines
  Added in v.1931
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26