3 Commits

7 changed files with 163 additions and 111 deletions

View File

@@ -1,3 +1,4 @@
import 'package:clock/clock.dart';
import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/group.dart';
import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/data/dto/player.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
@@ -18,7 +19,7 @@ class Game {
this.group, this.group,
this.winner = '', this.winner = '',
}) : id = id ?? const Uuid().v4(), }) : id = id ?? const Uuid().v4(),
createdAt = createdAt ?? DateTime.now(); createdAt = createdAt ?? clock.now();
@override @override
String toString() { String toString() {

View File

@@ -1,3 +1,4 @@
import 'package:clock/clock.dart';
import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/data/dto/player.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
@@ -13,7 +14,7 @@ class Group {
required this.name, required this.name,
required this.members, required this.members,
}) : id = id ?? const Uuid().v4(), }) : id = id ?? const Uuid().v4(),
createdAt = createdAt ?? DateTime.now(); createdAt = createdAt ?? clock.now();
@override @override
String toString() { String toString() {

View File

@@ -1,3 +1,4 @@
import 'package:clock/clock.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
class Player { class Player {
@@ -7,7 +8,7 @@ class Player {
Player({String? id, DateTime? createdAt, required this.name}) Player({String? id, DateTime? createdAt, required this.name})
: id = id ?? const Uuid().v4(), : id = id ?? const Uuid().v4(),
createdAt = createdAt ?? DateTime.now(); createdAt = createdAt ?? clock.now();
@override @override
String toString() { String toString() {

View File

@@ -20,6 +20,7 @@ dependencies:
provider: ^6.1.5 provider: ^6.1.5
skeletonizer: ^2.1.0+1 skeletonizer: ^2.1.0+1
uuid: ^4.5.2 uuid: ^4.5.2
clock: ^1.1.2
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:

View File

@@ -1,3 +1,4 @@
import 'package:clock/clock.dart';
import 'package:drift/drift.dart'; import 'package:drift/drift.dart';
import 'package:drift/native.dart'; import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
@@ -15,6 +16,8 @@ void main() {
late Player player5; late Player player5;
late Group testgroup; late Group testgroup;
late Game testgame; late Game testgame;
final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
final fakeClock = Clock(() => fixedDate);
setUp(() { setUp(() {
database = AppDatabase( database = AppDatabase(
@@ -25,24 +28,30 @@ void main() {
), ),
); );
withClock(fakeClock, () {
player1 = Player(name: 'Alice'); player1 = Player(name: 'Alice');
player2 = Player(name: 'Bob'); player2 = Player(name: 'Bob');
player3 = Player(name: 'Charlie'); player3 = Player(name: 'Charlie');
player4 = Player(name: 'Diana'); player4 = Player(name: 'Diana');
player5 = Player(name: 'Eve'); player5 = Player(name: 'Eve');
testgroup = Group(name: 'Test Group', members: [player1, player2, player3]); testgroup = Group(
name: 'Test Group',
members: [player1, player2, player3],
);
testgame = Game( testgame = Game(
name: 'Test Game', name: 'Test Game',
group: testgroup, group: testgroup,
players: [player4, player5], players: [player4, player5],
); );
}); });
});
tearDown(() async { tearDown(() async {
await database.close(); await database.close();
}); });
group('game tests', () { group('game tests', () {
test('game is added correctly', () async { test('game is added correctly', () async {
await withClock(fakeClock, () async {
await database.gameDao.addGame(game: testgame); await database.gameDao.addGame(game: testgame);
final result = await database.gameDao.getGameById(gameId: testgame.id); final result = await database.gameDao.getGameById(gameId: testgame.id);
@@ -50,6 +59,7 @@ void main() {
expect(result.id, testgame.id); expect(result.id, testgame.id);
expect(result.name, testgame.name); expect(result.name, testgame.name);
expect(result.winner, testgame.winner); expect(result.winner, testgame.winner);
expect(result.createdAt, testgame.createdAt);
if (result.group != null) { if (result.group != null) {
expect(result.group!.members.length, testgroup.members.length); expect(result.group!.members.length, testgroup.members.length);
@@ -67,11 +77,16 @@ void main() {
for (int i = 0; i < testgame.players!.length; i++) { for (int i = 0; i < testgame.players!.length; i++) {
expect(result.players![i].id, testgame.players![i].id); expect(result.players![i].id, testgame.players![i].id);
expect(result.players![i].name, testgame.players![i].name); expect(result.players![i].name, testgame.players![i].name);
expect(
result.players![i].createdAt,
testgame.players![i].createdAt,
);
} }
} else { } else {
fail('Players is null'); fail('Players is null');
} }
}); });
});
test('game is deleted correctly', () async { test('game is deleted correctly', () async {
await database.gameDao.addGame(game: testgame); await database.gameDao.addGame(game: testgame);

View File

@@ -1,3 +1,4 @@
import 'package:clock/clock.dart';
import 'package:drift/drift.dart'; import 'package:drift/drift.dart';
import 'package:drift/native.dart'; import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
@@ -12,6 +13,8 @@ void main() {
late Player player3; late Player player3;
late Player player4; late Player player4;
late Group testgroup; late Group testgroup;
final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
final fakeClock = Clock(() => fixedDate);
setUp(() { setUp(() {
database = AppDatabase( database = AppDatabase(
@@ -22,17 +25,23 @@ void main() {
), ),
); );
withClock(fakeClock, () {
player1 = Player(name: 'Alice'); player1 = Player(name: 'Alice');
player2 = Player(name: 'Bob'); player2 = Player(name: 'Bob');
player3 = Player(name: 'Charlie'); player3 = Player(name: 'Charlie');
player4 = Player(name: 'Diana'); player4 = Player(name: 'Diana');
testgroup = Group(name: 'Test Group', members: [player1, player2, player3]); testgroup = Group(
name: 'Test Group',
members: [player1, player2, player3],
);
});
}); });
tearDown(() async { tearDown(() async {
await database.close(); await database.close();
}); });
group('group tests', () { group('group tests', () {
test('all groups get fetched correctly', () async { test('all groups get fetched correctly', () async {
await withClock(fakeClock, () async {
final testgroup2 = Group( final testgroup2 = Group(
id: 'gr2', id: 'gr2',
name: 'Second Group', name: 'Second Group',
@@ -48,14 +57,20 @@ void main() {
expect(fetchedGroup1.name, testgroup.name); expect(fetchedGroup1.name, testgroup.name);
expect(fetchedGroup1.members.length, testgroup.members.length); expect(fetchedGroup1.members.length, testgroup.members.length);
expect(fetchedGroup1.members.elementAt(0).id, player1.id); expect(fetchedGroup1.members.elementAt(0).id, player1.id);
expect(fetchedGroup1.members.elementAt(0).createdAt, player1.createdAt);
final fetchedGroup2 = allGroups.firstWhere((g) => g.id == testgroup2.id); final fetchedGroup2 = allGroups.firstWhere(
(g) => g.id == testgroup2.id,
);
expect(fetchedGroup2.name, testgroup2.name); expect(fetchedGroup2.name, testgroup2.name);
expect(fetchedGroup2.members.length, testgroup2.members.length); expect(fetchedGroup2.members.length, testgroup2.members.length);
expect(fetchedGroup2.members.elementAt(0).id, player2.id); expect(fetchedGroup2.members.elementAt(0).id, player2.id);
expect(fetchedGroup2.members.elementAt(0).createdAt, player2.createdAt);
});
}); });
test('group and group members gets added correctly', () async { test('group and group members gets added correctly', () async {
await withClock(fakeClock, () async {
await database.groupDao.addGroup(group: testgroup); await database.groupDao.addGroup(group: testgroup);
final result = await database.groupDao.getGroupById( final result = await database.groupDao.getGroupById(
@@ -64,13 +79,16 @@ void main() {
expect(result.id, testgroup.id); expect(result.id, testgroup.id);
expect(result.name, testgroup.name); expect(result.name, testgroup.name);
expect(result.createdAt, testgroup.createdAt);
expect(result.members.length, testgroup.members.length); expect(result.members.length, testgroup.members.length);
for (int i = 0; i < testgroup.members.length; i++) { for (int i = 0; i < testgroup.members.length; i++) {
expect(result.members[i].id, testgroup.members[i].id); expect(result.members[i].id, testgroup.members[i].id);
expect(result.members[i].name, testgroup.members[i].name); expect(result.members[i].name, testgroup.members[i].name);
expect(result.members[i].createdAt, testgroup.members[i].createdAt);
} }
}); });
});
test('group gets deleted correctly', () async { test('group gets deleted correctly', () async {
await database.groupDao.addGroup(group: testgroup); await database.groupDao.addGroup(group: testgroup);
@@ -103,6 +121,7 @@ void main() {
}); });
test('Adding player to group works correctly', () async { test('Adding player to group works correctly', () async {
await withClock(fakeClock, () async {
await database.groupDao.addGroup(group: testgroup); await database.groupDao.addGroup(group: testgroup);
await database.playerGroupDao.addPlayerToGroup( await database.playerGroupDao.addPlayerToGroup(
@@ -124,15 +143,17 @@ void main() {
expect(playerNotAdded, true); expect(playerNotAdded, true);
expect(playerAdded, true);
final result = await database.groupDao.getGroupById( final result = await database.groupDao.getGroupById(
groupId: testgroup.id, groupId: testgroup.id,
); );
expect(result.members.length, testgroup.members.length + 1); expect(result.members.length, testgroup.members.length + 1);
final addedPlayer = result.members.firstWhere((p) => p.id == player4.id); final addedPlayer = result.members.firstWhere(
(p) => p.id == player4.id,
);
expect(addedPlayer.name, player4.name); expect(addedPlayer.name, player4.name);
expect(addedPlayer.createdAt, player4.createdAt);
});
}); });
test('Removing player from group works correctly', () async { test('Removing player from group works correctly', () async {

View File

@@ -1,3 +1,4 @@
import 'package:clock/clock.dart';
import 'package:drift/drift.dart'; import 'package:drift/drift.dart';
import 'package:drift/native.dart'; import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
@@ -7,6 +8,8 @@ import 'package:game_tracker/data/dto/player.dart';
void main() { void main() {
late AppDatabase database; late AppDatabase database;
late Player testPlayer; late Player testPlayer;
final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
final fakeClock = Clock(() => fixedDate);
setUp(() { setUp(() {
database = AppDatabase( database = AppDatabase(
@@ -17,14 +20,17 @@ void main() {
), ),
); );
withClock(fakeClock, () {
testPlayer = Player(name: 'Test Player'); testPlayer = Player(name: 'Test Player');
}); });
});
tearDown(() async { tearDown(() async {
await database.close(); await database.close();
}); });
group('player tests', () { group('player tests', () {
test('all players get fetched correctly', () async { test('all players get fetched correctly', () async {
await withClock(fakeClock, () async {
final testPlayer2 = Player(name: 'Second Group'); final testPlayer2 = Player(name: 'Second Group');
await database.playerDao.addPlayer(player: testPlayer); await database.playerDao.addPlayer(player: testPlayer);
await database.playerDao.addPlayer(player: testPlayer2); await database.playerDao.addPlayer(player: testPlayer2);
@@ -36,14 +42,18 @@ void main() {
(g) => g.id == testPlayer.id, (g) => g.id == testPlayer.id,
); );
expect(fetchedPlayer1.name, testPlayer.name); expect(fetchedPlayer1.name, testPlayer.name);
expect(fetchedPlayer1.createdAt, testPlayer.createdAt);
final fetchedPlayer2 = allPlayers.firstWhere( final fetchedPlayer2 = allPlayers.firstWhere(
(g) => g.id == testPlayer2.id, (g) => g.id == testPlayer2.id,
); );
expect(fetchedPlayer2.name, testPlayer2.name); expect(fetchedPlayer2.name, testPlayer2.name);
expect(fetchedPlayer2.createdAt, testPlayer2.createdAt);
});
}); });
test('players get inserted correcly ', () async { test('players get inserted correcly ', () async {
await withClock(fakeClock, () async {
await database.playerDao.addPlayer(player: testPlayer); await database.playerDao.addPlayer(player: testPlayer);
final result = await database.playerDao.getPlayerById( final result = await database.playerDao.getPlayerById(
playerId: testPlayer.id, playerId: testPlayer.id,
@@ -51,6 +61,8 @@ void main() {
expect(result.id, testPlayer.id); expect(result.id, testPlayer.id);
expect(result.name, testPlayer.name); expect(result.name, testPlayer.name);
expect(result.createdAt, testPlayer.createdAt);
});
}); });
test('players get deleted correcly ', () async { test('players get deleted correcly ', () async {