yume/juniper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run rust fmt.

Browse source
This commit is contained in:
Christoph Herzog 2018-05-03 07:37:10 +02:00 committed by theduke
parent b94ed37c1f
commit 9313c7ca6d
72 changed files with 1781 additions and 2196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
juniper/benches/bench.rs
View file

@ -4,8 +4,8 @@ extern crate juniper;
use bencher::Bencher;
use juniper::{execute, EmptyMutation, RootNode, Variables};
use juniper::tests::model::Database;
use juniper::{execute, EmptyMutation, RootNode, Variables};
fn query_type_name(b: &mut Bencher) {
let database = Database::new();

4
juniper/src/ast.rs
View file

@ -1,8 +1,8 @@
use std::fmt;
use std::borrow::Cow;
use std::fmt;
use std::hash::Hash;
use std::vec;
use std::slice;
use std::vec;
use indexmap::IndexMap;

8
juniper/src/executor/mod.rs
View file

@ -1,16 +1,16 @@
use std::cmp::Ordering;
use std::fmt::Display;
use std::borrow::Cow;
use std::cmp::Ordering;
use std::collections::HashMap;
use std::fmt::Display;
use std::sync::RwLock;
use fnv::FnvHashMap;
use GraphQLError;
use ast::{Definition, Document, Fragment, FromInputValue, InputValue, OperationType, Selection,
ToInputValue, Type};
use value::Value;
use parser::SourcePosition;
use value::Value;
use GraphQLError;
use schema::meta::{Argument, EnumMeta, EnumValue, Field, InputObjectMeta, InterfaceMeta, ListMeta,
MetaType, NullableMeta, ObjectMeta, PlaceholderMeta, ScalarMeta, UnionMeta};

2
juniper/src/executor_tests/directives.rs
View file

@ -1,9 +1,9 @@
use indexmap::IndexMap;
use value::Value;
use executor::Variables;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct TestType;

34
juniper/src/executor_tests/enums.rs
View file

@ -1,13 +1,13 @@
use indexmap::IndexMap;
use value::Value;
use ast::InputValue;
use executor::Variables;
use schema::model::RootNode;
use GraphQLError::ValidationError;
use validation::RuleError;
use parser::SourcePosition;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use validation::RuleError;
use value::Value;
use GraphQLError::ValidationError;
#[derive(GraphQLEnum, Debug)]
#[graphql(_internal)]
@ -77,12 +77,10 @@ fn does_not_accept_string_literals() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Invalid value for argument "color", expected type "Color!""#,
&[SourcePosition::new(18, 0, 18)],
),
])
ValidationError(vec![RuleError::new(
r#"Invalid value for argument "color", expected type "Color!""#,
&[SourcePosition::new(18, 0, 18)],
)])
);
}
@ -112,12 +110,10 @@ fn does_not_accept_incorrect_enum_name_in_variables() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$color" got invalid value. Invalid value for enum "Color"."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$color" got invalid value. Invalid value for enum "Color"."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
@ -134,11 +130,9 @@ fn does_not_accept_incorrect_type_in_variables() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
ValidationError(vec![RuleError::new(
r#"Variable "$color" got invalid value. Expected "Color", found not a string or enum."#,
&[SourcePosition::new(8, 0, 8)],
),
])
)])
);
}

214
juniper/src/executor_tests/executor.rs
View file

@ -1,8 +1,8 @@
mod field_execution {
use value::Value;
use ast::InputValue;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct DataType;
struct DeepDataType;
@ -128,9 +128,9 @@ mod field_execution {
}
mod merge_parallel_fragments {
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct Type;
@ -198,9 +198,9 @@ mod merge_parallel_fragments {
}
mod merge_parallel_inline_fragments {
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct Type;
struct Other;
@ -270,38 +270,34 @@ mod merge_parallel_inline_fragments {
("b", Value::string("Banana")),
(
"deeper",
Value::list(
vec![
Value::object(
vec![
(
"deepest",
Value::object(
vec![
("b", Value::string("Banana")),
("c", Value::string("Cherry")),
].into_iter()
.collect(),
),
),
].into_iter().collect()
),
Value::object(
vec![
(
"deepest",
Value::object(
vec![
("b", Value::string("Banana")),
("c", Value::string("Cherry")),
].into_iter()
.collect(),
),
),
].into_iter().collect()
),
]
),
Value::list(vec![
Value::object(
vec![(
"deepest",
Value::object(
vec![
("b", Value::string("Banana")),
("c", Value::string("Cherry")),
].into_iter()
.collect(),
),
)].into_iter()
.collect(),
),
Value::object(
vec![(
"deepest",
Value::object(
vec![
("b", Value::string("Banana")),
("c", Value::string("Cherry")),
].into_iter()
.collect(),
),
)].into_iter()
.collect(),
),
]),
),
("c", Value::string("Cherry")),
].into_iter()
@ -317,10 +313,10 @@ mod merge_parallel_inline_fragments {
}
mod threads_context_correctly {
use value::Value;
use types::scalars::EmptyMutation;
use schema::model::RootNode;
use executor::Context;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct Schema;
@ -369,11 +365,11 @@ mod threads_context_correctly {
mod dynamic_context_switching {
use indexmap::IndexMap;
use value::Value;
use types::scalars::EmptyMutation;
use schema::model::RootNode;
use parser::SourcePosition;
use executor::{Context, ExecutionError, FieldError, FieldResult};
use parser::SourcePosition;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct Schema;
@ -509,16 +505,14 @@ mod dynamic_context_switching {
assert_eq!(
result,
Value::object(
vec![
(
"first",
Value::object(
vec![("value", Value::string("First value"))]
.into_iter()
.collect(),
),
vec![(
"first",
Value::object(
vec![("value", Value::string("First value"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
)
);
@ -557,13 +551,11 @@ mod dynamic_context_switching {
assert_eq!(
errs,
vec![
ExecutionError::new(
SourcePosition::new(25, 2, 12),
&["missing"],
FieldError::new("Could not find key 2", Value::null()),
),
]
vec![ExecutionError::new(
SourcePosition::new(25, 2, 12),
&["missing"],
FieldError::new("Could not find key 2", Value::null()),
)]
);
println!("Result: {:?}", result);
@ -606,13 +598,11 @@ mod dynamic_context_switching {
assert_eq!(
errs,
[
ExecutionError::new(
SourcePosition::new(123, 4, 12),
&["tooLarge"],
FieldError::new("Key too large: 200", Value::null()),
),
]
[ExecutionError::new(
SourcePosition::new(123, 4, 12),
&["tooLarge"],
FieldError::new("Key too large: 200", Value::null()),
)]
);
println!("Result: {:?}", result);
@ -671,16 +661,14 @@ mod dynamic_context_switching {
assert_eq!(
result,
Value::object(
vec![
(
"first",
Value::object(
vec![("value", Value::string("First value"))]
.into_iter()
.collect(),
),
vec![(
"first",
Value::object(
vec![("value", Value::string("First value"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
)
);
@ -688,11 +676,11 @@ mod dynamic_context_switching {
}
mod propagates_errors_to_nullable_fields {
use value::Value;
use schema::model::RootNode;
use executor::{ExecutionError, FieldError, FieldResult};
use parser::SourcePosition;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct Schema;
struct Inner;
@ -728,13 +716,11 @@ mod propagates_errors_to_nullable_fields {
assert_eq!(
errs,
vec![
ExecutionError::new(
SourcePosition::new(10, 0, 10),
&["inner", "nullableErrorField"],
FieldError::new("Error for nullableErrorField", Value::null()),
),
]
vec![ExecutionError::new(
SourcePosition::new(10, 0, 10),
&["inner", "nullableErrorField"],
FieldError::new("Error for nullableErrorField", Value::null()),
)]
);
}
@ -753,13 +739,11 @@ mod propagates_errors_to_nullable_fields {
assert_eq!(
errs,
vec![
ExecutionError::new(
SourcePosition::new(10, 0, 10),
&["inner", "nonNullableErrorField"],
FieldError::new("Error for nonNullableErrorField", Value::null()),
),
]
vec![ExecutionError::new(
SourcePosition::new(10, 0, 10),
&["inner", "nonNullableErrorField"],
FieldError::new("Error for nonNullableErrorField", Value::null()),
)]
);
}
@ -781,13 +765,11 @@ mod propagates_errors_to_nullable_fields {
assert_eq!(
errs,
vec![
ExecutionError::new(
SourcePosition::new(26, 0, 26),
&["inner", "nullableField", "nonNullableErrorField"],
FieldError::new("Error for nonNullableErrorField", Value::null()),
),
]
vec![ExecutionError::new(
SourcePosition::new(26, 0, 26),
&["inner", "nullableField", "nonNullableErrorField"],
FieldError::new("Error for nonNullableErrorField", Value::null()),
)]
);
}
@ -806,13 +788,11 @@ mod propagates_errors_to_nullable_fields {
assert_eq!(
errs,
vec![
ExecutionError::new(
SourcePosition::new(29, 0, 29),
&["inner", "nonNullableField", "nonNullableErrorField"],
FieldError::new("Error for nonNullableErrorField", Value::null()),
),
]
vec![ExecutionError::new(
SourcePosition::new(29, 0, 29),
&["inner", "nonNullableField", "nonNullableErrorField"],
FieldError::new("Error for nonNullableErrorField", Value::null()),
)]
);
}
@ -834,13 +814,11 @@ mod propagates_errors_to_nullable_fields {
assert_eq!(
errs,
vec![
ExecutionError::new(
SourcePosition::new(29, 0, 29),
&["inner", "nonNullableField", "nullableErrorField"],
FieldError::new("Error for nullableErrorField", Value::null()),
),
]
vec![ExecutionError::new(
SourcePosition::new(29, 0, 29),
&["inner", "nonNullableField", "nullableErrorField"],
FieldError::new("Error for nullableErrorField", Value::null()),
)]
);
}
@ -859,13 +837,11 @@ mod propagates_errors_to_nullable_fields {
assert_eq!(
errs,
vec![
ExecutionError::new(
SourcePosition::new(11, 0, 11),
&["inners", "nonNullableErrorField"],
FieldError::new("Error for nonNullableErrorField", Value::null()),
),
]
vec![ExecutionError::new(
SourcePosition::new(11, 0, 11),
&["inners", "nonNullableErrorField"],
FieldError::new("Error for nonNullableErrorField", Value::null()),
)]
);
}
@ -919,9 +895,9 @@ mod propagates_errors_to_nullable_fields {
}
mod named_operations {
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
use GraphQLError;
struct Schema;

88
juniper/src/executor_tests/interfaces_unions.rs
View file

@ -1,7 +1,7 @@
mod interface {
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
trait Pet {
fn name(&self) -> &str;
@ -116,27 +116,25 @@ mod interface {
assert_eq!(
result,
Value::object(
vec![
(
"pets",
Value::list(vec![
Value::object(
vec![
("name", Value::string("Odie")),
("woofs", Value::boolean(true)),
].into_iter()
.collect(),
),
Value::object(
vec![
("name", Value::string("Garfield")),
("meows", Value::boolean(false)),
].into_iter()
.collect(),
),
]),
),
].into_iter()
vec![(
"pets",
Value::list(vec![
Value::object(
vec![
("name", Value::string("Odie")),
("woofs", Value::boolean(true)),
].into_iter()
.collect(),
),
Value::object(
vec![
("name", Value::string("Garfield")),
("meows", Value::boolean(false)),
].into_iter()
.collect(),
),
]),
)].into_iter()
.collect()
)
);
@ -144,9 +142,9 @@ mod interface {
}
mod union {
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
trait Pet {
fn as_dog(&self) -> Option<&Dog> {
@ -249,29 +247,27 @@ mod union {
assert_eq!(
result,
Value::object(
vec![
(
"pets",
Value::list(vec![
Value::object(
vec![
("__typename", Value::string("Dog")),
("name", Value::string("Odie")),
("woofs", Value::boolean(true)),
].into_iter()
.collect(),
),
Value::object(
vec![
("__typename", Value::string("Cat")),
("name", Value::string("Garfield")),
("meows", Value::boolean(false)),
].into_iter()
.collect(),
),
]),
),
].into_iter()
vec![(
"pets",
Value::list(vec![
Value::object(
vec![
("__typename", Value::string("Dog")),
("name", Value::string("Odie")),
("woofs", Value::boolean(true)),
].into_iter()
.collect(),
),
Value::object(
vec![
("__typename", Value::string("Cat")),
("name", Value::string("Garfield")),
("meows", Value::boolean(false)),
].into_iter()
.collect(),
),
]),
)].into_iter()
.collect()
)
);

38
juniper/src/executor_tests/introspection/enums.rs
View file

@ -1,9 +1,9 @@
use indexmap::IndexMap;
use executor::Variables;
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
/*
@ -48,15 +48,19 @@ enum EnumDescription {
#[derive(GraphQLEnum)]
#[graphql(_internal)]
enum EnumValueDescription {
#[graphql(description = "The FOO value")] Foo,
#[graphql(description = "The BAR value")] Bar,
#[graphql(description = "The FOO value")]
Foo,
#[graphql(description = "The BAR value")]
Bar,
}
#[derive(GraphQLEnum)]
#[graphql(_internal)]
enum EnumDeprecation {
#[graphql(deprecated = "Please don't use FOO any more")] Foo,
#[graphql(description = "The BAR value", deprecated = "Please don't use BAR any more")] Bar,
#[graphql(deprecated = "Please don't use FOO any more")]
Foo,
#[graphql(description = "The BAR value", deprecated = "Please don't use BAR any more")]
Bar,
}
struct Root;
@ -131,7 +135,7 @@ fn default_name_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -143,7 +147,7 @@ fn default_name_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -180,7 +184,7 @@ fn named_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -192,7 +196,7 @@ fn named_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -232,7 +236,7 @@ fn no_trailing_comma_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -244,7 +248,7 @@ fn no_trailing_comma_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -287,7 +291,7 @@ fn enum_description_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -299,7 +303,7 @@ fn enum_description_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -339,7 +343,7 @@ fn enum_value_description_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -351,7 +355,7 @@ fn enum_value_description_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -394,7 +398,7 @@ fn enum_deprecation_introspection() {
Value::string("Please don't use FOO any more"),
),
].into_iter()
.collect()
.collect(),
))
);
@ -409,7 +413,7 @@ fn enum_deprecation_introspection() {
Value::string("Please don't use BAR any more"),
),
].into_iter()
.collect()
.collect(),
))
);
});

175
juniper/src/executor_tests/introspection/input_object.rs
View file

@ -2,9 +2,9 @@ use indexmap::IndexMap;
use ast::{FromInputValue, InputValue};
use executor::Variables;
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct Root;
@ -53,8 +53,11 @@ pub struct PublicWithDescription {
}
#[derive(GraphQLInputObject, Debug)]
#[graphql(name = "APublicNamedInputObjectWithDescription",
description = "Description for the input object", _internal)]
#[graphql(
name = "APublicNamedInputObjectWithDescription",
description = "Description for the input object",
_internal
)]
pub struct NamedPublicWithDescription {
field_one: String,
}
@ -166,22 +169,20 @@ fn default_name_introspection() {
(
"type",
Value::object(
vec![
(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
vec![(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
),
),
("defaultValue", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -193,22 +194,20 @@ fn default_name_introspection() {
(
"type",
Value::object(
vec![
(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
vec![(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
),
),
("defaultValue", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -272,22 +271,20 @@ fn no_trailing_comma_introspection() {
(
"type",
Value::object(
vec![
(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
vec![(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
),
),
("defaultValue", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -299,22 +296,20 @@ fn no_trailing_comma_introspection() {
(
"type",
Value::object(
vec![
(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
vec![(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
),
),
("defaultValue", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -355,22 +350,20 @@ fn derive_introspection() {
(
"type",
Value::object(
vec![
(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
vec![(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
),
),
("defaultValue", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -427,22 +420,20 @@ fn named_introspection() {
(
"type",
Value::object(
vec![
(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
vec![(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
),
),
("defaultValue", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -486,22 +477,20 @@ fn description_introspection() {
(
"type",
Value::object(
vec![
(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
vec![(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
),
),
("defaultValue", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -545,22 +534,20 @@ fn field_description_introspection() {
(
"type",
Value::object(
vec![
(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
vec![(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
),
),
("defaultValue", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -572,22 +559,20 @@ fn field_description_introspection() {
(
"type",
Value::object(
vec![
(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
vec![(
"ofType",
Value::object(
vec![("name", Value::string("String"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
),
),
("defaultValue", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
});
@ -628,7 +613,7 @@ fn field_with_defaults_introspection() {
),
("defaultValue", Value::string("123")),
].into_iter()
.collect()
.collect(),
))
);
@ -642,7 +627,7 @@ fn field_with_defaults_introspection() {
),
("defaultValue", Value::string("456")),
].into_iter()
.collect()
.collect(),
))
);
});

26
juniper/src/executor_tests/introspection/mod.rs
View file

@ -1,14 +1,14 @@
mod input_object;
mod enums;
mod input_object;
// This asserts that the input objects defined public actually became public
#[allow(unused_imports)]
use self::input_object::{NamedPublic, NamedPublicWithDescription};
use executor::Variables;
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
#[derive(GraphQLEnum)]
#[graphql(name = "SampleEnum", _internal)]
@ -155,7 +155,7 @@ fn enum_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -167,7 +167,7 @@ fn enum_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
}
@ -290,7 +290,7 @@ fn interface_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
}
@ -366,13 +366,11 @@ fn object_introspection() {
);
assert_eq!(
type_info.get("interfaces"),
Some(&Value::list(vec![
Value::object(
vec![("name", Value::string("SampleInterface"))]
.into_iter()
.collect(),
),
]))
Some(&Value::list(vec![Value::object(
vec![("name", Value::string("SampleInterface"))]
.into_iter()
.collect(),
)]))
);
assert_eq!(type_info.get("enumValues"), Some(&Value::null()));
assert_eq!(type_info.get("inputFields"), Some(&Value::null()));
@ -418,7 +416,7 @@ fn object_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
@ -506,7 +504,7 @@ fn object_introspection() {
("isDeprecated", Value::boolean(false)),
("deprecationReason", Value::null()),
].into_iter()
.collect()
.collect(),
))
);
}

6
juniper/src/executor_tests/mod.rs
View file

@ -1,6 +1,6 @@
mod introspection;
mod variables;
mod enums;
mod directives;
mod enums;
mod executor;
mod interfaces_unions;
mod introspection;
mod variables;

426
juniper/src/executor_tests/variables.rs
View file

@ -1,13 +1,13 @@
use indexmap::IndexMap;
use value::Value;
use ast::InputValue;
use executor::Variables;
use schema::model::RootNode;
use GraphQLError::ValidationError;
use validation::RuleError;
use parser::SourcePosition;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use validation::RuleError;
use value::Value;
use GraphQLError::ValidationError;
#[derive(Debug)]
struct TestComplexScalar;
@ -178,19 +178,17 @@ fn inline_runs_from_input_value_on_scalar() {
fn variable_complex_input() {
run_variable_query(
r#"query q($input: TestInputObject) { fieldWithObjectInput(input: $input) }"#,
vec![
(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::list(vec![InputValue::string("bar")])),
("c", InputValue::string("baz")),
].into_iter()
.collect(),
),
vec![(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::list(vec![InputValue::string("bar")])),
("c", InputValue::string("baz")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
|result| {
assert_eq!(
@ -204,19 +202,17 @@ fn variable_complex_input() {
fn variable_parse_single_value_to_list() {
run_variable_query(
r#"query q($input: TestInputObject) { fieldWithObjectInput(input: $input) }"#,
vec![
(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::string("bar")),
("c", InputValue::string("baz")),
].into_iter()
.collect(),
),
vec![(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::string("bar")),
("c", InputValue::string("baz")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
|result| {
assert_eq!(
@ -230,18 +226,16 @@ fn variable_parse_single_value_to_list() {
fn variable_runs_from_input_value_on_scalar() {
run_variable_query(
r#"query q($input: TestInputObject) { fieldWithObjectInput(input: $input) }"#,
vec![
(
"input".to_owned(),
InputValue::object(
vec![
("c", InputValue::string("baz")),
("d", InputValue::string("SerializedValue")),
].into_iter()
.collect(),
),
vec![(
"input".to_owned(),
InputValue::object(
vec![
("c", InputValue::string("baz")),
("d", InputValue::string("SerializedValue")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect(),
|result| {
assert_eq!(
@ -256,31 +250,27 @@ fn variable_error_on_nested_non_null() {
let schema = RootNode::new(TestType, EmptyMutation::<()>::new());
let query = r#"query q($input: TestInputObject) { fieldWithObjectInput(input: $input) }"#;
let vars = vec![
(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::string("bar")),
("c", InputValue::null()),
].into_iter()
.collect(),
),
let vars = vec![(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::string("bar")),
("c", InputValue::null()),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect();
let error = ::execute(query, None, &schema, &vars, &()).unwrap_err();
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
ValidationError(vec![RuleError::new(
r#"Variable "$input" got invalid value. In field "c": Expected "String!", found null."#,
&[SourcePosition::new(8, 0, 8)],
),
])
)])
);
}
@ -308,30 +298,26 @@ fn variable_error_on_omit_non_null() {
let schema = RootNode::new(TestType, EmptyMutation::<()>::new());
let query = r#"query q($input: TestInputObject) { fieldWithObjectInput(input: $input) }"#;
let vars = vec![
(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::string("bar")),
].into_iter()
.collect(),
),
let vars = vec![(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::string("bar")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect();
let error = ::execute(query, None, &schema, &vars, &()).unwrap_err();
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
ValidationError(vec![RuleError::new(
r#"Variable "$input" got invalid value. In field "c": Expected "String!", found null."#,
&[SourcePosition::new(8, 0, 8)],
),
])
)])
);
}
@ -341,22 +327,16 @@ fn variable_multiple_errors_with_nesting() {
let query =
r#"query q($input: TestNestedInputObject) { fieldWithNestedObjectInput(input: $input) }"#;
let vars = vec![
(
"input".to_owned(),
InputValue::object(
vec![
(
"na",
InputValue::object(
vec![("a", InputValue::string("foo"))].into_iter().collect(),
),
),
].into_iter()
.collect(),
),
let vars = vec![(
"input".to_owned(),
InputValue::object(
vec![(
"na",
InputValue::object(vec![("a", InputValue::string("foo"))].into_iter().collect()),
)].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect();
let error = ::execute(query, None, &schema, &vars, &()).unwrap_err();
@ -378,32 +358,28 @@ fn variable_error_on_additional_field() {
let schema = RootNode::new(TestType, EmptyMutation::<()>::new());
let query = r#"query q($input: TestInputObject) { fieldWithObjectInput(input: $input) }"#;
let vars = vec![
(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::string("bar")),
("c", InputValue::string("baz")),
("extra", InputValue::string("dog")),
].into_iter()
.collect(),
),
let vars = vec![(
"input".to_owned(),
InputValue::object(
vec![
("a", InputValue::string("foo")),
("b", InputValue::string("bar")),
("c", InputValue::string("baz")),
("extra", InputValue::string("dog")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect();
let error = ::execute(query, None, &schema, &vars, &()).unwrap_err();
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$input" got invalid value. In field "extra": Unknown field."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$input" got invalid value. In field "extra": Unknown field."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
@ -499,12 +475,10 @@ fn does_not_allow_non_nullable_input_to_be_omitted_in_variable() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$value" of required type "String!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$value" of required type "String!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
@ -521,12 +495,10 @@ fn does_not_allow_non_nullable_input_to_be_set_to_null_in_variable() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$value" of required type "String!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$value" of required type "String!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
@ -576,12 +548,10 @@ fn allow_lists_to_be_null() {
fn allow_lists_to_contain_values() {
run_variable_query(
r#"query q($input: [String]) { list(input: $input) }"#,
vec![
(
"input".to_owned(),
InputValue::list(vec![InputValue::string("A")]),
),
].into_iter()
vec![(
"input".to_owned(),
InputValue::list(vec![InputValue::string("A")]),
)].into_iter()
.collect(),
|result| {
assert_eq!(
@ -596,16 +566,14 @@ fn allow_lists_to_contain_values() {
fn allow_lists_to_contain_null() {
run_variable_query(
r#"query q($input: [String]) { list(input: $input) }"#,
vec![
(
"input".to_owned(),
InputValue::list(vec![
InputValue::string("A"),
InputValue::null(),
InputValue::string("B"),
]),
),
].into_iter()
vec![(
"input".to_owned(),
InputValue::list(vec![
InputValue::string("A"),
InputValue::null(),
InputValue::string("B"),
]),
)].into_iter()
.collect(),
|result| {
assert_eq!(
@ -629,12 +597,10 @@ fn does_not_allow_non_null_lists_to_be_null() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$input" of required type "[String]!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$input" of required type "[String]!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
@ -642,12 +608,10 @@ fn does_not_allow_non_null_lists_to_be_null() {
fn allow_non_null_lists_to_contain_values() {
run_variable_query(
r#"query q($input: [String]!) { nnList(input: $input) }"#,
vec![
(
"input".to_owned(),
InputValue::list(vec![InputValue::string("A")]),
),
].into_iter()
vec![(
"input".to_owned(),
InputValue::list(vec![InputValue::string("A")]),
)].into_iter()
.collect(),
|result| {
assert_eq!(result.get("nnList"), Some(&Value::string(r#"[Some("A")]"#)));
@ -658,16 +622,14 @@ fn allow_non_null_lists_to_contain_values() {
fn allow_non_null_lists_to_contain_null() {
run_variable_query(
r#"query q($input: [String]!) { nnList(input: $input) }"#,
vec![
(
"input".to_owned(),
InputValue::list(vec![
InputValue::string("A"),
InputValue::null(),
InputValue::string("B"),
]),
),
].into_iter()
vec![(
"input".to_owned(),
InputValue::list(vec![
InputValue::string("A"),
InputValue::null(),
InputValue::string("B"),
]),
)].into_iter()
.collect(),
|result| {
assert_eq!(
@ -695,12 +657,10 @@ fn allow_lists_of_non_null_to_be_null() {
fn allow_lists_of_non_null_to_contain_values() {
run_variable_query(
r#"query q($input: [String!]) { listNn(input: $input) }"#,
vec![
(
"input".to_owned(),
InputValue::list(vec![InputValue::string("A")]),
),
].into_iter()
vec![(
"input".to_owned(),
InputValue::list(vec![InputValue::string("A")]),
)].into_iter()
.collect(),
|result| {
assert_eq!(result.get("listNn"), Some(&Value::string(r#"Some(["A"])"#)));
@ -713,16 +673,14 @@ fn does_not_allow_lists_of_non_null_to_contain_null() {
let schema = RootNode::new(TestType, EmptyMutation::<()>::new());
let query = r#"query q($input: [String!]) { listNn(input: $input) }"#;
let vars = vec![
(
"input".to_owned(),
InputValue::list(vec![
InputValue::string("A"),
InputValue::null(),
InputValue::string("B"),
]),
),
].into_iter()
let vars = vec![(
"input".to_owned(),
InputValue::list(vec![
InputValue::string("A"),
InputValue::null(),
InputValue::string("B"),
]),
)].into_iter()
.collect();
let error = ::execute(query, None, &schema, &vars, &()).unwrap_err();
@ -740,16 +698,14 @@ fn does_not_allow_non_null_lists_of_non_null_to_contain_null() {
let schema = RootNode::new(TestType, EmptyMutation::<()>::new());
let query = r#"query q($input: [String!]!) { nnListNn(input: $input) }"#;
let vars = vec![
(
"input".to_owned(),
InputValue::list(vec![
InputValue::string("A"),
InputValue::null(),
InputValue::string("B"),
]),
),
].into_iter()
let vars = vec![(
"input".to_owned(),
InputValue::list(vec![
InputValue::string("A"),
InputValue::null(),
InputValue::string("B"),
]),
)].into_iter()
.collect();
let error = ::execute(query, None, &schema, &vars, &()).unwrap_err();
@ -775,12 +731,10 @@ fn does_not_allow_non_null_lists_of_non_null_to_be_null() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$input" of required type "[String!]!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$input" of required type "[String!]!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
@ -788,12 +742,10 @@ fn does_not_allow_non_null_lists_of_non_null_to_be_null() {
fn allow_non_null_lists_of_non_null_to_contain_values() {
run_variable_query(
r#"query q($input: [String!]!) { nnListNn(input: $input) }"#,
vec![
(
"input".to_owned(),
InputValue::list(vec![InputValue::string("A")]),
),
].into_iter()
vec![(
"input".to_owned(),
InputValue::list(vec![InputValue::string("A")]),
)].into_iter()
.collect(),
|result| {
assert_eq!(result.get("nnListNn"), Some(&Value::string(r#"["A"]"#)));
@ -806,12 +758,10 @@ fn does_not_allow_invalid_types_to_be_used_as_values() {
let schema = RootNode::new(TestType, EmptyMutation::<()>::new());
let query = r#"query q($input: TestType!) { fieldWithObjectInput(input: $input) }"#;
let vars = vec![
(
"value".to_owned(),
InputValue::list(vec![InputValue::string("A"), InputValue::string("B")]),
),
].into_iter()
let vars = vec![(
"value".to_owned(),
InputValue::list(vec![InputValue::string("A"), InputValue::string("B")]),
)].into_iter()
.collect();
let error = ::execute(query, None, &schema, &vars, &()).unwrap_err();
@ -829,12 +779,10 @@ fn does_not_allow_unknown_types_to_be_used_as_values() {
let schema = RootNode::new(TestType, EmptyMutation::<()>::new());
let query = r#"query q($input: UnknownType!) { fieldWithObjectInput(input: $input) }"#;
let vars = vec![
(
"value".to_owned(),
InputValue::list(vec![InputValue::string("A"), InputValue::string("B")]),
),
].into_iter()
let vars = vec![(
"value".to_owned(),
InputValue::list(vec![InputValue::string("A"), InputValue::string("B")]),
)].into_iter()
.collect();
let error = ::execute(query, None, &schema, &vars, &()).unwrap_err();
@ -954,12 +902,10 @@ fn does_not_allow_missing_required_field() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Invalid value for argument "arg", expected type "ExampleInputObject!""#,
&[SourcePosition::new(20, 0, 20)],
),
])
ValidationError(vec![RuleError::new(
r#"Invalid value for argument "arg", expected type "ExampleInputObject!""#,
&[SourcePosition::new(20, 0, 20)],
)])
);
}
@ -974,12 +920,10 @@ fn does_not_allow_null_in_required_field() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Invalid value for argument "arg", expected type "ExampleInputObject!""#,
&[SourcePosition::new(20, 0, 20)],
),
])
ValidationError(vec![RuleError::new(
r#"Invalid value for argument "arg", expected type "ExampleInputObject!""#,
&[SourcePosition::new(20, 0, 20)],
)])
);
}
@ -994,12 +938,10 @@ fn does_not_allow_missing_variable_for_required_field() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$var" of required type "Int!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$var" of required type "Int!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
@ -1016,12 +958,10 @@ fn does_not_allow_null_variable_for_required_field() {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$var" of required type "Int!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$var" of required type "Int!" was not provided."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
@ -1117,12 +1057,10 @@ mod integers {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$var" got invalid value. Expected "Int"."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$var" got invalid value. Expected "Int"."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
@ -1139,12 +1077,10 @@ mod integers {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$var" got invalid value. Expected "Int"."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$var" got invalid value. Expected "Int"."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
}
@ -1197,12 +1133,10 @@ mod floats {
assert_eq!(
error,
ValidationError(vec![
RuleError::new(
r#"Variable "$var" got invalid value. Expected "Float"."#,
&[SourcePosition::new(8, 0, 8)],
),
])
ValidationError(vec![RuleError::new(
r#"Variable "$var" got invalid value. Expected "Float"."#,
&[SourcePosition::new(8, 0, 8)],
)])
);
}
}

4
juniper/src/http/mod.rs
View file

@ -5,9 +5,9 @@ pub mod graphiql;
use serde::ser;
use serde::ser::SerializeMap;
use {GraphQLError, GraphQLType, RootNode, Value, Variables};
use ast::InputValue;
use executor::ExecutionError;
use {GraphQLError, GraphQLType, RootNode, Value, Variables};
/// The expected structure of the decoded JSON document for either POST or GET requests.
///
@ -127,8 +127,8 @@ impl<'a> ser::Serialize for GraphQLResponse<'a> {
#[cfg(any(test, feature = "expose-test-schema"))]
#[allow(missing_docs)]
pub mod tests {
use serde_json::Value as Json;
use serde_json;
use serde_json::Value as Json;
/// Normalized response content we expect to get back from
/// the http framework integration we are testing.

2
juniper/src/integrations/chrono.rs
View file

@ -169,9 +169,9 @@ mod integration_test {
use chrono::Utc;
use executor::Variables;
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
#[test]
fn test_serialization() {

4
juniper/src/integrations/serde.rs
View file

@ -1,14 +1,14 @@
use indexmap::IndexMap;
use serde::{de, ser};
use serde::ser::SerializeMap;
use serde::{de, ser};
use std::fmt;
use {GraphQLError, Value};
use ast::InputValue;
use executor::ExecutionError;
use parser::{ParseError, SourcePosition, Spanning};
use validation::RuleError;
use {GraphQLError, Value};
impl ser::Serialize for ExecutionError {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>

22
juniper/src/lib.rs
View file

@ -122,16 +122,16 @@ mod value;
#[macro_use]
mod macros;
mod ast;
pub mod parser;
mod types;
mod schema;
mod validation;
mod util;
mod executor;
pub mod parser;
mod schema;
mod types;
mod util;
mod validation;
// This needs to be public until docs have support for private modules:
// https://github.com/rust-lang/cargo/issues/1520
pub mod integrations;
pub mod http;
pub mod integrations;
// TODO: remove this alias export in 0.10. (breaking change)
pub use http::graphiql;
@ -146,18 +146,18 @@ mod executor_tests;
// Needs to be public because macros use it.
pub use util::to_camel_case;
use executor::execute_validated_query;
use parser::{parse_document_source, ParseError, Spanning};
use validation::{validate_input_values, visit_all_rules, ValidatorContext};
use executor::execute_validated_query;
pub use ast::{FromInputValue, InputValue, Selection, ToInputValue, Type};
pub use value::Value;
pub use types::base::{Arguments, GraphQLType, TypeKind};
pub use executor::{Context, ExecutionError, ExecutionResult, Executor, FieldError, FieldResult,
FromContext, IntoResolvable, Registry, Variables};
pub use validation::RuleError;
pub use types::scalars::{EmptyMutation, ID};
pub use schema::model::RootNode;
pub use types::base::{Arguments, GraphQLType, TypeKind};
pub use types::scalars::{EmptyMutation, ID};
pub use validation::RuleError;
pub use value::Value;
pub use schema::meta;

48
juniper/src/macros/tests/args.rs
View file

@ -1,7 +1,7 @@
use executor::Variables;
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct Root;
@ -192,7 +192,7 @@ fn introspect_field_exec_arg_and_more() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -225,7 +225,7 @@ fn introspect_field_single_arg() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -258,7 +258,7 @@ fn introspect_field_multi_args() {
),
),
].into_iter()
.collect()
.collect(),
))
);
@ -284,7 +284,7 @@ fn introspect_field_multi_args() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -317,7 +317,7 @@ fn introspect_field_multi_args_trailing_comma() {
),
),
].into_iter()
.collect()
.collect(),
))
);
@ -343,7 +343,7 @@ fn introspect_field_multi_args_trailing_comma() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -376,7 +376,7 @@ fn introspect_field_single_arg_descr() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -409,7 +409,7 @@ fn introspect_field_multi_args_descr() {
),
),
].into_iter()
.collect()
.collect(),
))
);
@ -435,7 +435,7 @@ fn introspect_field_multi_args_descr() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -468,7 +468,7 @@ fn introspect_field_multi_args_descr_trailing_comma() {
),
),
].into_iter()
.collect()
.collect(),
))
);
@ -494,7 +494,7 @@ fn introspect_field_multi_args_descr_trailing_comma() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -520,7 +520,7 @@ fn introspect_field_arg_with_default() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -546,7 +546,7 @@ fn introspect_field_multi_args_with_default() {
),
),
].into_iter()
.collect()
.collect(),
))
);
@ -565,7 +565,7 @@ fn introspect_field_multi_args_with_default() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -591,7 +591,7 @@ fn introspect_field_multi_args_with_default_trailing_comma() {
),
),
].into_iter()
.collect()
.collect(),
))
);
@ -610,7 +610,7 @@ fn introspect_field_multi_args_with_default_trailing_comma() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -636,7 +636,7 @@ fn introspect_field_arg_with_default_descr() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -662,7 +662,7 @@ fn introspect_field_multi_args_with_default_descr() {
),
),
].into_iter()
.collect()
.collect(),
))
);
@ -681,7 +681,7 @@ fn introspect_field_multi_args_with_default_descr() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -707,7 +707,7 @@ fn introspect_field_multi_args_with_default_trailing_comma_descr() {
),
),
].into_iter()
.collect()
.collect(),
))
);
@ -726,7 +726,7 @@ fn introspect_field_multi_args_with_default_trailing_comma_descr() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});
@ -752,7 +752,7 @@ fn introspect_field_args_with_complex_default() {
),
),
].into_iter()
.collect()
.collect(),
))
);
@ -774,7 +774,7 @@ fn introspect_field_args_with_complex_default() {
),
),
].into_iter()
.collect()
.collect(),
))
);
});

4
juniper/src/macros/tests/field.rs
View file

@ -1,10 +1,10 @@
use indexmap::IndexMap;
use value::Value;
use ast::InputValue;
use schema::model::RootNode;
use executor::FieldResult;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct Interface;
struct Root;

20
juniper/src/macros/tests/interface.rs
View file

@ -2,9 +2,9 @@ use indexmap::IndexMap;
use std::marker::PhantomData;
use ast::InputValue;
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
/*
@ -184,7 +184,7 @@ fn introspect_custom_name() {
fields.contains(&Value::object(
vec![("name", Value::string("simple"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -200,7 +200,7 @@ fn introspect_with_lifetime() {
fields.contains(&Value::object(
vec![("name", Value::string("simple"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -216,7 +216,7 @@ fn introspect_with_generics() {
fields.contains(&Value::object(
vec![("name", Value::string("simple"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -235,7 +235,7 @@ fn introspect_description_first() {
fields.contains(&Value::object(
vec![("name", Value::string("simple"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -254,7 +254,7 @@ fn introspect_fields_first() {
fields.contains(&Value::object(
vec![("name", Value::string("simple"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -273,7 +273,7 @@ fn introspect_interfaces_first() {
fields.contains(&Value::object(
vec![("name", Value::string("simple"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -295,7 +295,7 @@ fn introspect_commas_with_trailing() {
fields.contains(&Value::object(
vec![("name", Value::string("simple"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -314,7 +314,7 @@ fn introspect_commas_on_meta() {
fields.contains(&Value::object(
vec![("name", Value::string("simple"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -336,7 +336,7 @@ fn introspect_resolvers_with_trailing_comma() {
fields.contains(&Value::object(
vec![("name", Value::string("simple"))]
.into_iter()
.collect()
.collect(),
))
);
});

4
juniper/src/macros/tests/mod.rs
View file

@ -1,6 +1,6 @@
mod scalar;
mod args;
mod field;
mod object;
mod interface;
mod object;
mod scalar;
mod union;

84
juniper/src/macros/tests/object.rs
View file

@ -2,10 +2,10 @@ use indexmap::IndexMap;
use std::marker::PhantomData;
use ast::InputValue;
use value::Value;
use executor::{Context, FieldResult};
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use executor::{Context, FieldResult};
use value::Value;
/*
@ -250,15 +250,13 @@ fn introspect_description_first() {
);
assert_eq!(
object.get("interfaces"),
Some(&Value::list(vec![
Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
),
]))
Some(&Value::list(vec![Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
)]))
);
assert!(fields.contains(&graphql_value!({
@ -278,15 +276,13 @@ fn introspect_fields_first() {
);
assert_eq!(
object.get("interfaces"),
Some(&Value::list(vec![
Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
),
]))
Some(&Value::list(vec![Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
)]))
);
assert!(fields.contains(&graphql_value!({
@ -306,15 +302,13 @@ fn introspect_interfaces_first() {
);
assert_eq!(
object.get("interfaces"),
Some(&Value::list(vec![
Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
),
]))
Some(&Value::list(vec![Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
)]))
);
assert!(fields.contains(&graphql_value!({
@ -337,15 +331,13 @@ fn introspect_commas_with_trailing() {
);
assert_eq!(
object.get("interfaces"),
Some(&Value::list(vec![
Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
),
]))
Some(&Value::list(vec![Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
)]))
);
assert!(fields.contains(&graphql_value!({
@ -365,15 +357,13 @@ fn introspect_commas_on_meta() {
);
assert_eq!(
object.get("interfaces"),
Some(&Value::list(vec![
Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
),
]))
Some(&Value::list(vec![Value::object(
vec![
("name", Value::string("Interface")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
)]))
);
assert!(fields.contains(&graphql_value!({

2
juniper/src/macros/tests/scalar.rs
View file

@ -1,9 +1,9 @@
use indexmap::IndexMap;
use executor::Variables;
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
struct DefaultName(i32);
struct OtherOrder(i32);

16
juniper/src/macros/tests/union.rs
View file

@ -2,9 +2,9 @@ use indexmap::IndexMap;
use std::marker::PhantomData;
use ast::InputValue;
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use value::Value;
/*
@ -162,7 +162,7 @@ fn introspect_custom_name() {
possible_types.contains(&Value::object(
vec![("name", Value::string("Concrete"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -178,7 +178,7 @@ fn introspect_with_lifetime() {
possible_types.contains(&Value::object(
vec![("name", Value::string("Concrete"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -194,7 +194,7 @@ fn introspect_with_generics() {
possible_types.contains(&Value::object(
vec![("name", Value::string("Concrete"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -213,7 +213,7 @@ fn introspect_description_first() {
possible_types.contains(&Value::object(
vec![("name", Value::string("Concrete"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -232,7 +232,7 @@ fn introspect_resolvers_first() {
possible_types.contains(&Value::object(
vec![("name", Value::string("Concrete"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -254,7 +254,7 @@ fn introspect_commas_with_trailing() {
possible_types.contains(&Value::object(
vec![("name", Value::string("Concrete"))]
.into_iter()
.collect()
.collect(),
))
);
});
@ -276,7 +276,7 @@ fn introspect_resolvers_with_trailing_comma() {
possible_types.contains(&Value::object(
vec![("name", Value::string("Concrete"))]
.into_iter()
.collect()
.collect(),
))
);
});

2
juniper/src/parser/document.rs
View file

@ -4,9 +4,9 @@ use ast::{Arguments, Definition, Directive, Document, Field, Fragment, FragmentS
InlineFragment, InputValue, Operation, OperationType, Selection, Type,
VariableDefinition, VariableDefinitions};
use parser::value::parse_value_literal;
use parser::{Lexer, OptionParseResult, ParseError, ParseResult, Parser, Spanning, Token,
UnlocatedParseResult};
use parser::value::parse_value_literal;
#[doc(hidden)]
pub fn parse_document_source(s: &str) -> UnlocatedParseResult<Document> {

4
juniper/src/parser/lexer.rs
View file

@ -1,8 +1,8 @@
use std::char;
use std::str::CharIndices;
use std::fmt;
use std::iter::{Iterator, Peekable};
use std::result::Result;
use std::fmt;
use std::str::CharIndices;
use parser::{SourcePosition, Spanning};

6
juniper/src/parser/mod.rs
View file

@ -1,16 +1,16 @@
//! Query parser and language utilities
mod utils;
mod document;
mod lexer;
mod parser;
mod utils;
mod value;
mod document;
#[cfg(test)]
mod tests;
pub use self::document::parse_document_source;
pub use self::parser::{OptionParseResult, ParseError, ParseResult, Parser, UnlocatedParseResult};
pub use self::lexer::{Lexer, LexerError, Token};
pub use self::parser::{OptionParseResult, ParseError, ParseResult, Parser, UnlocatedParseResult};
pub use self::utils::{SourcePosition, Spanning};

2
juniper/src/parser/parser.rs
View file

@ -1,5 +1,5 @@
use std::result::Result;
use std::fmt;
use std::result::Result;
use parser::{Lexer, LexerError, Spanning, Token};

148
juniper/src/parser/tests/document.rs
View file

@ -1,6 +1,6 @@
use ast::{Arguments, Definition, Document, Field, InputValue, Operation, OperationType, Selection};
use parser::{ParseError, SourcePosition, Spanning, Token};
use parser::document::parse_document_source;
use parser::{ParseError, SourcePosition, Spanning, Token};
fn parse_document(s: &str) -> Document {
parse_document_source(s).expect(&format!("Parse error on input {:#?}", s))
@ -26,85 +26,79 @@ fn simple_ast() {
}
"#
),
vec![
Definition::Operation(Spanning::start_end(
&SourcePosition::new(13, 1, 12),
&SourcePosition::new(124, 6, 13),
Operation {
operation_type: OperationType::Query,
name: None,
variable_definitions: None,
directives: None,
selection_set: vec![
Selection::Field(Spanning::start_end(
vec![Definition::Operation(Spanning::start_end(
&SourcePosition::new(13, 1, 12),
&SourcePosition::new(124, 6, 13),
Operation {
operation_type: OperationType::Query,
name: None,
variable_definitions: None,
directives: None,
selection_set: vec![Selection::Field(Spanning::start_end(
&SourcePosition::new(31, 2, 16),
&SourcePosition::new(110, 5, 17),
Field {
alias: None,
name: Spanning::start_end(
&SourcePosition::new(31, 2, 16),
&SourcePosition::new(110, 5, 17),
Field {
alias: None,
name: Spanning::start_end(
&SourcePosition::new(31, 2, 16),
&SourcePosition::new(35, 2, 20),
"node",
),
arguments: Some(Spanning::start_end(
&SourcePosition::new(35, 2, 20),
&SourcePosition::new(42, 2, 27),
Arguments {
items: vec![
(
Spanning::start_end(
&SourcePosition::new(36, 2, 21),
&SourcePosition::new(38, 2, 23),
"id",
),
Spanning::start_end(
&SourcePosition::new(40, 2, 25),
&SourcePosition::new(41, 2, 26),
InputValue::int(4),
),
),
],
},
)),
directives: None,
selection_set: Some(vec![
Selection::Field(Spanning::start_end(
&SourcePosition::new(65, 3, 20),
&SourcePosition::new(67, 3, 22),
Field {
alias: None,
name: Spanning::start_end(
&SourcePosition::new(65, 3, 20),
&SourcePosition::new(67, 3, 22),
"id",
),
arguments: None,
directives: None,
selection_set: None,
},
)),
Selection::Field(Spanning::start_end(
&SourcePosition::new(88, 4, 20),
&SourcePosition::new(92, 4, 24),
Field {
alias: None,
name: Spanning::start_end(
&SourcePosition::new(88, 4, 20),
&SourcePosition::new(92, 4, 24),
"name",
),
arguments: None,
directives: None,
selection_set: None,
},
)),
]),
&SourcePosition::new(35, 2, 20),
"node",
),
arguments: Some(Spanning::start_end(
&SourcePosition::new(35, 2, 20),
&SourcePosition::new(42, 2, 27),
Arguments {
items: vec![(
Spanning::start_end(
&SourcePosition::new(36, 2, 21),
&SourcePosition::new(38, 2, 23),
"id",
),
Spanning::start_end(
&SourcePosition::new(40, 2, 25),
&SourcePosition::new(41, 2, 26),
InputValue::int(4),
),
)],
},
)),
],
},
)),
]
directives: None,
selection_set: Some(vec![
Selection::Field(Spanning::start_end(
&SourcePosition::new(65, 3, 20),
&SourcePosition::new(67, 3, 22),
Field {
alias: None,
name: Spanning::start_end(
&SourcePosition::new(65, 3, 20),
&SourcePosition::new(67, 3, 22),
"id",
),
arguments: None,
directives: None,
selection_set: None,
},
)),
Selection::Field(Spanning::start_end(
&SourcePosition::new(88, 4, 20),
&SourcePosition::new(92, 4, 24),
Field {
alias: None,
name: Spanning::start_end(
&SourcePosition::new(88, 4, 20),
&SourcePosition::new(92, 4, 24),
"name",
),
arguments: None,
directives: None,
selection_set: None,
},
)),
]),
},
))],
},
))]
)
}

7
juniper/src/parser/tests/lexer.rs
View file

@ -50,9 +50,10 @@ fn tokenize_error(s: &str) -> Spanning<LexerError> {
fn empty_source() {
assert_eq!(
tokenize_to_vec(""),
vec![
Spanning::zero_width(&SourcePosition::new_origin(), Token::EndOfFile),
]
vec![Spanning::zero_width(
&SourcePosition::new_origin(),
Token::EndOfFile,
)]
);
}

26
juniper/src/parser/tests/value.rs
View file

@ -1,8 +1,8 @@
use indexmap::IndexMap;
use ast::InputValue;
use parser::{Lexer, Parser, SourcePosition, Spanning};
use parser::value::parse_value_literal;
use parser::{Lexer, Parser, SourcePosition, Spanning};
fn parse_value(s: &str) -> Spanning<InputValue> {
let mut lexer = Lexer::new(s);
@ -142,20 +142,18 @@ fn input_value_literals() {
Spanning::start_end(
&SourcePosition::new(18, 0, 18),
&SourcePosition::new(30, 0, 30),
InputValue::parsed_object(vec![
(
Spanning::start_end(
&SourcePosition::new(19, 0, 19),
&SourcePosition::new(22, 0, 22),
"foo".to_owned(),
),
Spanning::start_end(
&SourcePosition::new(24, 0, 24),
&SourcePosition::new(29, 0, 29),
InputValue::string("bar"),
),
InputValue::parsed_object(vec![(
Spanning::start_end(
&SourcePosition::new(19, 0, 19),
&SourcePosition::new(22, 0, 22),
"foo".to_owned(),
),
]),
Spanning::start_end(
&SourcePosition::new(24, 0, 24),
&SourcePosition::new(29, 0, 29),
InputValue::string("bar"),
),
)]),
),
),
])

27
juniper/src/schema/meta.rs
View file

@ -102,15 +102,24 @@ pub struct PlaceholderMeta<'a> {
/// Generic type metadata
#[derive(Debug)]
pub enum MetaType<'a> {
#[doc(hidden)] Scalar(ScalarMeta<'a>),
#[doc(hidden)] List(ListMeta<'a>),
#[doc(hidden)] Nullable(NullableMeta<'a>),
#[doc(hidden)] Object(ObjectMeta<'a>),
#[doc(hidden)] Enum(EnumMeta<'a>),
#[doc(hidden)] Interface(InterfaceMeta<'a>),
#[doc(hidden)] Union(UnionMeta<'a>),
#[doc(hidden)] InputObject(InputObjectMeta<'a>),
#[doc(hidden)] Placeholder(PlaceholderMeta<'a>),
#[doc(hidden)]
Scalar(ScalarMeta<'a>),
#[doc(hidden)]
List(ListMeta<'a>),
#[doc(hidden)]
Nullable(NullableMeta<'a>),
#[doc(hidden)]
Object(ObjectMeta<'a>),
#[doc(hidden)]
Enum(EnumMeta<'a>),
#[doc(hidden)]
Interface(InterfaceMeta<'a>),
#[doc(hidden)]
Union(UnionMeta<'a>),
#[doc(hidden)]
InputObject(InputObjectMeta<'a>),
#[doc(hidden)]
Placeholder(PlaceholderMeta<'a>),
}
/// Metadata for a field

2
juniper/src/schema/mod.rs
View file

@ -1,3 +1,3 @@
pub mod meta;
pub mod model;
pub mod schema;
pub mod meta;

15
juniper/src/schema/model.rs
View file

@ -2,11 +2,11 @@ use std::fmt;
use fnv::FnvHashMap;
use ast::Type;
use executor::{Context, Registry};
use schema::meta::{Argument, InterfaceMeta, MetaType, ObjectMeta, PlaceholderMeta, UnionMeta};
use types::base::GraphQLType;
use types::name::Name;
use executor::{Context, Registry};
use ast::Type;
use schema::meta::{Argument, InterfaceMeta, MetaType, ObjectMeta, PlaceholderMeta, UnionMeta};
/// Root query node of a schema
///
@ -55,9 +55,12 @@ pub enum DirectiveLocation {
Query,
Mutation,
Field,
#[graphql(name = "FRAGMENT_DEFINITION")] FragmentDefinition,
#[graphql(name = "FRAGMENT_SPREAD")] FragmentSpread,
#[graphql(name = "INLINE_SPREAD")] InlineFragment,
#[graphql(name = "FRAGMENT_DEFINITION")]
FragmentDefinition,
#[graphql(name = "FRAGMENT_SPREAD")]
FragmentSpread,
#[graphql(name = "INLINE_SPREAD")]
InlineFragment,
}
impl<'a, QueryT, MutationT> RootNode<'a, QueryT, MutationT>

2
juniper/src/schema/schema.rs
View file

@ -1,5 +1,5 @@
use types::base::{Arguments, GraphQLType, TypeKind};
use executor::{ExecutionResult, Executor, Registry};
use types::base::{Arguments, GraphQLType, TypeKind};
use schema::meta::{Argument, EnumMeta, EnumValue, Field, InputObjectMeta, InterfaceMeta, MetaType,
ObjectMeta, UnionMeta};

108
juniper/src/tests/introspection_tests.rs
View file

@ -1,10 +1,10 @@
use std::collections::HashSet;
use executor::Variables;
use value::Value;
use schema::model::RootNode;
use tests::model::Database;
use types::scalars::EmptyMutation;
use value::Value;
#[test]
fn test_query_type_name() {
@ -23,24 +23,18 @@ fn test_query_type_name() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"__schema",
Value::object(
vec![
(
"queryType",
Value::object(
vec![("name", Value::string("Query"))]
.into_iter()
.collect(),
),
),
].into_iter()
.collect(),
),
vec![(
"__schema",
Value::object(
vec![(
"queryType",
Value::object(
vec![("name", Value::string("Query"))].into_iter().collect(),
),
)].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -63,12 +57,10 @@ fn test_specific_type_name() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"__type",
Value::object(vec![("name", Value::string("Droid"))].into_iter().collect()),
),
].into_iter()
vec![(
"__type",
Value::object(vec![("name", Value::string("Droid"))].into_iter().collect()),
)].into_iter()
.collect()
),
vec![]
@ -93,18 +85,16 @@ fn test_specific_object_type_name_and_kind() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"__type",
Value::object(
vec![
("name", Value::string("Droid")),
("kind", Value::string("OBJECT")),
].into_iter()
.collect(),
),
vec![(
"__type",
Value::object(
vec![
("name", Value::string("Droid")),
("kind", Value::string("OBJECT")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -129,18 +119,16 @@ fn test_specific_interface_type_name_and_kind() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"__type",
Value::object(
vec![
("name", Value::string("Character")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
),
vec![(
"__type",
Value::object(
vec![
("name", Value::string("Character")),
("kind", Value::string("INTERFACE")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -165,23 +153,19 @@ fn test_documentation() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"__type",
Value::object(
vec![
("name", Value::string("Droid")),
(
"description",
Value::string(
"A mechanical creature in the Star Wars universe.",
),
),
].into_iter()
.collect(),
),
vec![(
"__type",
Value::object(
vec![
("name", Value::string("Droid")),
(
"description",
Value::string("A mechanical creature in the Star Wars universe."),
),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]

8
juniper/src/tests/mod.rs
View file

@ -1,10 +1,10 @@
//! Library tests and fixtures
pub mod model;
mod schema;
#[cfg(test)]
mod query_tests;
#[cfg(test)]
mod introspection_tests;
pub mod model;
#[cfg(test)]
mod query_tests;
mod schema;
#[cfg(test)]
mod type_info_tests;

3
juniper/src/tests/model.rs
View file

@ -5,7 +5,8 @@ use std::collections::HashMap;
#[derive(GraphQLEnum, Copy, Clone, Eq, PartialEq, Debug)]
#[graphql(_internal)]
pub enum Episode {
#[graphql(name = "NEW_HOPE")] NewHope,
#[graphql(name = "NEW_HOPE")]
NewHope,
Empire,
Jedi,
}

558
juniper/src/tests/query_tests.rs
View file

@ -1,9 +1,9 @@
use ast::InputValue;
use executor::Variables;
use value::Value;
use schema::model::RootNode;
use types::scalars::EmptyMutation;
use tests::model::Database;
use types::scalars::EmptyMutation;
use value::Value;
#[test]
fn test_hero_name() {
@ -20,12 +20,10 @@ fn test_hero_name() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"hero",
Value::object(vec![("name", Value::string("R2-D2"))].into_iter().collect()),
),
].into_iter()
vec![(
"hero",
Value::object(vec![("name", Value::string("R2-D2"))].into_iter().collect()),
)].into_iter()
.collect()
),
vec![]
@ -49,18 +47,16 @@ fn test_hero_field_order() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"hero",
Value::object(
vec![
("id", Value::string("2001")),
("name", Value::string("R2-D2")),
].into_iter()
.collect(),
),
vec![(
"hero",
Value::object(
vec![
("id", Value::string("2001")),
("name", Value::string("R2-D2")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -78,18 +74,16 @@ fn test_hero_field_order() {
::execute(doc_reversed, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"hero",
Value::object(
vec![
("name", Value::string("R2-D2")),
("id", Value::string("2001")),
].into_iter()
.collect(),
),
vec![(
"hero",
Value::object(
vec![
("name", Value::string("R2-D2")),
("id", Value::string("2001")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -116,38 +110,36 @@ fn test_hero_name_and_friends() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"hero",
Value::object(
vec![
("id", Value::string("2001")),
("name", Value::string("R2-D2")),
(
"friends",
Value::list(vec![
Value::object(
vec![("name", Value::string("Luke Skywalker"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("Han Solo"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("Leia Organa"))]
.into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
vec![(
"hero",
Value::object(
vec![
("id", Value::string("2001")),
("name", Value::string("R2-D2")),
(
"friends",
Value::list(vec![
Value::object(
vec![("name", Value::string("Luke Skywalker"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("Han Solo"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("Leia Organa"))]
.into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -178,153 +170,141 @@ fn test_hero_name_and_friends_and_friends_of_friends() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"hero",
Value::object(
vec![
("id", Value::string("2001")),
("name", Value::string("R2-D2")),
(
"friends",
Value::list(vec![
Value::object(
vec![
("name", Value::string("Luke Skywalker")),
(
"appearsIn",
Value::list(vec![
Value::string("NEW_HOPE"),
Value::string("EMPIRE"),
Value::string("JEDI"),
]),
),
(
"friends",
Value::list(vec![
Value::object(
vec![
("name", Value::string("Han Solo")),
].into_iter()
.collect(),
),
Value::object(
vec![
(
"name",
Value::string("Leia Organa"),
),
].into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("C-3PO"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("R2-D2"))]
.into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
Value::object(
vec![
("name", Value::string("Han Solo")),
(
"appearsIn",
Value::list(vec![
Value::string("NEW_HOPE"),
Value::string("EMPIRE"),
Value::string("JEDI"),
]),
),
(
"friends",
Value::list(vec![
Value::object(
vec![
(
"name",
Value::string("Luke Skywalker"),
),
].into_iter()
.collect(),
),
Value::object(
vec![
(
"name",
Value::string("Leia Organa"),
),
].into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("R2-D2"))]
.into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
Value::object(
vec![
("name", Value::string("Leia Organa")),
(
"appearsIn",
Value::list(vec![
Value::string("NEW_HOPE"),
Value::string("EMPIRE"),
Value::string("JEDI"),
]),
),
(
"friends",
Value::list(vec![
Value::object(
vec![
(
"name",
Value::string("Luke Skywalker"),
),
].into_iter()
.collect(),
),
Value::object(
vec![
("name", Value::string("Han Solo")),
].into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("C-3PO"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("R2-D2"))]
.into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
vec![(
"hero",
Value::object(
vec![
("id", Value::string("2001")),
("name", Value::string("R2-D2")),
(
"friends",
Value::list(vec![
Value::object(
vec![
("name", Value::string("Luke Skywalker")),
(
"appearsIn",
Value::list(vec![
Value::string("NEW_HOPE"),
Value::string("EMPIRE"),
Value::string("JEDI"),
]),
),
(
"friends",
Value::list(vec![
Value::object(
vec![("name", Value::string("Han Solo"))]
.into_iter()
.collect(),
),
Value::object(
vec![(
"name",
Value::string("Leia Organa"),
)].into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("C-3PO"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("R2-D2"))]
.into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
Value::object(
vec![
("name", Value::string("Han Solo")),
(
"appearsIn",
Value::list(vec![
Value::string("NEW_HOPE"),
Value::string("EMPIRE"),
Value::string("JEDI"),
]),
),
(
"friends",
Value::list(vec![
Value::object(
vec![(
"name",
Value::string("Luke Skywalker"),
)].into_iter()
.collect(),
),
Value::object(
vec![(
"name",
Value::string("Leia Organa"),
)].into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("R2-D2"))]
.into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
Value::object(
vec![
("name", Value::string("Leia Organa")),
(
"appearsIn",
Value::list(vec![
Value::string("NEW_HOPE"),
Value::string("EMPIRE"),
Value::string("JEDI"),
]),
),
(
"friends",
Value::list(vec![
Value::object(
vec![(
"name",
Value::string("Luke Skywalker"),
)].into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("Han Solo"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("C-3PO"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("R2-D2"))]
.into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
]),
),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -342,16 +322,14 @@ fn test_query_name() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"human",
Value::object(
vec![("name", Value::string("Luke Skywalker"))]
.into_iter()
.collect(),
),
vec![(
"human",
Value::object(
vec![("name", Value::string("Luke Skywalker"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -369,16 +347,14 @@ fn test_query_alias_single() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"luke",
Value::object(
vec![("name", Value::string("Luke Skywalker"))]
.into_iter()
.collect(),
),
vec![(
"luke",
Value::object(
vec![("name", Value::string("Luke Skywalker"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -487,16 +463,14 @@ fn test_query_name_variable() {
::execute(doc, None, &schema, &vars, &database),
Ok((
Value::object(
vec![
(
"human",
Value::object(
vec![("name", Value::string("Luke Skywalker"))]
.into_iter()
.collect(),
),
vec![(
"human",
Value::object(
vec![("name", Value::string("Luke Skywalker"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -533,41 +507,33 @@ fn test_query_friends_names() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"human",
Value::object(
vec![
(
"friends",
Value::list(vec![
Value::object(
vec![("name", Value::string("Han Solo"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("Leia Organa"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("C-3PO"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("R2-D2"))]
.into_iter()
.collect(),
),
]),
vec![(
"human",
Value::object(
vec![(
"friends",
Value::list(vec![
Value::object(
vec![("name", Value::string("Han Solo"))]
.into_iter()
.collect(),
),
].into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("Leia Organa"))]
.into_iter()
.collect(),
),
Value::object(
vec![("name", Value::string("C-3PO"))].into_iter().collect(),
),
Value::object(
vec![("name", Value::string("R2-D2"))].into_iter().collect(),
),
]),
)].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -596,19 +562,17 @@ fn test_query_inline_fragments_droid() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"hero",
Value::object(
vec![
("name", Value::string("R2-D2")),
("__typename", Value::string("Droid")),
("primaryFunction", Value::string("Astromech")),
].into_iter()
.collect(),
),
vec![(
"hero",
Value::object(
vec![
("name", Value::string("R2-D2")),
("__typename", Value::string("Droid")),
("primaryFunction", Value::string("Astromech")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -633,18 +597,16 @@ fn test_query_inline_fragments_human() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"hero",
Value::object(
vec![
("name", Value::string("Luke Skywalker")),
("__typename", Value::string("Human")),
].into_iter()
.collect(),
),
vec![(
"hero",
Value::object(
vec![
("name", Value::string("Luke Skywalker")),
("__typename", Value::string("Human")),
].into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]
@ -667,16 +629,14 @@ fn test_object_typename() {
::execute(doc, None, &schema, &Variables::new(), &database),
Ok((
Value::object(
vec![
(
"human",
Value::object(
vec![("__typename", Value::string("Human"))]
.into_iter()
.collect(),
),
vec![(
"human",
Value::object(
vec![("__typename", Value::string("Human"))]
.into_iter()
.collect(),
),
].into_iter()
)].into_iter()
.collect()
),
vec![]

2
juniper/src/tests/schema.rs
View file

@ -1,5 +1,5 @@
use tests::model::{Character, Database, Droid, Episode, Human};
use executor::Context;
use tests::model::{Character, Database, Droid, Episode, Human};
impl Context for Database {}

2
juniper/src/tests/type_info_tests.rs
View file

@ -1,11 +1,11 @@
use indexmap::IndexMap;
use executor::{ExecutionResult, Executor, Registry, Variables};
use value::Value;
use schema::meta::MetaType;
use schema::model::RootNode;
use types::base::{Arguments, GraphQLType};
use types::scalars::EmptyMutation;
use value::Value;
pub struct NodeTypeInfo {
name: String,

47
juniper/src/types/base.rs
View file

@ -1,13 +1,13 @@
use indexmap::IndexMap;
use indexmap::map::Entry;
use indexmap::IndexMap;
use ast::{Directive, FromInputValue, InputValue, Selection};
use executor::Variables;
use value::Value;
use schema::meta::{Argument, MetaType};
use executor::{ExecutionResult, Executor, Registry};
use parser::Spanning;
use schema::meta::{Argument, MetaType};
/// GraphQL type kind
///
@ -505,29 +505,28 @@ fn is_excluded(directives: &Option<Vec<Spanning<Directive>>>, vars: &Variables)
fn merge_key_into(result: &mut IndexMap<String, Value>, response_name: &str, value: Value) {
match result.entry(response_name.to_owned()) {
Entry::Occupied(mut e) => {
match e.get_mut() {
&mut Value::Object(ref mut dest_obj) => {
if let Value::Object(src_obj) = value {
merge_maps(dest_obj, src_obj);
}
},
&mut Value::List(ref mut dest_list) => {
if let Value::List(src_list) = value {
dest_list.iter_mut().zip(src_list.into_iter()).for_each(|(d, s)| {
match d {
&mut Value::Object(ref mut d_obj) => {
if let Value::Object(s_obj) = s {
merge_maps(d_obj, s_obj);
}
},
_ => {},
}
});
}
},
_ => {}
Entry::Occupied(mut e) => match e.get_mut() {
&mut Value::Object(ref mut dest_obj) => {
if let Value::Object(src_obj) = value {
merge_maps(dest_obj, src_obj);
}
}
&mut Value::List(ref mut dest_list) => {
if let Value::List(src_list) = value {
dest_list
.iter_mut()
.zip(src_list.into_iter())
.for_each(|(d, s)| match d {
&mut Value::Object(ref mut d_obj) => {
if let Value::Object(s_obj) = s {
merge_maps(d_obj, s_obj);
}
}
_ => {}
});
}
}
_ => {}
},
Entry::Vacant(e) => {
e.insert(value);

2
juniper/src/types/containers.rs
View file

@ -1,6 +1,6 @@
use ast::{FromInputValue, InputValue, Selection, ToInputValue};
use value::Value;
use schema::meta::MetaType;
use value::Value;
use executor::{Executor, Registry};
use types::base::GraphQLType;

6
juniper/src/types/mod.rs
View file

@ -1,6 +1,6 @@
pub mod base;
pub mod scalars;
pub mod pointers;
pub mod containers;
pub mod utilities;
pub mod name;
pub mod pointers;
pub mod scalars;
pub mod utilities;

2
juniper/src/types/pointers.rs
View file

@ -1,8 +1,8 @@
use ast::{FromInputValue, InputValue, Selection, ToInputValue};
use value::Value;
use schema::meta::MetaType;
use executor::{ExecutionResult, Executor, Registry};
use schema::meta::MetaType;
use types::base::{Arguments, GraphQLType};
impl<T, CtxT> GraphQLType for Box<T>

4
juniper/src/types/utilities.rs
View file

@ -1,7 +1,7 @@
use std::collections::HashSet;
use ast::InputValue;
use schema::model::{SchemaType, TypeType};
use schema::meta::{EnumMeta, InputObjectMeta, MetaType};
use schema::model::{SchemaType, TypeType};
use std::collections::HashSet;
pub fn is_valid_literal_value(
schema: &SchemaType,

6
juniper/src/validation/input_value.rs
View file

@ -1,12 +1,12 @@
use std::collections::HashSet;
use std::fmt;
use parser::SourcePosition;
use ast::{Definition, Document, InputValue, VariableDefinitions};
use executor::Variables;
use validation::RuleError;
use schema::model::{SchemaType, TypeType};
use parser::SourcePosition;
use schema::meta::{EnumMeta, InputObjectMeta, MetaType, ScalarMeta};
use schema::model::{SchemaType, TypeType};
use validation::RuleError;
#[derive(Debug)]
enum Path<'a> {

14
juniper/src/validation/mod.rs
View file

@ -1,21 +1,21 @@
//! Query validation related methods and data structures
mod visitor;
mod traits;
mod context;
mod input_value;
mod multi_visitor;
mod rules;
mod input_value;
mod traits;
mod visitor;
#[cfg(test)]
mod test_harness;
pub use self::context::{RuleError, ValidatorContext};
pub use self::input_value::validate_input_values;
pub use self::multi_visitor::{MultiVisitor, MultiVisitorNil};
pub use self::rules::visit_all_rules;
pub use self::traits::Visitor;
pub use self::visitor::visit;
pub use self::context::{RuleError, ValidatorContext};
pub use self::rules::visit_all_rules;
pub use self::multi_visitor::{MultiVisitor, MultiVisitorNil};
pub use self::input_value::validate_input_values;
#[cfg(test)]
pub use self::test_harness::{expect_fails_rule, expect_fails_rule_with_schema, expect_passes_rule,

312
juniper/src/validation/rules/arguments_of_correct_type.rs
View file

@ -1,7 +1,7 @@
use ast::{Directive, Field, InputValue};
use parser::Spanning;
use schema::meta::Argument;
use types::utilities::is_valid_literal_value;
use parser::Spanning;
use validation::{ValidatorContext, Visitor};
pub struct ArgumentsOfCorrectType<'a> {
@ -96,12 +96,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("nonNullIntArg", "Int!"),
&[SourcePosition::new(97, 3, 50)],
),
],
&[RuleError::new(
&error_message("nonNullIntArg", "Int!"),
&[SourcePosition::new(97, 3, 50)],
)],
);
}
@ -228,12 +226,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("stringArg", "String"),
&[SourcePosition::new(89, 3, 42)],
),
],
&[RuleError::new(
&error_message("stringArg", "String"),
&[SourcePosition::new(89, 3, 42)],
)],
);
}
@ -248,12 +244,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("stringArg", "String"),
&[SourcePosition::new(89, 3, 42)],
),
],
&[RuleError::new(
&error_message("stringArg", "String"),
&[SourcePosition::new(89, 3, 42)],
)],
);
}
@ -268,12 +262,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("stringArg", "String"),
&[SourcePosition::new(89, 3, 42)],
),
],
&[RuleError::new(
&error_message("stringArg", "String"),
&[SourcePosition::new(89, 3, 42)],
)],
);
}
@ -288,12 +280,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("stringArg", "String"),
&[SourcePosition::new(89, 3, 42)],
),
],
&[RuleError::new(
&error_message("stringArg", "String"),
&[SourcePosition::new(89, 3, 42)],
)],
);
}
@ -308,12 +298,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("intArg", "Int"),
&[SourcePosition::new(83, 3, 36)],
),
],
&[RuleError::new(
&error_message("intArg", "Int"),
&[SourcePosition::new(83, 3, 36)],
)],
);
}
@ -328,12 +316,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("intArg", "Int"),
&[SourcePosition::new(83, 3, 36)],
),
],
&[RuleError::new(
&error_message("intArg", "Int"),
&[SourcePosition::new(83, 3, 36)],
)],
);
}
@ -348,12 +334,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("intArg", "Int"),
&[SourcePosition::new(83, 3, 36)],
),
],
&[RuleError::new(
&error_message("intArg", "Int"),
&[SourcePosition::new(83, 3, 36)],
)],
);
}
@ -368,12 +352,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("intArg", "Int"),
&[SourcePosition::new(83, 3, 36)],
),
],
&[RuleError::new(
&error_message("intArg", "Int"),
&[SourcePosition::new(83, 3, 36)],
)],
);
}
@ -388,12 +370,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("floatArg", "Float"),
&[SourcePosition::new(87, 3, 40)],
),
],
&[RuleError::new(
&error_message("floatArg", "Float"),
&[SourcePosition::new(87, 3, 40)],
)],
);
}
@ -408,12 +388,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("floatArg", "Float"),
&[SourcePosition::new(87, 3, 40)],
),
],
&[RuleError::new(
&error_message("floatArg", "Float"),
&[SourcePosition::new(87, 3, 40)],
)],
);
}
@ -428,12 +406,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("floatArg", "Float"),
&[SourcePosition::new(87, 3, 40)],
),
],
&[RuleError::new(
&error_message("floatArg", "Float"),
&[SourcePosition::new(87, 3, 40)],
)],
);
}
@ -448,12 +424,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("booleanArg", "Boolean"),
&[SourcePosition::new(91, 3, 44)],
),
],
&[RuleError::new(
&error_message("booleanArg", "Boolean"),
&[SourcePosition::new(91, 3, 44)],
)],
);
}
@ -468,12 +442,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("booleanArg", "Boolean"),
&[SourcePosition::new(91, 3, 44)],
),
],
&[RuleError::new(
&error_message("booleanArg", "Boolean"),
&[SourcePosition::new(91, 3, 44)],
)],
);
}
@ -488,12 +460,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("booleanArg", "Boolean"),
&[SourcePosition::new(91, 3, 44)],
),
],
&[RuleError::new(
&error_message("booleanArg", "Boolean"),
&[SourcePosition::new(91, 3, 44)],
)],
);
}
@ -508,12 +478,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("booleanArg", "Boolean"),
&[SourcePosition::new(91, 3, 44)],
),
],
&[RuleError::new(
&error_message("booleanArg", "Boolean"),
&[SourcePosition::new(91, 3, 44)],
)],
);
}
@ -528,12 +496,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("idArg", "ID"),
&[SourcePosition::new(81, 3, 34)],
),
],
&[RuleError::new(
&error_message("idArg", "ID"),
&[SourcePosition::new(81, 3, 34)],
)],
);
}
@ -548,12 +514,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("idArg", "ID"),
&[SourcePosition::new(81, 3, 34)],
),
],
&[RuleError::new(
&error_message("idArg", "ID"),
&[SourcePosition::new(81, 3, 34)],
)],
);
}
@ -568,12 +532,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("idArg", "ID"),
&[SourcePosition::new(81, 3, 34)],
),
],
&[RuleError::new(
&error_message("idArg", "ID"),
&[SourcePosition::new(81, 3, 34)],
)],
);
}
@ -588,12 +550,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
),
],
&[RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
)],
);
}
@ -608,12 +568,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
),
],
&[RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
)],
);
}
@ -628,12 +586,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
),
],
&[RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
)],
);
}
@ -648,12 +604,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
),
],
&[RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
)],
);
}
@ -668,12 +622,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
),
],
&[RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
)],
);
}
@ -688,12 +640,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
),
],
&[RuleError::new(
&error_message("dogCommand", "DogCommand"),
&[SourcePosition::new(79, 3, 44)],
)],
);
}
@ -750,12 +700,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("stringListArg", "[String]"),
&[SourcePosition::new(97, 3, 50)],
),
],
&[RuleError::new(
&error_message("stringListArg", "[String]"),
&[SourcePosition::new(97, 3, 50)],
)],
);
}
@ -770,12 +718,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("stringListArg", "[String]"),
&[SourcePosition::new(97, 3, 50)],
),
],
&[RuleError::new(
&error_message("stringListArg", "[String]"),
&[SourcePosition::new(97, 3, 50)],
)],
);
}
@ -954,12 +900,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("req1", "Int!"),
&[SourcePosition::new(82, 3, 35)],
),
],
&[RuleError::new(
&error_message("req1", "Int!"),
&[SourcePosition::new(82, 3, 35)],
)],
);
}
@ -1070,12 +1014,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("complexArg", "ComplexInput"),
&[SourcePosition::new(91, 3, 44)],
),
],
&[RuleError::new(
&error_message("complexArg", "ComplexInput"),
&[SourcePosition::new(91, 3, 44)],
)],
);
}
@ -1093,12 +1035,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("complexArg", "ComplexInput"),
&[SourcePosition::new(91, 3, 44)],
),
],
&[RuleError::new(
&error_message("complexArg", "ComplexInput"),
&[SourcePosition::new(91, 3, 44)],
)],
);
}
@ -1116,12 +1056,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("complexArg", "ComplexInput"),
&[SourcePosition::new(91, 3, 44)],
),
],
&[RuleError::new(
&error_message("complexArg", "ComplexInput"),
&[SourcePosition::new(91, 3, 44)],
)],
);
}

22
juniper/src/validation/rules/default_values_of_correct_type.rs
View file

@ -1,6 +1,6 @@
use ast::VariableDefinition;
use types::utilities::is_valid_literal_value;
use parser::Spanning;
use types::utilities::is_valid_literal_value;
use validation::{ValidatorContext, Visitor};
pub struct DefaultValuesOfCorrectType {}
@ -162,12 +162,10 @@ mod tests {
dog { name }
}
"#,
&[
RuleError::new(
&type_error_message("a", "ComplexInput"),
&[SourcePosition::new(57, 1, 56)],
),
],
&[RuleError::new(
&type_error_message("a", "ComplexInput"),
&[SourcePosition::new(57, 1, 56)],
)],
);
}
@ -180,12 +178,10 @@ mod tests {
dog { name }
}
"#,
&[
RuleError::new(
&type_error_message("a", "[String]"),
&[SourcePosition::new(44, 1, 43)],
),
],
&[RuleError::new(
&type_error_message("a", "[String]"),
&[SourcePosition::new(44, 1, 43)],
)],
);
}

92
juniper/src/validation/rules/fields_on_correct_type.rs
View file

@ -1,7 +1,7 @@
use ast::Field;
use parser::Spanning;
use schema::meta::MetaType;
use validation::{ValidatorContext, Visitor};
use parser::Spanning;
pub struct FieldsOnCorrectType {}
@ -160,12 +160,10 @@ mod tests {
meowVolume
}
"#,
&[
RuleError::new(
&error_message("meowVolume", "Dog"),
&[SourcePosition::new(57, 2, 12)],
),
],
&[RuleError::new(
&error_message("meowVolume", "Dog"),
&[SourcePosition::new(57, 2, 12)],
)],
);
}
@ -180,12 +178,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("unknown_field", "Dog"),
&[SourcePosition::new(61, 2, 12)],
),
],
&[RuleError::new(
&error_message("unknown_field", "Dog"),
&[SourcePosition::new(61, 2, 12)],
)],
);
}
@ -200,12 +196,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("unknown_field", "Pet"),
&[SourcePosition::new(83, 3, 14)],
),
],
&[RuleError::new(
&error_message("unknown_field", "Pet"),
&[SourcePosition::new(83, 3, 14)],
)],
);
}
@ -220,12 +214,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("meowVolume", "Dog"),
&[SourcePosition::new(84, 3, 14)],
),
],
&[RuleError::new(
&error_message("meowVolume", "Dog"),
&[SourcePosition::new(84, 3, 14)],
)],
);
}
@ -238,12 +230,10 @@ mod tests {
volume : mooVolume
}
"#,
&[
RuleError::new(
&error_message("mooVolume", "Dog"),
&[SourcePosition::new(79, 2, 21)],
),
],
&[RuleError::new(
&error_message("mooVolume", "Dog"),
&[SourcePosition::new(79, 2, 21)],
)],
);
}
@ -256,12 +246,10 @@ mod tests {
barkVolume : kawVolume
}
"#,
&[
RuleError::new(
&error_message("kawVolume", "Dog"),
&[SourcePosition::new(88, 2, 25)],
),
],
&[RuleError::new(
&error_message("kawVolume", "Dog"),
&[SourcePosition::new(88, 2, 25)],
)],
);
}
@ -274,12 +262,10 @@ mod tests {
tailLength
}
"#,
&[
RuleError::new(
&error_message("tailLength", "Pet"),
&[SourcePosition::new(63, 2, 12)],
),
],
&[RuleError::new(
&error_message("tailLength", "Pet"),
&[SourcePosition::new(63, 2, 12)],
)],
);
}
@ -292,12 +278,10 @@ mod tests {
nickname
}
"#,
&[
RuleError::new(
&error_message("nickname", "Pet"),
&[SourcePosition::new(78, 2, 12)],
),
],
&[RuleError::new(
&error_message("nickname", "Pet"),
&[SourcePosition::new(78, 2, 12)],
)],
);
}
@ -322,12 +306,10 @@ mod tests {
name
}
"#,
&[
RuleError::new(
&error_message("name", "CatOrDog"),
&[SourcePosition::new(82, 2, 12)],
),
],
&[RuleError::new(
&error_message("name", "CatOrDog"),
&[SourcePosition::new(82, 2, 12)],
)],
);
}

40
juniper/src/validation/rules/fragments_on_composite_types.rs
View file

@ -145,12 +145,10 @@ mod tests {
bad
}
"#,
&[
RuleError::new(
&error_message(Some("scalarFragment"), "Boolean"),
&[SourcePosition::new(38, 1, 37)],
),
],
&[RuleError::new(
&error_message(Some("scalarFragment"), "Boolean"),
&[SourcePosition::new(38, 1, 37)],
)],
);
}
@ -163,12 +161,10 @@ mod tests {
bad
}
"#,
&[
RuleError::new(
&error_message(Some("scalarFragment"), "FurColor"),
&[SourcePosition::new(38, 1, 37)],
),
],
&[RuleError::new(
&error_message(Some("scalarFragment"), "FurColor"),
&[SourcePosition::new(38, 1, 37)],
)],
);
}
@ -181,12 +177,10 @@ mod tests {
stringField
}
"#,
&[
RuleError::new(
&error_message(Some("inputFragment"), "ComplexInput"),
&[SourcePosition::new(37, 1, 36)],
),
],
&[RuleError::new(
&error_message(Some("inputFragment"), "ComplexInput"),
&[SourcePosition::new(37, 1, 36)],
)],
);
}
@ -201,12 +195,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(None, "String"),
&[SourcePosition::new(64, 2, 19)],
),
],
&[RuleError::new(
&error_message(None, "String"),
&[SourcePosition::new(64, 2, 19)],
)],
);
}
}

22
juniper/src/validation/rules/known_argument_names.rs
View file

@ -1,6 +1,6 @@
use ast::{Directive, Field, InputValue};
use schema::meta::Argument;
use parser::Spanning;
use schema::meta::Argument;
use validation::{ValidatorContext, Visitor};
#[derive(Debug)]
@ -204,12 +204,10 @@ mod tests {
dog @skip(unless: true)
}
"#,
&[
RuleError::new(
&directive_error_message("unless", "skip"),
&[SourcePosition::new(35, 2, 22)],
),
],
&[RuleError::new(
&directive_error_message("unless", "skip"),
&[SourcePosition::new(35, 2, 22)],
)],
);
}
@ -222,12 +220,10 @@ mod tests {
doesKnowCommand(unknown: true)
}
"#,
&[
RuleError::new(
&field_error_message("unknown", "doesKnowCommand", "Dog"),
&[SourcePosition::new(72, 2, 28)],
),
],
&[RuleError::new(
&field_error_message("unknown", "doesKnowCommand", "Dog"),
&[SourcePosition::new(72, 2, 28)],
)],
);
}

16
juniper/src/validation/rules/known_directives.rs
View file

@ -1,7 +1,7 @@
use ast::{Directive, Field, Fragment, FragmentSpread, InlineFragment, Operation, OperationType};
use validation::{ValidatorContext, Visitor};
use schema::model::DirectiveLocation;
use parser::Spanning;
use schema::model::DirectiveLocation;
use validation::{ValidatorContext, Visitor};
pub struct KnownDirectives {
location_stack: Vec<DirectiveLocation>,
@ -141,8 +141,8 @@ mod tests {
use super::{factory, misplaced_error_message, unknown_error_message};
use parser::SourcePosition;
use validation::{expect_fails_rule, expect_passes_rule, RuleError};
use schema::model::DirectiveLocation;
use validation::{expect_fails_rule, expect_passes_rule, RuleError};
#[test]
fn with_no_directives() {
@ -189,12 +189,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&unknown_error_message("unknown"),
&[SourcePosition::new(29, 2, 16)],
),
],
&[RuleError::new(
&unknown_error_message("unknown"),
&[SourcePosition::new(29, 2, 16)],
)],
);
}

2
juniper/src/validation/rules/known_fragment_names.rs
View file

@ -1,6 +1,6 @@
use ast::FragmentSpread;
use validation::{ValidatorContext, Visitor};
use parser::Spanning;
use validation::{ValidatorContext, Visitor};
pub struct KnownFragmentNames {}

2
juniper/src/validation/rules/known_type_names.rs
View file

@ -1,6 +1,6 @@
use ast::{Fragment, InlineFragment, VariableDefinition};
use validation::{ValidatorContext, Visitor};
use parser::{SourcePosition, Spanning};
use validation::{ValidatorContext, Visitor};
pub struct KnownTypeNames {}

9
juniper/src/validation/rules/lone_anonymous_operation.rs
View file

@ -1,6 +1,6 @@
use ast::{Definition, Document, Operation};
use validation::{ValidatorContext, Visitor};
use parser::Spanning;
use validation::{ValidatorContext, Visitor};
pub struct LoneAnonymousOperation {
operation_count: Option<usize>,
@ -134,9 +134,10 @@ mod tests {
fieldB
}
"#,
&[
RuleError::new(error_message(), &[SourcePosition::new(11, 1, 10)]),
],
&[RuleError::new(
error_message(),
&[SourcePosition::new(11, 1, 10)],
)],
);
}
}

44
juniper/src/validation/rules/no_fragment_cycles.rs
View file

@ -1,8 +1,8 @@
use std::collections::{HashMap, HashSet};
use ast::{Document, Fragment, FragmentSpread};
use validation::{RuleError, ValidatorContext, Visitor};
use parser::Spanning;
use validation::{RuleError, ValidatorContext, Visitor};
pub struct NoFragmentCycles<'a> {
current_fragment: Option<&'a str>,
@ -203,9 +203,10 @@ mod tests {
r#"
fragment fragA on Human { relatives { ...fragA } },
"#,
&[
RuleError::new(&error_message("fragA"), &[SourcePosition::new(49, 1, 48)]),
],
&[RuleError::new(
&error_message("fragA"),
&[SourcePosition::new(49, 1, 48)],
)],
);
}
@ -216,9 +217,10 @@ mod tests {
r#"
fragment fragA on Dog { ...fragA }
"#,
&[
RuleError::new(&error_message("fragA"), &[SourcePosition::new(35, 1, 34)]),
],
&[RuleError::new(
&error_message("fragA"),
&[SourcePosition::new(35, 1, 34)],
)],
);
}
@ -233,9 +235,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(&error_message("fragA"), &[SourcePosition::new(74, 3, 14)]),
],
&[RuleError::new(
&error_message("fragA"),
&[SourcePosition::new(74, 3, 14)],
)],
);
}
@ -247,9 +250,10 @@ mod tests {
fragment fragA on Dog { ...fragB }
fragment fragB on Dog { ...fragA }
"#,
&[
RuleError::new(&error_message("fragA"), &[SourcePosition::new(35, 1, 34)]),
],
&[RuleError::new(
&error_message("fragA"),
&[SourcePosition::new(35, 1, 34)],
)],
);
}
@ -261,9 +265,10 @@ mod tests {
fragment fragB on Dog { ...fragA }
fragment fragA on Dog { ...fragB }
"#,
&[
RuleError::new(&error_message("fragB"), &[SourcePosition::new(35, 1, 34)]),
],
&[RuleError::new(
&error_message("fragB"),
&[SourcePosition::new(35, 1, 34)],
)],
);
}
@ -283,9 +288,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(&error_message("fragA"), &[SourcePosition::new(74, 3, 14)]),
],
&[RuleError::new(
&error_message("fragA"),
&[SourcePosition::new(74, 3, 14)],
)],
);
}

68
juniper/src/validation/rules/no_undefined_variables.rs
View file

@ -1,7 +1,7 @@
use std::collections::{HashMap, HashSet};
use ast::{Document, Fragment, FragmentSpread, InputValue, Operation, VariableDefinition};
use validation::{RuleError, ValidatorContext, Visitor};
use parser::{SourcePosition, Spanning};
use std::collections::{HashMap, HashSet};
use validation::{RuleError, ValidatorContext, Visitor};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum Scope<'a> {
@ -302,15 +302,13 @@ mod tests {
field(a: $a, b: $b, c: $c, d: $d)
}
"#,
&[
RuleError::new(
&error_message("d", Some("Foo")),
&[
SourcePosition::new(101, 2, 42),
SourcePosition::new(11, 1, 10),
],
),
],
&[RuleError::new(
&error_message("d", Some("Foo")),
&[
SourcePosition::new(101, 2, 42),
SourcePosition::new(11, 1, 10),
],
)],
);
}
@ -323,15 +321,13 @@ mod tests {
field(a: $a)
}
"#,
&[
RuleError::new(
&error_message("a", None),
&[
SourcePosition::new(34, 2, 21),
SourcePosition::new(11, 1, 10),
],
),
],
&[RuleError::new(
&error_message("a", None),
&[
SourcePosition::new(34, 2, 21),
SourcePosition::new(11, 1, 10),
],
)],
);
}
@ -375,15 +371,13 @@ mod tests {
field(a: $a)
}
"#,
&[
RuleError::new(
&error_message("a", None),
&[
SourcePosition::new(102, 5, 21),
SourcePosition::new(11, 1, 10),
],
),
],
&[RuleError::new(
&error_message("a", None),
&[
SourcePosition::new(102, 5, 21),
SourcePosition::new(11, 1, 10),
],
)],
);
}
@ -409,15 +403,13 @@ mod tests {
field(c: $c)
}
"#,
&[
RuleError::new(
&error_message("c", Some("Foo")),
&[
SourcePosition::new(358, 15, 21),
SourcePosition::new(11, 1, 10),
],
),
],
&[RuleError::new(
&error_message("c", Some("Foo")),
&[
SourcePosition::new(358, 15, 21),
SourcePosition::new(11, 1, 10),
],
)],
);
}

9
juniper/src/validation/rules/no_unused_fragments.rs
View file

@ -1,8 +1,8 @@
use std::collections::{HashMap, HashSet};
use ast::{Definition, Document, Fragment, FragmentSpread, Operation};
use validation::{ValidatorContext, Visitor};
use parser::Spanning;
use validation::{ValidatorContext, Visitor};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum Scope<'a> {
@ -270,9 +270,10 @@ mod tests {
name
}
"#,
&[
RuleError::new(&error_message("foo"), &[SourcePosition::new(107, 6, 10)]),
],
&[RuleError::new(
&error_message("foo"),
&[SourcePosition::new(107, 6, 10)],
)],
);
}
}

31
juniper/src/validation/rules/no_unused_variables.rs
View file

@ -1,7 +1,7 @@
use std::collections::{HashMap, HashSet};
use ast::{Document, Fragment, FragmentSpread, InputValue, Operation, VariableDefinition};
use validation::{RuleError, ValidatorContext, Visitor};
use parser::Spanning;
use std::collections::{HashMap, HashSet};
use validation::{RuleError, ValidatorContext, Visitor};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum Scope<'a> {
@ -274,9 +274,10 @@ mod tests {
field(a: $a, b: $b)
}
"#,
&[
RuleError::new(&error_message("c", None), &[SourcePosition::new(42, 1, 41)]),
],
&[RuleError::new(
&error_message("c", None),
&[SourcePosition::new(42, 1, 41)],
)],
);
}
@ -324,12 +325,10 @@ mod tests {
field
}
"#,
&[
RuleError::new(
&error_message("c", Some("Foo")),
&[SourcePosition::new(45, 1, 44)],
),
],
&[RuleError::new(
&error_message("c", Some("Foo")),
&[SourcePosition::new(45, 1, 44)],
)],
);
}
@ -383,12 +382,10 @@ mod tests {
field(b: $b)
}
"#,
&[
RuleError::new(
&error_message("b", Some("Foo")),
&[SourcePosition::new(21, 1, 20)],
),
],
&[RuleError::new(
&error_message("b", Some("Foo")),
&[SourcePosition::new(21, 1, 20)],
)],
);
}

598
juniper/src/validation/rules/overlapping_fields_can_be_merged.rs
View file

@ -1,11 +1,11 @@
use std::collections::HashMap;
use std::cell::RefCell;
use std::hash::Hash;
use std::borrow::Borrow;
use ast::{Arguments, Definition, Document, Field, Fragment, FragmentSpread, Selection, Type};
use validation::{ValidatorContext, Visitor};
use parser::{SourcePosition, Spanning};
use schema::meta::{Field as FieldType, MetaType};
use std::borrow::Borrow;
use std::cell::RefCell;
use std::collections::HashMap;
use std::hash::Hash;
use validation::{ValidatorContext, Visitor};
#[derive(Debug)]
struct Conflict(ConflictReason, Vec<SourcePosition>, Vec<SourcePosition>);
@ -708,13 +708,13 @@ fn format_reason(reason: &ConflictReasonMessage) -> String {
#[cfg(test)]
mod tests {
use super::{error_message, factory, ConflictReason};
use super::ConflictReasonMessage::*;
use super::{error_message, factory, ConflictReason};
use types::base::GraphQLType;
use executor::Registry;
use types::scalars::ID;
use schema::meta::MetaType;
use types::base::GraphQLType;
use types::scalars::ID;
use parser::SourcePosition;
use validation::{expect_fails_rule, expect_fails_rule_with_schema, expect_passes_rule,
@ -821,18 +821,16 @@ mod tests {
fido: nickname
}
"#,
&[
RuleError::new(
&error_message(
"fido",
&Message("name and nickname are different fields".to_owned()),
),
&[
SourcePosition::new(78, 2, 12),
SourcePosition::new(101, 3, 12),
],
&[RuleError::new(
&error_message(
"fido",
&Message("name and nickname are different fields".to_owned()),
),
],
&[
SourcePosition::new(78, 2, 12),
SourcePosition::new(101, 3, 12),
],
)],
);
}
@ -863,18 +861,16 @@ mod tests {
name
}
"#,
&[
RuleError::new(
&error_message(
"name",
&Message("nickname and name are different fields".to_owned()),
),
&[
SourcePosition::new(71, 2, 12),
SourcePosition::new(98, 3, 12),
],
&[RuleError::new(
&error_message(
"name",
&Message("nickname and name are different fields".to_owned()),
),
],
&[
SourcePosition::new(71, 2, 12),
SourcePosition::new(98, 3, 12),
],
)],
);
}
@ -888,18 +884,16 @@ mod tests {
doesKnowCommand(dogCommand: HEEL)
}
"#,
&[
RuleError::new(
&error_message(
"doesKnowCommand",
&Message("they have differing arguments".to_owned()),
),
&[
SourcePosition::new(57, 2, 12),
SourcePosition::new(85, 3, 12),
],
&[RuleError::new(
&error_message(
"doesKnowCommand",
&Message("they have differing arguments".to_owned()),
),
],
&[
SourcePosition::new(57, 2, 12),
SourcePosition::new(85, 3, 12),
],
)],
);
}
@ -913,18 +907,16 @@ mod tests {
doesKnowCommand
}
"#,
&[
RuleError::new(
&error_message(
"doesKnowCommand",
&Message("they have differing arguments".to_owned()),
),
&[
SourcePosition::new(57, 2, 12),
SourcePosition::new(102, 3, 12),
],
&[RuleError::new(
&error_message(
"doesKnowCommand",
&Message("they have differing arguments".to_owned()),
),
],
&[
SourcePosition::new(57, 2, 12),
SourcePosition::new(102, 3, 12),
],
)],
);
}
@ -938,18 +930,16 @@ mod tests {
doesKnowCommand(dogCommand: HEEL)
}
"#,
&[
RuleError::new(
&error_message(
"doesKnowCommand",
&Message("they have differing arguments".to_owned()),
),
&[
SourcePosition::new(57, 2, 12),
SourcePosition::new(102, 3, 12),
],
&[RuleError::new(
&error_message(
"doesKnowCommand",
&Message("they have differing arguments".to_owned()),
),
],
&[
SourcePosition::new(57, 2, 12),
SourcePosition::new(102, 3, 12),
],
)],
);
}
@ -986,15 +976,13 @@ mod tests {
x: b
}
"#,
&[
RuleError::new(
&error_message("x", &Message("a and b are different fields".to_owned())),
&[
SourcePosition::new(102, 6, 12),
SourcePosition::new(162, 9, 12),
],
),
],
&[RuleError::new(
&error_message("x", &Message("a and b are different fields".to_owned())),
&[
SourcePosition::new(102, 6, 12),
SourcePosition::new(162, 9, 12),
],
)],
);
}
@ -1065,25 +1053,21 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"field",
&Nested(vec![
ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
),
]),
),
&[
SourcePosition::new(25, 2, 12),
SourcePosition::new(47, 3, 14),
SourcePosition::new(79, 5, 12),
SourcePosition::new(101, 6, 14),
],
&[RuleError::new(
&error_message(
"field",
&Nested(vec![ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
)]),
),
],
&[
SourcePosition::new(25, 2, 12),
SourcePosition::new(47, 3, 14),
SourcePosition::new(79, 5, 12),
SourcePosition::new(101, 6, 14),
],
)],
);
}
@ -1103,31 +1087,29 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"field",
&Nested(vec![
ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
),
ConflictReason(
"y".to_owned(),
Message("c and d are different fields".to_owned()),
),
]),
),
&[
SourcePosition::new(25, 2, 12),
SourcePosition::new(47, 3, 14),
SourcePosition::new(66, 4, 14),
SourcePosition::new(98, 6, 12),
SourcePosition::new(120, 7, 14),
SourcePosition::new(139, 8, 14),
],
&[RuleError::new(
&error_message(
"field",
&Nested(vec![
ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
),
ConflictReason(
"y".to_owned(),
Message("c and d are different fields".to_owned()),
),
]),
),
],
&[
SourcePosition::new(25, 2, 12),
SourcePosition::new(47, 3, 14),
SourcePosition::new(66, 4, 14),
SourcePosition::new(98, 6, 12),
SourcePosition::new(120, 7, 14),
SourcePosition::new(139, 8, 14),
],
)],
);
}
@ -1149,32 +1131,26 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"field",
&Nested(vec![
ConflictReason(
"deepField".to_owned(),
Nested(vec![
ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
),
]),
),
]),
),
&[
SourcePosition::new(25, 2, 12),
SourcePosition::new(47, 3, 14),
SourcePosition::new(75, 4, 16),
SourcePosition::new(123, 7, 12),
SourcePosition::new(145, 8, 14),
SourcePosition::new(173, 9, 16),
],
&[RuleError::new(
&error_message(
"field",
&Nested(vec![ConflictReason(
"deepField".to_owned(),
Nested(vec![ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
)]),
)]),
),
],
&[
SourcePosition::new(25, 2, 12),
SourcePosition::new(47, 3, 14),
SourcePosition::new(75, 4, 16),
SourcePosition::new(123, 7, 12),
SourcePosition::new(145, 8, 14),
SourcePosition::new(173, 9, 16),
],
)],
);
}
@ -1199,25 +1175,21 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"deepField",
&Nested(vec![
ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
),
]),
),
&[
SourcePosition::new(47, 3, 14),
SourcePosition::new(75, 4, 16),
SourcePosition::new(110, 6, 14),
SourcePosition::new(138, 7, 16),
],
&[RuleError::new(
&error_message(
"deepField",
&Nested(vec![ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
)]),
),
],
&[
SourcePosition::new(47, 3, 14),
SourcePosition::new(75, 4, 16),
SourcePosition::new(110, 6, 14),
SourcePosition::new(138, 7, 16),
],
)],
);
}
@ -1250,25 +1222,21 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"deeperField",
&Nested(vec![
ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
),
]),
),
&[
SourcePosition::new(197, 11, 14),
SourcePosition::new(227, 12, 16),
SourcePosition::new(262, 14, 14),
SourcePosition::new(292, 15, 16),
],
&[RuleError::new(
&error_message(
"deeperField",
&Nested(vec![ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
)]),
),
],
&[
SourcePosition::new(197, 11, 14),
SourcePosition::new(227, 12, 16),
SourcePosition::new(262, 14, 14),
SourcePosition::new(292, 15, 16),
],
)],
);
}
@ -1300,31 +1268,29 @@ mod tests {
x: b
}
"#,
&[
RuleError::new(
&error_message(
"field",
&Nested(vec![
ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
),
ConflictReason(
"y".to_owned(),
Message("c and d are different fields".to_owned()),
),
]),
),
&[
SourcePosition::new(25, 2, 12),
SourcePosition::new(171, 10, 12),
SourcePosition::new(245, 14, 12),
SourcePosition::new(78, 5, 12),
SourcePosition::new(376, 21, 12),
SourcePosition::new(302, 17, 12),
],
&[RuleError::new(
&error_message(
"field",
&Nested(vec![
ConflictReason(
"x".to_owned(),
Message("a and b are different fields".to_owned()),
),
ConflictReason(
"y".to_owned(),
Message("c and d are different fields".to_owned()),
),
]),
),
],
&[
SourcePosition::new(25, 2, 12),
SourcePosition::new(171, 10, 12),
SourcePosition::new(245, 14, 12),
SourcePosition::new(78, 5, 12),
SourcePosition::new(376, 21, 12),
SourcePosition::new(302, 17, 12),
],
)],
);
}
@ -1594,18 +1560,16 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"scalar",
&Message("they return conflicting types Int and String!".to_owned()),
),
&[
SourcePosition::new(88, 4, 18),
SourcePosition::new(173, 7, 18),
],
&[RuleError::new(
&error_message(
"scalar",
&Message("they return conflicting types Int and String!".to_owned()),
),
],
&[
SourcePosition::new(88, 4, 18),
SourcePosition::new(173, 7, 18),
],
)],
);
}
@ -1650,18 +1614,16 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"scalar",
&Message("they return conflicting types Int and String".to_owned()),
),
&[
SourcePosition::new(89, 4, 18),
SourcePosition::new(167, 7, 18),
],
&[RuleError::new(
&error_message(
"scalar",
&Message("they return conflicting types Int and String".to_owned()),
),
],
&[
SourcePosition::new(89, 4, 18),
SourcePosition::new(167, 7, 18),
],
)],
);
}
@ -1714,27 +1676,21 @@ mod tests {
scalar: unrelatedField
}
"#,
&[
RuleError::new(
&error_message(
"other",
&Nested(vec![
ConflictReason(
"scalar".to_owned(),
Message(
"scalar and unrelatedField are different fields".to_owned(),
),
),
]),
),
&[
SourcePosition::new(703, 30, 14),
SourcePosition::new(889, 38, 14),
SourcePosition::new(771, 33, 14),
SourcePosition::new(960, 41, 14),
],
&[RuleError::new(
&error_message(
"other",
&Nested(vec![ConflictReason(
"scalar".to_owned(),
Message("scalar and unrelatedField are different fields".to_owned()),
)]),
),
],
&[
SourcePosition::new(703, 30, 14),
SourcePosition::new(889, 38, 14),
SourcePosition::new(771, 33, 14),
SourcePosition::new(960, 41, 14),
],
)],
);
}
@ -1755,18 +1711,16 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"scalar",
&Message("they return conflicting types String! and String".to_owned()),
),
&[
SourcePosition::new(100, 4, 18),
SourcePosition::new(178, 7, 18),
],
&[RuleError::new(
&error_message(
"scalar",
&Message("they return conflicting types String! and String".to_owned()),
),
],
&[
SourcePosition::new(100, 4, 18),
SourcePosition::new(178, 7, 18),
],
)],
);
}
@ -1791,20 +1745,16 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"box",
&Message(
"they return conflicting types [StringBox] and StringBox".to_owned(),
),
),
&[
SourcePosition::new(89, 4, 18),
SourcePosition::new(228, 9, 18),
],
&[RuleError::new(
&error_message(
"box",
&Message("they return conflicting types [StringBox] and StringBox".to_owned()),
),
],
&[
SourcePosition::new(89, 4, 18),
SourcePosition::new(228, 9, 18),
],
)],
);
expect_fails_rule_with_schema(
@ -1826,20 +1776,16 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"box",
&Message(
"they return conflicting types StringBox and [StringBox]".to_owned(),
),
),
&[
SourcePosition::new(89, 4, 18),
SourcePosition::new(224, 9, 18),
],
&[RuleError::new(
&error_message(
"box",
&Message("they return conflicting types StringBox and [StringBox]".to_owned()),
),
],
&[
SourcePosition::new(89, 4, 18),
SourcePosition::new(224, 9, 18),
],
)],
);
}
@ -1865,18 +1811,16 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"val",
&Message("scalar and unrelatedField are different fields".to_owned()),
),
&[
SourcePosition::new(126, 5, 20),
SourcePosition::new(158, 6, 20),
],
&[RuleError::new(
&error_message(
"val",
&Message("scalar and unrelatedField are different fields".to_owned()),
),
],
&[
SourcePosition::new(126, 5, 20),
SourcePosition::new(158, 6, 20),
],
)],
);
}
@ -1901,25 +1845,21 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"box",
&Nested(vec![
ConflictReason(
"scalar".to_owned(),
Message("they return conflicting types String and Int".to_owned()),
),
]),
),
&[
SourcePosition::new(89, 4, 18),
SourcePosition::new(126, 5, 20),
SourcePosition::new(224, 9, 18),
SourcePosition::new(258, 10, 20),
],
&[RuleError::new(
&error_message(
"box",
&Nested(vec![ConflictReason(
"scalar".to_owned(),
Message("they return conflicting types String and Int".to_owned()),
)]),
),
],
&[
SourcePosition::new(89, 4, 18),
SourcePosition::new(126, 5, 20),
SourcePosition::new(224, 9, 18),
SourcePosition::new(258, 10, 20),
],
)],
);
}
@ -2004,32 +1944,26 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message(
"edges",
&Nested(vec![
ConflictReason(
"node".to_owned(),
Nested(vec![
ConflictReason(
"id".to_owned(),
Message("name and id are different fields".to_owned()),
),
]),
),
]),
),
&[
SourcePosition::new(84, 4, 16),
SourcePosition::new(110, 5, 18),
SourcePosition::new(137, 6, 20),
SourcePosition::new(273, 13, 14),
SourcePosition::new(297, 14, 16),
SourcePosition::new(322, 15, 18),
],
&[RuleError::new(
&error_message(
"edges",
&Nested(vec![ConflictReason(
"node".to_owned(),
Nested(vec![ConflictReason(
"id".to_owned(),
Message("name and id are different fields".to_owned()),
)]),
)]),
),
],
&[
SourcePosition::new(84, 4, 16),
SourcePosition::new(110, 5, 18),
SourcePosition::new(137, 6, 20),
SourcePosition::new(273, 13, 14),
SourcePosition::new(297, 14, 16),
SourcePosition::new(322, 15, 18),
],
)],
);
}

114
juniper/src/validation/rules/possible_fragment_spreads.rs
View file

@ -1,8 +1,8 @@
use std::collections::HashMap;
use ast::{Definition, Document, FragmentSpread, InlineFragment};
use validation::{ValidatorContext, Visitor};
use parser::Spanning;
use schema::meta::MetaType;
use std::collections::HashMap;
use validation::{ValidatorContext, Visitor};
pub struct PossibleFragmentSpreads<'a> {
fragment_types: HashMap<&'a str, &'a MetaType<'a>>,
@ -223,12 +223,10 @@ mod tests {
fragment invalidObjectWithinObject on Cat { ...dogFragment }
fragment dogFragment on Dog { barkVolume }
"#,
&[
RuleError::new(
&error_message(Some("dogFragment"), "Cat", "Dog"),
&[SourcePosition::new(55, 1, 54)],
),
],
&[RuleError::new(
&error_message(Some("dogFragment"), "Cat", "Dog"),
&[SourcePosition::new(55, 1, 54)],
)],
);
}
@ -241,12 +239,10 @@ mod tests {
... on Dog { barkVolume }
}
"#,
&[
RuleError::new(
&error_message(None, "Cat", "Dog"),
&[SourcePosition::new(71, 2, 12)],
),
],
&[RuleError::new(
&error_message(None, "Cat", "Dog"),
&[SourcePosition::new(71, 2, 12)],
)],
);
}
@ -258,12 +254,10 @@ mod tests {
fragment invalidObjectWithinInterface on Pet { ...humanFragment }
fragment humanFragment on Human { pets { name } }
"#,
&[
RuleError::new(
&error_message(Some("humanFragment"), "Pet", "Human"),
&[SourcePosition::new(58, 1, 57)],
),
],
&[RuleError::new(
&error_message(Some("humanFragment"), "Pet", "Human"),
&[SourcePosition::new(58, 1, 57)],
)],
);
}
@ -275,12 +269,10 @@ mod tests {
fragment invalidObjectWithinUnion on CatOrDog { ...humanFragment }
fragment humanFragment on Human { pets { name } }
"#,
&[
RuleError::new(
&error_message(Some("humanFragment"), "CatOrDog", "Human"),
&[SourcePosition::new(59, 1, 58)],
),
],
&[RuleError::new(
&error_message(Some("humanFragment"), "CatOrDog", "Human"),
&[SourcePosition::new(59, 1, 58)],
)],
);
}
@ -292,12 +284,10 @@ mod tests {
fragment invalidUnionWithinObject on Human { ...catOrDogFragment }
fragment catOrDogFragment on CatOrDog { __typename }
"#,
&[
RuleError::new(
&error_message(Some("catOrDogFragment"), "Human", "CatOrDog"),
&[SourcePosition::new(56, 1, 55)],
),
],
&[RuleError::new(
&error_message(Some("catOrDogFragment"), "Human", "CatOrDog"),
&[SourcePosition::new(56, 1, 55)],
)],
);
}
@ -309,12 +299,10 @@ mod tests {
fragment invalidUnionWithinInterface on Pet { ...humanOrAlienFragment }
fragment humanOrAlienFragment on HumanOrAlien { __typename }
"#,
&[
RuleError::new(
&error_message(Some("humanOrAlienFragment"), "Pet", "HumanOrAlien"),
&[SourcePosition::new(57, 1, 56)],
),
],
&[RuleError::new(
&error_message(Some("humanOrAlienFragment"), "Pet", "HumanOrAlien"),
&[SourcePosition::new(57, 1, 56)],
)],
);
}
@ -326,12 +314,10 @@ mod tests {
fragment invalidUnionWithinUnion on CatOrDog { ...humanOrAlienFragment }
fragment humanOrAlienFragment on HumanOrAlien { __typename }
"#,
&[
RuleError::new(
&error_message(Some("humanOrAlienFragment"), "CatOrDog", "HumanOrAlien"),
&[SourcePosition::new(58, 1, 57)],
),
],
&[RuleError::new(
&error_message(Some("humanOrAlienFragment"), "CatOrDog", "HumanOrAlien"),
&[SourcePosition::new(58, 1, 57)],
)],
);
}
@ -343,12 +329,10 @@ mod tests {
fragment invalidInterfaceWithinObject on Cat { ...intelligentFragment }
fragment intelligentFragment on Intelligent { iq }
"#,
&[
RuleError::new(
&error_message(Some("intelligentFragment"), "Cat", "Intelligent"),
&[SourcePosition::new(58, 1, 57)],
),
],
&[RuleError::new(
&error_message(Some("intelligentFragment"), "Cat", "Intelligent"),
&[SourcePosition::new(58, 1, 57)],
)],
);
}
@ -362,12 +346,10 @@ mod tests {
}
fragment intelligentFragment on Intelligent { iq }
"#,
&[
RuleError::new(
&error_message(Some("intelligentFragment"), "Pet", "Intelligent"),
&[SourcePosition::new(73, 2, 12)],
),
],
&[RuleError::new(
&error_message(Some("intelligentFragment"), "Pet", "Intelligent"),
&[SourcePosition::new(73, 2, 12)],
)],
);
}
@ -380,12 +362,10 @@ mod tests {
...on Intelligent { iq }
}
"#,
&[
RuleError::new(
&error_message(None, "Pet", "Intelligent"),
&[SourcePosition::new(77, 2, 12)],
),
],
&[RuleError::new(
&error_message(None, "Pet", "Intelligent"),
&[SourcePosition::new(77, 2, 12)],
)],
);
}
@ -397,12 +377,10 @@ mod tests {
fragment invalidInterfaceWithinUnion on HumanOrAlien { ...petFragment }
fragment petFragment on Pet { name }
"#,
&[
RuleError::new(
&error_message(Some("petFragment"), "HumanOrAlien", "Pet"),
&[SourcePosition::new(66, 1, 65)],
),
],
&[RuleError::new(
&error_message(Some("petFragment"), "HumanOrAlien", "Pet"),
&[SourcePosition::new(66, 1, 65)],
)],
);
}

22
juniper/src/validation/rules/provided_non_null_arguments.rs
View file

@ -1,8 +1,8 @@
use ast::{Directive, Field};
use validation::{ValidatorContext, Visitor};
use parser::Spanning;
use schema::meta::Field as FieldType;
use schema::model::DirectiveType;
use validation::{ValidatorContext, Visitor};
pub struct ProvidedNonNullArguments {}
@ -262,12 +262,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&field_error_message("multipleReqs", "req1", "Int!"),
&[SourcePosition::new(63, 3, 16)],
),
],
&[RuleError::new(
&field_error_message("multipleReqs", "req1", "Int!"),
&[SourcePosition::new(63, 3, 16)],
)],
);
}
@ -306,12 +304,10 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&field_error_message("multipleReqs", "req2", "Int!"),
&[SourcePosition::new(63, 3, 16)],
),
],
&[RuleError::new(
&field_error_message("multipleReqs", "req2", "Int!"),
&[SourcePosition::new(63, 3, 16)],
)],
);
}

72
juniper/src/validation/rules/scalar_leafs.rs
View file

@ -1,6 +1,6 @@
use ast::Field;
use validation::{RuleError, ValidatorContext, Visitor};
use parser::Spanning;
use validation::{RuleError, ValidatorContext, Visitor};
pub struct ScalarLeafs {}
@ -77,12 +77,10 @@ mod tests {
human
}
"#,
&[
RuleError::new(
&required_error_message("human", "Human"),
&[SourcePosition::new(67, 2, 12)],
),
],
&[RuleError::new(
&required_error_message("human", "Human"),
&[SourcePosition::new(67, 2, 12)],
)],
);
}
@ -95,12 +93,10 @@ mod tests {
human { pets }
}
"#,
&[
RuleError::new(
&required_error_message("pets", "[Pet]"),
&[SourcePosition::new(33, 2, 20)],
),
],
&[RuleError::new(
&required_error_message("pets", "[Pet]"),
&[SourcePosition::new(33, 2, 20)],
)],
);
}
@ -125,12 +121,10 @@ mod tests {
barks { sinceWhen }
}
"#,
&[
RuleError::new(
&no_allowed_error_message("barks", "Boolean"),
&[SourcePosition::new(77, 2, 12)],
),
],
&[RuleError::new(
&no_allowed_error_message("barks", "Boolean"),
&[SourcePosition::new(77, 2, 12)],
)],
);
}
@ -143,12 +137,10 @@ mod tests {
furColor { inHexdec }
}
"#,
&[
RuleError::new(
&no_allowed_error_message("furColor", "FurColor"),
&[SourcePosition::new(74, 2, 12)],
),
],
&[RuleError::new(
&no_allowed_error_message("furColor", "FurColor"),
&[SourcePosition::new(74, 2, 12)],
)],
);
}
@ -161,12 +153,10 @@ mod tests {
doesKnowCommand(dogCommand: SIT) { sinceWhen }
}
"#,
&[
RuleError::new(
&no_allowed_error_message("doesKnowCommand", "Boolean"),
&[SourcePosition::new(76, 2, 12)],
),
],
&[RuleError::new(
&no_allowed_error_message("doesKnowCommand", "Boolean"),
&[SourcePosition::new(76, 2, 12)],
)],
);
}
@ -179,12 +169,10 @@ mod tests {
name @include(if: true) { isAlsoHumanName }
}
"#,
&[
RuleError::new(
&no_allowed_error_message("name", "String"),
&[SourcePosition::new(82, 2, 12)],
),
],
&[RuleError::new(
&no_allowed_error_message("name", "String"),
&[SourcePosition::new(82, 2, 12)],
)],
);
}
@ -197,12 +185,10 @@ mod tests {
doesKnowCommand(dogCommand: SIT) @include(if: true) { sinceWhen }
}
"#,
&[
RuleError::new(
&no_allowed_error_message("doesKnowCommand", "Boolean"),
&[SourcePosition::new(89, 2, 12)],
),
],
&[RuleError::new(
&no_allowed_error_message("doesKnowCommand", "Boolean"),
&[SourcePosition::new(89, 2, 12)],
)],
);
}

34
juniper/src/validation/rules/unique_argument_names.rs
View file

@ -1,8 +1,8 @@
use std::collections::hash_map::{Entry, HashMap};
use ast::{Directive, Field, InputValue};
use validation::{ValidatorContext, Visitor};
use parser::{SourcePosition, Spanning};
use validation::{ValidatorContext, Visitor};
pub struct UniqueArgumentNames<'a> {
known_names: HashMap<&'a str, SourcePosition>,
@ -171,15 +171,13 @@ mod tests {
field(arg1: "value", arg1: "value")
}
"#,
&[
RuleError::new(
&error_message("arg1"),
&[
SourcePosition::new(31, 2, 18),
SourcePosition::new(46, 2, 33),
],
),
],
&[RuleError::new(
&error_message("arg1"),
&[
SourcePosition::new(31, 2, 18),
SourcePosition::new(46, 2, 33),
],
)],
);
}
@ -220,15 +218,13 @@ mod tests {
field @directive(arg1: "value", arg1: "value")
}
"#,
&[
RuleError::new(
&error_message("arg1"),
&[
SourcePosition::new(42, 2, 29),
SourcePosition::new(57, 2, 44),
],
),
],
&[RuleError::new(
&error_message("arg1"),
&[
SourcePosition::new(42, 2, 29),
SourcePosition::new(57, 2, 44),
],
)],
);
}

32
juniper/src/validation/rules/unique_fragment_names.rs
View file

@ -143,15 +143,13 @@ mod tests {
fieldB
}
"#,
&[
RuleError::new(
&duplicate_message("fragA"),
&[
SourcePosition::new(65, 4, 19),
SourcePosition::new(131, 7, 19),
],
),
],
&[RuleError::new(
&duplicate_message("fragA"),
&[
SourcePosition::new(65, 4, 19),
SourcePosition::new(131, 7, 19),
],
)],
);
}
@ -167,15 +165,13 @@ mod tests {
fieldB
}
"#,
&[
RuleError::new(
&duplicate_message("fragA"),
&[
SourcePosition::new(20, 1, 19),
SourcePosition::new(86, 4, 19),
],
),
],
&[RuleError::new(
&duplicate_message("fragA"),
&[
SourcePosition::new(20, 1, 19),
SourcePosition::new(86, 4, 19),
],
)],
);
}
}

18
juniper/src/validation/rules/unique_input_field_names.rs
View file

@ -1,8 +1,8 @@
use std::collections::hash_map::{Entry, HashMap};
use ast::InputValue;
use validation::{ValidatorContext, Visitor};
use parser::{SourcePosition, Spanning};
use validation::{ValidatorContext, Visitor};
pub struct UniqueInputFieldNames<'a> {
known_name_stack: Vec<HashMap<&'a str, SourcePosition>>,
@ -128,15 +128,13 @@ mod tests {
field(arg: { f1: "value", f1: "value" })
}
"#,
&[
RuleError::new(
&error_message("f1"),
&[
SourcePosition::new(38, 2, 25),
SourcePosition::new(51, 2, 38),
],
),
],
&[RuleError::new(
&error_message("f1"),
&[
SourcePosition::new(38, 2, 25),
SourcePosition::new(51, 2, 38),
],
)],
);
}

32
juniper/src/validation/rules/unique_operation_names.rs
View file

@ -142,15 +142,13 @@ mod tests {
fieldB
}
"#,
&[
RuleError::new(
&error_message("Foo"),
&[
SourcePosition::new(11, 1, 10),
SourcePosition::new(64, 4, 10),
],
),
],
&[RuleError::new(
&error_message("Foo"),
&[
SourcePosition::new(11, 1, 10),
SourcePosition::new(64, 4, 10),
],
)],
);
}
@ -166,15 +164,13 @@ mod tests {
fieldB
}
"#,
&[
RuleError::new(
&error_message("Foo"),
&[
SourcePosition::new(11, 1, 10),
SourcePosition::new(64, 4, 10),
],
),
],
&[RuleError::new(
&error_message("Foo"),
&[
SourcePosition::new(11, 1, 10),
SourcePosition::new(64, 4, 10),
],
)],
);
}
}

112
juniper/src/validation/rules/variables_in_allowed_position.rs
View file

@ -383,15 +383,13 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("intArg", "Int", "Int!"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(117, 3, 48),
],
),
],
&[RuleError::new(
&error_message("intArg", "Int", "Int!"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(117, 3, 48),
],
)],
);
}
@ -410,15 +408,13 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("intArg", "Int", "Int!"),
&[
SourcePosition::new(154, 5, 22),
SourcePosition::new(110, 2, 46),
],
),
],
&[RuleError::new(
&error_message("intArg", "Int", "Int!"),
&[
SourcePosition::new(154, 5, 22),
SourcePosition::new(110, 2, 46),
],
)],
);
}
@ -441,15 +437,13 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("intArg", "Int", "Int!"),
&[
SourcePosition::new(255, 9, 22),
SourcePosition::new(211, 6, 46),
],
),
],
&[RuleError::new(
&error_message("intArg", "Int", "Int!"),
&[
SourcePosition::new(255, 9, 22),
SourcePosition::new(211, 6, 46),
],
)],
);
}
@ -464,15 +458,13 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("stringVar", "String", "Boolean"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(117, 3, 42),
],
),
],
&[RuleError::new(
&error_message("stringVar", "String", "Boolean"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(117, 3, 42),
],
)],
);
}
@ -487,15 +479,13 @@ mod tests {
}
}
"#,
&[
RuleError::new(
&error_message("stringVar", "String", "[String]"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(123, 3, 48),
],
),
],
&[RuleError::new(
&error_message("stringVar", "String", "[String]"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(123, 3, 48),
],
)],
);
}
@ -508,15 +498,13 @@ mod tests {
dog @include(if: $boolVar)
}
"#,
&[
RuleError::new(
&error_message("boolVar", "Boolean", "Boolean!"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(73, 2, 29),
],
),
],
&[RuleError::new(
&error_message("boolVar", "Boolean", "Boolean!"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(73, 2, 29),
],
)],
);
}
@ -529,15 +517,13 @@ mod tests {
dog @include(if: $stringVar)
}
"#,
&[
RuleError::new(
&error_message("stringVar", "String", "Boolean!"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(74, 2, 29),
],
),
],
&[RuleError::new(
&error_message("stringVar", "String", "Boolean!"),
&[
SourcePosition::new(23, 1, 22),
SourcePosition::new(74, 2, 29),
],
)],
);
}
}

32
juniper/src/validation/test_harness.rs
View file

@ -1,10 +1,10 @@
use parser::parse_document_source;
use ast::{FromInputValue, InputValue};
use types::base::GraphQLType;
use executor::Registry;
use types::scalars::{EmptyMutation, ID};
use schema::model::{DirectiveLocation, DirectiveType, RootNode};
use parser::parse_document_source;
use schema::meta::{EnumValue, MetaType};
use schema::model::{DirectiveLocation, DirectiveType, RootNode};
use types::base::GraphQLType;
use types::scalars::{EmptyMutation, ID};
use validation::{visit, MultiVisitor, MultiVisitorNil, RuleError, ValidatorContext, Visitor};
struct Being;
@ -60,11 +60,9 @@ impl GraphQLType for Being {
}
fn meta<'r>(i: &(), registry: &mut Registry<'r>) -> MetaType<'r> {
let fields = &[
registry
.field::<Option<String>>("name", i)
.argument(registry.arg::<Option<bool>>("surname", i)),
];
let fields = &[registry
.field::<Option<String>>("name", i)
.argument(registry.arg::<Option<bool>>("surname", i))];
registry.build_interface_type::<Self>(i, fields).into_meta()
}
@ -79,11 +77,9 @@ impl GraphQLType for Pet {
}
fn meta<'r>(i: &(), registry: &mut Registry<'r>) -> MetaType<'r> {
let fields = &[
registry
.field::<Option<String>>("name", i)
.argument(registry.arg::<Option<bool>>("surname", i)),
];
let fields = &[registry
.field::<Option<String>>("name", i)
.argument(registry.arg::<Option<bool>>("surname", i))];
registry.build_interface_type::<Self>(i, fields).into_meta()
}
@ -98,11 +94,9 @@ impl GraphQLType for Canine {
}
fn meta<'r>(i: &(), registry: &mut Registry<'r>) -> MetaType<'r> {
let fields = &[
registry
.field::<Option<String>>("name", i)
.argument(registry.arg::<Option<bool>>("surname", i)),
];
let fields = &[registry
.field::<Option<String>>("name", i)
.argument(registry.arg::<Option<bool>>("surname", i))];
registry.build_interface_type::<Self>(i, fields).into_meta()
}

2
juniper/src/validation/visitor.rs
View file

@ -3,8 +3,8 @@ use std::borrow::Cow;
use ast::{Arguments, Definition, Directive, Document, Field, Fragment, FragmentSpread,
InlineFragment, InputValue, Operation, OperationType, Selection, Type,
VariableDefinitions};
use schema::meta::Argument;
use parser::Spanning;
use schema::meta::Argument;
use validation::{ValidatorContext, Visitor};
#[doc(hidden)]

4
juniper/src/value.rs
View file

@ -1,8 +1,8 @@
use indexmap::IndexMap;
use std::hash::Hash;
use parser::Spanning;
use ast::{InputValue, ToInputValue};
use parser::Spanning;
/// Serializable value returned from query and field execution.
///
@ -276,7 +276,7 @@ mod tests {
Value::object(
vec![("key", Value::int(123)), ("next", Value::boolean(true))]
.into_iter()
.collect()
.collect(),
)
);
}