refactor schemars related tests

Author: mdepta42

src/lib.rs

@@ -2651,51 +2651,9 @@ mod impl_schemars {
 
     #[test]
     fn schema_generation_does_not_panic_for_common_floats() {
-        {
-            let schema = schemars::gen::SchemaGenerator::default()
-                .into_root_schema_for::<OrderedFloat<f32>>();
-            assert_eq!(
-                schema.schema.instance_type,
-                Some(schemars::schema::SingleOrVec::Single(std::boxed::Box::new(
-                    schemars::schema::InstanceType::Number
-                )))
-            );
-            assert_eq!(
-                schema.schema.metadata.unwrap().title.unwrap(),
-                std::string::String::from("float")
-            );
-        }
-        {
-            let schema = schemars::gen::SchemaGenerator::default()
-                .into_root_schema_for::<OrderedFloat<f64>>();
-            assert_eq!(
-                schema.schema.instance_type,
-                Some(schemars::schema::SingleOrVec::Single(std::boxed::Box::new(
-                    schemars::schema::InstanceType::Number
-                )))
-            );
-            assert_eq!(
-                schema.schema.metadata.unwrap().title.unwrap(),
-                std::string::String::from("double")
-            );
-        }
-        {
-            let schema =
-                schemars::gen::SchemaGenerator::default().into_root_schema_for::<NotNan<f32>>();
-            assert_eq!(
-                schema.schema.instance_type,
-                Some(schemars::schema::SingleOrVec::Single(std::boxed::Box::new(
-                    schemars::schema::InstanceType::Number
-                )))
-            );
-            assert_eq!(
-                schema.schema.metadata.unwrap().title.unwrap(),
-                std::string::String::from("float")
-            );
-        }
-        {
-            let schema =
-                schemars::gen::SchemaGenerator::default().into_root_schema_for::<NotNan<f64>>();
+        fn test_schema_properties<T: schemars::JsonSchema>(title: &str) {
+            let schema = schemars::r#gen::SchemaGenerator::default().into_root_schema_for::<T>();
+
             assert_eq!(
                 schema.schema.instance_type,
                 Some(schemars::schema::SingleOrVec::Single(std::boxed::Box::new(
@@ -2704,40 +2662,31 @@ mod impl_schemars {
             );
             assert_eq!(
                 schema.schema.metadata.unwrap().title.unwrap(),
-                std::string::String::from("double")
+                std::string::String::from(title)
             );
         }
+
+        test_schema_properties::<OrderedFloat<f32>>("float");
+        test_schema_properties::<OrderedFloat<f64>>("double");
+        test_schema_properties::<NotNan<f32>>("float");
+        test_schema_properties::<NotNan<f64>>("double");
     }
+
     #[test]
     fn ordered_float_schema_match_primitive_schema() {
-        {
-            let of_schema = schemars::gen::SchemaGenerator::default()
-                .into_root_schema_for::<OrderedFloat<f32>>();
-            let prim_schema =
-                schemars::gen::SchemaGenerator::default().into_root_schema_for::<f32>();
-            assert_eq!(of_schema, prim_schema);
-        }
-        {
-            let of_schema = schemars::gen::SchemaGenerator::default()
-                .into_root_schema_for::<OrderedFloat<f64>>();
-            let prim_schema =
-                schemars::gen::SchemaGenerator::default().into_root_schema_for::<f64>();
-            assert_eq!(of_schema, prim_schema);
-        }
-        {
-            let of_schema =
-                schemars::gen::SchemaGenerator::default().into_root_schema_for::<NotNan<f32>>();
-            let prim_schema =
-                schemars::gen::SchemaGenerator::default().into_root_schema_for::<f32>();
-            assert_eq!(of_schema, prim_schema);
-        }
-        {
-            let of_schema =
-                schemars::gen::SchemaGenerator::default().into_root_schema_for::<NotNan<f64>>();
-            let prim_schema =
-                schemars::gen::SchemaGenerator::default().into_root_schema_for::<f64>();
-            assert_eq!(of_schema, prim_schema);
+        fn test_schema_eq<Wrapped: schemars::JsonSchema, Inner: schemars::JsonSchema>() {
+            let wrapped_schema =
+                schemars::r#gen::SchemaGenerator::default().into_root_schema_for::<Wrapped>();
+            let primitive_schema =
+                schemars::r#gen::SchemaGenerator::default().into_root_schema_for::<Inner>();
+
+            assert_eq!(wrapped_schema, primitive_schema);
         }
+
+        test_schema_eq::<OrderedFloat<f32>, f32>();
+        test_schema_eq::<OrderedFloat<f64>, f64>();
+        test_schema_eq::<NotNan<f32>, f32>();
+        test_schema_eq::<NotNan<f64>, f64>();
     }
 }