Dragonestia/RoomPicker
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed all tests

Browse Source
This commit is contained in:
Andrey Terentev 2024-03-16 20:35:09 +07:00 committed by Andrey Terentev
parent 906e9c5cbe
commit 3395725265
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java
View File

@ -95,6 +95,7 @@ public class NodeContainer {
public @NotNull Room pick(@NotNull Set<User> users) { public @NotNull Room pick(@NotNull Set<User> users) {
synchronized (picker) { synchronized (picker) {
var room = picker.pick(users); var room = picker.pick(users);
room.addUsers(users, false);
transactionListener.accept(new UserTransaction(room.getRoom(), users)); transactionListener.accept(new UserTransaction(room.getRoom(), users));
return room.getRoom(); return room.getRoom();
} }

4
server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java
View File

@ -41,12 +41,14 @@ public class LeastPickedTests {
@ParameterizedTest @ParameterizedTest
@ArgumentsSource(PickingArgumentProvider.class) @ArgumentsSource(PickingArgumentProvider.class)
void testPicking(String expectedRoomId, int usersAmount) { void testPicking(String expectedRoomId, int usersAmount) {
var expectedRoomUsers = userRepository.usersOf(roomRepository.find(node, expectedRoomId).orElseThrow()).size();
var room = roomRepository.pick(node, userFiller.createRandomUsers(usersAmount)); var room = roomRepository.pick(node, userFiller.createRandomUsers(usersAmount));
var slots = room.getMaxSlots(); var slots = room.getMaxSlots();
var users = userRepository.usersOf(room); var users = userRepository.usersOf(room);
Assertions.assertTrue(slots == -1 || slots >= users.size()); // check slots limitation Assertions.assertTrue(slots == -1 || slots >= users.size()); // check slots limitation
System.out.printf("Room(%s) has %s/%s users. Expected: %s, added: %s%n", room.getIdentifier(), users.size(), slots, expectedRoomId, usersAmount); System.out.printf("Room(%s) has %s/%s users. Expected: %s(%s), added: %s%n", room.getIdentifier(), users.size(), slots, expectedRoomId, expectedRoomUsers, usersAmount);
Assertions.assertEquals(expectedRoomId, room.getIdentifier()); Assertions.assertEquals(expectedRoomId, room.getIdentifier());
} }

4
server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java
View File

@ -41,12 +41,14 @@ public class SequentialFillingTests {
@ParameterizedTest @ParameterizedTest
@ArgumentsSource(PickingArgumentProvider.class) @ArgumentsSource(PickingArgumentProvider.class)
void testPicking(String expectedRoomId, int usersAmount) { void testPicking(String expectedRoomId, int usersAmount) {
var expectedRoomUsers = userRepository.usersOf(roomRepository.find(node, expectedRoomId).orElseThrow()).size();
var room = roomRepository.pick(node, userFiller.createRandomUsers(usersAmount)); var room = roomRepository.pick(node, userFiller.createRandomUsers(usersAmount));
var slots = room.getMaxSlots(); var slots = room.getMaxSlots();
var users = userRepository.usersOf(room); var users = userRepository.usersOf(room);
Assertions.assertTrue(slots == -1 || slots >= users.size()); // check slots limitation Assertions.assertTrue(slots == -1 || slots >= users.size()); // check slots limitation
System.out.printf("Room(%s) has %s/%s users. Expected: %s, added: %s%n", room.getIdentifier(), users.size(), slots, expectedRoomId, usersAmount); System.out.printf("Room(%s) has %s/%s users. Expected: %s(%s), added: %s%n", room.getIdentifier(), users.size(), slots, expectedRoomId, expectedRoomUsers, usersAmount);
Assertions.assertEquals(expectedRoomId, room.getIdentifier()); Assertions.assertEquals(expectedRoomId, room.getIdentifier());
} }

1
settings.gradle
View File

@ -4,4 +4,5 @@ include 'server'
include 'control-panel' include 'control-panel'
include 'client-api' include 'client-api'
include 'client-impl' include 'client-impl'
include 'noiser'