Merge branch 'fix_geojson_test' of git://github.com/p-leger/gtfspy in…

…to p-leger-fix_geojson_test
CxAalto · Aug 29, 2019 · 00eb840 · 00eb840
2 parents 756cde5 + f28fcae
commit 00eb840
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/gtfspy/test/test_exports.py b/gtfspy/test/test_exports.py
@@ -240,21 +240,27 @@ def test_write_stops_geojson(self):
         in_memory_file = io.StringIO()
         exports.write_stops_geojson(self.gtfs, in_memory_file)
         in_memory_file.seek(0)
-        self.assertTrue(geojson.is_valid(in_memory_file.read(-1)))
-        in_memory_file.seek(0)
+
         gjson = geojson.loads(in_memory_file.read(-1))
+
+        self.assertTrue(gjson.is_valid)
+
         gjson_properties = gjson['features'][0]['properties']
+
         self.assertIn("name", gjson_properties.keys())
         self.assertIn("stop_I", gjson_properties.keys())
 
     def test_write_sections_geojson(self):
         in_memory_file = io.StringIO()
         exports.write_sections_geojson(self.gtfs, in_memory_file)
         in_memory_file.seek(0)
-        self.assertTrue(geojson.is_valid(in_memory_file.read(-1)))
-        in_memory_file.seek(0)
+
         gjson = geojson.loads(in_memory_file.read(-1))
+
+        self.assertTrue(gjson.is_valid)
+
         gjson_properties = gjson['features'][0]['properties']
+
         self.assertIn("from_stop_I", gjson_properties.keys())
         self.assertIn("to_stop_I", gjson_properties.keys())
         self.assertIn("n_vehicles", gjson_properties.keys())
@@ -266,10 +272,13 @@ def test_write_routes_geojson(self):
         in_memory_file = io.StringIO()
         exports.write_routes_geojson(self.gtfs, in_memory_file)
         in_memory_file.seek(0)
-        self.assertTrue(geojson.is_valid(in_memory_file.read(-1)))
-        in_memory_file.seek(0)
+
         gjson = geojson.loads(in_memory_file.read(-1))
+
+        self.assertTrue(gjson.is_valid)
+
         gjson_properties = gjson['features'][0]['properties']
+
         self.assertIn("route_type", gjson_properties.keys())
         self.assertIn("route_I", gjson_properties.keys())
         self.assertIn("route_name", gjson_properties.keys())