VienDesu/schemars
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename MakeSchema to JsonSchema

Browse source
This commit is contained in:
Graham Esau 2019-08-11 14:35:26 +01:00
parent 58e169b866
commit 870dc3a2de
16 changed files with 117 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

8
schemars/tests/enum.rs
View file

@ -1,8 +1,8 @@
mod util;
use schemars::{MakeSchema, Map};
use schemars::{JsonSchema, Map};
use util::*;
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
#[schemars(rename_all = "camelCase")]
pub enum External {
UnitOne,
@ -16,7 +16,7 @@ fn enum_external_tag() -> TestResult {
test_default_generated_schema::<External>("enum-external")
}
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
#[schemars(tag = "typeProperty")]
pub enum Internal {
UnitOne,
@ -30,7 +30,7 @@ fn enum_internal_tag() -> TestResult {
test_default_generated_schema::<Internal>("enum-internal")
}
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
#[schemars(untagged)]
pub enum Untagged {
UnitOne,

10
schemars/tests/flatten.rs
View file

@ -1,9 +1,9 @@
mod util;
use pretty_assertions::assert_eq;
use schemars::{schema_for, MakeSchema};
use schemars::{schema_for, JsonSchema};
use util::*;
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
struct Flat {
foo: f32,
bar: bool,
@ -11,7 +11,7 @@ struct Flat {
foobar: Vec<i32>,
}
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
#[schemars(rename = "Flat")]
struct Deep1 {
foo: f32,
@ -20,14 +20,14 @@ struct Deep1 {
foobar: Vec<i32>,
}
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
struct Deep2 {
bar: bool,
#[serde(flatten)]
deep3: Deep3,
}
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
struct Deep3 {
baz: String,
}

4
schemars/tests/property_name.rs
View file

@ -1,8 +1,8 @@
mod util;
use schemars::MakeSchema;
use schemars::JsonSchema;
use util::*;
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
#[serde(rename_all = "camelCase")]
struct MyStruct {
camel_case: i32,

10
schemars/tests/schema_name.rs
View file

@ -1,8 +1,8 @@
mod util;
use schemars::MakeSchema;
use schemars::JsonSchema;
use util::*;
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
struct MyStruct<T, U, V, W> {
t: T,
u: U,
@ -11,7 +11,7 @@ struct MyStruct<T, U, V, W> {
inner: MySimpleStruct,
}
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
struct MySimpleStruct {}
#[test]
@ -19,7 +19,7 @@ fn default_name_multiple_type_params() -> TestResult {
test_default_generated_schema::<MyStruct<i32, (), bool, Vec<String>>>("schema-name-default")
}
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
#[serde(rename = "a-new-name-{W}-{T}-{T}")]
struct MyRenamedStruct<T, U, V, W> {
t: T,
@ -29,7 +29,7 @@ struct MyRenamedStruct<T, U, V, W> {
inner: MySimpleRenamedStruct,
}
#[derive(Debug, MakeSchema)]
#[derive(Debug, JsonSchema)]
#[serde(rename = "this-attribute-is-ignored")]
#[schemars(rename = "another-new-name")]
struct MySimpleRenamedStruct {}

6
schemars/tests/util/mod.rs
View file

@ -1,5 +1,5 @@
use pretty_assertions::assert_eq;
use schemars::{gen::SchemaSettings, schema_for, MakeSchema};
use schemars::{gen::SchemaSettings, schema_for, JsonSchema};
use std::error::Error;
use std::fs;
use std::panic;
@ -7,7 +7,7 @@ use std::panic;
pub type TestResult = Result<(), Box<dyn Error>>;
#[allow(dead_code)] // https://github.com/rust-lang/rust/issues/46379
pub fn test_generated_schema<T: MakeSchema>(file: &str, settings: SchemaSettings) -> TestResult {
pub fn test_generated_schema<T: JsonSchema>(file: &str, settings: SchemaSettings) -> TestResult {
let expected_json = fs::read_to_string(format!("tests/expected/{}.json", file))?;
let expected = serde_json::from_str(&expected_json)?;
@ -23,7 +23,7 @@ pub fn test_generated_schema<T: MakeSchema>(file: &str, settings: SchemaSettings
}
#[allow(dead_code)] // https://github.com/rust-lang/rust/issues/46379
pub fn test_default_generated_schema<T: MakeSchema>(file: &str) -> TestResult {
pub fn test_default_generated_schema<T: JsonSchema>(file: &str) -> TestResult {
let expected_json = fs::read_to_string(format!("tests/expected/{}.json", file))?;
let expected = serde_json::from_str(&expected_json)?;