Restructure tests

Author: p4ken

tests/cases/mod.rs

@@ -3,6 +3,8 @@ use std::{borrow::Cow, collections::HashMap, io::Cursor};
 use flatgeobuf::FallibleStreamingIterator;
 use serde::{Deserialize, Serialize};
 
+mod testing;
+
 #[derive(Serialize, Deserialize)]
 struct Feat {
     name: Cow<'static, str>,
@@ -26,7 +28,7 @@ fn ser_test() -> anyhow::Result<()> {
         name: "hello".into(),
         child: Child {
             value: 42,
-            shape: crate::testing::ls(1),
+            shape: testing::ls(1),
         },
     };
     fgb_ser.serialize_feature(&feat.child.shape, &feat)?;
@@ -58,7 +60,7 @@ fn de_test() -> anyhow::Result<()> {
     let mut fgb_buf = Vec::new();
     let mut fgb_writer = flatgeobuf::FgbWriter::create("", flatgeobuf::GeometryType::LineString)?;
     flatgeobuf::geozero::GeozeroGeometry::process_geom(
-        &geo_types::Geometry::LineString(crate::testing::ls(1)),
+        &geo_types::Geometry::LineString(testing::ls(1)),
         &mut fgb_writer,
     )?;
     flatgeobuf::geozero::PropertyProcessor::property(
@@ -80,7 +82,7 @@ fn de_test() -> anyhow::Result<()> {
     let mut fgb_de = geoserde::fgb::FeatureDeserializer::new(fgb_reader)?;
     let (geom, props) = fgb_de.deserialize_feature::<geo_types::LineString, Feat>()?;
 
-    assert_eq!(geom, crate::testing::ls(1));
+    assert_eq!(geom, testing::ls(1));
     assert_eq!(props.name, "hello");
     assert_eq!(props.child.value, 42);
     Ok(())

tests/cases/fgb_flatten.rs tests/fgb_flatten.rstests/cases/fgb_flatten.rs renamed to tests/fgb_flatten.rs

@@ -3,6 +3,8 @@ use std::{borrow::Cow, collections::HashMap, io::Cursor};
 use flatgeobuf::FallibleStreamingIterator;
 use serde::Serialize;
 
+mod testing;
+
 #[derive(Serialize)]
 struct Feat {
     name: Cow<'static, str>,
@@ -25,7 +27,7 @@ fn ser_test() -> anyhow::Result<()> {
         name: "hello".into(),
         child: Child {
             value: 42,
-            shape: crate::testing::ls(1),
+            shape: testing::ls(1),
         },
     };
     fgb_ser.serialize_feature(&feat.child.shape, &feat)?;

tests/cases/fgb_nested.rs tests/fgb_nested.rstests/cases/fgb_nested.rs renamed to tests/fgb_nested.rs

@@ -1,21 +1,11 @@
-// 要件整理
-
-// ソートしたいのは任意の HashMap. properties 全体ではない。
-// ソートは serialze_feature の外で実施。
-
-// ソートするには HashMap を flatten する必要がある。
-// flatten も serialize_feature の外で実施。
-// とはいえ serialize_feature は任意の構造を受け入れたい気持ちもある
-// flatten は serialize_feature の中でも実施される。
-
 use std::collections::{BTreeSet, HashMap};
 use std::io::Cursor;
 
 use flatgeobuf::FallibleStreamingIterator;
 use serde::Serialize;
 
-use geoserde::ser;
 use geoserde::fgb::LayerSerializer;
+use geoserde::ser;
 
 #[derive(Serialize)]
 struct Feat {