From f254836fc382cedc594e6a4f4ceeb6a0ae5166b7 Mon Sep 17 00:00:00 2001 From: robinalfengard Date: Mon, 5 Feb 2024 16:39:32 +0100 Subject: [PATCH] Adjustment for test for initSocket method in main --- src/main/java/org/fungover/haze/Main.java | 6 ++++-- src/test/java/org/fungover/haze/MainTest.java | 21 +++++++------------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/fungover/haze/Main.java b/src/main/java/org/fungover/haze/Main.java index 77332abe..465f1d43 100644 --- a/src/main/java/org/fungover/haze/Main.java +++ b/src/main/java/org/fungover/haze/Main.java @@ -1,6 +1,8 @@ package org.fungover.haze; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -10,6 +12,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; + public class Main { static boolean serverOpen = true; static Logger logger = LogManager.getLogger(Main.class); @@ -67,7 +70,6 @@ private static void handleThread(HazeList hazeList, HazeDatabase hazeDatabase, S private static void controlCommand(HazeList hazeList, HazeDatabase hazeDatabase, Socket client, List inputList) throws IOException { client.getOutputStream().write(executeCommand(hazeDatabase, inputList, hazeList).getBytes()); - inputList.forEach(System.out::println); // For checking incoming message } @@ -140,7 +142,7 @@ private static String commandSwitch(HazeDatabase hazeDatabase, List inpu }; } - private static void readInputStream(BufferedReader input, List inputList, String firstReading) throws + public static void readInputStream(BufferedReader input, List inputList, String firstReading) throws IOException { logger.debug("readInputStream: {} {} {}", () -> input, () -> inputList, () -> firstReading); int size; diff --git a/src/test/java/org/fungover/haze/MainTest.java b/src/test/java/org/fungover/haze/MainTest.java index 2f500994..33a9f5de 100644 --- a/src/test/java/org/fungover/haze/MainTest.java +++ b/src/test/java/org/fungover/haze/MainTest.java @@ -16,6 +16,8 @@ import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.in; @@ -208,29 +210,20 @@ void callToShutDownClientIfNotAuthenticatedShouldNotShutDownOutputForAuthenticat assertThat(clientSocket.isOutputShutdown()).isEqualTo(false); } - @Test - @DisplayName("Call to initSocket should set reuseAddress to true") - void callToInitSocketShouldSetReuseAddressToTrue() throws IOException { - Initialize initialize = new Initialize(); - ServerSocket ss = new ServerSocket(); - Main.initSocket(initialize, ss); - assertThat(ss.getReuseAddress()).isTrue(); - } @Test @DisplayName("Call to initSocket should bind serversocket port to same as initialize") void callToInitSocketShouldBindServerSocketPortToSameAsInitialize() throws IOException { Initialize initialize = new Initialize(); ServerSocket ss = new ServerSocket(); - Main.initSocket(initialize, ss); int initializePort = initialize.getPort(); int serverSocketPort = ss.getLocalPort(); + assertThat(initializePort).isNotEqualTo(serverSocketPort); + + Main.initSocket(initialize, ss); + initializePort = initialize.getPort(); + serverSocketPort = ss.getLocalPort(); assertThat(initializePort).isEqualTo(serverSocketPort); } - - - - - }