X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Ftest_code%2FSerialServerTest.java;h=28eb8bb6fc04f48b4cdcbd92711aa7cb1670f0b1;hb=340e6065e8027c2b3b88549b5761b0b9f6950a53;hp=9c346fd5829b880622dd05307513720f816213b3;hpb=08f80ac5fa60738d3ad74c4b5390a0b79ae313d4;p=fanfix.git diff --git a/src/be/nikiroo/utils/test_code/SerialServerTest.java b/src/be/nikiroo/utils/test_code/SerialServerTest.java index 9c346fd..28eb8bb 100644 --- a/src/be/nikiroo/utils/test_code/SerialServerTest.java +++ b/src/be/nikiroo/utils/test_code/SerialServerTest.java @@ -2,6 +2,7 @@ package be.nikiroo.utils.test_code; import java.net.URL; +import be.nikiroo.utils.TraceHandler; import be.nikiroo.utils.serial.server.ConnectActionClientObject; import be.nikiroo.utils.serial.server.ConnectActionClientString; import be.nikiroo.utils.serial.server.ConnectActionServerObject; @@ -51,8 +52,8 @@ class SerialServerTest extends TestLauncher { ServerString server = new ServerString(this.getName(), 0, key) { @Override protected String onRequest( - ConnectActionServerString action, String data) - throws Exception { + ConnectActionServerString action, String data, + long id) throws Exception { return null; } @@ -81,7 +82,7 @@ class SerialServerTest extends TestLauncher { try { try { - new ConnectActionClientObject(null, port, key) { + new ConnectActionClientString(null, port, key) { @Override public void action() throws Exception { rec[0] = "ok"; @@ -111,8 +112,8 @@ class SerialServerTest extends TestLauncher { ServerString server = new ServerString(this.getName(), 0, key) { @Override protected String onRequest( - ConnectActionServerString action, String data) - throws Exception { + ConnectActionServerString action, String data, + long id) throws Exception { sent[0] = data; return "pong"; } @@ -172,8 +173,8 @@ class SerialServerTest extends TestLauncher { ServerString server = new ServerString(this.getName(), 0, key) { @Override protected String onRequest( - ConnectActionServerString action, String data) - throws Exception { + ConnectActionServerString action, String data, + long id) throws Exception { sent[0] = data; action.send("pong"); sent[1] = action.rec(); @@ -238,8 +239,8 @@ class SerialServerTest extends TestLauncher { ServerString server = new ServerString(this.getName(), 0, key) { @Override protected String onRequest( - ConnectActionServerString action, String data) - throws Exception { + ConnectActionServerString action, String data, + long id) throws Exception { sent[Integer.parseInt(data)] = data; return "" + (Integer.parseInt(data) * 2); } @@ -310,8 +311,8 @@ class SerialServerTest extends TestLauncher { ServerObject server = new ServerObject(this.getName(), 0, key) { @Override protected Object onRequest( - ConnectActionServerObject action, Object data) - throws Exception { + ConnectActionServerObject action, Object data, + long id) throws Exception { return null; } @@ -369,8 +370,8 @@ class SerialServerTest extends TestLauncher { ServerObject server = new ServerObject(this.getName(), 0, key) { @Override protected Object onRequest( - ConnectActionServerObject action, Object data) - throws Exception { + ConnectActionServerObject action, Object data, + long id) throws Exception { sent[0] = data; return "pong"; } @@ -430,8 +431,8 @@ class SerialServerTest extends TestLauncher { ServerObject server = new ServerObject(this.getName(), 0, key) { @Override protected Object onRequest( - ConnectActionServerObject action, Object data) - throws Exception { + ConnectActionServerObject action, Object data, + long id) throws Exception { sent[0] = data; action.send("pong"); sent[1] = action.rec(); @@ -496,8 +497,8 @@ class SerialServerTest extends TestLauncher { ServerObject server = new ServerObject(this.getName(), 0, key) { @Override protected Object onRequest( - ConnectActionServerObject action, Object data) - throws Exception { + ConnectActionServerObject action, Object data, + long id) throws Exception { sent[0] = data; return new Object[] { "ACK" }; } @@ -567,8 +568,8 @@ class SerialServerTest extends TestLauncher { ServerObject server = new ServerObject(this.getName(), 0, key) { @Override protected Object onRequest( - ConnectActionServerObject action, Object data) - throws Exception { + ConnectActionServerObject action, Object data, + long id) throws Exception { sent[(Integer) data] = data; return ((Integer) data) * 2; }