Merge branch 'feat/client-chat' into chore/ui-checkstyle-fixes
# Conflicts: # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/CoreClient.java # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/GameClient.java # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/LobbyClient.java # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java # src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java # src/main/resources/ui-structure/components/Chatbox.fxml
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
package ch.unibas.dmi.dbis.cs108.casono.client.chat;
|
||||
|
||||
import javafx.application.Application;
|
||||
|
||||
public class Chat {
|
||||
public static void main(String[] args) {
|
||||
Application.launch(ChatApplication.class);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package ch.unibas.dmi.dbis.cs108.casono.client.chat;
|
||||
|
||||
import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
|
||||
import ch.unibas.dmi.dbis.cs108.casono.client.network.CoreClient;
|
||||
import ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui.ChatBoxController;
|
||||
import java.io.IOException;
|
||||
import javafx.application.Application;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
public class ChatApplication extends Application {
|
||||
|
||||
private static final int SCENE_WIDTH = 1200;
|
||||
private static final int SCENE_HEIGHT = 800;
|
||||
String ip = "localhost";
|
||||
String username = "mathis";
|
||||
int port = 5000;
|
||||
|
||||
public ChatApplication() {}
|
||||
|
||||
public void start(Stage stage) throws IOException {
|
||||
FXMLLoader fxmlLoader =
|
||||
new FXMLLoader(
|
||||
getClass().getResource("/ui-structure/components/chatui/chatbox.fxml"));
|
||||
ClientService clientService = new ClientService(ip, port);
|
||||
CoreClient coreClient = new CoreClient(clientService);
|
||||
coreClient.login(username);
|
||||
ChatController chatController = new ChatController(username, clientService);
|
||||
ChatBoxController chatBoxController = new ChatBoxController(username, chatController);
|
||||
fxmlLoader.setController(chatBoxController);
|
||||
|
||||
Scene scene = new Scene(fxmlLoader.load(), SCENE_WIDTH, SCENE_HEIGHT);
|
||||
stage.setTitle("Chat");
|
||||
stage.setScene(scene);
|
||||
stage.show();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package ch.unibas.dmi.dbis.cs108.casono.client.chat;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
|
||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
public class ChatTest {
|
||||
|
||||
@Test
|
||||
public void chatTest() {
|
||||
List<String> list = new ArrayList<String>();
|
||||
list.add("COUNT=19199");
|
||||
list.add("TEXT='test \\' test'");
|
||||
list.add("TEXT='%/§§%&&/%=%$/%))==/?``*\\'\\'**\\'\\'§?'");
|
||||
list.add("TEXT='Hello World'");
|
||||
list.add("NUMBER=-56887387394898392849");
|
||||
|
||||
List<RequestParameter> newList = ClientService.convertToRequestParameters(list);
|
||||
RequestParameter par0 = newList.get(0);
|
||||
assertEquals("COUNT", par0.key());
|
||||
assertEquals("19199", par0.value());
|
||||
|
||||
RequestParameter par1 = newList.get(1);
|
||||
assertEquals("TEXT", par1.key());
|
||||
assertEquals("test ' test", par1.value());
|
||||
|
||||
RequestParameter par2 = newList.get(2);
|
||||
assertEquals("TEXT", par2.key());
|
||||
assertEquals("%/§§%&&/%=%$/%))==/?``*''**''§?", par2.value());
|
||||
|
||||
RequestParameter par4 = newList.get(4);
|
||||
assertEquals("NUMBER", par4.key());
|
||||
assertEquals("-56887387394898392849", par4.value());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user