@@ -25,13 +25,18 @@ void testModels() {
2525 testSingleModel <ModelF >(ModelF .variant0, ModelF .variant1);
2626 testSingleModel <ModelG >(ModelG .variant0, ModelG .variant1);
2727 testSingleModel <Note >(Note .variant0, Note .variant1);
28- testSingleModel <DeepPolymorphic >(DeepPolymorphic .variant0, DeepPolymorphic .variant1);
29- testSingleModel <CustomBaseImpl >(CustomBaseImpl .variant0, CustomBaseImpl .variant1);
30- testSingleModel <InitializersModel >(InitializersModel .variant0, InitializersModel .variant1);
31- testSingleModel <ConstructorBodyModel >(ConstructorBodyModel .variant0, ConstructorBodyModel .variant1);
28+ testSingleModel <DeepPolymorphic >(
29+ DeepPolymorphic .variant0, DeepPolymorphic .variant1);
30+ testSingleModel <CustomBaseImpl >(
31+ CustomBaseImpl .variant0, CustomBaseImpl .variant1);
32+ testSingleModel <InitializersModel >(
33+ InitializersModel .variant0, InitializersModel .variant1);
34+ testSingleModel <ConstructorBodyModel >(
35+ ConstructorBodyModel .variant0, ConstructorBodyModel .variant1);
3236 testSingleModel <GetterModel >(GetterModel .variant0, GetterModel .variant1);
33- testSingleModel <DefaultValueModel >(DefaultValueModel .variant0, DefaultValueModel .variant1);
34-
37+ testSingleModel <DefaultValueModel >(
38+ DefaultValueModel .variant0, DefaultValueModel .variant1);
39+
3540 test ("Default Values" , () {
3641 var defaultValues = DefaultValueModel .variant0 ();
3742 var defaultMap = dogs.toNative (defaultValues) as Map ;
@@ -46,61 +51,55 @@ void testModels() {
4651}
4752
4853void testSingleModel <T >(T Function () a, T Function () b) => group ("$T " , () {
54+ var va0 = a ();
55+ var va1 = a ();
56+ var vb0 = b ();
57+ var vb1 = b ();
4958
50- SchemaPass .run ((pass) {
51- print (dogs.findAssociatedConverter (T )! .describeOutput (dogs, SchemaConfig ()).toJson ());
52- });
53-
54- var va0 = a ();
55- var va1 = a ();
56- var vb0 = b ();
57- var vb1 = b ();
59+ test ("Base" , () {
60+ var ea = dogs.toJson <T >(va0);
61+ var eb = dogs.toJson <T >(vb0);
62+ var da = dogs.fromJson <T >(ea);
63+ var db = dogs.fromJson <T >(eb);
64+ expect (va1, da, reason: "Non-pure serialization" );
65+ expect (va0, da, reason: "Non-pure serialization" );
66+ expect (vb1, db, reason: "Non-pure serialization" );
67+ expect (vb0, db, reason: "Non-pure serialization" );
68+ expect (ea, isNot (eb), reason: "Wrong equality" );
69+ });
5870
59- test ("Base" , () {
60- var ea = dogs.toJson <T >(va0);
61- var eb = dogs.toJson <T >(vb0);
62- var da = dogs.fromJson <T >(ea);
63- var db = dogs.fromJson <T >(eb);
64- expect (va1, da, reason: "Non-pure serialization" );
65- expect (va0, da, reason: "Non-pure serialization" );
66- expect (vb1, db, reason: "Non-pure serialization" );
67- expect (vb0, db, reason: "Non-pure serialization" );
68- expect (ea, isNot (eb), reason: "Wrong equality" );
69- });
71+ // Test Iterable kind based serialization
72+ group ("Kind" , () {
73+ test ("List" , () => _testListKind <T >(va0, va1, vb0, vb1));
74+ test ("Set" , () => _testSetKind <T >(va0, va1, vb0, vb1));
75+ });
7076
71- // Test Iterable kind based serialization
72- group ( "Kind "{
73- test ("List " , () => _testListKind <T >(va0, va1, vb0, vb1 ));
74- test ("Set " , () => _testSetKind <T >(va0, va1, vb0, vb1 ));
75- } );
76-
77- group ( "Type Tree" , () {
78- test ( "Map "=> _testMap <T >(va0, va1 ));
79- test ( "Optional A" , () => _testOptional < T >(va0));
80- test ( "Optional B"=> _testOptional <T >(va1));
81- });
82- });
77+ group ( "Type Tree" , () {
78+ test ( "Map "=> _testMap < T >(va0, va1));
79+ test ("Optional A " , () => _testOptional <T >(va0));
80+ test ("Optional B " , () => _testOptional <T >(va1));
81+ test ( "Runtime Type Tree A" , () => _testRuntimeTypeTree < T >(va0) );
82+ test ( "Runtime Type Tree B" , () => _testRuntimeTypeTree < T >(va1));
83+ test (
84+ "Deep Runtime Type Tree A "=> _testDeepRuntimeTypeTree <T >(va0));
85+ test (
86+ "Deep Runtime Type Tree B"=> _testDeepRuntimeTypeTree <T >(va1));
87+ });
88+ });
8389
8490void _testListKind <T >(T va0, T va1, T vb0, T vb1) {
8591 var list = [va0, va1, vb0, vb1];
86- var encodedList = dogs.toJson (list,
87- type: T , kind: IterableKind .list
88- );
89- var decodedList = dogs.fromJson (encodedList,
90- type: T , kind: IterableKind .list
91- );
92+ var encodedList = dogs.toJson (list, type: T , kind: IterableKind .list);
93+ var decodedList =
94+ dogs.fromJson (encodedList, type: T , kind: IterableKind .list);
9295 expect (decodedList, orderedEquals (list));
9396}
9497
9598void _testSetKind <T >(T va0, T va1, T vb0, T vb1) {
9699 var list = {va0, va1, vb0, vb1};
97100 expect (list, hasLength (2 ));
98- var encodedList = dogs.toJson (list,
99- type: T , kind: IterableKind .set
100- );
101- var decodedList = dogs.fromJson (encodedList,
102- type: T , kind: IterableKind .set
103- );
101+ var encodedList = dogs.toJson (list, type: T , kind: IterableKind .set );
102+ var decodedList = dogs.fromJson (encodedList, type: T , kind: IterableKind .set );
104103 expect (decodedList, orderedEquals (list));
105104}
106105
@@ -121,8 +120,44 @@ void _testOptional<T>(T val) {
121120 var tree = QualifiedTypeTree .arg1 <Optional <T >, Optional , T >();
122121 var ea = dogs.toJson (Optional (va0), tree: tree);
123122 var eb = dogs.toJson (Optional (va1), tree: tree);
123+ var p0 = jsonDecode (ea);
124+ var p1 = jsonDecode (eb);
124125 var da = dogs.fromJson <Optional <T >>(ea, tree: tree);
125126 var db = dogs.fromJson <Optional <T >>(eb, tree: tree);
126127 expect (va0, da.value, reason: "Non-pure serialization" );
127128 expect (va1, db.value, reason: "Non-pure serialization" );
128- }
129+ expect (p0, isA <Map >());
130+ expect (p1, isNull);
131+ }
132+
133+ void _testRuntimeTypeTree <T >(T val) {
134+ var va0 = val;
135+ final tree = TypeTreeN <Map >([
136+ TypeTree .$string,
137+ TypeTreeN <List >([UnsafeRuntimeTypeCapture (T )])
138+ ]);
139+ var ea = dogs.toJson ({
140+ "a" : [va0]
141+ }, tree: tree);
142+ var payload = jsonDecode (ea);
143+ var da = dogs.fromJson (ea, tree: tree);
144+ expect (va0, da["a" ][0 ], reason: "Non-pure serialization" );
145+ expect ((payload["a" ][0 ] as Map ).containsKey ("_type" ), false ,
146+ reason: "Polymorphic serialization where not required" );
147+ }
148+
149+ void _testDeepRuntimeTypeTree <T >(T val) {
150+ var va0 = val;
151+ final tree = UnsafeRuntimeTypeCapture (Map , arguments: [
152+ UnsafeRuntimeTypeCapture (String ),
153+ UnsafeRuntimeTypeCapture (List , arguments: [UnsafeRuntimeTypeCapture (T )])
154+ ]);
155+ var ea = dogs.toJson ({
156+ "a" : [va0]
157+ }, tree: tree);
158+ var payload = jsonDecode (ea);
159+ var da = dogs.fromJson (ea, tree: tree);
160+ expect (va0, da["a" ][0 ], reason: "Non-pure serialization" );
161+ expect ((payload["a" ][0 ] as Map ).containsKey ("_type" ), false ,
162+ reason: "Polymorphic serialization where not required" );
163+ }
0 commit comments