Port std::* tests to new integration test style

GREsau · Sep 9, 2024 · e33f9c1 · e33f9c1
1 parent fd16576
commit e33f9c1
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 374 deletions.
diff --git a/schemars/Cargo.toml b/schemars/Cargo.toml
@@ -69,14 +69,6 @@ raw_value = ["serde_json/raw_value"]
 # For internal/CI use only
 _ui_test = []
 
-[[test]]
-name = "std_time"
-required-features = ["std"]
-
-[[test]]
-name = "ffi"
-required-features = ["std"]
-
 [[test]]
 name = "ui"
 required-features = ["_ui_test"]

diff --git a/schemars/src/json_schema_impls/ffi.rs b/schemars/src/json_schema_impls/ffi.rs
@@ -2,6 +2,7 @@ use crate::SchemaGenerator;
 use crate::_alloc_prelude::*;
 use crate::{json_schema, JsonSchema, Schema};
 use alloc::borrow::Cow;
+use serde_json::json;
 use std::ffi::{CStr, CString, OsStr, OsString};
 
 impl JsonSchema for OsString {
@@ -37,5 +38,31 @@ impl JsonSchema for OsString {
 
 forward_impl!(OsStr => OsString);
 
-forward_impl!(CString => Vec<u8>);
-forward_impl!(CStr => Vec<u8>);
+impl JsonSchema for CString {
+    fn schema_name() -> Cow<'static, str> {
+        "CString".into()
+    }
+
+    fn schema_id() -> Cow<'static, str> {
+        "std::ffi::CString".into()
+    }
+
+    fn json_schema(generator: &mut SchemaGenerator) -> Schema {
+        let ty = if generator.contract().is_deserialize() {
+            json!(["array", "string"])
+        } else {
+            json!("array")
+        };
+
+        json_schema!({
+            "type": ty,
+            "items": {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 255
+            },
+        })
+    }
+}
+
+forward_impl!(CStr => CString);
diff --git a/schemars/tests/expected/duration_and_systemtime.json b/schemars/tests/expected/duration_and_systemtime.json
diff --git a/schemars/tests/expected/no-variants.json b/schemars/tests/expected/no-variants.json
diff --git a/schemars/tests/expected/os_strings.json b/schemars/tests/expected/os_strings.json
diff --git a/schemars/tests/expected/range.json b/schemars/tests/expected/range.json
diff --git a/schemars/tests/expected/result.json b/schemars/tests/expected/result.json
diff --git a/schemars/tests/ffi.rs b/schemars/tests/ffi.rs
diff --git a/schemars/tests/integration/enums_flattened.rs b/schemars/tests/integration/enums_flattened.rs
@@ -1,6 +1,5 @@
-use schemars::generate::SchemaSettings;
-
 use crate::prelude::*;
+use schemars::generate::SchemaSettings;
 
 macro_rules! fn_values {
     () => {

diff --git a/schemars/tests/integration/main.rs b/schemars/tests/integration/main.rs
@@ -20,6 +20,7 @@ mod enum_repr;
 mod enums;
 mod enums_deny_unknown_fields;
 mod enums_flattened;
+mod std_types;
 
 mod prelude {
     pub use crate::test;