Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'

[nikiroo-utils.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 5f6222133706132e94079986a3070983a4745243..c10a158c347c1f9e0ed64f096a33352d8a3b4556 100644 (file)
--- a/src/be/nikiroo/utils/test_code/SerialServerTest.java
+++ b/src/be/nikiroo/utils/test_code/SerialServerTest.java
@@ -17,8 +17,8 @@ class SerialServerTest extends TestLauncher {
        public SerialServerTest(String[] args) {
                super("SerialServer test", args);
 
-               for (String key : new String[] { null, "",
-                               "some real key with a few bytes in it" }) {
+               for (String key : new String[] { null,
+                               "some super secret encryption key" }) {
                        for (boolean bridge : new Boolean[] { false, true }) {
                                final String skey = (key != null ? "(encrypted)"
                                                : "(plain text)");
@@ -52,9 +52,8 @@ class SerialServerTest extends TestLauncher {
                                ServerString server = new ServerString(this.getName(), 0, key) {
                                        @Override
                                        protected String onRequest(
-                                                       ConnectActionServerString action,
-                                                       Version clientVersion, String data)
-                                                       throws Exception {
+                                                       ConnectActionServerString action, Version version,
+                                                       String data, long id) throws Exception {
                                                return null;
                                        }
 
@@ -83,9 +82,9 @@ class SerialServerTest extends TestLauncher {
 
                                try {
                                        try {
-                                               new ConnectActionClientObject(null, port, key) {
+                                               new ConnectActionClientString(null, port, key) {
                                                        @Override
-                                                       public void action(Version serverVersion)
+                                                       public void action(Version version)
                                                                        throws Exception {
                                                                rec[0] = "ok";
                                                        }
@@ -114,9 +113,8 @@ class SerialServerTest extends TestLauncher {
                                ServerString server = new ServerString(this.getName(), 0, key) {
                                        @Override
                                        protected String onRequest(
-                                                       ConnectActionServerString action,
-                                                       Version clientVersion, String data)
-                                                       throws Exception {
+                                                       ConnectActionServerString action, Version version,
+                                                       String data, long id) throws Exception {
                                                sent[0] = data;
                                                return "pong";
                                        }
@@ -143,7 +141,7 @@ class SerialServerTest extends TestLauncher {
                                        try {
                                                new ConnectActionClientString(null, port, key) {
                                                        @Override
-                                                       public void action(Version serverVersion)
+                                                       public void action(Version version)
                                                                        throws Exception {
                                                                recd[0] = send("ping");
                                                        }
@@ -158,7 +156,8 @@ class SerialServerTest extends TestLauncher {
                                }
 
                                if (err[0] != null) {
-                                       fail("An exception was thrown: " + err[0].getMessage());
+                                       fail("An exception was thrown: " + err[0].getMessage(),
+                                                       err[0]);
                                }
 
                                assertEquals("ping", sent[0]);
@@ -176,9 +175,8 @@ class SerialServerTest extends TestLauncher {
                                ServerString server = new ServerString(this.getName(), 0, key) {
                                        @Override
                                        protected String onRequest(
-                                                       ConnectActionServerString action,
-                                                       Version clientVersion, String data)
-                                                       throws Exception {
+                                                       ConnectActionServerString action, Version version,
+                                                       String data, long id) throws Exception {
                                                sent[0] = data;
                                                action.send("pong");
                                                sent[1] = action.rec();
@@ -207,7 +205,7 @@ class SerialServerTest extends TestLauncher {
                                        try {
                                                new ConnectActionClientString(null, port, key) {
                                                        @Override
-                                                       public void action(Version serverVersion)
+                                                       public void action(Version version)
                                                                        throws Exception {
                                                                recd[0] = send("ping");
                                                                recd[1] = send("ping2");
@@ -223,7 +221,8 @@ class SerialServerTest extends TestLauncher {
                                }
 
                                if (err[0] != null) {
-                                       fail("An exception was thrown: " + err[0].getMessage());
+                                       fail("An exception was thrown: " + err[0].getMessage(),
+                                                       err[0]);
                                }
 
                                assertEquals("ping", sent[0]);
@@ -243,9 +242,8 @@ class SerialServerTest extends TestLauncher {
                                ServerString server = new ServerString(this.getName(), 0, key) {
                                        @Override
                                        protected String onRequest(
-                                                       ConnectActionServerString action,
-                                                       Version clientVersion, String data)
-                                                       throws Exception {
+                                                       ConnectActionServerString action, Version version,
+                                                       String data, long id) throws Exception {
                                                sent[Integer.parseInt(data)] = data;
                                                return "" + (Integer.parseInt(data) * 2);
                                        }
@@ -272,7 +270,7 @@ class SerialServerTest extends TestLauncher {
                                        try {
                                                new ConnectActionClientString(null, port, key) {
                                                        @Override
-                                                       public void action(Version serverVersion)
+                                                       public void action(Version version)
                                                                        throws Exception {
                                                                for (int i = 0; i < 3; i++) {
                                                                        recd[i] = send("" + i);
@@ -289,7 +287,8 @@ class SerialServerTest extends TestLauncher {
                                }
 
                                if (err[0] != null) {
-                                       fail("An exception was thrown: " + err[0].getMessage());
+                                       fail("An exception was thrown: " + err[0].getMessage(),
+                                                       err[0]);
                                }
 
                                assertEquals("0", sent[0]);
@@ -316,9 +315,8 @@ class SerialServerTest extends TestLauncher {
                                ServerObject server = new ServerObject(this.getName(), 0, key) {
                                        @Override
                                        protected Object onRequest(
-                                                       ConnectActionServerObject action,
-                                                       Version clientVersion, Object data)
-                                                       throws Exception {
+                                                       ConnectActionServerObject action, Version version,
+                                                       Object data, long id) throws Exception {
                                                return null;
                                        }
 
@@ -344,7 +342,7 @@ class SerialServerTest extends TestLauncher {
                                        try {
                                                new ConnectActionClientObject(null, port, key) {
                                                        @Override
-                                                       public void action(Version serverVersion)
+                                                       public void action(Version version)
                                                                        throws Exception {
                                                                rec[0] = true;
                                                        }
@@ -377,9 +375,8 @@ class SerialServerTest extends TestLauncher {
                                ServerObject server = new ServerObject(this.getName(), 0, key) {
                                        @Override
                                        protected Object onRequest(
-                                                       ConnectActionServerObject action,
-                                                       Version clientVersion, Object data)
-                                                       throws Exception {
+                                                       ConnectActionServerObject action, Version version,
+                                                       Object data, long id) throws Exception {
                                                sent[0] = data;
                                                return "pong";
                                        }
@@ -406,7 +403,7 @@ class SerialServerTest extends TestLauncher {
                                        try {
                                                new ConnectActionClientObject(null, port, key) {
                                                        @Override
-                                                       public void action(Version serverVersion)
+                                                       public void action(Version version)
                                                                        throws Exception {
                                                                recd[0] = send("ping");
                                                        }
@@ -421,7 +418,8 @@ class SerialServerTest extends TestLauncher {
                                }
 
                                if (err[0] != null) {
-                                       fail("An exception was thrown: " + err[0].getMessage());
+                                       fail("An exception was thrown: " + err[0].getMessage(),
+                                                       err[0]);
                                }
 
                                assertEquals("ping", sent[0]);
@@ -439,9 +437,8 @@ class SerialServerTest extends TestLauncher {
                                ServerObject server = new ServerObject(this.getName(), 0, key) {
                                        @Override
                                        protected Object onRequest(
-                                                       ConnectActionServerObject action,
-                                                       Version clientVersion, Object data)
-                                                       throws Exception {
+                                                       ConnectActionServerObject action, Version version,
+                                                       Object data, long id) throws Exception {
                                                sent[0] = data;
                                                action.send("pong");
                                                sent[1] = action.rec();
@@ -470,7 +467,7 @@ class SerialServerTest extends TestLauncher {
                                        try {
                                                new ConnectActionClientObject(null, port, key) {
                                                        @Override
-                                                       public void action(Version serverVersion)
+                                                       public void action(Version version)
                                                                        throws Exception {
                                                                recd[0] = send("ping");
                                                                recd[1] = send("ping2");
@@ -486,7 +483,8 @@ class SerialServerTest extends TestLauncher {
                                }
 
                                if (err[0] != null) {
-                                       fail("An exception was thrown: " + err[0].getMessage());
+                                       fail("An exception was thrown: " + err[0].getMessage(),
+                                                       err[0]);
                                }
 
                                assertEquals("ping", sent[0]);
@@ -506,9 +504,8 @@ class SerialServerTest extends TestLauncher {
                                ServerObject server = new ServerObject(this.getName(), 0, key) {
                                        @Override
                                        protected Object onRequest(
-                                                       ConnectActionServerObject action,
-                                                       Version clientVersion, Object data)
-                                                       throws Exception {
+                                                       ConnectActionServerObject action, Version version,
+                                                       Object data, long id) throws Exception {
                                                sent[0] = data;
                                                return new Object[] { "ACK" };
                                        }
@@ -535,7 +532,7 @@ class SerialServerTest extends TestLauncher {
                                        try {
                                                new ConnectActionClientObject(null, port, key) {
                                                        @Override
-                                                       public void action(Version serverVersion)
+                                                       public void action(Version version)
                                                                        throws Exception {
                                                                recd[0] = send(new Object[] {
                                                                                "key",
@@ -554,7 +551,8 @@ class SerialServerTest extends TestLauncher {
                                }
 
                                if (err[0] != null) {
-                                       fail("An exception was thrown: " + err[0].getMessage());
+                                       fail("An exception was thrown: " + err[0].getMessage(),
+                                                       err[0]);
                                }
 
                                Object[] sento = (Object[]) (sent[0]);
@@ -578,9 +576,8 @@ class SerialServerTest extends TestLauncher {
                                ServerObject server = new ServerObject(this.getName(), 0, key) {
                                        @Override
                                        protected Object onRequest(
-                                                       ConnectActionServerObject action,
-                                                       Version clientVersion, Object data)
-                                                       throws Exception {
+                                                       ConnectActionServerObject action, Version version,
+                                                       Object data, long id) throws Exception {
                                                sent[(Integer) data] = data;
                                                return ((Integer) data) * 2;
                                        }
@@ -607,7 +604,7 @@ class SerialServerTest extends TestLauncher {
                                        try {
                                                new ConnectActionClientObject(null, port, key) {
                                                        @Override
-                                                       public void action(Version serverVersion)
+                                                       public void action(Version version)
                                                                        throws Exception {
                                                                for (int i = 0; i < 3; i++) {
                                                                        recd[i] = send(i);
@@ -624,7 +621,8 @@ class SerialServerTest extends TestLauncher {
                                }
 
                                if (err[0] != null) {
-                                       fail("An exception was thrown: " + err[0].getMessage());
+                                       fail("An exception was thrown: " + err[0].getMessage(),
+                                                       err[0]);
                                }
 
                                assertEquals(0, sent[0]);