Merge branch 'develop' of https://github.com/vitusortner/floor into d…

…evelop

floor_generator/lib/processor/dao_processor.dart

@@ -44,9 +44,10 @@ class DaoProcessor extends Processor<Dao> {
   @override
   Dao process() {
     final name = _classElement.displayName;
-    final supertypeMethods =
-        _classElement.allSupertypes.expand((type) => type.methods);
-    final methods = [..._classElement.methods, ...supertypeMethods];
+    final methods = [
+      ..._classElement.methods,
+      ..._classElement.allSupertypes.expand((type) => type.methods)
+    ];
 
     final queryMethods = _getQueryMethods(methods);
     final insertionMethods = _getInsertionMethods(methods);

floor_generator/test/processor/dao_processor_test.dart

@@ -28,8 +28,9 @@ void main() {
       }
     ''');
 
-    final actual =
-        DaoProcessor(classElement, '', '', entities).process().methodsLength;
+    final actual = DaoProcessor(classElement, '', '', entities, [])
+        .process()
+        .methodsLength;
 
     expect(actual, equals(2));
   });
@@ -54,13 +55,14 @@ void main() {
       }
     ''');
 
-    final actual =
-        DaoProcessor(classElement, '', '', entities).process().methodsLength;
+    final actual = DaoProcessor(classElement, '', '', entities, [])
+        .process()
+        .methodsLength;
 
     expect(actual, equals(3));
   });
 
-  test('Includes methods form mixin', () async {
+  test('Includes methods from mixin', () async {
     final classElement = await _createDao('''
       @dao
       abstract class PersonDao with MixinDao<Person> {
@@ -74,8 +76,9 @@ void main() {
       }
     ''');
 
-    final actual =
-        DaoProcessor(classElement, '', '', entities).process().methodsLength;
+    final actual = DaoProcessor(classElement, '', '', entities, [])
+        .process()
+        .methodsLength;
 
     expect(actual, equals(2));
   });
@@ -94,8 +97,9 @@ void main() {
       }
     ''');
 
-    final actual =
-        DaoProcessor(classElement, '', '', entities).process().methodsLength;
+    final actual = DaoProcessor(classElement, '', '', entities, [])
+        .process()
+        .methodsLength;
 
     expect(actual, equals(2));
   });
@@ -114,8 +118,9 @@ void main() {
       }
     ''');
 
-    final actual =
-        DaoProcessor(classElement, '', '', entities).process().methodsLength;
+    final actual = DaoProcessor(classElement, '', '', entities, [])
+        .process()
+        .methodsLength;
 
     expect(actual, equals(2));
   });