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

Fixed tests

Browse Source
This commit is contained in:
Andrey Terentev 2024-03-13 14:02:48 +07:00 committed by Andrey Terentev
parent c5b0d9ccf3
commit 2424030dd9
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java
View File

@ -3,7 +3,7 @@ package ru.dragonestia.picker.config;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import ru.dragonestia.picker.api.repository.response.type.type.PickingMode; import ru.dragonestia.picker.api.model.node.PickingMethod;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.User;
@ -51,7 +51,7 @@ public class FillingNodesConfig {
@Bean @Bean
void createSequentialFillingNode() { void createSequentialFillingNode() {
var node = new Node("seq", PickingMode.SEQUENTIAL_FILLING, false); var node = new Node("seq", PickingMethod.SEQUENTIAL_FILLING, false);
nodeRepository.create(node); nodeRepository.create(node);
fillNode(node); fillNode(node);
@ -61,7 +61,7 @@ public class FillingNodesConfig {
@Bean @Bean
void createRoundRobinNode() { void createRoundRobinNode() {
var node = new Node("round", PickingMode.ROUND_ROBIN, false); var node = new Node("round", PickingMethod.ROUND_ROBIN, false);
nodeRepository.create(node); nodeRepository.create(node);
fillNode(node); fillNode(node);
@ -71,7 +71,7 @@ public class FillingNodesConfig {
@Bean @Bean
void createLeastPickerNode() { void createLeastPickerNode() {
var node = new Node("least", PickingMode.LEAST_PICKED, false); var node = new Node("least", PickingMethod.LEAST_PICKED, false);
nodeRepository.create(node); nodeRepository.create(node);
fillNode(node); fillNode(node);

10
server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java
View File

@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException;
import ru.dragonestia.picker.api.repository.response.type.type.PickingMode; import ru.dragonestia.picker.api.model.node.PickingMethod;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.Node;
import java.util.List; import java.util.List;
@ -18,7 +18,7 @@ public class NodeServiceTests {
@Test @Test
void test_nodeCreateAndRemove() { void test_nodeCreateAndRemove() {
var node = new Node("test", PickingMode.SEQUENTIAL_FILLING, false); var node = new Node("test", PickingMethod.SEQUENTIAL_FILLING, false);
Assertions.assertDoesNotThrow(() -> nodeService.create(node)); Assertions.assertDoesNotThrow(() -> nodeService.create(node));
Assertions.assertTrue(nodeService.find(node.id()).isPresent()); Assertions.assertTrue(nodeService.find(node.id()).isPresent());
@ -34,9 +34,9 @@ public class NodeServiceTests {
nodeService.all().forEach(node -> nodeService.remove(node)); nodeService.all().forEach(node -> nodeService.remove(node));
var nodes = List.of( var nodes = List.of(
new Node("test1", PickingMode.SEQUENTIAL_FILLING, false), new Node("test1", PickingMethod.SEQUENTIAL_FILLING, false),
new Node("test2", PickingMode.ROUND_ROBIN, false), new Node("test2", PickingMethod.ROUND_ROBIN, false),
new Node("test3", PickingMode.ROUND_ROBIN, false) new Node("test3", PickingMethod.ROUND_ROBIN, false)
); );
nodes.forEach(node -> nodeService.create(node)); nodes.forEach(node -> nodeService.create(node));

8
server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java
View File

@ -9,7 +9,7 @@ import ru.dragonestia.picker.api.exception.NodeAlreadyExistException;
import ru.dragonestia.picker.api.exception.NodeNotFoundException; import ru.dragonestia.picker.api.exception.NodeNotFoundException;
import ru.dragonestia.picker.api.exception.NotPersistedNodeException; import ru.dragonestia.picker.api.exception.NotPersistedNodeException;
import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException;
import ru.dragonestia.picker.api.repository.response.type.type.PickingMode; import ru.dragonestia.picker.api.model.node.PickingMethod;
import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.Room;
import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.model.User;
@ -30,7 +30,7 @@ public class RoomServiceTests {
@BeforeEach @BeforeEach
void init() { void init() {
node = new Node("test-rooms", PickingMode.SEQUENTIAL_FILLING, false); node = new Node("test-rooms", PickingMethod.SEQUENTIAL_FILLING, false);
try { try {
nodeService.create(node); nodeService.create(node);
@ -93,7 +93,7 @@ public class RoomServiceTests {
); );
Assertions.assertEquals("test-room4", roomService.pickAvailable(node, users).getId()); Assertions.assertEquals("test-room4", roomService.pickAvailable(node, users).roomId());
} }
@Test @Test
@ -105,7 +105,7 @@ public class RoomServiceTests {
@Test @Test
void test_nodeDoesNotExists() { void test_nodeDoesNotExists() {
var node = new Node("Bruh", PickingMode.ROUND_ROBIN, false); var node = new Node("Bruh", PickingMethod.ROUND_ROBIN, false);
var room = Room.create("test", node, SlotLimit.unlimited(), "", false); var room = Room.create("test", node, SlotLimit.unlimited(), "", false);
Assertions.assertThrows(NodeNotFoundException.class, () -> roomService.create(room)); Assertions.assertThrows(NodeNotFoundException.class, () -> roomService.create(room));