fix persistence not building for web
This commit is contained in:
@@ -1,5 +1,3 @@
|
|||||||
import 'package:meta/meta.dart';
|
|
||||||
import 'package:moor/ffi.dart';
|
|
||||||
import 'package:moor/moor.dart';
|
import 'package:moor/moor.dart';
|
||||||
import 'package:stream_chat/stream_chat.dart';
|
import 'package:stream_chat/stream_chat.dart';
|
||||||
|
|
||||||
@@ -46,10 +44,6 @@ class MoorChatDatabase extends _$MoorChatDatabase {
|
|||||||
DatabaseConnection connection,
|
DatabaseConnection connection,
|
||||||
) : super.connect(connection);
|
) : super.connect(connection);
|
||||||
|
|
||||||
/// Custom constructor used only for testing
|
|
||||||
@visibleForTesting
|
|
||||||
MoorChatDatabase.testable(this._userId) : super(VmDatabase.memory());
|
|
||||||
|
|
||||||
final String _userId;
|
final String _userId;
|
||||||
|
|
||||||
/// User id to which the database is connected
|
/// User id to which the database is connected
|
||||||
|
|||||||
@@ -3,12 +3,14 @@ import 'package:stream_chat_persistence/src/dao/channel_dao.dart';
|
|||||||
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
|
|
||||||
|
import '../../stream_chat_persistence_client_test.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
late ChannelDao channelDao;
|
late ChannelDao channelDao;
|
||||||
late MoorChatDatabase database;
|
late MoorChatDatabase database;
|
||||||
|
|
||||||
setUp(() {
|
setUp(() {
|
||||||
database = MoorChatDatabase.testable('testUserId');
|
database = testDatabaseProvider('testUserId');
|
||||||
channelDao = database.channelDao;
|
channelDao = database.channelDao;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import 'package:stream_chat_persistence/src/dao/channel_query_dao.dart';
|
|||||||
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
|
|
||||||
|
import '../../stream_chat_persistence_client_test.dart';
|
||||||
import '../utils/date_matcher.dart';
|
import '../utils/date_matcher.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
@@ -12,7 +13,7 @@ void main() {
|
|||||||
late ChannelQueryDao channelQueryDao;
|
late ChannelQueryDao channelQueryDao;
|
||||||
|
|
||||||
setUp(() {
|
setUp(() {
|
||||||
database = MoorChatDatabase.testable('testUserId');
|
database = testDatabaseProvider('testUserId');
|
||||||
channelQueryDao = database.channelQueryDao;
|
channelQueryDao = database.channelQueryDao;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import 'package:stream_chat_persistence/src/dao/connection_event_dao.dart';
|
|||||||
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
|
|
||||||
|
import '../../stream_chat_persistence_client_test.dart';
|
||||||
import '../utils/date_matcher.dart';
|
import '../utils/date_matcher.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
@@ -10,7 +11,7 @@ void main() {
|
|||||||
late MoorChatDatabase database;
|
late MoorChatDatabase database;
|
||||||
|
|
||||||
setUp(() {
|
setUp(() {
|
||||||
database = MoorChatDatabase.testable('testUserId');
|
database = testDatabaseProvider('testUserId');
|
||||||
eventDao = database.connectionEventDao;
|
eventDao = database.connectionEventDao;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import 'package:stream_chat_persistence/src/dao/dao.dart';
|
|||||||
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
|
|
||||||
|
import '../../stream_chat_persistence_client_test.dart';
|
||||||
import '../utils/date_matcher.dart';
|
import '../utils/date_matcher.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
@@ -12,7 +13,7 @@ void main() {
|
|||||||
late MoorChatDatabase database;
|
late MoorChatDatabase database;
|
||||||
|
|
||||||
setUp(() {
|
setUp(() {
|
||||||
database = MoorChatDatabase.testable('testUserId');
|
database = testDatabaseProvider('testUserId');
|
||||||
memberDao = database.memberDao;
|
memberDao = database.memberDao;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,12 +5,14 @@ import 'package:stream_chat_persistence/src/dao/dao.dart';
|
|||||||
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
|
|
||||||
|
import '../../stream_chat_persistence_client_test.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
late MessageDao messageDao;
|
late MessageDao messageDao;
|
||||||
late MoorChatDatabase database;
|
late MoorChatDatabase database;
|
||||||
|
|
||||||
setUp(() {
|
setUp(() {
|
||||||
database = MoorChatDatabase.testable('testUserId');
|
database = testDatabaseProvider('testUserId');
|
||||||
messageDao = database.messageDao;
|
messageDao = database.messageDao;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,12 +5,14 @@ import 'package:stream_chat_persistence/src/dao/dao.dart';
|
|||||||
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
|
|
||||||
|
import '../../stream_chat_persistence_client_test.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
late PinnedMessageDao pinnedMessageDao;
|
late PinnedMessageDao pinnedMessageDao;
|
||||||
late MoorChatDatabase database;
|
late MoorChatDatabase database;
|
||||||
|
|
||||||
setUp(() {
|
setUp(() {
|
||||||
database = MoorChatDatabase.testable('testUserId');
|
database = testDatabaseProvider('testUserId');
|
||||||
pinnedMessageDao = database.pinnedMessageDao;
|
pinnedMessageDao = database.pinnedMessageDao;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,12 +5,14 @@ import 'package:stream_chat_persistence/src/dao/reaction_dao.dart';
|
|||||||
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
|
|
||||||
|
import '../../stream_chat_persistence_client_test.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
late ReactionDao reactionDao;
|
late ReactionDao reactionDao;
|
||||||
late MoorChatDatabase database;
|
late MoorChatDatabase database;
|
||||||
|
|
||||||
setUp(() {
|
setUp(() {
|
||||||
database = MoorChatDatabase.testable('testUserId');
|
database = testDatabaseProvider('testUserId');
|
||||||
reactionDao = database.reactionDao;
|
reactionDao = database.reactionDao;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import 'package:stream_chat_persistence/src/dao/dao.dart';
|
|||||||
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
|
|
||||||
|
import '../../stream_chat_persistence_client_test.dart';
|
||||||
import '../utils/date_matcher.dart';
|
import '../utils/date_matcher.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
@@ -10,7 +11,7 @@ void main() {
|
|||||||
late MoorChatDatabase database;
|
late MoorChatDatabase database;
|
||||||
|
|
||||||
setUp(() {
|
setUp(() {
|
||||||
database = MoorChatDatabase.testable('testUserId');
|
database = testDatabaseProvider('testUserId');
|
||||||
readDao = database.readDao;
|
readDao = database.readDao;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,12 +5,14 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
|||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:stream_chat/stream_chat.dart';
|
import 'package:stream_chat/stream_chat.dart';
|
||||||
|
|
||||||
|
import '../../stream_chat_persistence_client_test.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
late UserDao userDao;
|
late UserDao userDao;
|
||||||
late MoorChatDatabase database;
|
late MoorChatDatabase database;
|
||||||
|
|
||||||
setUp(() {
|
setUp(() {
|
||||||
database = MoorChatDatabase.testable('testUserId');
|
database = testDatabaseProvider('testUserId');
|
||||||
userDao = database.userDao;
|
userDao = database.userDao;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'package:mocktail/mocktail.dart';
|
import 'package:mocktail/mocktail.dart';
|
||||||
|
import 'package:moor/ffi.dart';
|
||||||
import 'package:stream_chat/stream_chat.dart';
|
import 'package:stream_chat/stream_chat.dart';
|
||||||
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
|
||||||
import 'package:stream_chat_persistence/src/stream_chat_persistence_client.dart';
|
import 'package:stream_chat_persistence/src/stream_chat_persistence_client.dart';
|
||||||
@@ -6,8 +7,8 @@ import 'package:test/test.dart';
|
|||||||
import 'mock_chat_database.dart';
|
import 'mock_chat_database.dart';
|
||||||
import 'src/utils/date_matcher.dart';
|
import 'src/utils/date_matcher.dart';
|
||||||
|
|
||||||
MoorChatDatabase _testDatabaseProvider(String userId, ConnectionMode mode) =>
|
MoorChatDatabase testDatabaseProvider(String userId, [ConnectionMode? mode]) =>
|
||||||
MoorChatDatabase.testable(userId);
|
MoorChatDatabase(userId, VmDatabase.memory());
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('connect', () {
|
group('connect', () {
|
||||||
@@ -15,7 +16,7 @@ void main() {
|
|||||||
test('successfully connects with the Database', () async {
|
test('successfully connects with the Database', () async {
|
||||||
final client = StreamChatPersistenceClient(logLevel: Level.ALL);
|
final client = StreamChatPersistenceClient(logLevel: Level.ALL);
|
||||||
expect(client.db, isNull);
|
expect(client.db, isNull);
|
||||||
await client.connect(userId, databaseProvider: _testDatabaseProvider);
|
await client.connect(userId, databaseProvider: testDatabaseProvider);
|
||||||
expect(client.db, isNotNull);
|
expect(client.db, isNotNull);
|
||||||
expect(client.db, isA<MoorChatDatabase>());
|
expect(client.db, isA<MoorChatDatabase>());
|
||||||
expect(client.db!.userId, userId);
|
expect(client.db!.userId, userId);
|
||||||
@@ -28,13 +29,13 @@ void main() {
|
|||||||
test('throws if already connected', () async {
|
test('throws if already connected', () async {
|
||||||
final client = StreamChatPersistenceClient(logLevel: Level.ALL);
|
final client = StreamChatPersistenceClient(logLevel: Level.ALL);
|
||||||
expect(client.db, isNull);
|
expect(client.db, isNull);
|
||||||
await client.connect(userId, databaseProvider: _testDatabaseProvider);
|
await client.connect(userId, databaseProvider: testDatabaseProvider);
|
||||||
expect(client.db, isNotNull);
|
expect(client.db, isNotNull);
|
||||||
expect(client.db, isNotNull);
|
expect(client.db, isNotNull);
|
||||||
expect(client.db, isA<MoorChatDatabase>());
|
expect(client.db, isA<MoorChatDatabase>());
|
||||||
expect(client.db!.userId, userId);
|
expect(client.db!.userId, userId);
|
||||||
expect(
|
expect(
|
||||||
() => client.connect(userId, databaseProvider: _testDatabaseProvider),
|
() => client.connect(userId, databaseProvider: testDatabaseProvider),
|
||||||
throwsException,
|
throwsException,
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -47,7 +48,7 @@ void main() {
|
|||||||
test('disconnect', () async {
|
test('disconnect', () async {
|
||||||
const userId = 'testUserId';
|
const userId = 'testUserId';
|
||||||
final client = StreamChatPersistenceClient(logLevel: Level.ALL);
|
final client = StreamChatPersistenceClient(logLevel: Level.ALL);
|
||||||
await client.connect(userId, databaseProvider: _testDatabaseProvider);
|
await client.connect(userId, databaseProvider: testDatabaseProvider);
|
||||||
expect(client.db, isNotNull);
|
expect(client.db, isNotNull);
|
||||||
await client.disconnect(flush: true);
|
await client.disconnect(flush: true);
|
||||||
expect(client.db, isNull);
|
expect(client.db, isNull);
|
||||||
|
|||||||
Reference in New Issue
Block a user