X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Ftest_code%2FSerialServerTest.java;h=c10a158c347c1f9e0ed64f096a33352d8a3b4556;hb=5584adbbbf5444c0039fed2b35dc7d5bb57b71b1;hp=28eb8bb6fc04f48b4cdcbd92711aa7cb1670f0b1;hpb=340e6065e8027c2b3b88549b5761b0b9f6950a53;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/test_code/SerialServerTest.java b/src/be/nikiroo/utils/test_code/SerialServerTest.java
index 28eb8bb..c10a158 100644
--- a/src/be/nikiroo/utils/test_code/SerialServerTest.java
+++ b/src/be/nikiroo/utils/test_code/SerialServerTest.java
@@ -2,7 +2,7 @@ package be.nikiroo.utils.test_code;
 
 import java.net.URL;
 
-import be.nikiroo.utils.TraceHandler;
+import be.nikiroo.utils.Version;
 import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 import be.nikiroo.utils.serial.server.ConnectActionClientString;
 import be.nikiroo.utils.serial.server.ConnectActionServerObject;
@@ -52,8 +52,8 @@ class SerialServerTest extends TestLauncher {
 				ServerString server = new ServerString(this.getName(), 0, key) {
 					@Override
 					protected String onRequest(
-							ConnectActionServerString action, String data,
-							long id) throws Exception {
+							ConnectActionServerString action, Version version,
+							String data, long id) throws Exception {
 						return null;
 					}
 
@@ -84,7 +84,8 @@ class SerialServerTest extends TestLauncher {
 					try {
 						new ConnectActionClientString(null, port, key) {
 							@Override
-							public void action() throws Exception {
+							public void action(Version version)
+									throws Exception {
 								rec[0] = "ok";
 							}
 						}.connect();
@@ -112,8 +113,8 @@ class SerialServerTest extends TestLauncher {
 				ServerString server = new ServerString(this.getName(), 0, key) {
 					@Override
 					protected String onRequest(
-							ConnectActionServerString action, String data,
-							long id) throws Exception {
+							ConnectActionServerString action, Version version,
+							String data, long id) throws Exception {
 						sent[0] = data;
 						return "pong";
 					}
@@ -140,7 +141,8 @@ class SerialServerTest extends TestLauncher {
 					try {
 						new ConnectActionClientString(null, port, key) {
 							@Override
-							public void action() throws Exception {
+							public void action(Version version)
+									throws Exception {
 								recd[0] = send("ping");
 							}
 						}.connect();
@@ -173,8 +175,8 @@ class SerialServerTest extends TestLauncher {
 				ServerString server = new ServerString(this.getName(), 0, key) {
 					@Override
 					protected String onRequest(
-							ConnectActionServerString action, String data,
-							long id) throws Exception {
+							ConnectActionServerString action, Version version,
+							String data, long id) throws Exception {
 						sent[0] = data;
 						action.send("pong");
 						sent[1] = action.rec();
@@ -203,7 +205,8 @@ class SerialServerTest extends TestLauncher {
 					try {
 						new ConnectActionClientString(null, port, key) {
 							@Override
-							public void action() throws Exception {
+							public void action(Version version)
+									throws Exception {
 								recd[0] = send("ping");
 								recd[1] = send("ping2");
 							}
@@ -239,8 +242,8 @@ class SerialServerTest extends TestLauncher {
 				ServerString server = new ServerString(this.getName(), 0, key) {
 					@Override
 					protected String onRequest(
-							ConnectActionServerString action, String data,
-							long id) throws Exception {
+							ConnectActionServerString action, Version version,
+							String data, long id) throws Exception {
 						sent[Integer.parseInt(data)] = data;
 						return "" + (Integer.parseInt(data) * 2);
 					}
@@ -267,7 +270,8 @@ class SerialServerTest extends TestLauncher {
 					try {
 						new ConnectActionClientString(null, port, key) {
 							@Override
-							public void action() throws Exception {
+							public void action(Version version)
+									throws Exception {
 								for (int i = 0; i < 3; i++) {
 									recd[i] = send("" + i);
 								}
@@ -311,8 +315,8 @@ class SerialServerTest extends TestLauncher {
 				ServerObject server = new ServerObject(this.getName(), 0, key) {
 					@Override
 					protected Object onRequest(
-							ConnectActionServerObject action, Object data,
-							long id) throws Exception {
+							ConnectActionServerObject action, Version version,
+							Object data, long id) throws Exception {
 						return null;
 					}
 
@@ -338,7 +342,8 @@ class SerialServerTest extends TestLauncher {
 					try {
 						new ConnectActionClientObject(null, port, key) {
 							@Override
-							public void action() throws Exception {
+							public void action(Version version)
+									throws Exception {
 								rec[0] = true;
 							}
 
@@ -370,8 +375,8 @@ class SerialServerTest extends TestLauncher {
 				ServerObject server = new ServerObject(this.getName(), 0, key) {
 					@Override
 					protected Object onRequest(
-							ConnectActionServerObject action, Object data,
-							long id) throws Exception {
+							ConnectActionServerObject action, Version version,
+							Object data, long id) throws Exception {
 						sent[0] = data;
 						return "pong";
 					}
@@ -398,7 +403,8 @@ class SerialServerTest extends TestLauncher {
 					try {
 						new ConnectActionClientObject(null, port, key) {
 							@Override
-							public void action() throws Exception {
+							public void action(Version version)
+									throws Exception {
 								recd[0] = send("ping");
 							}
 						}.connect();
@@ -431,8 +437,8 @@ class SerialServerTest extends TestLauncher {
 				ServerObject server = new ServerObject(this.getName(), 0, key) {
 					@Override
 					protected Object onRequest(
-							ConnectActionServerObject action, Object data,
-							long id) throws Exception {
+							ConnectActionServerObject action, Version version,
+							Object data, long id) throws Exception {
 						sent[0] = data;
 						action.send("pong");
 						sent[1] = action.rec();
@@ -461,7 +467,8 @@ class SerialServerTest extends TestLauncher {
 					try {
 						new ConnectActionClientObject(null, port, key) {
 							@Override
-							public void action() throws Exception {
+							public void action(Version version)
+									throws Exception {
 								recd[0] = send("ping");
 								recd[1] = send("ping2");
 							}
@@ -497,8 +504,8 @@ class SerialServerTest extends TestLauncher {
 				ServerObject server = new ServerObject(this.getName(), 0, key) {
 					@Override
 					protected Object onRequest(
-							ConnectActionServerObject action, Object data,
-							long id) throws Exception {
+							ConnectActionServerObject action, Version version,
+							Object data, long id) throws Exception {
 						sent[0] = data;
 						return new Object[] { "ACK" };
 					}
@@ -525,7 +532,8 @@ class SerialServerTest extends TestLauncher {
 					try {
 						new ConnectActionClientObject(null, port, key) {
 							@Override
-							public void action() throws Exception {
+							public void action(Version version)
+									throws Exception {
 								recd[0] = send(new Object[] {
 										"key",
 										new URL(
@@ -568,8 +576,8 @@ class SerialServerTest extends TestLauncher {
 				ServerObject server = new ServerObject(this.getName(), 0, key) {
 					@Override
 					protected Object onRequest(
-							ConnectActionServerObject action, Object data,
-							long id) throws Exception {
+							ConnectActionServerObject action, Version version,
+							Object data, long id) throws Exception {
 						sent[(Integer) data] = data;
 						return ((Integer) data) * 2;
 					}
@@ -596,7 +604,8 @@ class SerialServerTest extends TestLauncher {
 					try {
 						new ConnectActionClientObject(null, port, key) {
 							@Override
-							public void action() throws Exception {
+							public void action(Version version)
+									throws Exception {
 								for (int i = 0; i < 3; i++) {
 									recd[i] = send(i);
 								}