diff --git a/src/main/java/client/WordleClientMain.java b/src/main/java/client/WordleClientMain.java index 8abfc68..4f06c0f 100644 --- a/src/main/java/client/WordleClientMain.java +++ b/src/main/java/client/WordleClientMain.java @@ -10,11 +10,11 @@ import java.net.Socket; import java.util.Optional; import java.util.Properties; -import model.ServerResponse; +import model.Response; import model.StreamHandler; import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; /** * WordleClientMain is the client for the Wordle game. @@ -27,8 +27,8 @@ public class WordleClientMain { private static ObjectInputStream in; private static ObjectOutputStream out; - private static final ServerResponse errorResponse = - new ServerResponse(-1, "Error sending request to server."); + private static final Response errorResponse = + new Response(-1, "Error sending requestType to server."); /** @@ -58,63 +58,63 @@ public static void main(String[] args) { /** - * Sends a login request to the server. + * Sends a login requestType to the server. * - * @param username the username of the user sending the request - * @param password the password of the user sending the request + * @param username the username of the user sending the requestType + * @param password the password of the user sending the requestType */ - public static Optional login(String username, String password) { + public static Optional login(String username, String password) { final PasswordHashingService passwordHashingService = PasswordHashingService.getInstance(); final String hashedPassword = passwordHashingService.hashPassword(password); final User user = new User(username, hashedPassword); - final UserRequest userRequest = new UserRequest(Request.LOGIN, user); + final UserRequest userRequest = new UserRequest(RequestType.LOGIN, user); if (StreamHandler.sendData(out, userRequest)) { - return StreamHandler.getData(in, ServerResponse.class); + return StreamHandler.getData(in, Response.class); } return Optional.of(errorResponse); } /** - * Sends a register request to the server. + * Sends a register requestType to the server. * - * @param username the username of the user sending the request - * @param password the password of the user sending the request + * @param username the username of the user sending the requestType + * @param password the password of the user sending the requestType */ - public static Optional register(String username, String password) { + public static Optional register(String username, String password) { final PasswordHashingService passwordHashingService = PasswordHashingService.getInstance(); final String hashedPassword = passwordHashingService.hashPassword(password); final User user = new User(username, hashedPassword); - final UserRequest userRequest = new UserRequest(Request.REGISTER, user); + final UserRequest userRequest = new UserRequest(RequestType.REGISTER, user); if (StreamHandler.sendData(out, userRequest)) { - return StreamHandler.getData(in, ServerResponse.class); + return StreamHandler.getData(in, Response.class); } return Optional.of(errorResponse); } /** - * Sends a logout request to the server. + * Sends a logout requestType to the server. * - * @param username the username of the user sending the request + * @param username the username of the user sending the requestType */ - public static Optional logout(String username) { + public static Optional logout(String username) { final User user = new User(username, ""); - final UserRequest userRequest = new UserRequest(Request.LOGOUT, user); + final UserRequest userRequest = new UserRequest(RequestType.LOGOUT, user); if (StreamHandler.sendData(out, userRequest)) { - return StreamHandler.getData(in, ServerResponse.class); + return StreamHandler.getData(in, Response.class); } return Optional.of(errorResponse); } /** - * Sends a play request to the server. + * Sends a play requestType to the server. * - * @param username the username of the user sending the request + * @param username the username of the user sending the requestType */ - public static Optional play(String username) { + public static Optional play(String username) { final User user = new User(username, ""); - final UserRequest userRequest = new UserRequest(Request.PLAY, user); + final UserRequest userRequest = new UserRequest(RequestType.PLAY, user); if (StreamHandler.sendData(out, userRequest)) { - return StreamHandler.getData(in, ServerResponse.class); + return StreamHandler.getData(in, Response.class); } return Optional.of(errorResponse); } @@ -122,15 +122,15 @@ public static Optional play(String username) { /** * Sends a word to the server. * - * @param username the username of the user sending the request + * @param username the username of the user sending the requestType * @param word the word to send * @return the response from the server */ - public static Optional sendWord(String username, String word) { + public static Optional sendWord(String username, String word) { final User user = new User(username, ""); - final UserRequest userRequest = new UserRequest(Request.SENDWORD, user, word); + final UserRequest userRequest = new UserRequest(RequestType.SENDWORD, user, word); if (StreamHandler.sendData(out, userRequest)) { - return StreamHandler.getData(in, ServerResponse.class); + return StreamHandler.getData(in, Response.class); } return Optional.of(errorResponse); } diff --git a/src/main/java/client/gui/AuthenticationDialog.java b/src/main/java/client/gui/AuthenticationDialog.java index 7cb118d..da1e2f2 100644 --- a/src/main/java/client/gui/AuthenticationDialog.java +++ b/src/main/java/client/gui/AuthenticationDialog.java @@ -13,7 +13,7 @@ import javax.swing.JOptionPane; import javax.swing.JPasswordField; import javax.swing.JTextField; -import model.ServerResponse; +import model.Response; import model.enums.AuthType; /** @@ -97,7 +97,7 @@ private void addActionEvent() { @Override public void actionPerformed(ActionEvent e) { - final Optional response; + final Optional response; if (this.authType == AuthType.Login) { response = WordleClientMain.login(usernameField.getText(), diff --git a/src/main/java/client/gui/HomePage.java b/src/main/java/client/gui/HomePage.java index 7b1eb45..8bbaa7c 100644 --- a/src/main/java/client/gui/HomePage.java +++ b/src/main/java/client/gui/HomePage.java @@ -12,7 +12,7 @@ import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.JPanel; -import model.ServerResponse; +import model.Response; /** * Interface for the home page. @@ -44,7 +44,7 @@ public HomePage(String username) { final JButton playButton = new JButton("Play"); playButton.addActionListener(e -> { - final Optional response = WordleClientMain.play(username); + final Optional response = WordleClientMain.play(username); if (response.isEmpty()) { JOptionPane.showMessageDialog(HomePage.this, "Server could not respond."); } else if (response.get().status() == 0) { @@ -61,7 +61,7 @@ public HomePage(String username) { @Override public void actionPerformed(ActionEvent e) { - final Optional response = WordleClientMain.logout(username); + final Optional response = WordleClientMain.logout(username); if (response.isEmpty()) { JOptionPane.showMessageDialog(this, "Server could not respond."); } else if (response.get().status() == 0) { diff --git a/src/main/java/client/gui/play/PlayPage.java b/src/main/java/client/gui/play/PlayPage.java index 864339b..0ab95a5 100644 --- a/src/main/java/client/gui/play/PlayPage.java +++ b/src/main/java/client/gui/play/PlayPage.java @@ -22,7 +22,7 @@ import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; import javax.swing.border.LineBorder; -import model.ServerResponse; +import model.Response; import model.WordHints; /** @@ -115,7 +115,7 @@ public void actionPerformed(ActionEvent e) { Arrays.stream(inputFields[currentAttempt]) .forEach(field -> guess.append(field.getText())); - final Optional response = + final Optional response = WordleClientMain.sendWord(username, guess.toString()); if (response.isEmpty()) { diff --git a/src/main/java/model/ServerResponse.java b/src/main/java/model/Response.java similarity index 56% rename from src/main/java/model/ServerResponse.java rename to src/main/java/model/Response.java index a4e611b..f8a3a54 100644 --- a/src/main/java/model/ServerResponse.java +++ b/src/main/java/model/Response.java @@ -5,34 +5,34 @@ /** * Represents a response from the server. */ -public record ServerResponse(int status, String message, Object data) implements Serializable { +public record Response(int status, String message, Object data) implements Serializable { /** - * Constructor for ServerResponse. Sets data to null. + * Constructor for Response. Sets data to null. * * @param status the status of the response * @param message the message of the response */ - public ServerResponse(int status, String message) { + public Response(int status, String message) { this(status, message, null); } /** - * Single argument constructor for ServerResponse. + * Single argument constructor for Response. * * @param status the status of the response */ - public ServerResponse(int status) { + public Response(int status) { this(status, "", null); } /** - * Two argument constructor for ServerResponse. + * Two argument constructor for Response. * * @param status the status of the response * @param data the data of the response */ - public ServerResponse(int status, Object data) { + public Response(int status, Object data) { this(status, "", data); } diff --git a/src/main/java/model/UserRequest.java b/src/main/java/model/UserRequest.java index 1dbbaa2..d95c2cd 100644 --- a/src/main/java/model/UserRequest.java +++ b/src/main/java/model/UserRequest.java @@ -1,21 +1,21 @@ package model; import java.io.Serializable; -import model.enums.Request; +import model.enums.RequestType; /** - * Represents a user request. + * Represents a user requestType. */ -public record UserRequest(Request request, User user, String word) implements Serializable { +public record UserRequest(RequestType requestType, User user, String word) implements Serializable { /** * Constructor for the UserRequest. * - * @param request the request type - * @param user the user sending the request + * @param requestType the requestType type + * @param user the user sending the requestType */ - public UserRequest(Request request, User user) { - this(request, user, null); + public UserRequest(RequestType requestType, User user) { + this(requestType, user, null); } diff --git a/src/main/java/model/enums/Request.java b/src/main/java/model/enums/RequestType.java similarity index 63% rename from src/main/java/model/enums/Request.java rename to src/main/java/model/enums/RequestType.java index fca8dc0..4a96897 100644 --- a/src/main/java/model/enums/Request.java +++ b/src/main/java/model/enums/RequestType.java @@ -1,9 +1,9 @@ package model.enums; /** - * Represents a request. + * Represents a requestType. */ -public enum Request { +public enum RequestType { LOGIN, REGISTER, diff --git a/src/main/java/server/controller/RequestHandler.java b/src/main/java/server/controller/RequestHandler.java index f9ace9b..68dedba 100644 --- a/src/main/java/server/controller/RequestHandler.java +++ b/src/main/java/server/controller/RequestHandler.java @@ -7,10 +7,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import model.ServerResponse; +import model.Response; import model.StreamHandler; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.jetbrains.annotations.NotNull; import server.model.Command; import server.service.AuthenticationService; @@ -22,23 +22,23 @@ import server.service.SendWordCommand; /** - * Handles a request from a client. + * Handles a requestType from a client. */ public class RequestHandler implements Runnable, AutoCloseable { private final Socket socket; private final ObjectInputStream in; private final ObjectOutputStream out; - private static final Map commandMap; + private static final Map commandMap; static { commandMap = new HashMap<>(); final AuthenticationService authenticationService = new AuthenticationService(); - commandMap.put(Request.LOGIN, new LoginCommand(authenticationService)); - commandMap.put(Request.LOGOUT, new LogoutCommand(authenticationService)); - commandMap.put(Request.REGISTER, new RegisterCommand(authenticationService)); - commandMap.put(Request.PLAY, new PlayCommand(new PlayWordleService())); - commandMap.put(Request.SENDWORD, new SendWordCommand(new PlayWordleService())); + commandMap.put(RequestType.LOGIN, new LoginCommand(authenticationService)); + commandMap.put(RequestType.LOGOUT, new LogoutCommand(authenticationService)); + commandMap.put(RequestType.REGISTER, new RegisterCommand(authenticationService)); + commandMap.put(RequestType.PLAY, new PlayCommand(new PlayWordleService())); + commandMap.put(RequestType.SENDWORD, new SendWordCommand(new PlayWordleService())); } @@ -62,14 +62,14 @@ public void run() { break; } - final Command command = commandMap.get(userRequest.get().request()); + final Command command = commandMap.get(userRequest.get().requestType()); if (command == null) { throw new IllegalStateException("Command not found."); } - final ServerResponse serverResponse = command.handle(userRequest.get()); + final Response response = command.handle(userRequest.get()); - if (!StreamHandler.sendData(out, serverResponse)) { + if (!StreamHandler.sendData(out, response)) { break; } } diff --git a/src/main/java/server/model/Command.java b/src/main/java/server/model/Command.java index 1ec6105..1e95bb4 100644 --- a/src/main/java/server/model/Command.java +++ b/src/main/java/server/model/Command.java @@ -1,8 +1,6 @@ package server.model; -import java.io.IOException; -import java.io.ObjectOutputStream; -import model.ServerResponse; +import model.Response; import model.UserRequest; import org.jetbrains.annotations.NotNull; @@ -12,12 +10,12 @@ public interface Command { /** - * Handles a user request. + * Handles a user requestType. * - * @param userRequest the user request + * @param userRequest the user requestType * @return the server response */ - ServerResponse handle(@NotNull UserRequest userRequest); + Response handle(@NotNull UserRequest userRequest); diff --git a/src/main/java/server/service/LoginCommand.java b/src/main/java/server/service/LoginCommand.java index 75b9234..844b207 100644 --- a/src/main/java/server/service/LoginCommand.java +++ b/src/main/java/server/service/LoginCommand.java @@ -1,10 +1,10 @@ package server.service; import java.util.Optional; -import model.ServerResponse; +import model.Response; import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.jetbrains.annotations.NotNull; import server.model.Command; @@ -25,15 +25,15 @@ public LoginCommand(AuthenticationService authenticationService) { } /** - * Handles a user request. + * Handles a user requestType. * - * @param userRequest the user request + * @param userRequest the user requestType * @return the server response */ - public ServerResponse handle(@NotNull UserRequest userRequest) { + public Response handle(@NotNull UserRequest userRequest) { - if (userRequest.request() != Request.LOGIN) { - throw new IllegalArgumentException("Cannot handle a non-logout request"); + if (userRequest.requestType() != RequestType.LOGIN) { + throw new IllegalArgumentException("Cannot handle a non-logout requestType"); } else if (userRequest.user() == null) { throw new IllegalArgumentException("Cannot logout a null user"); } @@ -43,11 +43,11 @@ public ServerResponse handle(@NotNull UserRequest userRequest) { authenticationService.getUserByUsername(user.getUsername()); if (isRegistered.isEmpty()) { - return new ServerResponse(-1, "User not registered."); + return new Response(-1, "User not registered."); } else if (isRegistered.get().equals(user)) { - return new ServerResponse(0, "Login successful."); + return new Response(0, "Login successful."); } - return new ServerResponse(-1, "Wrong username or password."); + return new Response(-1, "Wrong username or password."); } diff --git a/src/main/java/server/service/LogoutCommand.java b/src/main/java/server/service/LogoutCommand.java index 82f3334..7467373 100644 --- a/src/main/java/server/service/LogoutCommand.java +++ b/src/main/java/server/service/LogoutCommand.java @@ -1,9 +1,9 @@ package server.service; -import model.ServerResponse; +import model.Response; import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.jetbrains.annotations.NotNull; import server.model.Command; @@ -24,15 +24,15 @@ public LogoutCommand(AuthenticationService authenticationService) { } /** - * Handles a user request. + * Handles a user requestType. * - * @param userRequest the user request + * @param userRequest the user requestType * @return the server response */ - public ServerResponse handle(@NotNull UserRequest userRequest) { + public Response handle(@NotNull UserRequest userRequest) { - if (userRequest.request() != Request.LOGOUT) { - throw new IllegalArgumentException("Cannot handle a non-logout request"); + if (userRequest.requestType() != RequestType.LOGOUT) { + throw new IllegalArgumentException("Cannot handle a non-logout requestType"); } else if (userRequest.user() == null) { throw new IllegalArgumentException("Cannot logout a null user"); } @@ -41,7 +41,7 @@ public ServerResponse handle(@NotNull UserRequest userRequest) { if (authenticationService.getUserByUsername(user.getUsername()).isEmpty()) { throw new IllegalStateException("Cannot logout a not registered user"); } - return new ServerResponse(0, "Logout successful."); + return new Response(0, "Logout successful."); } } diff --git a/src/main/java/server/service/PlayCommand.java b/src/main/java/server/service/PlayCommand.java index de229de..2435a2c 100644 --- a/src/main/java/server/service/PlayCommand.java +++ b/src/main/java/server/service/PlayCommand.java @@ -1,9 +1,9 @@ package server.service; -import model.ServerResponse; +import model.Response; import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.jetbrains.annotations.NotNull; import server.model.Command; @@ -24,26 +24,26 @@ public PlayCommand(PlayWordleService playWordleService) { } /** - * Handles a user request. + * Handles a user requestType. * - * @param userRequest the user request + * @param userRequest the user requestType * @return the server response */ - public ServerResponse handle(@NotNull UserRequest userRequest) { + public Response handle(@NotNull UserRequest userRequest) { - if (userRequest.request() != Request.PLAY) { - throw new IllegalArgumentException("Cannot handle a non-play request"); + if (userRequest.requestType() != RequestType.PLAY) { + throw new IllegalArgumentException("Cannot handle a non-play requestType"); } else if (userRequest.user() == null) { throw new IllegalArgumentException("Cannot play a null user"); } final User user = userRequest.user(); if (playWordleService.hasPlayed(user, WordExtractionService.getCurrentWord())) { - return new ServerResponse(-1, "You have already played the game for this word."); + return new Response(-1, "You have already played the game for this word."); } else if (playWordleService.addPlayedGame(user, WordExtractionService.getCurrentWord())) { - return new ServerResponse(0, "The user can play the game."); + return new Response(0, "The user can play the game."); } - return new ServerResponse(-1, "Error while saving the played game."); + return new Response(-1, "Error while saving the played game."); } } diff --git a/src/main/java/server/service/RegisterCommand.java b/src/main/java/server/service/RegisterCommand.java index 66088c9..5eadf0d 100644 --- a/src/main/java/server/service/RegisterCommand.java +++ b/src/main/java/server/service/RegisterCommand.java @@ -1,9 +1,9 @@ package server.service; -import model.ServerResponse; +import model.Response; import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.jetbrains.annotations.NotNull; import server.model.Command; @@ -24,15 +24,15 @@ public RegisterCommand(AuthenticationService authenticationService) { } /** - * Handles a user request. + * Handles a user requestType. * - * @param userRequest the user request + * @param userRequest the user requestType * @return the server response */ - public ServerResponse handle(@NotNull UserRequest userRequest) { + public Response handle(@NotNull UserRequest userRequest) { - if (userRequest.request() != Request.REGISTER) { - throw new IllegalArgumentException("Cannot handle a non-register request"); + if (userRequest.requestType() != RequestType.REGISTER) { + throw new IllegalArgumentException("Cannot handle a non-register requestType"); } else if (userRequest.user() == null) { throw new IllegalArgumentException("Cannot register a null user"); } @@ -40,13 +40,13 @@ public ServerResponse handle(@NotNull UserRequest userRequest) { final User user = userRequest.user(); if (user.getPasswordHash().isEmpty()) { - return new ServerResponse(-1, "Password cannot be empty."); + return new Response(-1, "Password cannot be empty."); } else if (authenticationService.getUserByUsername(user.getUsername()).isPresent()) { - return new ServerResponse(-1, "User already registered."); + return new Response(-1, "User already registered."); } else if (authenticationService.add(user)) { - return new ServerResponse(0, "Registration successful."); + return new Response(0, "Registration successful."); } - return new ServerResponse(-1, "Registration failed."); + return new Response(-1, "Registration failed."); } } diff --git a/src/main/java/server/service/SendWordCommand.java b/src/main/java/server/service/SendWordCommand.java index 7f4b74a..480a72d 100644 --- a/src/main/java/server/service/SendWordCommand.java +++ b/src/main/java/server/service/SendWordCommand.java @@ -1,8 +1,8 @@ package server.service; -import model.ServerResponse; +import model.Response; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.jetbrains.annotations.NotNull; import server.model.Command; @@ -23,17 +23,17 @@ public SendWordCommand(PlayWordleService playWordleService) { } @Override - public ServerResponse handle(@NotNull UserRequest userRequest) { + public Response handle(@NotNull UserRequest userRequest) { - if (userRequest.request() != Request.SENDWORD) { - throw new IllegalArgumentException("Cannot handle a non-sendword request"); + if (userRequest.requestType() != RequestType.SENDWORD) { + throw new IllegalArgumentException("Cannot handle a non-sendword requestType"); } else if (userRequest.word() == null) { throw new IllegalArgumentException("Cannot send a null word"); } if (userRequest.word().equals(WordExtractionService.getCurrentWord())) { - return new ServerResponse(1, "You guessed the word!"); + return new Response(1, "You guessed the word!"); } - return new ServerResponse(0, playWordleService.guessWord(userRequest.word())); + return new Response(0, playWordleService.guessWord(userRequest.word())); } diff --git a/src/test/java/client/WordleClientMainTests.java b/src/test/java/client/WordleClientMainTests.java index baf9000..fafdf57 100644 --- a/src/test/java/client/WordleClientMainTests.java +++ b/src/test/java/client/WordleClientMainTests.java @@ -1,6 +1,5 @@ package client; -import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -37,7 +36,7 @@ public void testWordleMain() { } @Test - @DisplayName(" can correctly send a request") + @DisplayName(" can correctly send a requestType") public void testSendRequest() { // TODO diff --git a/src/test/java/model/ServerResponseTests.java b/src/test/java/model/ResponseTests.java similarity index 53% rename from src/test/java/model/ServerResponseTests.java rename to src/test/java/model/ResponseTests.java index 3c1f5db..91e6502 100644 --- a/src/test/java/model/ServerResponseTests.java +++ b/src/test/java/model/ResponseTests.java @@ -6,23 +6,23 @@ import org.junit.jupiter.api.Test; /** - * Tests for ServerResponse class. + * Tests for Response class. */ -@DisplayName("The ServerResponse tests ") -public class ServerResponseTests { +@DisplayName("The Response tests ") +public class ResponseTests { - private final ServerResponse serverResponse = new ServerResponse(123, "testMessage"); + private final Response response = new Response(123, "testMessage"); @Test @DisplayName(" can correctly get the status") public void testGetStatus() { - assertEquals(123, serverResponse.status()); + assertEquals(123, response.status()); } @Test @DisplayName(" can correctly get the message") public void testGetMessage() { - assertEquals("testMessage", serverResponse.message()); + assertEquals("testMessage", response.message()); } } diff --git a/src/test/java/model/UserRequestTests.java b/src/test/java/model/UserRequestTests.java index c017570..118313f 100644 --- a/src/test/java/model/UserRequestTests.java +++ b/src/test/java/model/UserRequestTests.java @@ -2,13 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import model.enums.Request; +import model.enums.RequestType; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; /** - * Tests for user request. + * Tests for user requestType. */ @DisplayName("The UserRequest tests ") public class UserRequestTests { @@ -21,18 +21,18 @@ public static void setUp() { } @Test - @DisplayName(" can correctly get the request") + @DisplayName(" can correctly get the requestType") public void testGetRequest() { final UserRequest userRequest = - new UserRequest(Request.LOGIN, user); - assertEquals(Request.LOGIN, userRequest.request()); + new UserRequest(RequestType.LOGIN, user); + assertEquals(RequestType.LOGIN, userRequest.requestType()); } @Test @DisplayName(" can correctly get the user") public void testGetUser() { final UserRequest userRequest = - new UserRequest(Request.LOGIN, user); + new UserRequest(RequestType.LOGIN, user); assertEquals(user, userRequest.user()); } diff --git a/src/test/java/server/controller/RequestHandlerTests.java b/src/test/java/server/controller/RequestHandlerTests.java index 65f04cc..2f57856 100644 --- a/src/test/java/server/controller/RequestHandlerTests.java +++ b/src/test/java/server/controller/RequestHandlerTests.java @@ -14,7 +14,7 @@ /** * RequestHandlerTests is the test suite for RequestHandler. */ -@DisplayName("The request handler tests ") +@DisplayName("The requestType handler tests ") public class RequestHandlerTests { @Mock @@ -37,7 +37,7 @@ public void setUp() { @Test - @DisplayName(" can correctly handle a user request") + @DisplayName(" can correctly handle a user requestType") public void testHandleUserRequest() { // TODO diff --git a/src/test/java/server/service/LoginCommandTests.java b/src/test/java/server/service/LoginCommandTests.java index 2e6163c..e64ace1 100644 --- a/src/test/java/server/service/LoginCommandTests.java +++ b/src/test/java/server/service/LoginCommandTests.java @@ -7,10 +7,10 @@ import static org.mockito.Mockito.when; import java.util.Optional; -import model.ServerResponse; +import model.Response; import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -38,10 +38,10 @@ void setUp() { @Test - @DisplayName(" cannot handle a request that is not login") + @DisplayName(" cannot handle a requestType that is not login") void testHandleInvalidRequest() { assertThrows(IllegalArgumentException.class, - () -> loginCommand.handle(new UserRequest(Request.LOGOUT, user)) + () -> loginCommand.handle(new UserRequest(RequestType.LOGOUT, user)) ); } @@ -49,7 +49,7 @@ void testHandleInvalidRequest() { @DisplayName(" cannot login a null user") void testHandleNullUser() { assertThrows(IllegalArgumentException.class, - () -> loginCommand.handle(new UserRequest(Request.LOGIN, null)) + () -> loginCommand.handle(new UserRequest(RequestType.LOGIN, null)) ); } @@ -59,8 +59,8 @@ void testHandleNotRegisteredUser() { when(authenticationService.getUserByUsername(any())) .thenReturn(Optional.empty()); assertEquals( - new ServerResponse(-1, "User not registered."), - loginCommand.handle(new UserRequest(Request.LOGIN, user)) + new Response(-1, "User not registered."), + loginCommand.handle(new UserRequest(RequestType.LOGIN, user)) ); } @@ -71,19 +71,19 @@ void testHandleWrongPassword() { when(authenticationService.getUserByUsername(any())) .thenReturn(Optional.of(new User("username", "wrong password"))); assertEquals( - new ServerResponse(-1, "Wrong username or password."), - loginCommand.handle(new UserRequest(Request.LOGIN, user)) + new Response(-1, "Wrong username or password."), + loginCommand.handle(new UserRequest(RequestType.LOGIN, user)) ); } @Test - @DisplayName(" can handle a correct login request") + @DisplayName(" can handle a correct login requestType") void testHandle() { when(authenticationService.getUserByUsername(any())) .thenReturn(Optional.of(user)); assertEquals( - new ServerResponse(0, "Login successful."), - loginCommand.handle(new UserRequest(Request.LOGIN, user)) + new Response(0, "Login successful."), + loginCommand.handle(new UserRequest(RequestType.LOGIN, user)) ); } diff --git a/src/test/java/server/service/LogoutCommandTests.java b/src/test/java/server/service/LogoutCommandTests.java index 77de246..1ea36ca 100644 --- a/src/test/java/server/service/LogoutCommandTests.java +++ b/src/test/java/server/service/LogoutCommandTests.java @@ -7,10 +7,10 @@ import static org.mockito.Mockito.when; import java.util.Optional; -import model.ServerResponse; +import model.Response; import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -38,10 +38,10 @@ void setUp() { @Test - @DisplayName(" cannot handle a request that is not logout") + @DisplayName(" cannot handle a requestType that is not logout") void testHandleInvalidRequest() { assertThrows(IllegalArgumentException.class, - () -> logoutCommand.handle(new UserRequest(Request.LOGIN, user)) + () -> logoutCommand.handle(new UserRequest(RequestType.LOGIN, user)) ); } @@ -49,7 +49,7 @@ void testHandleInvalidRequest() { @DisplayName(" cannot logout a null user") void testHandleNullUser() { assertThrows(IllegalArgumentException.class, - () -> logoutCommand.handle(new UserRequest(Request.LOGOUT, null)) + () -> logoutCommand.handle(new UserRequest(RequestType.LOGOUT, null)) ); } @@ -59,18 +59,18 @@ void testHandleNotRegisteredUser() { when(authenticationService.getUserByUsername(any())) .thenReturn(Optional.empty()); assertThrows(IllegalStateException.class, - () -> logoutCommand.handle(new UserRequest(Request.LOGOUT, user)) + () -> logoutCommand.handle(new UserRequest(RequestType.LOGOUT, user)) ); } @Test - @DisplayName(" can handle a correct logout request") + @DisplayName(" can handle a correct logout requestType") void testHandle() { when(authenticationService.getUserByUsername(any())) .thenReturn(Optional.of(user)); assertEquals( - logoutCommand.handle(new UserRequest(Request.LOGOUT, user)), - new ServerResponse(0, "Logout successful.") + logoutCommand.handle(new UserRequest(RequestType.LOGOUT, user)), + new Response(0, "Logout successful.") ); } diff --git a/src/test/java/server/service/PlayCommandTests.java b/src/test/java/server/service/PlayCommandTests.java index cff07df..3565cc8 100644 --- a/src/test/java/server/service/PlayCommandTests.java +++ b/src/test/java/server/service/PlayCommandTests.java @@ -5,10 +5,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import model.ServerResponse; +import model.Response; import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -35,10 +35,10 @@ public void setUp() { } @Test - @DisplayName(" cannot handle a request that is not play") + @DisplayName(" cannot handle a requestType that is not play") void testHandleInvalidRequest() { assertThrows(IllegalArgumentException.class, - () -> playCommand.handle(new UserRequest(Request.LOGIN, user)) + () -> playCommand.handle(new UserRequest(RequestType.LOGIN, user)) ); } @@ -46,44 +46,44 @@ void testHandleInvalidRequest() { @DisplayName(" correctly throws exception when user is null") void testHandleNullUser() { assertThrows(IllegalArgumentException.class, - () -> playCommand.handle(new UserRequest(Request.PLAY, null)) + () -> playCommand.handle(new UserRequest(RequestType.PLAY, null)) ); } @Test - @DisplayName(" correctly handles a request if the user has already played the game") + @DisplayName(" correctly handles a requestType if the user has already played the game") void testHandleUserAlreadyPlayed() { when(playWordleService.hasPlayed(user, WordExtractionService.getCurrentWord())) .thenReturn(true); assertEquals( - new ServerResponse(-1, "You have already played the game for this word."), - playCommand.handle(new UserRequest(Request.PLAY, user)) + new Response(-1, "You have already played the game for this word."), + playCommand.handle(new UserRequest(RequestType.PLAY, user)) ); } @Test - @DisplayName(" correctly handles a request if the user has not played the game") + @DisplayName(" correctly handles a requestType if the user has not played the game") void testHandleUserNotPlayed() { when(playWordleService.hasPlayed(user, WordExtractionService.getCurrentWord())) .thenReturn(false); when(playWordleService.addPlayedGame(user, WordExtractionService.getCurrentWord())) .thenReturn(true); assertEquals( - new ServerResponse(0, "The user can play the game."), - playCommand.handle(new UserRequest(Request.PLAY, user)) + new Response(0, "The user can play the game."), + playCommand.handle(new UserRequest(RequestType.PLAY, user)) ); } @Test - @DisplayName(" correctly handles a request if the user has not played the game") + @DisplayName(" correctly handles a requestType if the user has not played the game") void testHandleUserNotPlayedError() { when(playWordleService.hasPlayed(user, WordExtractionService.getCurrentWord())) .thenReturn(false); when(playWordleService.addPlayedGame(user, WordExtractionService.getCurrentWord())) .thenReturn(false); assertEquals( - new ServerResponse(-1, "Error while saving the played game."), - playCommand.handle(new UserRequest(Request.PLAY, user)) + new Response(-1, "Error while saving the played game."), + playCommand.handle(new UserRequest(RequestType.PLAY, user)) ); } diff --git a/src/test/java/server/service/RegisterCommandTests.java b/src/test/java/server/service/RegisterCommandTests.java index 92ec606..a71a554 100644 --- a/src/test/java/server/service/RegisterCommandTests.java +++ b/src/test/java/server/service/RegisterCommandTests.java @@ -7,10 +7,10 @@ import static org.mockito.Mockito.when; import java.util.Optional; -import model.ServerResponse; +import model.Response; import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -37,10 +37,10 @@ void setUp() { } @Test - @DisplayName(" cannot handle a request that is not register") + @DisplayName(" cannot handle a requestType that is not register") void testHandleInvalidRequest() { assertThrows(IllegalArgumentException.class, - () -> registerCommand.handle(new UserRequest(Request.LOGOUT, user)) + () -> registerCommand.handle(new UserRequest(RequestType.LOGOUT, user)) ); } @@ -48,7 +48,7 @@ void testHandleInvalidRequest() { @DisplayName(" cannot register a null user") void testHandleNullUser() { assertThrows(IllegalArgumentException.class, - () -> registerCommand.handle(new UserRequest(Request.REGISTER, null)) + () -> registerCommand.handle(new UserRequest(RequestType.REGISTER, null)) ); } @@ -57,9 +57,9 @@ void testHandleNullUser() { @DisplayName(" cannot register a user with an empty password") void testHandleEmptyPassword() { assertEquals( - new ServerResponse(-1, "Password cannot be empty."), + new Response(-1, "Password cannot be empty."), registerCommand.handle( - new UserRequest(Request.REGISTER, + new UserRequest(RequestType.REGISTER, new User("username", ""))) ); } @@ -70,34 +70,34 @@ void testHandleAlreadyRegisteredUser() { when(authenticationService.getUserByUsername(any())) .thenReturn(Optional.of(user)); assertEquals( - new ServerResponse(-1, "User already registered."), - registerCommand.handle(new UserRequest(Request.REGISTER, user)) + new Response(-1, "User already registered."), + registerCommand.handle(new UserRequest(RequestType.REGISTER, user)) ); } @Test - @DisplayName(" can handle a correct register request") + @DisplayName(" can handle a correct register requestType") void testHandle() { when(authenticationService.getUserByUsername(any())) .thenReturn(Optional.empty()); when(authenticationService.add(any())) .thenReturn(true); assertEquals( - registerCommand.handle(new UserRequest(Request.REGISTER, user)), - new ServerResponse(0, "Registration successful.") + registerCommand.handle(new UserRequest(RequestType.REGISTER, user)), + new Response(0, "Registration successful.") ); } @Test - @DisplayName(" can handle a correct reqister request that fails to add the user") + @DisplayName(" can handle a correct reqister requestType that fails to add the user") void testHandleFailedAdd() { when(authenticationService.getUserByUsername(any())) .thenReturn(Optional.empty()); when(authenticationService.add(any())) .thenReturn(false); assertEquals( - registerCommand.handle(new UserRequest(Request.REGISTER, user)), - new ServerResponse(-1, "Registration failed.") + registerCommand.handle(new UserRequest(RequestType.REGISTER, user)), + new Response(-1, "Registration failed.") ); } diff --git a/src/test/java/server/service/SendWordCommandTests.java b/src/test/java/server/service/SendWordCommandTests.java index 6e6c995..d3ba0a3 100644 --- a/src/test/java/server/service/SendWordCommandTests.java +++ b/src/test/java/server/service/SendWordCommandTests.java @@ -5,7 +5,7 @@ import model.User; import model.UserRequest; -import model.enums.Request; +import model.enums.RequestType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -32,10 +32,10 @@ public void setUp() { } @Test - @DisplayName(" cannot handle a request that is not send word") + @DisplayName(" cannot handle a requestType that is not send word") void testHandleInvalidRequest() { assertThrows(IllegalArgumentException.class, - () -> playCommand.handle(new UserRequest(Request.LOGIN, user)) + () -> playCommand.handle(new UserRequest(RequestType.LOGIN, user)) ); } @@ -44,7 +44,7 @@ void testHandleInvalidRequest() { void testHandleNullWord() { assertThrows(IllegalArgumentException.class, () -> playCommand.handle( - new UserRequest(Request.SENDWORD, new User("", ""), null)) + new UserRequest(RequestType.SENDWORD, new User("", ""), null)) ); }