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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1687 by bh,
Fri Aug 29 10:02:16 2003 UTC
+revision 2446 by frank,
Mon Dec 13 11:52:34 2004 UTC
 Line 1
- # Copyright (c) 2002, 2003 by Intevation GmbH
+ # Copyright (c) 2002, 2003, 2004 by Intevation GmbH
  # Authors:
  # Bernhard Herzog <[email protected]>
  #
 Line 16 
 files created by Thuban 0.2.
  Maintenance of the test cases:
  When during a development period the file format is changed with respect
- to the last released version for the first, the tests here should be
+ to the last released version for the first time, the tests here should
- copied to the version specific test file. The round-trip tests which
+ be copied to the version specific test file.  The round-trip tests which
  save the session again and compare the XML files should not be copied
  over as they only make sense here to make sure th that the files checked
  here are actually ones that may have been written by the current thuban
 Line 38 
 import postgissupport
  from xmlsupport import sax_eventlist
  import dbflib
+ import shapelib
  from Thuban.Model.save import save_session
  from Thuban.Model.load import load_session, parse_color, LoadError, \
-Line 46 
 from Thuban.Model.color import Transpare
+Line 47 
 from Thuban.Model.color import Transpare
  from Thuban.Model.classification import ClassGroupProperties, ClassGroupRange,\
      ClassGroupSingleton, ClassGroupDefault
  from Thuban.Model.postgisdb import ConnectionError
+ from Thuban.Model.table import DBFTable, MemoryTable, \
+      FIELDTYPE_DOUBLE, FIELDTYPE_INT, FIELDTYPE_STRING, \
+      table_to_dbf
+ from Thuban.Model.label import ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM, \
+      ALIGN_LEFT, ALIGN_RIGHT, ALIGN_BASELINE
  def filenames_equal(name1, name2):
      """Return true if the filenames name1 and name2 are equal.
-Line 82 
 class LoadSessionTest(support.FileLoadTe
+Line 89 
 class LoadSessionTest(support.FileLoadTe
          self.session = None
-     dtd = "http://thuban.intevation.org/dtds/thuban-0.9.dtd"
+     dtd = "http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
      thubanids = [((dtd, n), (None, "id")) for n in
                   ["fileshapesource", "filetable", "jointable",
                    "derivedshapesource"]]
-Line 92 
 class LoadSessionTest(support.FileLoadTe
+Line 99 
 class LoadSessionTest(support.FileLoadTe
                       ("jointable", "right"),
                       ("derivedshapesource", "table"),
                       ("derivedshapesource", "shapesource")]]
-     filenames = [((dtd, n), (None, m)) for n, m in
-                  [("fileshapesource", "filename"),
+     # The filenames in the tests should be understandable on all
-                   ("rasterlayer", "filename"),
+     # currently supported platforms so filenames is an empty list
-                   ("filetable", "filename")]]
+     filenames = []
      del n, m, dtd
      def check_format(self):
-Line 154 
 class ClassificationTest(LoadSessionTest
+Line 162 
 class ClassificationTest(LoadSessionTest
                  props.SetLineWidth(data[CLASSES][i][GROUP_PROPS][1])
                  props.SetFill(
                      parse_color(data[CLASSES][i][GROUP_PROPS][2]))
+                 if len(data[CLASSES][i][GROUP_PROPS]) > 3:
+                     props.SetSize(data[CLASSES][i][GROUP_PROPS][3])
                  if data[CLASSES][i][GROUP_TYPE] == "default":
                      g = ClassGroupDefault(props, data[CLASSES][i][GROUP_LABEL])
-Line 173 
 class ClassificationTest(LoadSessionTest
+Line 183 
 class ClassificationTest(LoadSessionTest
  class TestSingleLayer(LoadSessionTest):
+     # Note: The use of &amp; and non-ascii characters is deliberate. We
+     # want to test whether the loading code handles that correctly.
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-0.9.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9.dtd"
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
-         title="single map&amp;layer">
+         title="Stra\xc3\x9fen &amp; Landmarken">
      <fileshapesource filetype="shapefile" id="D1"
          filename="../../Data/iceland/political.shp"/>
-     <map title="Test Map">
+     <map title="\xc3\x9cbersicht">
-         <projection name="Unknown">
+         <projection epsg="32627" name="WGS 84 / UTM zone 27N">
-             <parameter value="zone=26"/>
+             <parameter value="datum=WGS84"/>
+             <parameter value="ellps=WGS84"/>
              <parameter value="proj=utm"/>
-             <parameter value="ellps=clrk66"/>
+             <parameter value="units=m"/>
+             <parameter value="zone=27"/>
          </projection>
          <layer shapestore="D1" visible="true"
-                 stroke="#000000" title="My Layer" stroke_width="1"
+                 stroke="#000000" title="K\xc3\xbcste" stroke_width="1"
                  fill="None"/>
      </map>
  </session>
-Line 200 
 class TestSingleLayer(LoadSessionTest):
+Line 214 
 class TestSingleLayer(LoadSessionTest):
          self.session = session
          # Check the title
-         eq(session.Title(), "single map&layer")
+         eq(session.Title(), "Stra\xdfen & Landmarken")
          # the session has one map.
          maps = session.Maps()
-Line 208 
 class TestSingleLayer(LoadSessionTest):
+Line 222 
 class TestSingleLayer(LoadSessionTest):
          # Check the map's attributes
          map = maps[0]
-         eq(map.Title(), "Test Map")
+         eq(map.Title(), "\xdcbersicht")
+         proj = map.GetProjection()
+         eq(proj.GetName(), "WGS 84 / UTM zone 27N")
+         eq(proj.EPSGCode(), "32627")
+         params = proj.GetAllParameters()
+         params.sort()
+         eq(params, ["datum=WGS84", "ellps=WGS84", "proj=utm", "units=m",
+                     "zone=27"])
          # the map has a single layer
          layers = map.Layers()
-Line 216 
 class TestSingleLayer(LoadSessionTest):
+Line 237 
 class TestSingleLayer(LoadSessionTest):
          # Check the layer attributes
          layer = layers[0]
-         eq(layer.Title(), "My Layer")
+         eq(layer.Title(), "K\xfcste")
          self.failUnless(filenames_equal(layer.ShapeStore().FileName(),
                                          os.path.join(self.temp_dir(),
                                                       os.pardir, os.pardir,
-Line 231 
 class TestSingleLayer(LoadSessionTest):
+Line 252 
 class TestSingleLayer(LoadSessionTest):
          self.session.Destroy()
          self.session = None
+     def test_leak(self):
+         """Test load_session for resource leaks
+         The load_session function had a resource leak in that it created
+         cyclic references. The objects would have been eventually
+         collected by the garbage collector but too late. One symptom is
+         that when layers are removed so that the last normal reference
+         owned indirectly by the session to a shape store goes away, the
+         shape store is not actually removed from the session even though
+         the session only keeps weak references because there are still
+         references owned by the cyclic garbage.
+         """
+         session = load_session(self.filename())
+         self.session = session
+         # sanity check
+         self.assertEquals(len(session.ShapeStores()), 1)
+         # remove the map. The shapestore should go away too
+         session.RemoveMap(session.Maps()[0])
+         self.assertEquals(len(session.ShapeStores()), 0)
+ class TestNonAsciiColumnName(LoadSessionTest):
+     file_contents = '''\
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
+         title="Non ASCII column name test">
+     <fileshapesource filetype="shapefile" id="D1"
+         filename="TestNonAsciiColumnName.shp"/>
+     <map title="map">
+         <projection name="Some Projection">
+             <parameter value="datum=WGS84"/>
+             <parameter value="ellps=WGS84"/>
+             <parameter value="proj=utm"/>
+             <parameter value="units=m"/>
+             <parameter value="zone=27"/>
+         </projection>
+         <layer shapestore="D1" visible="true"
+                 stroke="#000000" title="layer" stroke_width="1"
+                 fill="None">
+             <classification field="Fl\xc3\xa4che" field_type="double">
+                 <clnull label="">
+                     <cldata stroke="#000000" stroke_width="1" fill="None"/>
+                 </clnull>
+             </classification>
+         </layer>
+     </map>
+ </session>
+ '''
+     def test(self):
+         """Load a session with a single map with a single layer"""
+         # Create a shapefile and a dbffile with a non-ascii column name
+         dbffile = self.temp_file_name("TestNonAsciiColumnName.dbf")
+         shpfile = self.temp_file_name("TestNonAsciiColumnName.shp")
+         dbf = dbflib.create(dbffile)
+         dbf.add_field('Fl\xe4che', dbflib.FTDouble, 10, 5)
+         dbf.write_record(0, (0.0,))
+         dbf.close()
+         shp = shapelib.create(shpfile, shapelib.SHPT_POLYGON)
+         shp.write_object(-1, shapelib.SHPObject(shapelib.SHPT_POLYGON, 1,
+                                                 [[(0,0), (10, 10), (10, 0),
+                                                   (0, 0)]]))
+         shp.close()
+         try:
+             session = load_session(self.filename())
+         except ValueError, v:
+             # Usually if the field name is not decoded properly the
+             # loading fails because the field type mentioned in the file
+             # is not None as returned from the layer for a non-existing
+             # column name so we check for that and report it as failure.
+             # Other exceptions are errors in the test case.
+             if str(v) == "xml field type differs from database!":
+                 self.fail("Cannot load file with non-ascii column names")
+             else:
+                 raise
+         self.session = session
+         # In case Thuban could load the file anyway (i.e. no ValueError
+         # exception in load_session()), check explicitly whether the
+         # field name was decoded properly. The test will probably lead
+         # to a UnicodeError instead of a test failure so we check that
+         # too
+         layer = session.Maps()[0].Layers()[0]
+         try:
+             self.assertEquals(layer.GetClassificationColumn(), 'Fl\xe4che')
+         except UnicodeError:
+             # FIXME: Obviously this will have to change if Thuban ever
+             # supports unicode properly.
+             self.fail("Column name was not converted to a bytestring")
+         # roundtrip check
+         self.check_format()
  class TestLayerVisibility(LoadSessionTest):
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-0.9.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9.dtd"
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
          title="single map&amp;layer">
      <fileshapesource filetype="shapefile" id="D1"
          filename="../../Data/iceland/political.shp"/>
-Line 270 
 class TestLayerVisibility(LoadSessionTes
+Line 390 
 class TestLayerVisibility(LoadSessionTes
          self.check_format()
+ class TestSymbolSize(ClassificationTest):
+     file_contents = '''\
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd" title="Thuban sample session">
+     <fileshapesource filetype="shapefile" id="D813968480" filename="../../Data/iceland/cultural_landmark-point.shp"/>
+     <map title="Iceland map">
+         <layer title="cultural_landmark-point" stroke_width="1" shapestore="D813968480" visible="true" stroke="#000000" fill="#000000">
+             <classification field="CLPTLABEL" field_type="string">
+                 <clnull label="">
+                     <cldata stroke="#000000" stroke_width="1" size="3" fill="#000000"/>
+                 </clnull>
+                 <clpoint label="" value="RUINS">
+                     <cldata stroke="#000000" stroke_width="1" size="6" fill="#ffffff"/>
+                 </clpoint>
+                 <clpoint label="" value="FARM">
+                     <cldata stroke="#000000" stroke_width="1" size="9" fill="#ffff00"/>
+                 </clpoint>
+             </classification>
+         </layer>
+     </map>
+ </session>
+ '''
+     def test(self):
+         """Test that the size attribute for point symbols is correctly
+         loaded for a layer."""
+         eq = self.assertEquals
+         session = load_session(self.filename())
+         self.session = session
+         map = session.Maps()[0] # only one map in the sample
+         expected = [("cultural_landmark-point", 2,
+                         [("default", (), "",
+                             ("#000000", 1, "#000000", 3)),
+                          ("single", "RUINS", "",
+                             ("#000000", 1, "#ffffff", 6)),
+                          ("single", "FARM", "",
+                             ("#000000", 1, "#ffff00", 9))])]
+         self.TestLayers(map.Layers(), expected)
+         self.check_format()
  class TestClassification(ClassificationTest):
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session title="single map&amp;layer">
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
-         <map title="Test Map">
+         title="single map&amp;layer">
-                 <projection>
+     <fileshapesource filetype="shapefile" id="D138389860"
-                         <parameter value="zone=26"/>
+         filename="../../Data/iceland/political.shp"/>
-                         <parameter value="proj=utm"/>
+     <fileshapesource filetype="shapefile" id="D138504492"
-                         <parameter value="ellps=clrk66"/>
+         filename="../../Data/iceland/political.shp"/>
-                 </projection>
+     <map title="Test Map">
-                 <layer title="My Layer" stroke_width="1" fill="None"
+         <projection name="">
-                     filename="../../Data/iceland/political.shp"
+             <parameter value="zone=26"/>
-                     stroke="#000000">
+             <parameter value="proj=utm"/>
+             <parameter value="ellps=clrk66"/>
+         </projection>
+         <layer shapestore="D138389860" visible="true" stroke="#000000"
+                 title="My Layer" stroke_width="1" fill="None">
              <classification field="POPYREG" field_type="string">
-                 <clnull>
+                 <clnull label="">
                      <cldata stroke="#000000" stroke_width="1" fill="None"/>
                  </clnull>
-                 <clpoint value="1">
+                 <clpoint label="" value="1">
                      <cldata stroke="#000000" stroke_width="2" fill="None"/>
                  </clpoint>
-                 <clpoint value="1">
+                 <clpoint label="" value="1">
                      <cldata stroke="#000000" stroke_width="10" fill="None"/>
                  </clpoint>
-                 <clpoint value="\xc3\xa4\xc3\xb6\xc3\xbc"
+                 <clpoint label="\xc3\x9cml\xc3\xa4uts"
-                          label="\xc3\x9cml\xc3\xa4uts">
+                         value="\xc3\xa4\xc3\xb6\xc3\xbc">
-                     <cldata fill="None" stroke="#000000" stroke_width="1"/>
+                     <cldata stroke="#000000" stroke_width="1" fill="None"/>
                  </clpoint>
              </classification>
          </layer>
-                 <layer title="My Layer 2" stroke_width="1" fill="None"
+         <layer shapestore="D138504492" visible="true" stroke="#000000"
-                     filename="../../Data/iceland/political.shp"
+                 title="My Layer 2" stroke_width="2" fill="None">
-                     stroke="#000000">
              <classification field="AREA" field_type="double">
-                 <clnull>
+                 <clnull label="">
                      <cldata stroke="#000000" stroke_width="2" fill="None"/>
                  </clnull>
-                 <clrange min="0" max="1">
+                 <clrange label="" range="[0;1[">
                      <cldata stroke="#111111" stroke_width="1" fill="None"/>
                  </clrange>
-                 <clpoint value=".5">
+                 <clpoint label="" value="0.5">
                      <cldata stroke="#000000" stroke_width="1" fill="#111111"/>
                  </clpoint>
-                 <clrange min="-1" max="0">
+                 <clrange label="" range="[-1;0[">
                      <cldata stroke="#000000" stroke_width="1" fill="None"/>
                  </clrange>
-                 <clpoint value="-.5">
+                 <clpoint label="" value="-0.5">
                      <cldata stroke="#000000" stroke_width="1" fill="None"/>
                  </clpoint>
              </classification>
          </layer>
-         </map>
+     </map>
  </session>
  '''
-Line 356 
 class TestClassification(ClassificationT
+Line 526 
 class TestClassification(ClassificationT
          self.TestLayers(map.Layers(), expected)
+         self.check_format()
  class TestLabels(ClassificationTest):
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-0.9.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9.dtd"
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
          title="single map&amp;layer">
      <fileshapesource filetype="shapefile" id="D1"
          filename="../../Data/iceland/political.shp"/>
-Line 409 
 class TestLayerProjection(LoadSessionTes
+Line 581 
 class TestLayerProjection(LoadSessionTes
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-0.9.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9.dtd"
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
          title="single map&amp;layer">
      <fileshapesource filetype="shapefile" id="D2"
          filename="../../Data/iceland/roads-line.shp"/>
-Line 487 
 class TestRasterLayer(LoadSessionTest):
+Line 659 
 class TestRasterLayer(LoadSessionTest):
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-0.9.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9.dtd"
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
          title="single map&amp;layer">
      <map title="Test Map">
          <rasterlayer visible="false" filename="../../Data/iceland/island.tif"
-Line 521 
 class TestRasterLayer(LoadSessionTest):
+Line 693 
 class TestRasterLayer(LoadSessionTest):
  class TestJoinedTable(LoadSessionTest):
      file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-0.9.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9.dtd" title="A Joined Table session">
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd" title="A Joined Table session">
      <fileshapesource filetype="shapefile" id="D137227612"
          filename="../../Data/iceland/roads-line.shp"/>
      <filetable filetype="DBF" filename="load_joinedtable.dbf" id="D136171140"
-Line 566 
 class TestJoinedTable(LoadSessionTest):
+Line 738 
 class TestJoinedTable(LoadSessionTest):
          self.check_format()
+ class TestLabelLayer(LoadSessionTest):
+     # Note that the labels deliberately contain non-ascii characters to
+     # test whether they're supported correctly.
+     file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd" title="Thuban sample session">
+     <fileshapesource filetype="shapefile" id="D145265052"
+         filename="../../Data/iceland/political.shp"/>
+     <fileshapesource filetype="shapefile" id="D145412868"
+         filename="../../Data/iceland/cultural_landmark-point.shp"/>
+     <map title="Iceland map">
+         <projection name="Unknown">
+             <parameter value="zone=26"/>
+             <parameter value="proj=utm"/>
+             <parameter value="ellps=clrk66"/>
+         </projection>
+         <layer shapestore="D145265052" visible="true" stroke="#000000"
+                 title="political" stroke_width="1" fill="#c0c0c0">
+             <projection name="Geographic">
+                 <parameter value="proj=latlong"/>
+                 <parameter value="to_meter=0.017453"/>
+                 <parameter value="ellps=clrk66"/>
+             </projection>
+         </layer>
+         <layer shapestore="D145412868" visible="true" stroke="#000000"
+                 title="landmarks" stroke_width="1" fill="#ffff00">
+             <projection name="Geographic">
+                 <parameter value="proj=latlong"/>
+                 <parameter value="to_meter=0.017453"/>
+                 <parameter value="ellps=clrk66"/>
+             </projection>
+         </layer>
+         <labellayer>
+             <label x="-21.5" y="64.25" text="RUINS"
+                 halign="left" valign="center"/>
+             <label x="-15.125" y="64.75" text="H\xc3\xbctte"
+                 halign="right" valign="top"/>
+         </labellayer>
+     </map>
+ </session>
+ '''
+     def test(self):
+         """Test loading a session with a label layer"""
+         session = load_session(self.filename())
+         self.session = session
+         label_layer = self.session.Maps()[0].LabelLayer()
+         expected_labels = [(-21.5, 64.25, "RUINS", ALIGN_LEFT, ALIGN_CENTER),
+                            (-15.125, 64.75, "H\xfctte", ALIGN_RIGHT, ALIGN_TOP),
+                            ]
+         for label, values in zip(label_layer.Labels(), expected_labels):
+             self.assertEquals((label.x, label.y, label.text, label.halign,
+                                label.valign),
+                               values)
+         self.check_format()
  class TestPostGISLayer(LoadSessionTest):
      file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-0.9.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9.dtd"
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
          title="unnamed session">
      <dbconnection port="%(port)s" host="%(host)s" user="%(user)s"
          dbtype="postgis" id="D142684948" dbname="%(dbname)s"/>
-     <dbshapesource tablename="landmarks" id="D143149420" dbconn="D142684948"/>
+     <dbshapesource id="D143149420" dbconn="D142684948"
+         tablename="landmarks_point_id" id_column="point_id"
+         geometry_column="the_geom" />
      <map title="unnamed map">
          <layer shapestore="D143149420" visible="true" stroke="#000000"
                  title="landmarks" stroke_width="1" fill="None"/>
-Line 619 
 class TestPostGISLayer(LoadSessionTest):
+Line 852 
 class TestPostGISLayer(LoadSessionTest):
  class TestPostGISLayerPassword(LoadSessionTest):
      file_contents = '''<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-0.9.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9.dtd"
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
          title="unnamed session">
      <dbconnection port="%(port)s" host="%(host)s" user="%(user)s"
          dbtype="postgis" id="D142684948" dbname="%(dbname)s"/>
-Line 714 
 class TestLoadError(LoadSessionTest):
+Line 947 
 class TestLoadError(LoadSessionTest):
      file_contents = '''\
  <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE session SYSTEM "thuban-0.9.dtd">
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
- <session xmlns="http://thuban.intevation.org/dtds/thuban-0.9.dtd"
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"
          title="single map&amp;layer">
      <fileshapesource id="D1" filename="../../Data/iceland/political.shp"/>
      <map title="Test Map">
-Line 742 
 class TestLoadError(LoadSessionTest):
+Line 975 
 class TestLoadError(LoadSessionTest):
              # LoadError really was about the missing attribute
              self.assertEquals(str(value),
                "Element "
-               "(u'http://thuban.intevation.org/dtds/thuban-0.9.dtd',"
+               "(u'http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd',"
                " u'fileshapesource') requires an attribute 'filetype'")
          else:
              self.fail("Missing filetype attribute doesn't raise LoadError")
+ class Shapefile_CallBack:
+     def __init__(self, params):
+         """Initialize the callback return values.
+            params must be a dictionary of the potential CB modes (keys),
+            with lists of tuples of return values as values.
+            Depending on the test the callback can be called multiple,
+            each time a return value is poped from the list
+         """
+         self.params = params
+     def s_cb(self, filename, mode = None, second_try= 0):
+         if self.params.has_key(mode):
+             return self.params[mode].pop(0)
+         else:
+             raise LoadError
+ class TestAltPath(LoadSessionTest):
+     """Test the various cases in the alternative path feature.
+        The test checks the reasonable cases:
+        - First recognition of a path error, fixed with user interaction.
+        - First recognition of a path error, load cancelled.
+        - Path error fixed from list, confirmed by user.
+        - Path error fixed from list, changed by user.
+        - Path error fixed from list, cancelled by user.
+        - Path error wrongly fixed from list, manual fix forced.
+     """
+     file_contents = '''\
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE session SYSTEM "thuban-1.1.dtd">
+ <session xmlns="http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd" title="Thuban sample session">
+     <fileshapesource filetype="shapefile" id="D1108450956" filename="../../Data/iceland/political.shp"/>
+     <fileshapesource filetype="shapefile" id="D1108900076" filename="../Data/iceland/roads-line.shp"/>
+     <fileshapesource filetype="shapefile" id="D1108947244" filename="../../Data/iceland/cultural_landmark-point.shp"/>
+     <map title="not the iceland map">
+         <layer title="political" stroke_width="1" shapestore="D1108450956" visible="true" stroke="#000000" fill="#c0c0c0"/>
+         <layer title="roads-line" stroke_width="1" shapestore="D1108900076" visible="true" stroke="#000000" fill="None"/>
+         <layer title="something else" stroke_width="1" shapestore="D1108947244" visible="true" stroke="#000000" fill="None"/>
+     </map>
+ </session>
+ '''
+     def test_01_single_path_error_fix(self):
+         """Test single file path error fix."""
+         # The usual initial case
+         s_cb = Shapefile_CallBack({
+                     "search": [("../Data/iceland/roads-line.shp",0)],
+                     "check": [(None, None)]})
+         self.session = load_session(self.filename(),
+                                     shapefile_callback =s_cb.s_cb)
+         self.session.Destroy()
+         self.session = None
+     def test_02_path_error_fix_from_list(self):
+         """Test single file path error fix."""
+         # This represents the usual case for "from_list"
+         s_cb = Shapefile_CallBack({
+                 "search": [("../Data/iceland/roads-line.shp",1)],
+                 "check": [(os.path.abspath("../Data/iceland/roads-line.shp"),1)]
+                })
+         self.session = load_session(self.filename(),
+                                     shapefile_callback =s_cb.s_cb)
+         self.session.Destroy()
+         self.session = None
+     def test_03_single_path_error_cancelled(self):
+         """Test alternative path cancelled."""
+         s_cb = Shapefile_CallBack({
+                     "search": [(None,0)],
+                     "check": [(None, None)]})
+         self.assertRaises(LoadCancelled,
+                             load_session, self.filename(), None, s_cb.s_cb)
+     def test_04_path_error_fix_from_list_cancelled(self):
+         """Test alternative path from list cancelled."""
+         s_cb = Shapefile_CallBack({
+                 "search": [("../Data/iceland/roads-line.shp",1)],
+                 "check": [(None,1)]
+                })
+         self.assertRaises(LoadCancelled,
+                             load_session, self.filename(), None, s_cb.s_cb)
+     def test_05_path_error_fix_from_list_changed(self):
+         """Test alternative path from list changed."""
+         s_cb = Shapefile_CallBack({
+                 "search": [("../Data/iceland/roads-line.shp",1)],
+                 "check": [("../Data/iceland/roads-line.shp",0)]
+                })
+         self.session = load_session(self.filename(),
+                                     shapefile_callback =s_cb.s_cb)
+         self.session.Destroy()
+         self.session = None
+     def test_06_path_error_fix_from_list_fails(self):
+         """Test alternative path recovery from list."""
+         s_cb = Shapefile_CallBack({
+                 "search": [("../wrong/iceland/roads-line.shp",1),
+                             ("../Data/iceland/roads-line.shp",0)],
+                 "check": [(None,None)]
+                })
+         self.session = load_session(self.filename(),
+                                     shapefile_callback =s_cb.s_cb)
+         self.assertRaises(IndexError,
+                             s_cb.s_cb, None, "search")
+         self.session.Destroy()
+         self.session = None
  if __name__ == "__main__":
      support.run_tests()

 Legend:



Removed from v.1687
 


changed lines


 
Added in v.2446
 Legend:



Removed from v.1687
 


changed lines


 
Added in v.2446
-Removed from v.1687
+Added in v.2446

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26