Make test schemas stricter

GREsau · Sep 14, 2024 · cf7f4b1 · cf7f4b1
1 parent 88eb609
commit cf7f4b1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/schemars/tests/integration/enums.rs b/schemars/tests/integration/enums.rs
@@ -28,7 +28,7 @@ enum External {
  #[schemars(with = "u64")]
  UnitAsInt,
  #[serde(with = "tuple_variant_as_str")]
- #[schemars(with = "str")]
+ #[schemars(schema_with = "tuple_variant_as_str::json_schema")]
  TupleAsStr(i32, bool),
 }
 
@@ -75,7 +75,7 @@ enum Internal {
  // UnitAsInt,
  // Internally-tagged enums don't support tuple variants
  // #[serde(with = "tuple_variant_as_str")]
- // #[schemars(with = "str")]
+ // #[schemars(schema_with = "tuple_variant_as_str::json_schema")]
  // TupleAsStr(i32, bool),
 }
 
@@ -122,7 +122,7 @@ enum Adjacent {
  #[schemars(with = "u64")]
  UnitAsInt,
  #[serde(with = "tuple_variant_as_str")]
- #[schemars(with = "str")]
+ #[schemars(schema_with = "tuple_variant_as_str::json_schema")]
  TupleAsStr(i32, bool),
 }
 
@@ -169,7 +169,7 @@ enum Untagged {
  #[schemars(with = "u64")]
  UnitAsInt,
  #[serde(with = "tuple_variant_as_str")]
- #[schemars(with = "str", extend("pattern" = r"^\d+ (true|false)$"))]
+ #[schemars(schema_with = "tuple_variant_as_str::json_schema")]
  TupleAsStr(i32, bool),
 }
 
@@ -241,6 +241,13 @@ mod tuple_variant_as_str {
  b.parse().map_err(|_| error())?,
  ))
  }
+
+ pub(super) fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
+ schemars::json_schema!({
+ "type": "string",
+ "pattern": r"^\d+ (true|false)$"
+ })
+ }
 }
 
 #[test]

diff --git a/.../integration/snapshots/schemars/tests/integration/enums.rs~adjacently_tagged_enum.de.json b/.../integration/snapshots/schemars/tests/integration/enums.rs~adjacently_tagged_enum.de.json
@@ -159,7 +159,8 @@
  "const": "TupleAsStr"
  },
  "content": {
- "type": "string"
+ "type": "string",
+ "pattern": "^\\d+ (true|false)$"
  }
  },
  "required": [

diff --git a/...integration/snapshots/schemars/tests/integration/enums.rs~adjacently_tagged_enum.ser.json b/...integration/snapshots/schemars/tests/integration/enums.rs~adjacently_tagged_enum.ser.json
@@ -159,7 +159,8 @@
  "const": "TupleAsStr"
  },
  "content": {
- "type": "string"
+ "type": "string",
+ "pattern": "^\\d+ (true|false)$"
  }
  },
  "required": [

diff --git a/.../integration/snapshots/schemars/tests/integration/enums.rs~externally_tagged_enum.de.json b/.../integration/snapshots/schemars/tests/integration/enums.rs~externally_tagged_enum.de.json
@@ -114,7 +114,8 @@
  "type": "object",
  "properties": {
  "tupleAsStr": {
- "type": "string"
+ "type": "string",
+ "pattern": "^\\d+ (true|false)$"
  }
  },
  "required": [

diff --git a/...integration/snapshots/schemars/tests/integration/enums.rs~externally_tagged_enum.ser.json b/...integration/snapshots/schemars/tests/integration/enums.rs~externally_tagged_enum.ser.json
@@ -114,7 +114,8 @@
  "type": "object",
  "properties": {
  "tupleAsStr": {
- "type": "string"
+ "type": "string",
+ "pattern": "^\\d+ (true|false)$"
  }
  },
  "required": [