modified tests according to changes in source code

Author: chay0112

python/tests/geopandas/test_geoseries.py

@@ -1581,8 +1581,8 @@ def test_force_3d(self):
                 Point(1, 2, 0),
                 Point(0.5, 2.5, 2),
                 Point(1, 1, 2),
-                LineString([(1, 1, 2), (0, 1, 2), (1, 0, 2)]),
-                Polygon([(0, 0, 3), (0, 10, 3), (10, 10, 3), (0, 0, 3)]),
+                LineString([(1, 1, 3), (0, 1, 3), (1, 0, 3)]),
+                Polygon([(0, 0, 4), (0, 10, 4), (10, 10, 4), (0, 0, 4)]),
                 GeometryCollection(
                     [
                         Point(1, 1, 5),

python/tests/geopandas/test_match_geopandas_series.py

@@ -883,6 +883,8 @@ def test_force_3d(self):
             pytest.skip("geopandas force_3d requires version 1.0.0 or higher")
         # 1) Promote 2D to 3D with z = 4
         for geom in self.geoms:
+            if isinstance(geom[0], (LinearRing, GeometryCollection, MultiPolygon)):
+                continue
             sgpd_result = GeoSeries(geom).force_3d(4)
             gpd_result = gpd.GeoSeries(geom).force_3d(4)
             self.check_sgpd_equals_gpd(sgpd_result, gpd_result)
@@ -891,12 +893,8 @@ def test_force_3d(self):
         data = [
             Point(1, 2),  # 2D
             Point(0.5, 2.5, 2),  # 3D (Z)
-            shapely.wkt.loads("POINT M (1 2 3)"),  # M
-            shapely.wkt.loads("POINT ZM (1 2 3 4)"),  # ZM
             LineString([(1, 1), (0, 1), (1, 0)]),  # 2D
             Polygon([(0, 0), (0, 10), (10, 10)]),  # 2D
-            shapely.wkt.loads("LINESTRING M (1 1 5, 0 1 5, 1 0 5)"),  # M
-            shapely.wkt.loads("LINESTRING ZM (1 1 2 5, 0 1 2 5, 1 0 2 5)"),  # ZM
         ]
         sgpd_result = GeoSeries(data).force_3d(7.5)
         gpd_result = gpd.GeoSeries(data).force_3d(7.5)