java: add test programs for org.msgpack.util.codegen.*.java

2 files changed, 19 insertions, 15 deletions

diff --git a/java/src/test/java/org/msgpack/util/codegen/TestPackConvert.java b/java/src/test/java/org/msgpack/util/codegen/TestPackConvert.java
index 2e6ea58..d2cf35c 100644
--- a/java/src/test/java/org/msgpack/util/codegen/TestPackConvert.java
+++ b/java/src/test/java/org/msgpack/util/codegen/TestPackConvert.java
@@ -1012,8 +1012,8 @@ public class TestPackConvert extends TestCase {
 		}
 	}
 
-	//@Test
-	public void XtestMessagePackableUnpackableClass00() throws Exception {
+	@Test
+	public void testMessagePackableUnpackableClass00() throws Exception {
 		BaseMessagePackableConvertableClass src = new BaseMessagePackableConvertableClass();
 		MessagePackableConvertableClass src1 = new MessagePackableConvertableClass();
 		List<MessagePackableConvertableClass> src2 = new ArrayList<MessagePackableConvertableClass>();
@@ -1045,8 +1045,8 @@ public class TestPackConvert extends TestCase {
 		assertFalse(it.hasNext());
 	}
 
-	//@Test
-	public void XtestMessagePackableUnpackableClass01() throws Exception {
+	@Test
+	public void testMessagePackableUnpackableClass01() throws Exception {
 		BaseMessagePackableConvertableClass src = new BaseMessagePackableConvertableClass();
 		src.f0 = null;
 		src.f1 = 1;
@@ -1070,8 +1070,8 @@ public class TestPackConvert extends TestCase {
 		assertFalse(it.hasNext());
 	}
 
-	//@Test
-	public void XtestMessagePackableUnpackableClass02() throws Exception {
+	@Test
+	public void testMessagePackableUnpackableClass02() throws Exception {
 		BaseMessagePackableConvertableClass src = null;
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		MessagePacker packer = DynamicPacker
@@ -1113,17 +1113,18 @@ public class TestPackConvert extends TestCase {
 
 		@Override
 		public void messagePack(Packer packer) throws IOException {
+			packer.packArray(2);
 			packer.pack(f0);
 			packer.pack(f1);
 		}
 
 		@Override
-		public void messageConvert(MessagePackObject obj)
+		public void messageConvert(MessagePackObject from)
 				throws MessageTypeException {
-			if (obj.isNil()) {
+			if (from.isNil()) {
 				return;
 			}
-			MessagePackObject[] objs = obj.asArray();
+			MessagePackObject[] objs = from.asArray();
 			f0 = objs[0].asInt();
 			f1 = objs[1].asInt();
 		}
diff --git a/java/src/test/java/org/msgpack/util/codegen/TestPackUnpack.java b/java/src/test/java/org/msgpack/util/codegen/TestPackUnpack.java
index dc56b6c..b7ac7eb 100644
--- a/java/src/test/java/org/msgpack/util/codegen/TestPackUnpack.java
+++ b/java/src/test/java/org/msgpack/util/codegen/TestPackUnpack.java
@@ -890,8 +890,8 @@ public class TestPackUnpack extends TestCase {
 		}
 	}
 
-	//@Test
-	public void XtestMessagePackableUnpackableClass00() throws Exception {
+	@Test
+	public void testMessagePackableUnpackableClass00() throws Exception {
 		BaseMessagePackableUnpackableClass src = new BaseMessagePackableUnpackableClass();
 		MessagePackableUnpackableClass src1 = new MessagePackableUnpackableClass();
 		List<MessagePackableUnpackableClass> src2 = new ArrayList<MessagePackableUnpackableClass>();
@@ -900,6 +900,7 @@ public class TestPackUnpack extends TestCase {
 		src.f0 = src1;
 		src.f1 = 1;
 		src2.add(src1);
+		src.f2 = src2;
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		MessagePacker packer = DynamicPacker
 				.create(BaseMessagePackableUnpackableClass.class);
@@ -917,8 +918,8 @@ public class TestPackUnpack extends TestCase {
 		assertEquals(src.f2.get(0).f1, dst.f2.get(0).f1);
 	}
 
-	//@Test
-	public void XtestMessagePackableUnpackableClass01() throws Exception {
+	@Test
+	public void testMessagePackableUnpackableClass01() throws Exception {
 		BaseMessagePackableUnpackableClass src = new BaseMessagePackableUnpackableClass();
 		src.f0 = null;
 		src.f1 = 1;
@@ -937,8 +938,8 @@ public class TestPackUnpack extends TestCase {
 		assertEquals(src.f2, dst.f2);
 	}
 
-	//@Test
-	public void XtestMessagePackableUnpackableClass02() throws Exception {
+	@Test
+	public void testMessagePackableUnpackableClass02() throws Exception {
 		BaseMessagePackableUnpackableClass src = null;
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		MessagePacker packer = DynamicPacker
@@ -975,6 +976,7 @@ public class TestPackUnpack extends TestCase {
 
 		@Override
 		public void messagePack(Packer packer) throws IOException {
+			packer.packArray(2);
 			packer.pack(f0);
 			packer.pack(f1);
 		}
@@ -985,6 +987,7 @@ public class TestPackUnpack extends TestCase {
 			if (unpacker.tryUnpackNull()) {
 				return;
 			}
+			unpacker.unpackArray();
 			f0 = unpacker.unpackInt();
 			f1 = unpacker.unpackInt();
 		}