move a test to be near other related tests. natcap#1657

Author: davemfish

tests/test_coastal_vulnerability.py

@@ -1358,6 +1358,48 @@ def test_aoi_invalid_geometry(self):
                 aoi_path, landmass_path, model_resolution, target_vector_path,
                 polygon_pickle, lines_pickle, lines_rtree)
 
+    def test_prepare_landmass_invalid_geometry(self):
+        """CV: test handling invalid geometries in landmass vector."""
+        from natcap.invest import coastal_vulnerability
+        aoi_path = os.path.join(self.workspace_dir, 'aoi.geojson')
+        srs = osr.SpatialReference()
+        srs.ImportFromEPSG(26910)  # UTM Zone 10N
+        wkt = srs.ExportToWkt()
+
+        aoi_geometries = [Polygon([
+            (-200, -200), (200, -200), (200, 200), (-200, 200), (-200, -200)])]
+        pygeoprocessing.shapely_geometry_to_vector(
+            aoi_geometries, aoi_path, wkt, 'GeoJSON')
+
+        landmass_vector_path = os.path.join(self.workspace_dir, 'vector.gpkg')
+        n_features = make_vector_of_invalid_geoms(landmass_vector_path)
+
+        target_polygon_pickle_path = os.path.join(
+            self.workspace_dir, 'polygon.pickle')
+        target_lines_pickle_path = os.path.join(
+            self.workspace_dir, 'lines.pickle')
+        target_rtree_path = os.path.join(self.workspace_dir, 'rtree.dat')
+        # Create rtree files to exercise the function's logic of removing
+        # pre-exisiting files
+        target_rtree_path_base = os.path.splitext(target_rtree_path)[0]
+        open(target_rtree_path, 'a').close()
+        open(target_rtree_path_base + '.idx', 'a').close()
+
+        model_resolution = 100
+        target_vector_path = os.path.join(
+            self.workspace_dir, 'temp-shore-pts.gpkg')
+        coastal_vulnerability.prepare_landmass_line_index_and_interpolate_shore_points(
+            aoi_path, landmass_vector_path, model_resolution,
+            target_vector_path, target_polygon_pickle_path,
+            target_lines_pickle_path, target_rtree_path)
+
+        with open(target_polygon_pickle_path, 'rb') as polygon_file:
+            shapely_geom = pickle.load(polygon_file)
+
+        # Expect 1 input geometry to be skipped, and the rest to be in
+        # shapely_geom_list.
+        self.assertTrue(len(shapely_geom.geoms) == n_features - 1)
+
     def test_no_wwiii_coverage(self):
         """CV: test exception when shore points are outside max wwiii dist."""
         from natcap.invest import coastal_vulnerability
@@ -1434,48 +1476,6 @@ def test_projected_wwiii_input(self):
         layer = None
         vector = None
 
-    def test_prepare_landmass_invalid_geometry(self):
-        """CV: test handling invalid geometries in landmass vector."""
-        from natcap.invest import coastal_vulnerability
-        aoi_path = os.path.join(self.workspace_dir, 'aoi.geojson')
-        srs = osr.SpatialReference()
-        srs.ImportFromEPSG(26910)  # UTM Zone 10N
-        wkt = srs.ExportToWkt()
-
-        aoi_geometries = [Polygon([
-            (-200, -200), (200, -200), (200, 200), (-200, 200), (-200, -200)])]
-        pygeoprocessing.shapely_geometry_to_vector(
-            aoi_geometries, aoi_path, wkt, 'GeoJSON')
-
-        landmass_vector_path = os.path.join(self.workspace_dir, 'vector.gpkg')
-        n_features = make_vector_of_invalid_geoms(landmass_vector_path)
-
-        target_polygon_pickle_path = os.path.join(
-            self.workspace_dir, 'polygon.pickle')
-        target_lines_pickle_path = os.path.join(
-            self.workspace_dir, 'lines.pickle')
-        target_rtree_path = os.path.join(self.workspace_dir, 'rtree.dat')
-        # Create rtree files to exercise the function's logic of removing
-        # pre-exisiting files
-        target_rtree_path_base = os.path.splitext(target_rtree_path)[0]
-        open(target_rtree_path, 'a').close()
-        open(target_rtree_path_base + '.idx', 'a').close()
-
-        model_resolution = 100
-        target_vector_path = os.path.join(
-            self.workspace_dir, 'temp-shore-pts.gpkg')
-        coastal_vulnerability.prepare_landmass_line_index_and_interpolate_shore_points(
-            aoi_path, landmass_vector_path, model_resolution,
-            target_vector_path, target_polygon_pickle_path,
-            target_lines_pickle_path, target_rtree_path)
-
-        with open(target_polygon_pickle_path, 'rb') as polygon_file:
-            shapely_geom = pickle.load(polygon_file)
-
-        # Expect 1 input geometry to be skipped, and the rest to be in
-        # shapely_geom_list.
-        self.assertTrue(len(shapely_geom.geoms) == n_features - 1)
-
     def test_clip_project_already_projected_raster(self):
         """CV: test clip_and_project_raster on an already projected raster."""
         from natcap.invest import coastal_vulnerability