Skip to content

Commit 30e3479

Browse files
kevmookevmoo
committed
Test cleanup, factories, etc
1 parent 19b7e95 commit 30e3479

6 files changed

+90
-61
lines changed

‎json_serializable/test/kitchen_sink_test.dart

Lines changed: 13 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -6,83 +6,36 @@ import 'package:test/test.dart';
66

77
import 'package:json_serializable/src/constants.dart';
88

9-
import 'test_files/kitchen_sink.dart' as nullable;
10-
import 'test_files/kitchen_sink.non_nullable.dart' as nn;
11-
import 'test_files/kitchen_sink.non_nullable.wrapped.dart' as nnwrapped;
12-
import 'test_files/kitchen_sink.wrapped.dart' as wrapped;
9+
import 'test_files/kitchen_sink.dart' as nullable
10+
show testFactory, testFromJson;
11+
import 'test_files/kitchen_sink.non_nullable.dart' as nn
12+
show testFactory, testFromJson;
13+
import 'test_files/kitchen_sink.non_nullable.wrapped.dart' as nnwrapped
14+
show testFactory, testFromJson;
15+
import 'test_files/kitchen_sink.wrapped.dart' as wrapped
16+
show testFactory, testFromJson;
17+
1318
import 'test_files/kitchen_sink_interface.dart';
1419
import 'test_utils.dart';
1520

1621
void main() {
1722
group('nullable', () {
1823
group('unwrapped', () {
19-
_nullableTests(
20-
(
21-
{Iterable iterable,
22-
Iterable<dynamic> dynamicIterable,
23-
Iterable<Object> objectIterable,
24-
Iterable<int> intIterable,
25-
Iterable<DateTime> dateTimeIterable}) =>
26-
new nullable.KitchenSink(
27-
iterable: iterable,
28-
dynamicIterable: dynamicIterable,
29-
objectIterable: objectIterable,
30-
intIterable: intIterable,
31-
dateTimeIterable: dateTimeIterable),
32-
(j) => new nullable.KitchenSink.fromJson(j));
24+
_nullableTests(nullable.testFactory, nullable.testFromJson);
3325
});
3426

3527
group('wrapped', () {
36-
_nullableTests(
37-
(
38-
{Iterable iterable,
39-
Iterable<dynamic> dynamicIterable,
40-
Iterable<Object> objectIterable,
41-
Iterable<int> intIterable,
42-
Iterable<DateTime> dateTimeIterable}) =>
43-
new wrapped.KitchenSink(
44-
iterable: iterable,
45-
dynamicIterable: dynamicIterable,
46-
objectIterable: objectIterable,
47-
intIterable: intIterable,
48-
dateTimeIterable: dateTimeIterable),
49-
(j) => new wrapped.KitchenSink.fromJson(j));
28+
_nullableTests(wrapped.testFactory, wrapped.testFromJson);
5029
});
5130
});
5231

5332
group('non-nullable', () {
5433
group('unwrapped', () {
55-
_nonNullableTests(
56-
(
57-
{Iterable iterable,
58-
Iterable<dynamic> dynamicIterable,
59-
Iterable<Object> objectIterable,
60-
Iterable<int> intIterable,
61-
Iterable<DateTime> dateTimeIterable}) =>
62-
new nn.KitchenSink(
63-
iterable: iterable,
64-
dynamicIterable: dynamicIterable,
65-
objectIterable: objectIterable,
66-
intIterable: intIterable,
67-
dateTimeIterable: dateTimeIterable),
68-
(j) => new nn.KitchenSink.fromJson(j));
34+
_nonNullableTests(nn.testFactory, nn.testFromJson);
6935
});
7036

7137
group('wrapped', () {
72-
_nonNullableTests(
73-
(
74-
{Iterable iterable,
75-
Iterable<dynamic> dynamicIterable,
76-
Iterable<Object> objectIterable,
77-
Iterable<int> intIterable,
78-
Iterable<DateTime> dateTimeIterable}) =>
79-
new nnwrapped.KitchenSink(
80-
iterable: iterable,
81-
dynamicIterable: dynamicIterable,
82-
objectIterable: objectIterable,
83-
intIterable: intIterable,
84-
dateTimeIterable: dateTimeIterable),
85-
(j) => new nnwrapped.KitchenSink.fromJson(j));
38+
_nonNullableTests(nnwrapped.testFactory, nnwrapped.testFromJson);
8639
});
8740
});
8841
}

‎json_serializable/test/test_files/kitchen_sink.dart

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@ part 'kitchen_sink.g.dart';
1212
List<T> _defaultList<T>() => null;
1313
Map _defaultMap() => null;
1414

15+
k.KitchenSink testFactory(
16+
{Iterable iterable,
17+
Iterable<dynamic> dynamicIterable,
18+
Iterable<Object> objectIterable,
19+
Iterable<int> intIterable,
20+
Iterable<DateTime> dateTimeIterable}) =>
21+
new KitchenSink(
22+
iterable: iterable,
23+
dynamicIterable: dynamicIterable,
24+
objectIterable: objectIterable,
25+
intIterable: intIterable,
26+
dateTimeIterable: dateTimeIterable);
27+
28+
k.KitchenSink testFromJson(Map<String, dynamic> json) =>
29+
new KitchenSink.fromJson(json);
30+
1531
@JsonSerializable()
1632
class KitchenSink extends Object
1733
with _$KitchenSinkSerializerMixin

‎json_serializable/test/test_files/kitchen_sink.non_nullable.dart

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ part 'kitchen_sink.non_nullable.g.dart';
1818
List<T> _defaultList<T>() => <T>[];
1919
Map<String, T> _defaultMap<T>() => <String, T>{};
2020

21+
k.KitchenSink testFactory(
22+
{Iterable iterable,
23+
Iterable<dynamic> dynamicIterable,
24+
Iterable<Object> objectIterable,
25+
Iterable<int> intIterable,
26+
Iterable<DateTime> dateTimeIterable}) =>
27+
new KitchenSink(
28+
iterable: iterable,
29+
dynamicIterable: dynamicIterable,
30+
objectIterable: objectIterable,
31+
intIterable: intIterable,
32+
dateTimeIterable: dateTimeIterable);
33+
34+
k.KitchenSink testFromJson(Map<String, dynamic> json) =>
35+
new KitchenSink.fromJson(json);
36+
2137
@JsonSerializable(nullable: false)
2238
class KitchenSink extends Object
2339
with _$KitchenSinkSerializerMixin

‎json_serializable/test/test_files/kitchen_sink.non_nullable.wrapped.dart

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@ part 'kitchen_sink.non_nullable.wrapped.g.dart';
2424
List<T> _defaultList<T>() => <T>[];
2525
Map<String, T> _defaultMap<T>() => <String, T>{};
2626

27+
k.KitchenSink testFactory(
28+
{Iterable iterable,
29+
Iterable<dynamic> dynamicIterable,
30+
Iterable<Object> objectIterable,
31+
Iterable<int> intIterable,
32+
Iterable<DateTime> dateTimeIterable}) =>
33+
new KitchenSink(
34+
iterable: iterable,
35+
dynamicIterable: dynamicIterable,
36+
objectIterable: objectIterable,
37+
intIterable: intIterable,
38+
dateTimeIterable: dateTimeIterable);
39+
40+
k.KitchenSink testFromJson(Map<String, dynamic> json) =>
41+
new KitchenSink.fromJson(json);
42+
2743
@JsonSerializable(nullable: false)
2844
class KitchenSink extends Object
2945
with _$KitchenSinkSerializerMixin

‎json_serializable/test/test_files/kitchen_sink.wrapped.dart

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ part 'kitchen_sink.wrapped.g.dart';
1818
List<T> _defaultList<T>() => null;
1919
Map _defaultMap() => null;
2020

21+
k.KitchenSink testFactory(
22+
{Iterable iterable,
23+
Iterable<dynamic> dynamicIterable,
24+
Iterable<Object> objectIterable,
25+
Iterable<int> intIterable,
26+
Iterable<DateTime> dateTimeIterable}) =>
27+
new KitchenSink(
28+
iterable: iterable,
29+
dynamicIterable: dynamicIterable,
30+
objectIterable: objectIterable,
31+
intIterable: intIterable,
32+
dateTimeIterable: dateTimeIterable);
33+
34+
k.KitchenSink testFromJson(Map<String, dynamic> json) =>
35+
new KitchenSink.fromJson(json);
36+
2137
@JsonSerializable()
2238
class KitchenSink extends Object
2339
with _$KitchenSinkSerializerMixin

‎json_serializable/test/test_files/kitchen_sink_interface.dart

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,22 @@ bool sinkEquals(KitchenSink a, Object other) =>
4040
a.dateTime == other.dateTime &&
4141
_deepEquals(a.iterable, other.iterable) &&
4242
_deepEquals(a.dynamicIterable, other.dynamicIterable) &&
43+
// objectIterable
44+
// intIterable
4345
_deepEquals(a.dateTimeIterable, other.dateTimeIterable) &&
46+
// list
47+
// dynamicList
48+
// objectList
49+
// intList
4450
_deepEquals(a.dateTimeList, other.dateTimeList) &&
51+
// map
52+
// stringStringMap
53+
// stringIntMap
4554
_deepEquals(a.stringDateTimeMap, other.stringDateTimeMap) &&
46-
_deepEquals(a.crazyComplex, other.crazyComplex);
55+
_deepEquals(a.crazyComplex, other.crazyComplex) &&
56+
// val
57+
a.writeNotNull == other.writeNotNull &&
58+
a.string == other.string;
4759

4860
bool _deepEquals(Object a, Object b) =>
4961
const DeepCollectionEquality().equals(a, b);

0 commit comments

Comments
 (0)