Add JUnit testing, move on to 1.0.1

Author: velitasali

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.genonbeta.coolsocket</groupId>
     <artifactId>main</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
 
     <repositories>
         <repository>
@@ -26,6 +26,12 @@
             <artifactId>json</artifactId>
             <version>20180130</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/genonbeta/CoolSocket/CoolSocket.java

@@ -145,7 +145,8 @@ public boolean isInterrupted()
 
 	public boolean isServerAlive()
 	{
-		return this.getServerThread().isAlive();
+		return this.getServerThread() != null
+				&& this.getServerThread().isAlive();
 	}
 
 	protected boolean respondRequest(final Socket socket)
@@ -236,16 +237,35 @@ public boolean start()
 		return true;
 	}
 
+	// ensures the server, if was stopping, has stopped
 	public boolean startDelayed(int timeout)
 	{
 		long startTime = System.currentTimeMillis();
 
-		while (this.isServerAlive() && (System.currentTimeMillis() - startTime) < timeout) {
+		while (this.isServerAlive()) {
+			if ((System.currentTimeMillis() - startTime) > timeout)
+				// We did not request start but it was already running, so it was rather not
+				// requested to stop or the server blocked itself and does not respond
+				return false;
 		}
 
 		return this.start();
 	}
 
+	// ensures the server is started otherwise returns false
+	public boolean startEnsured(int timeout) {
+		long startTime = System.currentTimeMillis();
+
+		if (!this.startDelayed(timeout))
+			return false;
+
+		while (!this.isServerAlive())
+			if ((System.currentTimeMillis() - startTime) > timeout)
+				return false;
+
+		return true;
+	}
+
 	public boolean stop()
 	{
 		if (this.isInterrupted())

src/test/java/com/genonbeta/CoolSocket/Main.java

@@ -0,0 +1,113 @@
+package com.genonbeta.CoolSocket;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.concurrent.TimeoutException;
+
+public class Main
+{
+	public static final int PORT_SERVER = 53535;
+
+	@Test
+	public void main()
+	{
+		final TestServer testServer = new TestServer();
+
+		log("Server started ?= %s", testServer.startEnsured(5000));
+
+		CoolSocket.connect(client -> {
+			if (!testServer.isServerAlive())
+				return;
+
+			try {
+				CoolSocket.ActiveConnection activeConnection = client.connect(new InetSocketAddress(PORT_SERVER), CoolSocket.NO_TIMEOUT);
+
+				activeConnection.reply("Hi server");
+
+				CoolSocket.ActiveConnection.Response response = activeConnection.receive();
+
+				log("Server says: %s; with total character of: %d; header of: %s",
+						response.response,
+						response.totalLength,
+						response.headerIndex.toString());
+
+				activeConnection.getSocket().close();
+			} catch (IOException | TimeoutException e) {
+				e.printStackTrace();
+			}
+		});
+
+		while (testServer.isServerAlive()) {
+			// the server has not shut down
+		}
+
+		log("Program exited");
+	}
+
+	public static class TestServer extends CoolSocket
+	{
+		private int connectionRemains = 10;
+
+		public TestServer()
+		{
+			super(PORT_SERVER);
+		}
+
+		@Override
+		public void onServerStarted()
+		{
+			super.onServerStarted();
+			log(String.format("Server started on port %d", getLocalPort()));
+		}
+
+		@Override
+		public void onServerStopped()
+		{
+			super.onServerStopped();
+			log("Server stopped");
+		}
+
+		@Override
+		protected void onConnected(ActiveConnection activeConnection)
+		{
+			connectionRemains--;
+
+			try {
+				ActiveConnection.Response response = activeConnection.receive();
+
+				log("Client says: %s; with total character of: %d; header of: %s",
+						response.response,
+						response.totalLength,
+						response.headerIndex.toString());
+
+				activeConnection.reply(String.format("Thanks, remaining server shutdown step is %s", connectionRemains));
+
+				activeConnection.getSocket().close();
+			} catch (IOException | TimeoutException e) {
+				e.printStackTrace();
+			}
+
+			if (connectionRemains == 0)
+				stop();
+		}
+	}
+
+	public static void log(String print)
+	{
+		log(print, (Object[]) null);
+	}
+
+	public static void log(String print, Object... formatted)
+	{
+		StringBuilder stringBuilder = new StringBuilder()
+				.append(Main.class.getName())
+				.append("(): ")
+				.append(print);
+
+		System.out.println(print == null
+				? stringBuilder.toString()
+				: String.format(stringBuilder.toString(), formatted));
+	}
+}