Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'

[fanfix.git] / src / be / nikiroo / utils / test_code / SerialServerTest.java

diff --git a/src/be/nikiroo/utils/test_code/SerialServerTest.java b/src/be/nikiroo/utils/test_code/SerialServerTest.java
index 956499a40f3e43cac07998ffa5f9c20764b7bc70..c10a158c347c1f9e0ed64f096a33352d8a3b4556 100644 (file)
--- 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.Version;
 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,
-                                                       long id) throws Exception {
+                                                       ConnectActionServerString action, Version version,
+                                                       String data, long id) throws Exception {
                                                return null;
                                        }
 
@@ -81,9 +82,10 @@ class SerialServerTest extends TestLauncher {
 
                                try {
                                        try {
-                                               new ConnectActionClientObject(null, port, key) {
+                                               new ConnectActionClientString(null, port, key) {
                                                        @Override
-                                                       public void action() throws Exception {
+                                                       public void action(Version version)
+                                                                       throws Exception {
                                                                rec[0] = "ok";
                                                        }
                                                }.connect();
@@ -111,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";
                                        }
@@ -139,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();
@@ -172,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();
@@ -202,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");
                                                        }
@@ -238,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);
                                        }
@@ -266,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);
                                                                }
@@ -310,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;
                                        }
 
@@ -337,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;
                                                        }
 
@@ -369,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";
                                        }
@@ -397,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();
@@ -430,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();
@@ -460,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");
                                                        }
@@ -496,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" };
                                        }
@@ -524,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(
@@ -567,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;
                                        }
@@ -595,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);
                                                                }