Skip to content

Commit 357d172

Browse files
redbrogdonredbrogdon
authored
Adding tests, tweaking built_value code. (#5)
1 parent 166c797 commit 357d172

12 files changed

+907
-89
lines changed

‎jsonexample/lib/built_value/built_complex_object.dart‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,19 @@ abstract class BuiltComplexObject
2323
@nullable
2424
double get aDouble;
2525

26+
@nullable
2627
BuiltSimpleObject get anObject;
2728

29+
@nullable
2830
BuiltList<String> get aListOfStrings;
2931

32+
@nullable
3033
BuiltList<int> get aListOfInts;
3134

35+
@nullable
3236
BuiltList<double> get aListOfDoubles;
3337

38+
@nullable
3439
BuiltList<BuiltSimpleObject> get aListOfObjects;
3540

3641
BuiltComplexObject._();

‎jsonexample/lib/built_value/built_complex_object.g.dart‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
part of 'built_complex_object.dart';
88

99
// **************************************************************************
10-
// Generator: BuiltValueGenerator
10+
// BuiltValueGenerator
1111
// **************************************************************************
1212

1313
// ignore_for_file: always_put_control_body_on_new_line
@@ -31,27 +31,7 @@ class _$BuiltComplexObjectSerializer
3131
@override
3232
Iterable serialize(Serializers serializers, BuiltComplexObject object,
3333
{FullType specifiedType: FullType.unspecified}) {
34-
final result = <Object>[
35-
'anObject',
36-
serializers.serialize(object.anObject,
37-
specifiedType: const FullType(BuiltSimpleObject)),
38-
'aListOfStrings',
39-
serializers.serialize(object.aListOfStrings,
40-
specifiedType:
41-
const FullType(BuiltList, const [const FullType(String)])),
42-
'aListOfInts',
43-
serializers.serialize(object.aListOfInts,
44-
specifiedType:
45-
const FullType(BuiltList, const [const FullType(int)])),
46-
'aListOfDoubles',
47-
serializers.serialize(object.aListOfDoubles,
48-
specifiedType:
49-
const FullType(BuiltList, const [const FullType(double)])),
50-
'aListOfObjects',
51-
serializers.serialize(object.aListOfObjects,
52-
specifiedType: const FullType(
53-
BuiltList, const [const FullType(BuiltSimpleObject)])),
54-
];
34+
final result = <Object>[];
5535
if (object.aString != null) {
5636
result
5737
..add('aString')
@@ -70,6 +50,40 @@ class _$BuiltComplexObjectSerializer
7050
..add(serializers.serialize(object.aDouble,
7151
specifiedType: const FullType(double)));
7252
}
53+
if (object.anObject != null) {
54+
result
55+
..add('anObject')
56+
..add(serializers.serialize(object.anObject,
57+
specifiedType: const FullType(BuiltSimpleObject)));
58+
}
59+
if (object.aListOfStrings != null) {
60+
result
61+
..add('aListOfStrings')
62+
..add(serializers.serialize(object.aListOfStrings,
63+
specifiedType:
64+
const FullType(BuiltList, const [const FullType(String)])));
65+
}
66+
if (object.aListOfInts != null) {
67+
result
68+
..add('aListOfInts')
69+
..add(serializers.serialize(object.aListOfInts,
70+
specifiedType:
71+
const FullType(BuiltList, const [const FullType(int)])));
72+
}
73+
if (object.aListOfDoubles != null) {
74+
result
75+
..add('aListOfDoubles')
76+
..add(serializers.serialize(object.aListOfDoubles,
77+
specifiedType:
78+
const FullType(BuiltList, const [const FullType(double)])));
79+
}
80+
if (object.aListOfObjects != null) {
81+
result
82+
..add('aListOfObjects')
83+
..add(serializers.serialize(object.aListOfObjects,
84+
specifiedType: const FullType(
85+
BuiltList, const [const FullType(BuiltSimpleObject)])));
86+
}
7387

7488
return result;
7589
}
@@ -163,21 +177,7 @@ class _$BuiltComplexObject extends BuiltComplexObject {
163177
this.aListOfInts,
164178
this.aListOfDoubles,
165179
this.aListOfObjects})
166-
: super._() {
167-
if (anObject == null)
168-
throw new BuiltValueNullFieldError('BuiltComplexObject', 'anObject');
169-
if (aListOfStrings == null)
170-
throw new BuiltValueNullFieldError(
171-
'BuiltComplexObject', 'aListOfStrings');
172-
if (aListOfInts == null)
173-
throw new BuiltValueNullFieldError('BuiltComplexObject', 'aListOfInts');
174-
if (aListOfDoubles == null)
175-
throw new BuiltValueNullFieldError(
176-
'BuiltComplexObject', 'aListOfDoubles');
177-
if (aListOfObjects == null)
178-
throw new BuiltValueNullFieldError(
179-
'BuiltComplexObject', 'aListOfObjects');
180-
}
180+
: super._();
181181

182182
@override
183183
BuiltComplexObject rebuild(void updates(BuiltComplexObjectBuilder b)) =>
@@ -315,24 +315,24 @@ class BuiltComplexObjectBuilder
315315
aString: aString,
316316
anInt: anInt,
317317
aDouble: aDouble,
318-
anObject: anObject.build(),
319-
aListOfStrings: aListOfStrings.build(),
320-
aListOfInts: aListOfInts.build(),
321-
aListOfDoubles: aListOfDoubles.build(),
322-
aListOfObjects: aListOfObjects.build());
318+
anObject: _anObject?.build(),
319+
aListOfStrings: _aListOfStrings?.build(),
320+
aListOfInts: _aListOfInts?.build(),
321+
aListOfDoubles: _aListOfDoubles?.build(),
322+
aListOfObjects: _aListOfObjects?.build());
323323
} catch (_) {
324324
String _$failedField;
325325
try {
326326
_$failedField = 'anObject';
327-
anObject.build();
327+
_anObject?.build();
328328
_$failedField = 'aListOfStrings';
329-
aListOfStrings.build();
329+
_aListOfStrings?.build();
330330
_$failedField = 'aListOfInts';
331-
aListOfInts.build();
331+
_aListOfInts?.build();
332332
_$failedField = 'aListOfDoubles';
333-
aListOfDoubles.build();
333+
_aListOfDoubles?.build();
334334
_$failedField = 'aListOfObjects';
335-
aListOfObjects.build();
335+
_aListOfObjects?.build();
336336
} catch (e) {
337337
throw new BuiltValueNestedFieldError(
338338
'BuiltComplexObject', _$failedField, e.toString());

‎jsonexample/lib/built_value/built_simple_object.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ abstract class BuiltSimpleObject
2222
@nullable
2323
double get aDouble;
2424

25+
@nullable
2526
BuiltList<String> get aListOfStrings;
2627

28+
@nullable
2729
BuiltList<int> get aListOfInts;
2830

31+
@nullable
2932
BuiltList<double> get aListOfDoubles;
3033

3134
BuiltSimpleObject._();

‎jsonexample/lib/built_value/built_simple_object.g.dart‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
part of 'built_simple_object.dart';
88

99
// **************************************************************************
10-
// Generator: BuiltValueGenerator
10+
// BuiltValueGenerator
1111
// **************************************************************************
1212

1313
// ignore_for_file: always_put_control_body_on_new_line
@@ -31,20 +31,7 @@ class _$BuiltSimpleObjectSerializer
3131
@override
3232
Iterable serialize(Serializers serializers, BuiltSimpleObject object,
3333
{FullType specifiedType: FullType.unspecified}) {
34-
final result = <Object>[
35-
'aListOfStrings',
36-
serializers.serialize(object.aListOfStrings,
37-
specifiedType:
38-
const FullType(BuiltList, const [const FullType(String)])),
39-
'aListOfInts',
40-
serializers.serialize(object.aListOfInts,
41-
specifiedType:
42-
const FullType(BuiltList, const [const FullType(int)])),
43-
'aListOfDoubles',
44-
serializers.serialize(object.aListOfDoubles,
45-
specifiedType:
46-
const FullType(BuiltList, const [const FullType(double)])),
47-
];
34+
final result = <Object>[];
4835
if (object.aString != null) {
4936
result
5037
..add('aString')
@@ -63,6 +50,27 @@ class _$BuiltSimpleObjectSerializer
6350
..add(serializers.serialize(object.aDouble,
6451
specifiedType: const FullType(double)));
6552
}
53+
if (object.aListOfStrings != null) {
54+
result
55+
..add('aListOfStrings')
56+
..add(serializers.serialize(object.aListOfStrings,
57+
specifiedType:
58+
const FullType(BuiltList, const [const FullType(String)])));
59+
}
60+
if (object.aListOfInts != null) {
61+
result
62+
..add('aListOfInts')
63+
..add(serializers.serialize(object.aListOfInts,
64+
specifiedType:
65+
const FullType(BuiltList, const [const FullType(int)])));
66+
}
67+
if (object.aListOfDoubles != null) {
68+
result
69+
..add('aListOfDoubles')
70+
..add(serializers.serialize(object.aListOfDoubles,
71+
specifiedType:
72+
const FullType(BuiltList, const [const FullType(double)])));
73+
}
6674

6775
return result;
6876
}
@@ -139,14 +147,7 @@ class _$BuiltSimpleObject extends BuiltSimpleObject {
139147
this.aListOfStrings,
140148
this.aListOfInts,
141149
this.aListOfDoubles})
142-
: super._() {
143-
if (aListOfStrings == null)
144-
throw new BuiltValueNullFieldError('BuiltSimpleObject', 'aListOfStrings');
145-
if (aListOfInts == null)
146-
throw new BuiltValueNullFieldError('BuiltSimpleObject', 'aListOfInts');
147-
if (aListOfDoubles == null)
148-
throw new BuiltValueNullFieldError('BuiltSimpleObject', 'aListOfDoubles');
149-
}
150+
: super._();
150151

151152
@override
152153
BuiltSimpleObject rebuild(void updates(BuiltSimpleObjectBuilder b)) =>
@@ -262,18 +263,18 @@ class BuiltSimpleObjectBuilder
262263
aString: aString,
263264
anInt: anInt,
264265
aDouble: aDouble,
265-
aListOfStrings: aListOfStrings.build(),
266-
aListOfInts: aListOfInts.build(),
267-
aListOfDoubles: aListOfDoubles.build());
266+
aListOfStrings: _aListOfStrings?.build(),
267+
aListOfInts: _aListOfInts?.build(),
268+
aListOfDoubles: _aListOfDoubles?.build());
268269
} catch (_) {
269270
String _$failedField;
270271
try {
271272
_$failedField = 'aListOfStrings';
272-
aListOfStrings.build();
273+
_aListOfStrings?.build();
273274
_$failedField = 'aListOfInts';
274-
aListOfInts.build();
275+
_aListOfInts?.build();
275276
_$failedField = 'aListOfDoubles';
276-
aListOfDoubles.build();
277+
_aListOfDoubles?.build();
277278
} catch (e) {
278279
throw new BuiltValueNestedFieldError(
279280
'BuiltSimpleObject', _$failedField, e.toString());

‎jsonexample/lib/built_value/built_value_serializers.g.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
part of serializers;
88

99
// **************************************************************************
10-
// Generator: BuiltValueGenerator
10+
// BuiltValueGenerator
1111
// **************************************************************************
1212

1313
// ignore_for_file: always_put_control_body_on_new_line

‎jsonexample/lib/json_serializable/serializable_complex_object.g.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
part of 'serializable_complex_object.dart';
88

99
// **************************************************************************
10-
// Generator: JsonSerializableGenerator
10+
// JsonSerializableGenerator
1111
// **************************************************************************
1212

1313
SerializableComplexObject _$SerializableComplexObjectFromJson(

‎jsonexample/lib/json_serializable/serializable_simple_object.g.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
part of 'serializable_simple_object.dart';
88

99
// **************************************************************************
10-
// Generator: JsonSerializableGenerator
10+
// JsonSerializableGenerator
1111
// **************************************************************************
1212

1313
SerializableSimpleObject _$SerializableSimpleObjectFromJson(

‎jsonexample/lib/tab_pages.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class BasicsPage extends StatelessWidget {
104104
children: [
105105
Padding(
106106
padding: const EdgeInsets.only(right: 8.0, bottom: 4.0),
107-
child: Text('List of dynamic:', style: boldStyle),
107+
child: Text('List of dynamics:', style: boldStyle),
108108
),
109109
Text(
110110
prettyPrintList(strongListOfDynamics),

0 commit comments

Comments
 (0)