Merge pull request #49 from icapps/feature/#38-tests

Refactor to make code testable
icapps · Oct 25, 2020 · 338e08f · 338e08f
2 parents 571068e + f80ccaa
commit 338e08f
Show file tree

Hide file tree

Showing 137 changed files with 3,018 additions and 442 deletions.
diff --git a/.gitignore b/.gitignore
@@ -106,7 +106,11 @@ unlinked_spec.ds
 **/macos/Flutter/Flutter-Profile.xcconfig
 
 # Coverage
-coverage/
+coverage/html/
+coverage/lcov.info
+
+# Test
+test/coverage_helper_test.dart
 
 # Symbols
 app.*.symbols

diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,9 @@ os: osx
 osx_image: xcode12.2
 
 before_install:
-  - chmod +x ./tool/test.sh
+  - chmod +x ./tool/travis/analyze.sh
+  - chmod +x ./tool/travis/test.sh
+  - chmod +x ./tool/travis/format.sh
 
 sudo: required
 
@@ -21,13 +23,13 @@ jobs:
   include:
     - stage: quality
       name: "Tests"
-      script: ./tool/test.sh
+      script: ./tool/travis/test.sh || exit -1
     - stage: quality
       name: "Analyze"
-      script: flutter analyze || exit -1;
+      script: ./tool/travis/analyze.sh || exit -1
     - stage: quality
       name: "Format"
-      script: flutter pub global run dart_style:format -n --set-exit-if-changed . || exit -1;
+      script: ./tool/travis/format.sh || exit -1
 
 stages:
   - quality

diff --git a/bin/model_generator.dart b/bin/model_generator.dart
@@ -2,17 +2,16 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:meta/meta.dart';
+import 'package:model_generator/config/pubspec_config.dart';
+import 'package:model_generator/config/yml_generator_config.dart';
+import 'package:model_generator/model/model/custom_model.dart';
+import 'package:model_generator/model/model/enum_model.dart';
+import 'package:model_generator/model/model/json_converter_model.dart';
+import 'package:model_generator/model/model/object_model.dart';
+import 'package:model_generator/writer/enum_model_writer.dart';
+import 'package:model_generator/writer/object_model_writer.dart';
 import 'package:path/path.dart';
 
-import 'src/config/pubspec_config.dart';
-import 'src/config/yml_generator_config.dart';
-import 'src/model/model/custom_model.dart';
-import 'src/model/model/enum_model.dart';
-import 'src/model/model/json_converter_model.dart';
-import 'src/model/object_model.dart';
-import 'src/writer/enum_model_writer.dart';
-import 'src/writer/object_model_writer.dart';
-
 Future<void> main(List<String> args) async {
   final argParser = ArgParser()
     ..addOption('path',

diff --git a/bin/src/config/yml_generator_config.dart b/bin/src/config/yml_generator_config.dart
diff --git a/bin/src/model/field.dart b/bin/src/model/field.dart
diff --git a/bin/src/model/item_type/item_type.dart b/bin/src/model/item_type/item_type.dart
diff --git a/bin/src/model/item_type/object_type.dart b/bin/src/model/item_type/object_type.dart
diff --git a/bin/src/model/model/custom_from_to_json_model.dart b/bin/src/model/model/custom_from_to_json_model.dart
diff --git a/bin/src/model/model/custom_model.dart b/bin/src/model/model/custom_model.dart
diff --git a/bin/src/model/model/enum_model.dart b/bin/src/model/model/enum_model.dart
diff --git a/bin/src/model/model/json_converter_model.dart b/bin/src/model/model/json_converter_model.dart
diff --git a/bin/src/model/object_model.dart b/bin/src/model/object_model.dart