fix: Fix lock_provider_test mock method signatures and tests

Yonomi · Nov 18, 2021 · 897a7bb · 897a7bb
1 parent a398319
commit 897a7bb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 26 deletions.
diff --git a/lib/components/lock_widget.dart b/lib/components/lock_widget.dart
@@ -16,7 +16,7 @@ class LockWidget extends StatelessWidget {
             Row(
               children: <Widget>[
                 Text(
-                  lockProvider.deviceDetail?.displayName ?? '',
+                  lockProvider.deviceDetail.displayName,
                   style: Theme.of(context).textTheme.headline6,
                 ),
               ],
@@ -35,7 +35,7 @@ class LockWidget extends StatelessWidget {
                       onTap: () {
                         bool setLock = !lockProvider.isLocked;
                         lockProvider.setLockUnlockAction(
-                            lockProvider.deviceDetail?.id, setLock);
+                            lockProvider.deviceDetail.id, setLock);
                       },
                     )),
                 color: lockProvider.isLocked

diff --git a/lib/providers/lock_provider.dart b/lib/providers/lock_provider.dart
@@ -19,14 +19,14 @@ class LockProvider extends ChangeNotifier {
   }
 
   late Request _request;
-  Device? _deviceDetail;
+  late Device _deviceDetail;
 
-  Device? get deviceDetail => _deviceDetail;
+  Device get deviceDetail => _deviceDetail;
 
   bool get isLocked => getLockTrait()?.state.value ?? false;
 
   LockTrait? getLockTrait() {
-    return _deviceDetail?.traits.first as LockTrait?;
+    return _deviceDetail.traits.first as LockTrait?;
   }
 
   Future<void> getDeviceDetail(String deviceId,

diff --git a/test/components/lock_widget_test.dart b/test/components/lock_widget_test.dart
@@ -80,6 +80,6 @@ void main() {
 
     await tester.tap(find.byIcon(Icons.lock));
 
-    verify(mockProvider.setLockUnlockAction(any, any!)).called(1);
+    verify(mockProvider.setLockUnlockAction('deviceId', true)).called(1);
   });
 }
diff --git a/test/providers/lock_provider_test.dart b/test/providers/lock_provider_test.dart
@@ -5,52 +5,49 @@ import 'package:yonomi_platform_sdk/third_party/yonomi_graphql_schema/schema.doc
 import 'package:yonomi_platform_sdk/yonomi-sdk.dart';
 
 class MockGetLockDetailsFunction extends Mock {
-  Future<void> call(Request? request, String? id);
+  Future<Device> call(Request request, String id);
 }
 
 class MockSendLockUnlockFunction extends Mock {
-  Future<void> call(Request request, String id, bool lockUnlock);
+  Future<Device> call(Request request, String id, bool lockUnlock);
 }
 
 // @GenerateMocks([])
 
 void main() {
   test('Calling setLockUnlockAction calls repository method', () async {
     Request request = Request("", {});
-    GetLockDetailsFunction mockLockDetailsMethod = MockGetLockDetailsFunction()
-        as Future<Device> Function(Request?, String?);
+    GetLockDetailsFunction mockLockDetailsMethod = MockGetLockDetailsFunction();
     SendLockUnlockFunction mockSendLockUnlockMethod =
-        MockSendLockUnlockFunction() as Future<void> Function(
-            Request?, String?, bool?);
-    LockProvider lockProvider = LockProvider(request, "deviceId",
+        MockSendLockUnlockFunction();
+    LockProvider lockProvider = LockProvider(request, 'deviceId',
         getLockDetails: mockLockDetailsMethod);
 
-    await lockProvider.setLockUnlockAction("deviceId", true,
+    await lockProvider.setLockUnlockAction('deviceId', true,
         lockDetails: mockLockDetailsMethod,
         sendLockUnlock: mockSendLockUnlockMethod);
 
-    verify(mockSendLockUnlockMethod(any, any, false)).called(1);
+    verify(mockSendLockUnlockMethod(request, 'deviceId', false)).called(1);
   });
 
   test('Calling getDeviceDetail calls repository method', () async {
     Request request = Request("", {});
-    GetLockDetailsFunction mockLockDetailsMethod = MockGetLockDetailsFunction()
-        as Future<Device> Function(Request?, String?);
-    LockProvider lockProvider = LockProvider(request, "deviceId",
+    GetLockDetailsFunction mockLockDetailsMethod = MockGetLockDetailsFunction();
+    LockProvider lockProvider = LockProvider(request, 'deviceId',
         getLockDetails: mockLockDetailsMethod);
 
-    await lockProvider.getDeviceDetail("test",
+    await lockProvider.getDeviceDetail('test',
         getLockDetails: mockLockDetailsMethod);
 
-    verify(mockLockDetailsMethod(any, any)).called(2);
+    verify(mockLockDetailsMethod(request, 'deviceId')).called(2);
   });
 
   test('Device data is set using DeviceRepository\'s return values', () async {
     Request request = Request("", {});
 
-    GetLockDetailsFunction mockLockDetailsMethod = MockGetLockDetailsFunction()
-        as Future<Device> Function(Request?, String?);
-    when(mockLockDetailsMethod(any, any)).thenAnswer((_) => Future.value(
+    GetLockDetailsFunction mockLockDetailsMethod = MockGetLockDetailsFunction();
+    when(mockLockDetailsMethod(request, 'deviceId'))
+        .thenAnswer((_) => Future.value(
           Device(
             "someId",
             "someDisplayName",
@@ -63,12 +60,12 @@ void main() {
             [],
           ),
         ));
-    LockProvider lockProvider = LockProvider(request, "deviceId",
+    LockProvider lockProvider = LockProvider(request, 'deviceId',
         getLockDetails: mockLockDetailsMethod);
 
-    await lockProvider.getDeviceDetail("test",
+    await lockProvider.getDeviceDetail('test',
         getLockDetails: mockLockDetailsMethod);
 
-    expect(lockProvider.deviceDetail?.displayName, "someDisplayName");
+    expect(lockProvider.deviceDetail.displayName, 'someDisplayName');
   });
 }