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

diff --git a/src/be/nikiroo/utils/test/SerialTest.java b/src/be/nikiroo/utils/test/SerialTest.java
index 26571df..fdf5992 100644
--- a/src/be/nikiroo/utils/test/SerialTest.java
+++ b/src/be/nikiroo/utils/test/SerialTest.java
@@ -20,10 +20,11 @@ class SerialTest extends TestLauncher {
 			@Override
 			public void test() throws Exception {
 				Data data = new Data(42);
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
@@ -31,17 +32,54 @@ class SerialTest extends TestLauncher {
 		});
 
 		addTest(new TestCase() {
+			@SuppressWarnings("unused")
 			private TestCase me = setName("Anonymous inner class");
 
 			@Override
 			public void test() throws Exception {
 				Data data = new Data() {
+					@SuppressWarnings("unused")
+					int value = 42;
 				};
 
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
+
+				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
+						reencoded.replaceAll("@[0-9]*", "@REF"));
+			}
+		});
+
+		addTest(new TestCase() {
+			@SuppressWarnings("unused")
+			private TestCase me = setName("Array of anonymous inner classes");
+
+			@Override
+			public void test() throws Exception {
+				Data[] data = new Data[] { new Data() {
+					@SuppressWarnings("unused")
+					int value = 42;
+				} };
+
+				String encoded = new Exporter().append(data).toString(false,
+						false);
+				Object redata = new Importer().read(encoded).getValue();
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
+
+				// Comparing the 2 strings won't be useful, because the @REFs
+				// will be ZIP-encoded; so we parse and re-encode the object
+				encoded = new Exporter().append(data[0]).toString(false, false);
+				try {
+					reencoded = new Exporter().append(((Data[]) redata)[0])
+							.toString(false, false);
+				} catch (Exception e) {
+					fail("Cannot cast the returned data into its original object",
+							e);
+				}
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
@@ -52,10 +90,11 @@ class SerialTest extends TestLauncher {
 			@Override
 			public void test() throws Exception {
 				URL data = new URL("https://fanfan.be/");
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
@@ -66,10 +105,11 @@ class SerialTest extends TestLauncher {
 			@Override
 			public void test() throws Exception {
 				String data = new URL("https://fanfan.be/").toString();
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
@@ -83,10 +123,11 @@ class SerialTest extends TestLauncher {
 				final String url = "https://fanfan.be/";
 
 				Object[] data = new Object[] { new URL(url), url };
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
@@ -99,10 +140,11 @@ class SerialTest extends TestLauncher {
 			@Override
 			public void test() throws Exception {
 				Data data = new DataObject(new Data(21));
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
@@ -116,10 +158,11 @@ class SerialTest extends TestLauncher {
 				data.next = new DataLoop("level 2");
 				data.next.next = data;
 
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
@@ -130,10 +173,11 @@ class SerialTest extends TestLauncher {
 			@Override
 			public void test() throws Exception {
 				Object data = new DataArray();// new String[] { "un", "deux" };
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
@@ -144,10 +188,11 @@ class SerialTest extends TestLauncher {
 			@Override
 			public void test() throws Exception {
 				Object data = new String[] { "un", "deux" };
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
@@ -158,22 +203,80 @@ class SerialTest extends TestLauncher {
 			@Override
 			public void test() throws Exception {
 				Object data = EnumToSend.FANFAN;
-				String encoded = new Exporter().append(data).toString(false);
+				String encoded = new Exporter().append(data).toString(false,
+						false);
 				Object redata = new Importer().read(encoded).getValue();
-				String reencoded = new Exporter().append(redata)
-						.toString(false);
+				String reencoded = new Exporter().append(redata).toString(
+						false, false);
 
 				assertEquals(encoded.replaceAll("@[0-9]*", "@REF"),
 						reencoded.replaceAll("@[0-9]*", "@REF"));
 			}
 		});
+
+		addTest(new TestCase("B64 and ZIP String test") {
+			@Override
+			public void test() throws Exception {
+				Object data = "Fanfan la tulipe";
+				String encoded = new Exporter().append(data).toString(true,
+						false);
+				String redata = (String) new Importer().read(encoded)
+						.getValue();
+
+				assertEquals("Items not identical after B64", data, redata);
+
+				encoded = new Exporter().append(data).toString(true, true);
+				redata = (String) new Importer().read(encoded).getValue();
+
+				assertEquals("Items not identical after ZIP", data, redata);
+			}
+		});
+
+		addTest(new TestCase("B64 and ZIP Data test") {
+			@Override
+			public void test() throws Exception {
+				Object data = new Data(55);
+				String encoded = new Exporter().append(data).toString(true,
+						false);
+				Data redata = (Data) new Importer().read(encoded).getValue();
+
+				assertEquals("Items not identical after B64", data, redata);
+
+				encoded = new Exporter().append(data).toString(true, true);
+				redata = (Data) new Importer().read(encoded).getValue();
+
+				assertEquals("Items not identical after ZIP", data, redata);
+			}
+		});
+
+		addTest(new TestCase("B64 and ZIP 70000 chars test") {
+			@Override
+			public void test() throws Exception {
+				StringBuilder builder = new StringBuilder();
+				for (int i = 0; i < 7000; i++) {
+					builder.append("0123456789");
+				}
+
+				Object data = builder.toString();
+				String encoded = new Exporter().append(data).toString(true,
+						false);
+				String redata = (String) new Importer().read(encoded)
+						.getValue();
+
+				assertEquals("Items not identical after B64", data, redata);
+
+				encoded = new Exporter().append(data).toString(true, true);
+				redata = (String) new Importer().read(encoded).getValue();
+
+				assertEquals("Items not identical after ZIP", data, redata);
+			}
+		});
 	}
 
 	class DataArray {
 		public String[] data = new String[] { "un", "deux" };
 	}
 
-	@SuppressWarnings("unused")
 	class Data {
 		private int value;
 
@@ -183,6 +286,21 @@ class SerialTest extends TestLauncher {
 		public Data(int value) {
 			this.value = value;
 		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj instanceof Data) {
+				Data other = (Data) obj;
+				return other.value == this.value;
+			}
+
+			return false;
+		}
+
+		@Override
+		public int hashCode() {
+			return new Integer(value).hashCode();
+		}
 	}
 
 	@SuppressWarnings("unused")