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

diff --git a/src/be/nikiroo/utils/test/SerialTest.java b/src/be/nikiroo/utils/test/SerialTest.java
index 22d1206..26571df 100644
--- a/src/be/nikiroo/utils/test/SerialTest.java
+++ b/src/be/nikiroo/utils/test/SerialTest.java
@@ -1,28 +1,16 @@
 package be.nikiroo.utils.test;
 
-import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.ConnectActionServer;
+import java.net.URL;
+
 import be.nikiroo.utils.serial.Exporter;
 import be.nikiroo.utils.serial.Importer;
-import be.nikiroo.utils.serial.Server;
 
 class SerialTest extends TestLauncher {
-	private void not_used() {
-		// TODO: test Server ; but this will at least help dependency checking
-		try {
-			Server server = new Server(null, 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);
+	/**
+	 * Required for Import/Export of objects.
+	 */
+	public SerialTest() {
+		this(null);
 	}
 
 	public SerialTest(String[] args) {
@@ -42,6 +30,71 @@ class SerialTest extends TestLauncher {
 			}
 		});
 
+		addTest(new TestCase() {
+			private TestCase me = setName("Anonymous inner class");
+
+			@Override
+			public void test() throws Exception {
+				Data data = new Data() {
+				};
+
+				String encoded = new Exporter().append(data).toString(false);
+				Object redata = new Importer().read(encoded).getValue();
+				String reencoded = new Exporter().append(redata)
+						.toString(false);
+
+				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
+			}
+		});
+
+		addTest(new TestCase("URL Import/Export") {
+			@Override
+			public void test() throws Exception {
+				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);
+
+				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
+			}
+		});
+
+		addTest(new TestCase("URL-String Import/Export") {
+			@Override
+			public void test() throws Exception {
+				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);
+
+				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
+				assertEquals(data, redata);
+			}
+		});
+
+		addTest(new TestCase("URL/URL-String arrays Import/Export") {
+			@Override
+			public void test() throws Exception {
+				final String url = "https://fanfan.be/";
+
+				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)
+						.toString(false);
+
+				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
+				assertEquals(data[0], ((Object[]) redata)[0]);
+				assertEquals(data[1], ((Object[]) redata)[1]);
+			}
+		});
+
 		addTest(new TestCase("Import/Export with nested objects") {
 			@Override
 			public void test() throws Exception {
@@ -100,6 +153,20 @@ class SerialTest extends TestLauncher {
 						reencoded.replaceAll("@[0-9]*", "@REF"));
 			}
 		});
+
+		addTest(new TestCase("Enum Import/Export") {
+			@Override
+			public void test() throws Exception {
+				Object data = EnumToSend.FANFAN;
+				String encoded = new Exporter().append(data).toString(false);
+				Object redata = new Importer().read(encoded).getValue();
+				String reencoded = new Exporter().append(redata)
+						.toString(false);
+
+				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
+			}
+		});
 	}
 
 	class DataArray {
@@ -146,4 +213,8 @@ class SerialTest extends TestLauncher {
 			this.value = value;
 		}
 	}
+
+	enum EnumToSend {
+		FANFAN, TULIPE,
+	}
 }