@@ -67,7 +67,8 @@ async fn one_interface_zero_entities() {
67
67
. unwrap ( ) ;
68
68
69
69
let data = extract_data ! ( res) . unwrap ( ) ;
70
- assert_eq ! ( format!( "{:?}" , data) , "Object({\" leggeds\" : List([])})" )
70
+ let exp = object ! { leggeds: Vec :: <r:: Value >:: new( ) } ;
71
+ assert_eq ! ( data, exp) ;
71
72
}
72
73
73
74
#[ tokio:: test]
@@ -87,21 +88,17 @@ async fn one_interface_one_entity() {
87
88
. await
88
89
. unwrap ( ) ;
89
90
let data = extract_data ! ( res) . unwrap ( ) ;
90
- assert_eq ! (
91
- format!( "{:?}" , data) ,
92
- "Object({\" leggeds\" : List([Object({\" legs\" : Int(3)})])})"
93
- ) ;
91
+ let exp = object ! { leggeds: vec![ object!{ legs: 3 } ] } ;
92
+ assert_eq ! ( data, exp) ;
94
93
95
94
// Query by ID.
96
95
let query = "query { legged(id: \" 1\" ) { legs } }" ;
97
96
let res = insert_and_query ( subgraph_id, schema, vec ! [ ] , query)
98
97
. await
99
98
. unwrap ( ) ;
100
99
let data = extract_data ! ( res) . unwrap ( ) ;
101
- assert_eq ! (
102
- format!( "{:?}" , data) ,
103
- "Object({\" legged\" : Object({\" legs\" : Int(3)})})" ,
104
- ) ;
100
+ let exp = object ! { legged: object! { legs: 3 } } ;
101
+ assert_eq ! ( data, exp) ;
105
102
}
106
103
107
104
#[ tokio:: test]
@@ -121,10 +118,8 @@ async fn one_interface_one_entity_typename() {
121
118
. await
122
119
. unwrap ( ) ;
123
120
let data = extract_data ! ( res) . unwrap ( ) ;
124
- assert_eq ! (
125
- format!( "{:?}" , data) ,
126
- "Object({\" leggeds\" : List([Object({\" __typename\" : String(\" Animal\" )})])})"
127
- )
121
+ let exp = object ! { leggeds: vec![ object!{ __typename: "Animal" } ] } ;
122
+ assert_eq ! ( data, exp) ;
128
123
}
129
124
130
125
#[ tokio:: test]
@@ -150,21 +145,17 @@ async fn one_interface_multiple_entities() {
150
145
. await
151
146
. unwrap ( ) ;
152
147
let data = extract_data ! ( res) . unwrap ( ) ;
153
- assert_eq ! (
154
- format!( "{:?}" , data) ,
155
- "Object({\" leggeds\" : List([Object({\" legs\" : Int(3)}), Object({\" legs\" : Int(4)})])})"
156
- ) ;
148
+ let exp = object ! { leggeds: vec![ object! { legs: 3 } , object! { legs: 4 } ] } ;
149
+ assert_eq ! ( data, exp) ;
157
150
158
151
// Test for support issue #32.
159
152
let query = "query { legged(id: \" 2\" ) { legs } }" ;
160
153
let res = insert_and_query ( subgraph_id, schema, vec ! [ ] , query)
161
154
. await
162
155
. unwrap ( ) ;
163
156
let data = extract_data ! ( res) . unwrap ( ) ;
164
- assert_eq ! (
165
- format!( "{:?}" , data) ,
166
- "Object({\" legged\" : Object({\" legs\" : Int(4)})})" ,
167
- ) ;
157
+ let exp = object ! { legged: object! { legs: 4 } } ;
158
+ assert_eq ! ( data, exp) ;
168
159
}
169
160
170
161
#[ tokio:: test]
@@ -187,10 +178,8 @@ async fn reference_interface() {
187
178
. unwrap ( ) ;
188
179
189
180
let data = extract_data ! ( res) . unwrap ( ) ;
190
- assert_eq ! (
191
- format!( "{:?}" , data) ,
192
- "Object({\" leggeds\" : List([Object({\" leg\" : Object({\" id\" : String(\" 1\" )})})])})"
193
- )
181
+ let exp = object ! { leggeds: vec![ object!{ leg: object! { id: "1" } } ] } ;
182
+ assert_eq ! ( data, exp) ;
194
183
}
195
184
196
185
#[ tokio:: test]
@@ -253,13 +242,15 @@ async fn reference_interface_derived() {
253
242
. unwrap ( ) ;
254
243
255
244
let data = extract_data ! ( res) . unwrap ( ) ;
256
- assert_eq ! (
257
- format!( "{:?}" , data) ,
258
- "Object({\" events\" : List([\
259
- Object({\" id\" : String(\" buy\" ), \" transaction\" : Object({\" id\" : String(\" txn\" )})}), \
260
- Object({\" id\" : String(\" gift\" ), \" transaction\" : Object({\" id\" : String(\" txn\" )})}), \
261
- Object({\" id\" : String(\" sell1\" ), \" transaction\" : Object({\" id\" : String(\" txn\" )})}), \
262
- Object({\" id\" : String(\" sell2\" ), \" transaction\" : Object({\" id\" : String(\" txn\" )})})])})") ;
245
+ let exp = object ! {
246
+ events: vec![
247
+ object! { id: "buy" , transaction: object! { id: "txn" } } ,
248
+ object! { id: "gift" , transaction: object! { id: "txn" } } ,
249
+ object! { id: "sell1" , transaction: object! { id: "txn" } } ,
250
+ object! { id: "sell2" , transaction: object! { id: "txn" } }
251
+ ]
252
+ } ;
253
+ assert_eq ! ( data, exp) ;
263
254
}
264
255
265
256
#[ tokio:: test]
@@ -323,10 +314,10 @@ async fn follow_interface_reference() {
323
314
. unwrap ( ) ;
324
315
325
316
let data = extract_data ! ( res) . unwrap ( ) ;
326
- assert_eq ! (
327
- format! ( "{:?}" , data ) ,
328
- "Object({ \" legged \" : Object({ \" parent \" : Object({ \" id \" : String( \" parent \" )})})})"
329
- )
317
+ let exp = object ! {
318
+ legged : object! { parent : object! { id : "parent" } }
319
+ } ;
320
+ assert_eq ! ( data , exp )
330
321
}
331
322
332
323
#[ tokio:: test]
@@ -426,11 +417,11 @@ async fn two_interfaces() {
426
417
. await
427
418
. unwrap ( ) ;
428
419
let data = extract_data ! ( res) . unwrap ( ) ;
429
- assert_eq ! (
430
- format! ( "{:?}" , data ) ,
431
- "Object({ \" ibars \" : List([Object({ \" bar \" : Int(100)}), Object({ \" bar \" : Int(200)})]), \
432
- \" ifoos \" : List([Object({ \" foo \" : String( \" bla \" )}), Object({ \" foo \" : String( \" ble \" )})])})"
433
- ) ;
420
+ let exp = object ! {
421
+ ibars : vec! [ object! { bar : 100 } , object! { bar : 200 } ] ,
422
+ ifoos : vec! [ object! { foo : "bla" } , object! { foo : "ble" } ]
423
+ } ;
424
+ assert_eq ! ( data , exp ) ;
434
425
}
435
426
436
427
#[ tokio:: test]
@@ -454,21 +445,17 @@ async fn interface_non_inline_fragment() {
454
445
. await
455
446
. unwrap ( ) ;
456
447
let data = extract_data ! ( res) . unwrap ( ) ;
457
- assert_eq ! (
458
- format!( "{:?}" , data) ,
459
- r#"Object({"leggeds": List([Object({"name": String("cow")})])})"#
460
- ) ;
448
+ let exp = object ! { leggeds: vec![ object! { name: "cow" } ] } ;
449
+ assert_eq ! ( data, exp) ;
461
450
462
451
// Query the fragment and something else.
463
452
let query = "query { leggeds { legs, ...frag } } fragment frag on Animal { name }" ;
464
453
let res = insert_and_query ( subgraph_id, schema, vec ! [ ] , query)
465
454
. await
466
455
. unwrap ( ) ;
467
456
let data = extract_data ! ( res) . unwrap ( ) ;
468
- assert_eq ! (
469
- format!( "{:?}" , data) ,
470
- r#"Object({"leggeds": List([Object({"legs": Int(3), "name": String("cow")})])})"# ,
471
- ) ;
457
+ let exp = object ! { leggeds: vec![ object!{ legs: 3 , name: "cow" } ] } ;
458
+ assert_eq ! ( data, exp) ;
472
459
}
473
460
474
461
#[ tokio:: test]
@@ -501,10 +488,8 @@ async fn interface_inline_fragment() {
501
488
. await
502
489
. unwrap ( ) ;
503
490
let data = extract_data ! ( res) . unwrap ( ) ;
504
- assert_eq ! (
505
- format!( "{:?}" , data) ,
506
- r#"Object({"leggeds": List([Object({"airspeed": Int(24)}), Object({"name": String("cow")})])})"#
507
- ) ;
491
+ let exp = object ! { leggeds: vec![ object!{ airspeed: 24 } , object! { name: "cow" } ] } ;
492
+ assert_eq ! ( data, exp) ;
508
493
}
509
494
510
495
#[ tokio:: test]
@@ -567,20 +552,11 @@ async fn interface_inline_fragment_with_subquery() {
567
552
. await
568
553
. unwrap ( ) ;
569
554
let data = extract_data ! ( res) . unwrap ( ) ;
570
-
571
- assert_eq ! (
572
- format!( "{:?}" , data) ,
573
- "Object({\
574
- \" leggeds\" : List([\
575
- Object({\
576
- \" airspeed\" : Int(5), \
577
- \" legs\" : Int(2), \
578
- \" parent\" : Object({\" id\" : String(\" mama_bird\" )})\
579
- }), \
580
- Object({\" legs\" : Int(4)})\
581
- ])\
582
- })"
583
- ) ;
555
+ let exp = object ! {
556
+ leggeds: vec![ object!{ airspeed: 5 , legs: 2 , parent: object! { id: "mama_bird" } } ,
557
+ object!{ legs: 4 } ]
558
+ } ;
559
+ assert_eq ! ( data, exp) ;
584
560
}
585
561
586
562
#[ tokio:: test]
0 commit comments