diff --git a/lib/src/mock_data_snapshot.dart b/lib/src/mock_data_snapshot.dart index bf81b82..07c1e4a 100644 --- a/lib/src/mock_data_snapshot.dart +++ b/lib/src/mock_data_snapshot.dart @@ -53,7 +53,7 @@ class MockDataSnapshot extends Mock implements DataSnapshot { if (value is Map) { return value .map((key, value) => - MapEntry(key, MockDataSnapshot(_ref.child(key), value))) + MapEntry(key, MockDataSnapshot(_ref.child(key as String), value))) .values; } else if (value is List) { var index = 0; diff --git a/lib/src/mock_database_reference.dart b/lib/src/mock_database_reference.dart index 857e2eb..92a9df6 100644 --- a/lib/src/mock_database_reference.dart +++ b/lib/src/mock_database_reference.dart @@ -15,7 +15,7 @@ class MockDatabaseReference extends Mock implements DatabaseReference { MockDatabaseReference([this._volatileData]); - MockDatabaseReference._(nodePath, [this._volatileData]) { + MockDatabaseReference._(String nodePath, [this._volatileData]) { _nodePath += nodePath; } @@ -31,11 +31,12 @@ class MockDatabaseReference extends Mock implements DatabaseReference { return _volatileData; } - set _data(data) { + set _data(Map? data) { if (MockFirebaseDatabase.persistData) { _persistedData = data; - } else - return _volatileData = data; + } else { + _volatileData = data; + } } @override @@ -70,7 +71,7 @@ class MockDatabaseReference extends Mock implements DatabaseReference { value = _parseValue(value); if (_nodePath == '/') { - _data = value; + _data = value as Map?; return; } @@ -87,7 +88,7 @@ class MockDatabaseReference extends Mock implements DatabaseReference { @override Future update(Map value) async { - value = _parseValue(value); + value = _parseValue(value) as Map; Map _baseData = _getDataHandle(_nodePath, _data, true)!; if (key != null && _baseData[key] == null) { @@ -95,7 +96,7 @@ class MockDatabaseReference extends Mock implements DatabaseReference { } if (key != null) { - _baseData = _baseData[key]!; + _baseData = _baseData[key]! as Map; } for (var _key in value.keys) { @@ -166,7 +167,7 @@ class MockDatabaseReference extends Mock implements DatabaseReference { _data[segment] = {}; } - _data = _data[segment]; + _data = _data[segment] as Map?; } return _data; @@ -188,7 +189,7 @@ class MockDatabaseReference extends Mock implements DatabaseReference { break; } if (tempData[nodePath] is Map) { - tempData = tempData[nodePath]; + tempData = tempData[nodePath] as Map?; } } } diff --git a/lib/src/mock_firebase_database.dart b/lib/src/mock_firebase_database.dart index 4e90d40..9a460cd 100644 --- a/lib/src/mock_firebase_database.dart +++ b/lib/src/mock_firebase_database.dart @@ -6,7 +6,7 @@ import 'mock_database_reference.dart'; class MockFirebaseDatabase extends Mock implements FirebaseDatabase { static FirebaseDatabase get instance => MockFirebaseDatabase(); - static get persistData => _persistData; + static bool get persistData => _persistData; Map _volatileData = {};