test: Cleanup kitchen_sink Classes and generation

Author: kevmoo

json_serializable/test/kitchen_sink_test.dart

@@ -6,18 +6,19 @@ import 'package:test/test.dart';
 
 import 'package:json_serializable/src/utils.dart';
 
-import 'test_files/kitchen_sink.dart';
+import 'test_files/kitchen_sink.dart' as nullable;
 import 'test_files/kitchen_sink.non_nullable.dart' as nn;
+import 'test_files/kitchen_sink_interface.dart';
 import 'test_utils.dart';
 
 void main() {
   group('KitchenSink', () {
     roundTripItem(KitchenSink p) {
-      roundTripObject(p, (json) => new KitchenSink.fromJson(json));
+      roundTripObject(p, (json) => new nullable.KitchenSink.fromJson(json));
     }
 
     test('Fields with `!includeIfNull` should not be included when null', () {
-      var item = new KitchenSink();
+      var item = new nullable.KitchenSink();
 
       var expectedDefaultKeys = _expectedOrder.toSet()
         ..removeAll(_excludeIfNullKeys);
@@ -33,15 +34,15 @@ void main() {
 
     test('list and map of DateTime', () {
       var now = new DateTime.now();
-      var item = new KitchenSink(dateTimeIterable: <DateTime>[now])
+      var item = new nullable.KitchenSink(dateTimeIterable: <DateTime>[now])
         ..dateTimeList = <DateTime>[now, null]
         ..stringDateTimeMap = <String, DateTime>{'value': now, 'null': null};
 
       roundTripItem(item);
     });
 
     test('complex nested type', () {
-      var item = new KitchenSink()
+      var item = new nullable.KitchenSink()
         ..crazyComplex = [
           null,
           {},
@@ -69,13 +70,13 @@ void main() {
                 Iterable<Object> objectIterable,
                 Iterable<int> intIterable,
                 Iterable<DateTime> dateTimeIterable}) =>
-            new KitchenSink(
+            new nullable.KitchenSink(
                 iterable: iterable,
                 dynamicIterable: dynamicIterable,
                 objectIterable: objectIterable,
                 intIterable: intIterable,
                 dateTimeIterable: dateTimeIterable),
-        (j) => new KitchenSink.fromJson(j));
+        (j) => new nullable.KitchenSink.fromJson(j));
   });
 
   group('KitchenSink - non-nullable', () {

json_serializable/test/test_files/json_test_example.non_nullable.dart

@@ -9,7 +9,7 @@
 // **************************************************************************
 
 // ignore_for_file: annotate_overrides, hash_and_equals
-library json_serializable.test.json_test_example_non_nullable;
+library json_serializable.test.json_test_example.non_nullable;
 
 import 'dart:collection';
 

json_serializable/test/test_files/json_test_example.non_nullable.g.dart

@@ -4,7 +4,7 @@
 
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of json_serializable.test.json_test_example_non_nullable;
+part of json_serializable.test.json_test_example.non_nullable;
 
 // **************************************************************************
 // Generator: JsonSerializableGenerator

json_serializable/test/test_files/kitchen_sink.dart

@@ -7,15 +7,17 @@ library json_serializable.test.kitchen_sink;
 
 import 'package:json_annotation/json_annotation.dart';
 
-import 'test_files_util.dart';
+import 'kitchen_sink_interface.dart' as k;
 
 part 'kitchen_sink.g.dart';
 
 List<T> _defaultList<T>() => null;
 Map _defaultMap() => null;
 
 @JsonSerializable()
-class KitchenSink extends Object with _$KitchenSinkSerializerMixin {
+class KitchenSink extends Object
+    with _$KitchenSinkSerializerMixin
+    implements k.KitchenSink {
   // To ensure static members are not considered for serialization.
   static const answer = 42;
   static final reason = 42;
@@ -80,5 +82,5 @@ class KitchenSink extends Object with _$KitchenSinkSerializerMixin {
   @JsonKey(name: r'$string')
   String string;
 
-  bool operator ==(Object other) => sinkEquals(this, other);
+  bool operator ==(Object other) => k.sinkEquals(this, other);
 }

json_serializable/test/test_files/kitchen_sink.non_nullable.dart

@@ -9,12 +9,11 @@
 // **************************************************************************
 
 // ignore_for_file: annotate_overrides, hash_and_equals
-library json_serializable.test.kitchen_sink_non_nullable;
+library json_serializable.test.kitchen_sink.non_nullable;
 
 import 'package:json_annotation/json_annotation.dart';
 
-import 'kitchen_sink.dart' as k;
-import 'test_files_util.dart';
+import 'kitchen_sink_interface.dart' as k;
 
 part 'kitchen_sink.non_nullable.g.dart';
 
@@ -89,5 +88,5 @@ class KitchenSink extends Object
   @JsonKey(name: r'$string')
   String string;
 
-  bool operator ==(Object other) => sinkEquals(this, other);
+  bool operator ==(Object other) => k.sinkEquals(this, other);
 }

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

@@ -4,7 +4,7 @@
 
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of json_serializable.test.kitchen_sink_non_nullable;
+part of json_serializable.test.kitchen_sink.non_nullable;
 
 // **************************************************************************
 // Generator: JsonSerializableGenerator

json_serializable/test/test_files/test_files_util.dart renamed to json_serializable/test/test_files/kitchen_sink_interface.dart

@@ -1,10 +1,38 @@
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:collection/collection.dart';
 
-import 'kitchen_sink.dart';
+abstract class KitchenSink {
+  DateTime dateTime;
+
+  Iterable get iterable;
+  Iterable<dynamic> get dynamicIterable;
+  Iterable<Object> get objectIterable;
+  Iterable<int> get intIterable;
+
+  Iterable<DateTime> get dateTimeIterable;
+
+  List list;
+  List<dynamic> dynamicList;
+  List<Object> objectList;
+  List<int> intList;
+  List<DateTime> dateTimeList;
+
+  Map map;
+  Map<String, String> stringStringMap;
+  Map<String, int> stringIntMap;
+  Map<String, DateTime> stringDateTimeMap;
+
+  List<Map<String, Map<String, List<List<DateTime>>>>> crazyComplex;
+
+  Map<String, bool> val;
+  bool writeNotNull;
+  String string;
+
+  Map<String, dynamic> toJson();
+}
 
 //TODO(kevmoo) - finish this...
 bool sinkEquals(KitchenSink a, Object other) =>

json_serializable/tool/build_actions.dart

@@ -50,18 +50,13 @@ class _NonNullableGenerator extends Generator {
     final path = buildStep.inputId.path;
     final baseName = p.basenameWithoutExtension(path);
 
-    // 1) - source file
-    final f1Content = await buildStep.readAsString(buildStep.inputId);
-    final f1LibraryDirective =
-        'library ${buildStep.inputId.package}.test.$baseName';
-    final f1PartDirective = "part '${baseName}.g.dart";
-
+    final content = await buildStep.readAsString(buildStep.inputId);
     var replacements = <_Replacement>[
       new _Replacement(_copyrightContent, ''),
-      new _Replacement(f1LibraryDirective,
-          'library ${buildStep.inputId.package}.test.${baseName}_non_nullable'),
+      new _Replacement('library ${buildStep.inputId.package}.test.$baseName',
+          'library ${buildStep.inputId.package}.test.${baseName}.non_nullable'),
       new _Replacement(
-        f1PartDirective,
+        "part '${baseName}.g.dart",
         "part '${baseName}.non_nullable.g.dart",
       ),
       new _Replacement(
@@ -70,30 +65,16 @@ class _NonNullableGenerator extends Generator {
 
     if (baseName == 'kitchen_sink') {
       replacements.addAll([
-        new _Replacement("import 'test_files_util.dart';",
-            "import 'kitchen_sink.dart' as k;\nimport 'test_files_util.dart';"),
         new _Replacement('List<T> _defaultList<T>() => null;',
             'List<T> _defaultList<T>() => <T>[];'),
         new _Replacement(
             'Map _defaultMap() => null;', 'Map _defaultMap() => {};'),
-        new _Replacement(r'with _$KitchenSinkSerializerMixin {',
-            r'with _$KitchenSinkSerializerMixin implements k.KitchenSink {'),
         new _Replacement('DateTime dateTime;',
             'DateTime dateTime = new DateTime(1981, 6, 5);')
       ]);
     }
 
-    var f2Content = f1Content;
-
-    for (var r in replacements) {
-      if (!f2Content.contains(r.existing)) {
-        throw new StateError(
-            'Input string did not contain `${r.existing}` as expected.');
-      }
-      f2Content = f2Content.replaceAll(r.existing, r.replacement);
-    }
-
-    return f2Content;
+    return _Replacement.generate(content, replacements);
   }
 }
 
@@ -102,4 +83,19 @@ class _Replacement {
   final String replacement;
 
   _Replacement(this.existing, this.replacement);
+
+  static String generate(
+      String inputContent, Iterable<_Replacement> replacements) {
+    var outputContent = inputContent;
+
+    for (var r in replacements) {
+      if (!outputContent.contains(r.existing)) {
+        throw new StateError(
+            'Input string did not contain `${r.existing}` as expected.');
+      }
+      outputContent = outputContent.replaceAll(r.existing, r.replacement);
+    }
+
+    return outputContent;
+  }
 }