remove remaining usages from tests or mark to suppress warnings

jorisvandenbossche · jorisvandenbossche · commit 722a43c79560 · 2020-09-07T10:11:21.000+02:00
diff --git a/shapely/geometry/collection.py b/shapely/geometry/collection.py
@@ -56,6 +56,8 @@ def geoms(self):
 
 def geos_geometrycollection_from_py(ob):
     """Creates a GEOS GeometryCollection from a list of geometries"""
+    if isinstance(ob, BaseMultipartGeometry):
+         ob = ob.geoms
     L = len(ob)
     N = 2
     subs = (c_void_p * L)()
diff --git a/tests/test_getitem.py b/tests/test_getitem.py
@@ -1,4 +1,4 @@
-from . import unittest
+from . import unittest, shapely20_deprecated
 from shapely import geometry
 
 
@@ -48,6 +48,7 @@ def test_slice_3d_coords(self):
 
 class MultiGeomGetItemTestCase(unittest.TestCase):
 
+    @shapely20_deprecated
     def test_index_multigeom(self):
         c = [(float(x), float(-x)) for x in range(4)]
         g = geometry.MultiPoint(c)
@@ -56,11 +57,13 @@ def test_index_multigeom(self):
         self.assertRaises(IndexError, lambda: g[4])
         self.assertRaises(IndexError, lambda: g[-5])
 
+    @shapely20_deprecated
     def test_index_multigeom_misc(self):
         g = geometry.MultiLineString()  # empty
         self.assertRaises(IndexError, lambda: g[0])
         self.assertRaises(TypeError, lambda: g[0.0])
 
+    @shapely20_deprecated
     def test_slice_multigeom(self):
         c = [(float(x), float(-x)) for x in range(4)]
         g = geometry.MultiPoint(c)
diff --git a/tests/test_multilinestring.py b/tests/test_multilinestring.py
@@ -32,8 +32,8 @@ def test_multilinestring(self):
 
         # Sub-geometry Access
         geom = MultiLineString([(((0.0, 0.0), (1.0, 2.0)))])
-        self.assertIsInstance(geom[0], LineString)
-        self.assertEqual(dump_coords(geom[0]), [(0.0, 0.0), (1.0, 2.0)])
+        self.assertIsInstance(geom.geoms[0], LineString)
+        self.assertEqual(dump_coords(geom.geoms[0]), [(0.0, 0.0), (1.0, 2.0)])
         with self.assertRaises(IndexError):  # index out of range
             geom.geoms[1]
 
@@ -42,7 +42,6 @@ def test_multilinestring(self):
                          {'type': 'MultiLineString',
                           'coordinates': (((0.0, 0.0), (1.0, 2.0)),)})
 
-
     def test_from_multilinestring_z(self):
         coords1 = [(0.0, 1.0, 2.0), (3.0, 4.0, 5.0)]
         coords2 = [(6.0, 7.0, 8.0), (9.0, 10.0, 11.0)]
@@ -85,6 +84,7 @@ def test_numpy_adapter(self):
 
         # TODO: is there an inverse?
 
+    @shapely20_deprecated
     def test_subgeom_access(self):
         line0 = LineString([(0.0, 1.0), (2.0, 3.0)])
         line1 = LineString([(4.0, 5.0), (6.0, 7.0)])
diff --git a/tests/test_multipoint.py b/tests/test_multipoint.py
@@ -89,6 +89,7 @@ def test_numpy_adapter(self):
         pas = asarray(geoma)
         assert_array_equal(pas, array([[1., 2.], [3., 4.]]))
 
+    @shapely20_deprecated
     def test_subgeom_access(self):
         p0 = Point(1.0, 2.0)
         p1 = Point(3.0, 4.0)
diff --git a/tests/test_multipolygon.py b/tests/test_multipolygon.py
@@ -74,6 +74,7 @@ def test_multipolygon_adapter(self):
         self.assertEqual(len(mpa.geoms[0].interiors), 1)
         self.assertEqual(len(mpa.geoms[0].interiors[0].coords), 5)
 
+    @shapely20_deprecated
     def test_subgeom_access(self):
         poly0 = Polygon([(0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0)])
         poly1 = Polygon([(0.25, 0.25), (0.25, 0.5), (0.5, 0.5), (0.5, 0.25)])
diff --git a/tests/test_shared_paths.py b/tests/test_shared_paths.py
@@ -17,10 +17,10 @@ def test_shared_paths_forward(self):
         a, b = result.geoms
         self.assertTrue(isinstance(a, MultiLineString))
         self.assertTrue(len(a) == 1)
-        self.assertEqual(a[0].coords[:], [(5, 0), (10, 0)])
+        self.assertEqual(a.geoms[0].coords[:], [(5, 0), (10, 0)])
         self.assertTrue(b.is_empty)
 
-    def test_shared_paths_forward(self):
+    def test_shared_paths_forward2(self):
         g1 = LineString([(0, 0), (10, 0), (10, 5), (20, 5)])
         g2 = LineString([(15, 0), (5, 0)])
         result = shared_paths(g1, g2)
@@ -30,7 +30,7 @@ def test_shared_paths_forward(self):
         a, b = result.geoms
         self.assertTrue(isinstance(b, MultiLineString))
         self.assertTrue(len(b) == 1)
-        self.assertEqual(b[0].coords[:], [(5, 0), (10, 0)])
+        self.assertEqual(b.geoms[0].coords[:], [(5, 0), (10, 0)])
         self.assertTrue(a.is_empty)
     
     def test_wrong_type(self):
diff --git a/tests/test_split.py b/tests/test_split.py
@@ -23,7 +23,7 @@ def helper(self, geom, splitter, expected_chunks):
 				raise ValueError
 		elif expected_chunks == 1:
 			# not split --> expected equal to line
-			self.assertTrue(s[0].equals(geom))
+			self.assertTrue(s.geoms[0].equals(geom))
 
 	def test_split_closed_line_with_point(self):
 		# point at start/end of closed ring -> return equal
@@ -175,15 +175,15 @@ def test_split_closed_ring_with_point(self):
 		splitter = Point([0.0, 0.5])
 		self.helper(self.ls, splitter, 2)
 		result = split(self.ls, splitter)
-		assert result[0].coords[:] == [(0, 0), (0.0, 0.5)]
-		assert result[1].coords[:] == [(0.0, 0.5), (0, 1), (1, 1), (1, 0), (0, 0)]
+		assert result.geoms[0].coords[:] == [(0, 0), (0.0, 0.5)]
+		assert result.geoms[1].coords[:] == [(0.0, 0.5), (0, 1), (1, 1), (1, 0), (0, 0)]
 
 		# previously failed, see GH#585
 		splitter = Point([0.5, 0.0])
 		self.helper(self.ls, splitter, 2)
 		result = split(self.ls, splitter)
-		assert result[0].coords[:] == [(0, 0), (0, 1), (1, 1), (1, 0), (0.5, 0)]
-		assert result[1].coords[:] == [(0.5, 0), (0, 0)]
+		assert result.geoms[0].coords[:] == [(0, 0), (0, 1), (1, 1), (1, 0), (0.5, 0)]
+		assert result.geoms[1].coords[:] == [(0.5, 0), (0, 0)]
 
 		splitter = Point([2.0, 2.0])
 		self.helper(self.ls, splitter, 1)
