X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Ftest%2FSerialTest.java;h=b1b5c8b53bc3a823f5cfd142c5d628a76122d314;hb=79ce1a4973eba079ba819ba841d906de42f38e40;hp=4233a7bde2bd336f875ce1a29cc464e8d487acde;hpb=08a58812f12617289463b00161c98d7c59490bf2;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/test/SerialTest.java b/src/be/nikiroo/utils/test/SerialTest.java
index 4233a7b..b1b5c8b 100644
--- a/src/be/nikiroo/utils/test/SerialTest.java
+++ b/src/be/nikiroo/utils/test/SerialTest.java
@@ -1,237 +1,424 @@
 package be.nikiroo.utils.test;
 
 import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.ConnectActionClient;
-import be.nikiroo.utils.serial.ConnectActionServer;
 import be.nikiroo.utils.serial.Exporter;
 import be.nikiroo.utils.serial.Importer;
-import be.nikiroo.utils.serial.Server;
+import be.nikiroo.utils.serial.server.ConnectActionClientObject;
+import be.nikiroo.utils.serial.server.ConnectActionClientString;
+import be.nikiroo.utils.serial.server.ConnectActionServerObject;
+import be.nikiroo.utils.serial.server.ConnectActionServerString;
+import be.nikiroo.utils.serial.server.ServerObject;
+import be.nikiroo.utils.serial.server.ServerString;
 
 class SerialTest extends TestLauncher {
-	@SuppressWarnings("unused")
-	private void not_used() {
-		// TODO: test Server ; but this will at least help dependency checking
-		try {
-			Server server = new Server(0, false) {
-				@Override
-				protected Object onRequest(ConnectActionServer action,
-						Version clientVersion, Object data) throws Exception {
-					return null;
-				}
-			};
-		} catch (Exception e) {
-		}
-	}
-
 	private SerialTest() {
 		super("Serial test", null);
 	}
 
-	private TestCase[] createServerTestCases(final boolean ssl) {
+	private TestLauncher createServerStringTestCases(final String[] args,
+			final boolean ssl) {
 		final String ssls = (ssl ? "(ssl)" : "(plain text)");
-		return new TestCase[] {
-				new TestCase("Client/Server simple connection " + ssls) {
+		TestLauncher series = new TestLauncher("Client/Server " + ssls, args);
+
+		series.addTest(new TestCase("Simple connection " + ssls) {
+			@Override
+			public void test() throws Exception {
+				final String[] rec = new String[1];
+
+				ServerString server = new ServerString(this.getName(), 0, ssl) {
 					@Override
-					public void test() throws Exception {
-						final Object[] rec = new Object[1];
-
-						Server server = new Server("testy", 0, ssl) {
-							@Override
-							protected Object onRequest(
-									ConnectActionServer action,
-									Version clientVersion, Object data)
-									throws Exception {
-								return null;
-							}
-						};
-
-						assertEquals("A port should have been assigned", true,
-								server.getPort() > 0);
-
-						server.start();
-
-						try {
-							new ConnectActionClient(null, server.getPort(), ssl) {
-								@Override
-								public void action(Version serverVersion)
-										throws Exception {
-									rec[0] = true;
-								}
-							}.connect();
-						} finally {
-							server.stop();
+					protected String onRequest(
+							ConnectActionServerString action,
+							Version clientVersion, String data)
+							throws Exception {
+						return null;
+					}
+				};
+
+				assertEquals("A port should have been assigned", true,
+						server.getPort() > 0);
+
+				server.start();
+
+				try {
+					new ConnectActionClientObject(null, server.getPort(), ssl) {
+						@Override
+						public void action(Version serverVersion)
+								throws Exception {
+							rec[0] = "ok";
 						}
+					}.connect();
+				} finally {
+					server.stop();
+				}
 
-						assertNotNull("The client action was not run", rec[0]);
-						assertEquals(true, (boolean) ((Boolean) rec[0]));
+				assertNotNull("The client action was not run", rec[0]);
+				assertEquals("ok", rec[0]);
+			}
+		});
+
+		series.addTest(new TestCase("Simple exchange " + ssls) {
+			final String[] sent = new String[1];
+			final String[] recd = new String[1];
+			final Exception[] err = new Exception[1];
+
+			@Override
+			public void test() throws Exception {
+				ServerString server = new ServerString(this.getName(), 0, ssl) {
+					@Override
+					protected String onRequest(
+							ConnectActionServerString action,
+							Version clientVersion, String data)
+							throws Exception {
+						sent[0] = data;
+						return "pong";
 					}
-				}, //
-				new TestCase("Client/Server simple exchange " + ssls) {
-					final Object[] rec = new Object[3];
 
 					@Override
-					public void test() throws Exception {
-						Server server = new Server("testy", 0, ssl) {
-							@Override
-							protected Object onRequest(
-									ConnectActionServer action,
-									Version clientVersion, Object data)
-									throws Exception {
-								rec[0] = data;
-								return "pong";
-							}
+					protected void onError(Exception e) {
+						super.onError(e);
+						err[0] = e;
+					}
+				};
 
-							@Override
-							protected void onError(Exception e) {
-								super.onError(e);
-								rec[2] = e;
-							}
-						};
-
-						assertEquals("A port should have been assigned", true,
-								server.getPort() > 0);
-
-						server.start();
-
-						try {
-							new ConnectActionClient(null, server.getPort(), ssl) {
-								@Override
-								public void action(Version serverVersion)
-										throws Exception {
-									rec[1] = send("ping");
-								}
-							}.connect();
-						} finally {
-							server.stop();
+				server.start();
+
+				try {
+					new ConnectActionClientString(null, server.getPort(), ssl) {
+						@Override
+						public void action(Version serverVersion)
+								throws Exception {
+							recd[0] = send("ping");
 						}
+					}.connect();
+				} finally {
+					server.stop();
+				}
+
+				if (err[0] != null) {
+					fail("An exception was thrown: " + err[0].getMessage());
+				}
+
+				assertEquals("ping", sent[0]);
+				assertEquals("pong", recd[0]);
+			}
+		});
+
+		series.addTest(new TestCase("Multiple exchanges " + ssls) {
+			final String[] sent = new String[3];
+			final String[] recd = new String[3];
+			final Exception[] err = new Exception[1];
 
-						if (rec[2] != null) {
-							fail("An exception was thrown: "
-									+ ((Exception) rec[2]).getMessage());
+			@Override
+			public void test() throws Exception {
+				ServerString server = new ServerString(this.getName(), 0, ssl) {
+					@Override
+					protected String onRequest(
+							ConnectActionServerString action,
+							Version clientVersion, String data)
+							throws Exception {
+						sent[0] = data;
+						action.send("pong");
+						sent[1] = action.rec();
+						return "pong2";
+					}
+
+					@Override
+					protected void onError(Exception e) {
+						super.onError(e);
+						err[0] = e;
+					}
+				};
+
+				server.start();
+
+				try {
+					new ConnectActionClientString(null, server.getPort(), ssl) {
+						@Override
+						public void action(Version serverVersion)
+								throws Exception {
+							recd[0] = send("ping");
+							recd[1] = send("ping2");
 						}
+					}.connect();
+				} finally {
+					server.stop();
+				}
+
+				if (err[0] != null) {
+					fail("An exception was thrown: " + err[0].getMessage());
+				}
+
+				assertEquals("ping", sent[0]);
+				assertEquals("pong", recd[0]);
+				assertEquals("ping2", sent[1]);
+				assertEquals("pong2", recd[1]);
+			}
+		});
+
+		series.addTest(new TestCase("Multiple call from client " + ssls) {
+			final String[] sent = new String[3];
+			final String[] recd = new String[3];
+			final Exception[] err = new Exception[1];
 
-						assertEquals("ping", rec[0]);
-						assertEquals("pong", rec[1]);
+			@Override
+			public void test() throws Exception {
+				ServerString server = new ServerString(this.getName(), 0, ssl) {
+					@Override
+					protected String onRequest(
+							ConnectActionServerString action,
+							Version clientVersion, String data)
+							throws Exception {
+						sent[Integer.parseInt(data)] = data;
+						return "" + (Integer.parseInt(data) * 2);
 					}
-				}, //
-				new TestCase("Client/Server multiple exchanges " + ssls) {
-					final Object[] sent = new Object[3];
-					final Object[] recd = new Object[3];
-					final Exception[] err = new Exception[1];
 
 					@Override
-					public void test() throws Exception {
-						Server server = new Server("testy", 0, ssl) {
-							@Override
-							protected Object onRequest(
-									ConnectActionServer action,
-									Version clientVersion, Object data)
-									throws Exception {
-								sent[0] = data;
-								action.send("pong");
-								sent[1] = action.flush();
-								return "pong2";
-							}
+					protected void onError(Exception e) {
+						super.onError(e);
+						err[0] = e;
+					}
+				};
+
+				server.start();
 
-							@Override
-							protected void onError(Exception e) {
-								super.onError(e);
-								err[0] = e;
+				try {
+					new ConnectActionClientString(null, server.getPort(), ssl) {
+						@Override
+						public void action(Version serverVersion)
+								throws Exception {
+							for (int i = 0; i < 3; i++) {
+								recd[i] = send("" + i);
 							}
-						};
-
-						server.start();
-
-						try {
-							new ConnectActionClient(null, server.getPort(), ssl) {
-								@Override
-								public void action(Version serverVersion)
-										throws Exception {
-									recd[0] = send("ping");
-									recd[1] = send("ping2");
-								}
-							}.connect();
-						} finally {
-							server.stop();
 						}
+					}.connect();
+				} finally {
+					server.stop();
+				}
+
+				if (err[0] != null) {
+					fail("An exception was thrown: " + err[0].getMessage());
+				}
+
+				assertEquals("0", sent[0]);
+				assertEquals("0", recd[0]);
+				assertEquals("1", sent[1]);
+				assertEquals("2", recd[1]);
+				assertEquals("2", sent[2]);
+				assertEquals("4", recd[2]);
+			}
+		});
+
+		return series;
+	}
+
+	private TestLauncher createServerObjectTestCases(final String[] args,
+			final boolean ssl) {
+		final String ssls = (ssl ? "(ssl)" : "(plain text)");
+		TestLauncher series = new TestLauncher("Client/Server " + ssls, args);
 
-						if (err[0] != null) {
-							fail("An exception was thrown: "
-									+ err[0].getMessage());
+		series.addTest(new TestCase("Simple connection " + ssls) {
+			@Override
+			public void test() throws Exception {
+				final Object[] rec = new Object[1];
+
+				ServerObject server = new ServerObject(this.getName(), 0, ssl) {
+					@Override
+					protected Object onRequest(
+							ConnectActionServerObject action,
+							Version clientVersion, Object data)
+							throws Exception {
+						return null;
+					}
+				};
+
+				assertEquals("A port should have been assigned", true,
+						server.getPort() > 0);
+
+				server.start();
+
+				try {
+					new ConnectActionClientObject(null, server.getPort(), ssl) {
+						@Override
+						public void action(Version serverVersion)
+								throws Exception {
+							rec[0] = true;
 						}
+					}.connect();
+				} finally {
+					server.stop();
+				}
+
+				assertNotNull("The client action was not run", rec[0]);
+				assertEquals(true, (boolean) ((Boolean) rec[0]));
+			}
+		});
 
-						assertEquals("ping", sent[0]);
-						assertEquals("pong", recd[0]);
-						assertEquals("ping2", sent[1]);
-						assertEquals("pong2", recd[1]);
+		series.addTest(new TestCase("Simple exchange " + ssls) {
+			final Object[] sent = new Object[1];
+			final Object[] recd = new Object[1];
+			final Exception[] err = new Exception[1];
+
+			@Override
+			public void test() throws Exception {
+				ServerObject server = new ServerObject(this.getName(), 0, ssl) {
+					@Override
+					protected Object onRequest(
+							ConnectActionServerObject action,
+							Version clientVersion, Object data)
+							throws Exception {
+						sent[0] = data;
+						return "pong";
 					}
-				}, //
-				new TestCase("Client/Server multiple call from client " + ssls) {
-					final Object[] sent = new Object[3];
-					final Object[] recd = new Object[3];
-					final Exception[] err = new Exception[1];
 
 					@Override
-					public void test() throws Exception {
-						Server server = new Server("testy", 0, ssl) {
-							@Override
-							protected Object onRequest(
-									ConnectActionServer action,
-									Version clientVersion, Object data)
-									throws Exception {
-								sent[(Integer) data] = data;
-								return ((Integer) data) * 2;
-							}
+					protected void onError(Exception e) {
+						super.onError(e);
+						err[0] = e;
+					}
+				};
 
-							@Override
-							protected void onError(Exception e) {
-								super.onError(e);
-								err[0] = e;
-							}
-						};
-
-						server.start();
-
-						try {
-							new ConnectActionClient(null, server.getPort(), ssl) {
-								@Override
-								public void action(Version serverVersion)
-										throws Exception {
-									for (int i = 0; i < 3; i++) {
-										recd[i] = send(i);
-									}
-								}
-							}.connect();
-						} finally {
-							server.stop();
+				server.start();
+
+				try {
+					new ConnectActionClientObject(null, server.getPort(), ssl) {
+						@Override
+						public void action(Version serverVersion)
+								throws Exception {
+							recd[0] = send("ping");
 						}
+					}.connect();
+				} finally {
+					server.stop();
+				}
+
+				if (err[0] != null) {
+					fail("An exception was thrown: " + err[0].getMessage());
+				}
+
+				assertEquals("ping", sent[0]);
+				assertEquals("pong", recd[0]);
+			}
+		});
+
+		series.addTest(new TestCase("Multiple exchanges " + ssls) {
+			final Object[] sent = new Object[3];
+			final Object[] recd = new Object[3];
+			final Exception[] err = new Exception[1];
+
+			@Override
+			public void test() throws Exception {
+				ServerObject server = new ServerObject(this.getName(), 0, ssl) {
+					@Override
+					protected Object onRequest(
+							ConnectActionServerObject action,
+							Version clientVersion, Object data)
+							throws Exception {
+						sent[0] = data;
+						action.send("pong");
+						sent[1] = action.rec();
+						return "pong2";
+					}
 
-						if (err[0] != null) {
-							fail("An exception was thrown: "
-									+ err[0].getMessage());
+					@Override
+					protected void onError(Exception e) {
+						super.onError(e);
+						err[0] = e;
+					}
+				};
+
+				server.start();
+
+				try {
+					new ConnectActionClientObject(null, server.getPort(), ssl) {
+						@Override
+						public void action(Version serverVersion)
+								throws Exception {
+							recd[0] = send("ping");
+							recd[1] = send("ping2");
 						}
+					}.connect();
+				} finally {
+					server.stop();
+				}
+
+				if (err[0] != null) {
+					fail("An exception was thrown: " + err[0].getMessage());
+				}
+
+				assertEquals("ping", sent[0]);
+				assertEquals("pong", recd[0]);
+				assertEquals("ping2", sent[1]);
+				assertEquals("pong2", recd[1]);
+			}
+		});
+
+		series.addTest(new TestCase("Multiple call from client " + ssls) {
+			final Object[] sent = new Object[3];
+			final Object[] recd = new Object[3];
+			final Exception[] err = new Exception[1];
+
+			@Override
+			public void test() throws Exception {
+				ServerObject server = new ServerObject(this.getName(), 0, ssl) {
+					@Override
+					protected Object onRequest(
+							ConnectActionServerObject action,
+							Version clientVersion, Object data)
+							throws Exception {
+						sent[(Integer) data] = data;
+						return ((Integer) data) * 2;
+					}
 
-						assertEquals(0, sent[0]);
-						assertEquals(0, recd[0]);
-						assertEquals(1, sent[1]);
-						assertEquals(2, recd[1]);
-						assertEquals(2, sent[2]);
-						assertEquals(4, recd[2]);
+					@Override
+					protected void onError(Exception e) {
+						super.onError(e);
+						err[0] = e;
 					}
-				}, //
-		};
+				};
+
+				server.start();
+
+				try {
+					new ConnectActionClientObject(null, server.getPort(), ssl) {
+						@Override
+						public void action(Version serverVersion)
+								throws Exception {
+							for (int i = 0; i < 3; i++) {
+								recd[i] = send(i);
+							}
+						}
+					}.connect();
+				} finally {
+					server.stop();
+				}
+
+				if (err[0] != null) {
+					fail("An exception was thrown: " + err[0].getMessage());
+				}
+
+				assertEquals(0, sent[0]);
+				assertEquals(0, recd[0]);
+				assertEquals(1, sent[1]);
+				assertEquals(2, recd[1]);
+				assertEquals(2, sent[2]);
+				assertEquals(4, recd[2]);
+			}
+		});
+
+		return series;
 	}
 
 	public SerialTest(String[] args) {
 		super("Serial test", args);
 
-		for (TestCase test : createServerTestCases(false)) {
-			addTest(test);
-		}
+		addSeries(createServerObjectTestCases(args, false));
 
-		for (TestCase test : createServerTestCases(true)) {
-			addTest(test);
-		}
+		addSeries(createServerObjectTestCases(args, true));
+
+		addSeries(createServerStringTestCases(args, false));
+
+		addSeries(createServerStringTestCases(args, true));
 
 		addTest(new TestCase("Simple class Import/Export") {
 			@Override