From 6290eb98daf3756943c3afdf53c950876c53b8e4 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Mon, 15 Jun 2015 23:01:22 +0100 Subject: [PATCH] Delete obsolete code for testing TCP client/server model --- .../test/server/TestTcpCommunication.java | 24 -------------- .../server/dummy/DummyChannelTcpClient.java | 13 -------- .../server/dummy/DummySocketTcpClient.java | 13 -------- .../server/dummy/DummyTcpServerClient.java | 17 ---------- .../java/test/server/dummy/DummyWriter.java | 32 ------------------- 5 files changed, 99 deletions(-) delete mode 100644 java/base/src/main/java/test/server/TestTcpCommunication.java delete mode 100644 java/base/src/main/java/test/server/dummy/DummyChannelTcpClient.java delete mode 100644 java/base/src/main/java/test/server/dummy/DummySocketTcpClient.java delete mode 100644 java/base/src/main/java/test/server/dummy/DummyTcpServerClient.java delete mode 100644 java/base/src/main/java/test/server/dummy/DummyWriter.java diff --git a/java/base/src/main/java/test/server/TestTcpCommunication.java b/java/base/src/main/java/test/server/TestTcpCommunication.java deleted file mode 100644 index ff0fd16..0000000 --- a/java/base/src/main/java/test/server/TestTcpCommunication.java +++ /dev/null @@ -1,24 +0,0 @@ -package test.server; - -import test.server.dummy.DummyChannelTcpClient; -import test.server.dummy.DummySocketTcpClient; -import test.server.dummy.DummyTcpServerClient; -import test.server.dummy.DummyWriter; -import base.server.channel.TcpServer; - -public class TestTcpCommunication { - public static void main(String[] args) { - try { - // Test client > server - new TcpServer(1234, DummyTcpServerClient.class).start(); - DummySocketTcpClient client1 = new DummySocketTcpClient("localhost", 1234); - DummyChannelTcpClient client2 = new DummyChannelTcpClient("localhost", 1234); - - client1.start(); - client2.start(); - Thread.sleep(1000); - client1.send("Succes!".getBytes()); - new DummyWriter(client1).start(); - } catch (Exception e) {} - } -} diff --git a/java/base/src/main/java/test/server/dummy/DummyChannelTcpClient.java b/java/base/src/main/java/test/server/dummy/DummyChannelTcpClient.java deleted file mode 100644 index 06e1ed7..0000000 --- a/java/base/src/main/java/test/server/dummy/DummyChannelTcpClient.java +++ /dev/null @@ -1,13 +0,0 @@ -package test.server.dummy; - -import base.server.socket.TcpClient; - -public class DummyChannelTcpClient extends TcpClient { - public DummyChannelTcpClient(String host, int port) { - super(host, port); - } - - public void input(byte[] buffer) { - System.out.println("Client: " + new String(buffer).trim()); - } -} diff --git a/java/base/src/main/java/test/server/dummy/DummySocketTcpClient.java b/java/base/src/main/java/test/server/dummy/DummySocketTcpClient.java deleted file mode 100644 index 5c17c12..0000000 --- a/java/base/src/main/java/test/server/dummy/DummySocketTcpClient.java +++ /dev/null @@ -1,13 +0,0 @@ -package test.server.dummy; - -import base.server.socket.TcpClient; - -public class DummySocketTcpClient extends TcpClient { - public DummySocketTcpClient(String host, int port) { - super(host, port); - } - - public void input(byte[] buffer) { - System.out.println("Client: " + new String(buffer).trim()); - } -} diff --git a/java/base/src/main/java/test/server/dummy/DummyTcpServerClient.java b/java/base/src/main/java/test/server/dummy/DummyTcpServerClient.java deleted file mode 100644 index 4137655..0000000 --- a/java/base/src/main/java/test/server/dummy/DummyTcpServerClient.java +++ /dev/null @@ -1,17 +0,0 @@ -package test.server.dummy; - -import java.io.IOException; -import java.nio.channels.SocketChannel; - -import base.server.channel.TcpServer; -import base.server.channel.TcpServerClient; - -public class DummyTcpServerClient extends TcpServerClient { - public DummyTcpServerClient(TcpServer server, SocketChannel socketChannel, Integer bufferSize) { - super(server, socketChannel, bufferSize); - } - - public void input(byte[] buffer) { - server.input(this, buffer); - } -} diff --git a/java/base/src/main/java/test/server/dummy/DummyWriter.java b/java/base/src/main/java/test/server/dummy/DummyWriter.java deleted file mode 100644 index e8e91e4..0000000 --- a/java/base/src/main/java/test/server/dummy/DummyWriter.java +++ /dev/null @@ -1,32 +0,0 @@ -package test.server.dummy; - -import java.io.IOException; - -import base.sender.Sender; -import base.work.Work; - -public class DummyWriter extends Work implements Sender { - - private Sender sender; - - public DummyWriter(Sender sender) { - this.sender = sender; - } - - public void work() { - System.out.println("Client sending messages to server..."); - String [] messages = new String[] {"Time goes fast.", "What now?", "Bye."}; - try { - for (int i = 0; i < messages.length; i++) { - System.out.println(messages[i]); - send(new String(messages[i]).getBytes()); - sleep(200); - } - stop(); - } catch (Exception e) {} - } - - public void send(byte[] buffer) throws IOException { - sender.send(buffer); - } -}