fixed and added tests

Author: johntruckenbrodt

environment.yml

@@ -16,6 +16,7 @@ dependencies:
   - python>=3.8
   - pyyaml
   - requests
+  - shapely
   - spatialist>=0.15.2
   - sqlalchemy>=1.4,<2.0
   - sqlalchemy-utils>=0.37

requirements.txt

@@ -7,6 +7,7 @@ progressbar2
 psycopg2
 pyyaml
 requests
+shapely
 spatialist>=0.15.2
 sqlalchemy>=1.4,<2.0
 sqlalchemy-utils>=0.37

tests/test_drivers.py

@@ -8,6 +8,7 @@
 from spatialist import Vector
 from sqlalchemy import Table, MetaData, Column, Integer, String
 from geoalchemy2 import Geometry
+from shapely import wkt
 
 metadata = MetaData()
 
@@ -177,14 +178,16 @@ def test_archive(tmpdir, testdata):
     assert len(out) == 1
     assert isinstance(out[0], str)
 
-    out = db.select(vv=1, return_value=['mindate', 'geometry_wkt'])
+    out = db.select(vv=1, return_value=['mindate', 'geometry_wkt', 'geometry_wkb'])
     assert len(out) == 1
     assert isinstance(out[0], tuple)
     assert out[0][0] == '20150222T170750'
-    assert out[0][1] == ('POLYGON(('
-                         '8.505644 50.295261, 8.017178 51.788181, '
-                         '11.653832 52.183979, 12.0268 50.688881, '
-                         '8.505644 50.295261))')
+    geom = wkt.loads('POLYGON(('
+                     '8.505644 50.295261, 12.0268 50.688881, '
+                     '11.653832 52.183979, 8.017178 51.788181, '
+                     '8.505644 50.295261))')
+    assert wkt.loads(out[0][1]) == geom
+    assert out[0][2] == geom.wkb
 
     with pytest.raises(ValueError):
         out = db.select(vv=1, return_value=['foobar'])
@@ -214,9 +217,11 @@ def test_archive2(tmpdir, testdata):
     assert not os.path.isfile(dbfile)
     assert Vector(shp).nfeatures == 1
 
-    with pytest.raises(OSError):
-        with pyroSAR.Archive(dbfile) as db:
+    with pyroSAR.Archive(dbfile) as db:
+        with pytest.raises(OSError):
             db.import_outdated(testdata['archive_old_csv'])
+        with pytest.raises(RuntimeError):
+            db.import_outdated('foobar')
 
     # the archive_old_bbox database contains a relative file name for the scene
     # so that it can be reimported into the new database. The working directory