Tie the struct name to the operation name in derives

The generated code was too confusing when they were disjoint. This will
be documented in a subsequent commit.

Author: tomhoule

graphql_client/tests/custom_scalars.rs

@@ -16,7 +16,7 @@ type NetworkAddress = Ipv4Addr;
     query_path = "tests/custom_scalars/query.graphql",
     schema_path = "tests/custom_scalars/schema.graphql"
 )]
-pub struct CustomScalarsQuery;
+pub struct CustomScalarQuery;
 
 #[test]
 fn custom_scalars() {
@@ -25,7 +25,7 @@ fn custom_scalars() {
     });
 
     let valid_addr =
-        serde_json::from_value::<custom_scalars_query::ResponseData>(valid_response).unwrap();
+        serde_json::from_value::<custom_scalar_query::ResponseData>(valid_response).unwrap();
 
     assert_eq!(
         valid_addr.address.unwrap(),
@@ -36,7 +36,5 @@ fn custom_scalars() {
         "address": "localhost",
     });
 
-    assert!(
-        serde_json::from_value::<custom_scalars_query::ResponseData>(invalid_response).is_err()
-    );
+    assert!(serde_json::from_value::<custom_scalar_query::ResponseData>(invalid_response).is_err());
 }

graphql_client/tests/deprecation.rs

@@ -36,7 +36,7 @@ fn deprecation_allow() {
     // as deprecated.
     #![deny(deprecated)]
     let _ = allow_deprecation::ResponseData {
-        current_user: Some(allow_deprecation::TestCurrentUser {
+        current_user: Some(allow_deprecation::AllowDeprecationCurrentUser {
             id: Some("abcd".to_owned()),
             name: Some("Angela Merkel".to_owned()),
             deprecated_with_reason: Some("foo".to_owned()),
@@ -48,7 +48,7 @@ fn deprecation_allow() {
 #[test]
 fn deprecation_deny() {
     let _ = deny_deprecation::ResponseData {
-        current_user: Some(deny_deprecation::TestCurrentUser {
+        current_user: Some(deny_deprecation::DenyDeprecationCurrentUser {
             id: Some("abcd".to_owned()),
             name: Some("Angela Merkel".to_owned()),
             // Notice the deprecated fields are not included here.
@@ -63,7 +63,7 @@ fn deprecation_deny() {
 fn deprecation_warn() {
     #![allow(deprecated)]
     let _ = warn_deprecation::ResponseData {
-        current_user: Some(warn_deprecation::TestCurrentUser {
+        current_user: Some(warn_deprecation::WarnDeprecationCurrentUser {
             id: Some("abcd".to_owned()),
             name: Some("Angela Merkel".to_owned()),
             deprecated_with_reason: Some("foo".to_owned()),

graphql_client/tests/deprecation/query.graphql

@@ -1,4 +1,22 @@
-query Test {
+query DenyDeprecation {
+  currentUser {
+    name
+    id
+    deprecatedWithReason
+    deprecatedNoReason
+  }
+}
+
+query AllowDeprecation {
+  currentUser {
+    name
+    id
+    deprecatedWithReason
+    deprecatedNoReason
+  }
+}
+
+query WarnDeprecation {
   currentUser {
     name
     id

graphql_client/tests/input_object_variables/input_object_variables_query.graphql

@@ -1,4 +1,4 @@
-query VariablesQuery($msg: Message) {
+query InputObjectVariablesQuery($msg: Message) {
   echo(message: $msg) {
     result
   }

graphql_client/tests/input_object_variables/input_object_variables_query_defaults.graphql

@@ -1,4 +1,4 @@
-query VariablesQuery(
+query DefaultInputObjectVariablesQuery(
   $msg: Message = { to: { email: "rosa.luxemburg@example.com" } }
 ) {
   echo(message: $msg) {

graphql_client/tests/interfaces.rs

@@ -26,25 +26,31 @@ fn interface_deserialization() {
 
     let expected = ResponseData {
         everything: Some(vec![
-            MyQueryEverything {
+            InterfaceQueryEverything {
                 name: "Audrey Lorde".to_string(),
-                on: MyQueryEverythingOn::Person(MyQueryEverythingOnPerson {
+                on: InterfaceQueryEverythingOn::Person(InterfaceQueryEverythingOnPerson {
                     birthday: Some("1934-02-18".to_string()),
                 }),
             },
-            MyQueryEverything {
+            InterfaceQueryEverything {
                 name: "Laïka".to_string(),
-                on: MyQueryEverythingOn::Dog(MyQueryEverythingOnDog { is_good_dog: true }),
+                on: InterfaceQueryEverythingOn::Dog(InterfaceQueryEverythingOnDog {
+                    is_good_dog: true,
+                }),
             },
-            MyQueryEverything {
+            InterfaceQueryEverything {
                 name: "Mozilla".to_string(),
-                on: MyQueryEverythingOn::Organization(MyQueryEverythingOnOrganization {
-                    industry: Industry::OTHER,
-                }),
+                on: InterfaceQueryEverythingOn::Organization(
+                    InterfaceQueryEverythingOnOrganization {
+                        industry: Industry::OTHER,
+                    },
+                ),
             },
-            MyQueryEverything {
+            InterfaceQueryEverything {
                 name: "Norbert".to_string(),
-                on: MyQueryEverythingOn::Dog(MyQueryEverythingOnDog { is_good_dog: true }),
+                on: InterfaceQueryEverythingOn::Dog(InterfaceQueryEverythingOnDog {
+                    is_good_dog: true,
+                }),
             },
         ]),
     };
@@ -56,7 +62,7 @@ fn interface_deserialization() {
 #[graphql(
     query_path = "tests/interfaces/interface_not_on_everything_query.graphql",
     schema_path = "tests/interfaces/interface_schema.graphql",
-    response_derives = "Debug"
+    response_derives = "Debug,PartialEq"
 )]
 pub struct InterfaceNotOnEverythingQuery;
 
@@ -65,15 +71,43 @@ const RESPONSE_NOT_ON_EVERYTHING: &'static str =
 
 #[test]
 fn interface_not_on_everything_deserialization() {
-    println!("{:?}", RESPONSE);
+    use interface_not_on_everything_query::*;
+
     let response_data: interface_not_on_everything_query::ResponseData =
         serde_json::from_str(RESPONSE_NOT_ON_EVERYTHING).unwrap();
 
-    println!("{:?}", response_data);
+    let expected = ResponseData {
+        everything: Some(vec![
+            InterfaceNotOnEverythingQueryEverything {
+                name: "Audrey Lorde".to_string(),
+                on: InterfaceNotOnEverythingQueryEverythingOn::Person(
+                    InterfaceNotOnEverythingQueryEverythingOnPerson {
+                        birthday: Some("1934-02-18".to_string()),
+                    },
+                ),
+            },
+            InterfaceNotOnEverythingQueryEverything {
+                name: "Laïka".to_string(),
+                on: InterfaceNotOnEverythingQueryEverythingOn::Dog,
+            },
+            InterfaceNotOnEverythingQueryEverything {
+                name: "Mozilla".to_string(),
+                on: InterfaceNotOnEverythingQueryEverythingOn::Organization(
+                    InterfaceNotOnEverythingQueryEverythingOnOrganization {
+                        industry: Industry::OTHER,
+                    },
+                ),
+            },
+            InterfaceNotOnEverythingQueryEverything {
+                name: "Norbert".to_string(),
+                on: InterfaceNotOnEverythingQueryEverythingOn::Dog,
+            },
+        ]),
+    };
 
-    let expected = r##"ResponseData { everything: Some([MyQueryEverything { name: "Audrey Lorde", on: Person(MyQueryEverythingOnPerson { birthday: Some("1934-02-18") }) }, MyQueryEverything { name: "Laïka", on: Dog }, MyQueryEverything { name: "Mozilla", on: Organization(MyQueryEverythingOnOrganization { industry: OTHER }) }, MyQueryEverything { name: "Norbert", on: Dog }]) }"##;
+    // let expected = r##"ResponseData { everything: Some([InterfaceQueryEverything { name: "Audrey Lorde", on: Person(InterfaceQueryEverythingOnPerson { birthday: Some("1934-02-18") }) }, InterfaceQueryEverything { name: "Laïka", on: Dog }, InterfaceQueryEverything { name: "Mozilla", on: Organization(InterfaceQueryEverythingOnOrganization { industry: OTHER }) }, InterfaceQueryEverything { name: "Norbert", on: Dog }]) }"##;
 
-    assert_eq!(format!("{:?}", response_data), expected);
+    assert_eq!(response_data, expected);
 
     assert_eq!(response_data.everything.map(|names| names.len()), Some(4));
 }

graphql_client/tests/interfaces/interface_not_on_everything_query.graphql

@@ -1,4 +1,4 @@
-query MyQuery {
+query InterfaceNotOnEverythingQuery {
   everything {
     __typename
     name

graphql_client/tests/interfaces/interface_query.graphql

@@ -1,4 +1,4 @@
-query MyQuery {
+query InterfaceQuery {
   everything {
     __typename
     name

graphql_client/tests/interfaces/interface_with_type_refining_fragment_query.graphql

@@ -2,7 +2,7 @@ fragment Birthday on Person {
   birthday
 }
 
-query MyQuery {
+query QueryOnInterface {
   everything {
     __typename
     name

graphql_client/tests/json_schema.rs

@@ -18,7 +18,7 @@ pub struct WithSchema1;
 
 #[derive(GraphQLQuery)]
 #[graphql(
-    query_path = "tests/json_schema/query.graphql",
+    query_path = "tests/json_schema/query_2.graphql",
     schema_path = "tests/json_schema/schema_2.json",
     response_derives = "Debug"
 )]