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

diff --git a/src/be/nikiroo/utils/test/SerialTest.java b/src/be/nikiroo/utils/test/SerialTest.java
index b1b5c8b..26571df 100644
--- a/src/be/nikiroo/utils/test/SerialTest.java
+++ b/src/be/nikiroo/utils/test/SerialTest.java
@@ -1,429 +1,88 @@
 package be.nikiroo.utils.test;
 
-import be.nikiroo.utils.Version;
+import java.net.URL;
+
 import be.nikiroo.utils.serial.Exporter;
 import be.nikiroo.utils.serial.Importer;
-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 {
-	private SerialTest() {
-		super("Serial test", null);
+	/**
+	 * Required for Import/Export of objects.
+	 */
+	public SerialTest() {
+		this(null);
 	}
 
-	private TestLauncher createServerStringTestCases(final String[] args,
-			final boolean ssl) {
-		final String ssls = (ssl ? "(ssl)" : "(plain text)");
-		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
-					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("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";
-					}
-
-					@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");
-						}
-					}.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];
+	public SerialTest(String[] args) {
+		super("Serial test", args);
 
+		addTest(new TestCase("Simple class Import/Export") {
 			@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;
-					}
-				};
+				Data data = new Data(42);
+				String encoded = new Exporter().append(data).toString(false);
+				Object redata = new Importer().read(encoded).getValue();
+				String reencoded = new Exporter().append(redata)
+						.toString(false);
 
-				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]);
+				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
 			}
 		});
 
-		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];
+		addTest(new TestCase() {
+			private TestCase me = setName("Anonymous inner class");
 
 			@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);
-					}
-
-					@Override
-					protected void onError(Exception e) {
-						super.onError(e);
-						err[0] = e;
-					}
+				Data data = new Data() {
 				};
 
-				server.start();
-
-				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);
-							}
-						}
-					}.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);
-
-		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;
-					}
-				};
+				String encoded = new Exporter().append(data).toString(false);
+				Object redata = new Importer().read(encoded).getValue();
+				String reencoded = new Exporter().append(redata)
+						.toString(false);
 
-				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(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
 			}
 		});
 
-		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];
-
+		addTest(new TestCase("URL Import/Export") {
 			@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";
-					}
-
-					@Override
-					protected void onError(Exception e) {
-						super.onError(e);
-						err[0] = e;
-					}
-				};
+				URL data = new URL("https://fanfan.be/");
+				String encoded = new Exporter().append(data).toString(false);
+				Object redata = new Importer().read(encoded).getValue();
+				String reencoded = new Exporter().append(redata)
+						.toString(false);
 
-				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]);
+				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
 			}
 		});
 
-		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];
-
+		addTest(new TestCase("URL-String Import/Export") {
 			@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";
-					}
-
-					@Override
-					protected void onError(Exception e) {
-						super.onError(e);
-						err[0] = e;
-					}
-				};
+				String data = new URL("https://fanfan.be/").toString();
+				String encoded = new Exporter().append(data).toString(false);
+				Object redata = new Importer().read(encoded).getValue();
+				String reencoded = new Exporter().append(redata)
+						.toString(false);
 
-				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]);
+				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
+				assertEquals(data, redata);
 			}
 		});
 
-		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];
-
+		addTest(new TestCase("URL/URL-String arrays Import/Export") {
 			@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;
-					}
-
-					@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;
-	}
+				final String url = "https://fanfan.be/";
 
-	public SerialTest(String[] args) {
-		super("Serial test", args);
-
-		addSeries(createServerObjectTestCases(args, false));
-
-		addSeries(createServerObjectTestCases(args, true));
-
-		addSeries(createServerStringTestCases(args, false));
-
-		addSeries(createServerStringTestCases(args, true));
-
-		addTest(new TestCase("Simple class Import/Export") {
-			@Override
-			public void test() throws Exception {
-				Data data = new Data(42);
+				Object[] data = new Object[] { new URL(url), url };
 				String encoded = new Exporter().append(data).toString(false);
 				Object redata = new Importer().read(encoded).getValue();
 				String reencoded = new Exporter().append(redata)
@@ -431,6 +90,8 @@ class SerialTest extends TestLauncher {
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
+				assertEquals(data[0], ((Object[]) redata)[0]);
+				assertEquals(data[1], ((Object[]) redata)[1]);
 			}
 		});