java: improves test case of the MessagePack class

1 files changed, 90 insertions, 89 deletions

diff --git a/java/src/test/java/org/msgpack/TestMessagePackStaticMethods.java b/java/src/test/java/org/msgpack/TestMessagePackStaticMethods.java
index 5d97953..e7b8d84 100644
--- a/java/src/test/java/org/msgpack/TestMessagePackStaticMethods.java
+++ b/java/src/test/java/org/msgpack/TestMessagePackStaticMethods.java
@@ -57,74 +57,11 @@ public class TestMessagePackStaticMethods extends TestCase {
 	}
 
 	static {
-		// provided classes needs registration
+		// provided classes need registration
 		MessagePack.register(ProvidedClass.class);
-		// annotated classes doesn't need registration
+		// annotated classes don't need registration
 	}
 
-	@Test
-	public void testPackToByteArray() throws Exception {
-		byte[] a = MessagePack.pack("msgpack");
-		byte[] b = MessagePack.pack((Object)1);
-		byte[] c = MessagePack.pack((Object)null);
-		byte[] d = MessagePack.pack(createStringList());
-		byte[] e = MessagePack.pack(createProvidedClass());
-		byte[] f = MessagePack.pack(createUserDefinedClass_dynamic());
-
-		{
-			MessagePackObject aobj = MessagePack.unpack(a);
-			MessagePackObject bobj = MessagePack.unpack(b);
-			MessagePackObject cobj = MessagePack.unpack(c);
-			MessagePackObject dobj = MessagePack.unpack(d);
-			MessagePackObject eobj = MessagePack.unpack(e);
-			MessagePackObject fobj = MessagePack.unpack(f);
-
-			assertEquals(aobj, RawType.create("msgpack"));
-			assertEquals(bobj, IntegerType.create(1));
-			assertEquals(cobj, NilType.create());
-			assertEquals(dobj, createStringList_dynamic());
-			assertEquals(eobj, createProvidedClass_dynamic());
-			assertEquals(fobj, createUserDefinedClass_dynamic());
-		}
-	}
-
-	@Test
-	public void testPackToStream() throws Exception {
-		ByteArrayOutputStream aout = new ByteArrayOutputStream();
-		MessagePack.pack(aout, "msgpack");
-		ByteArrayOutputStream bout = new ByteArrayOutputStream();
-		MessagePack.pack(bout, (Object)1);
-		ByteArrayOutputStream cout = new ByteArrayOutputStream();
-		MessagePack.pack(cout, (Object)null);
-		ByteArrayOutputStream dout = new ByteArrayOutputStream();
-		MessagePack.pack(dout, createStringList());
-		ByteArrayOutputStream eout = new ByteArrayOutputStream();
-		MessagePack.pack(eout, createProvidedClass());
-		ByteArrayOutputStream fout = new ByteArrayOutputStream();
-		MessagePack.pack(fout, createUserDefinedClass());
-
-		{
-			InputStream ain = new ByteArrayInputStream(aout.toByteArray());
-			MessagePackObject aobj = MessagePack.unpack(ain);
-			InputStream bin = new ByteArrayInputStream(bout.toByteArray());
-			MessagePackObject bobj = MessagePack.unpack(bin);
-			InputStream cin = new ByteArrayInputStream(cout.toByteArray());
-			MessagePackObject cobj = MessagePack.unpack(cin);
-			InputStream din = new ByteArrayInputStream(dout.toByteArray());
-			MessagePackObject dobj = MessagePack.unpack(din);
-			InputStream ein = new ByteArrayInputStream(eout.toByteArray());
-			MessagePackObject eobj = MessagePack.unpack(ein);
-			InputStream fin = new ByteArrayInputStream(fout.toByteArray());
-			MessagePackObject fobj = MessagePack.unpack(fin);
-
-			assertEquals(aobj, RawType.create("msgpack"));
-			assertEquals(bobj, IntegerType.create(1));
-			assertEquals(cobj, NilType.create());
-			assertEquals(dobj, createStringList_dynamic());
-			assertEquals(eobj, createProvidedClass_dynamic());
-			assertEquals(fobj, createUserDefinedClass_dynamic());
-		}
-	}
 
 	@Test
 	public void testCheckedPackToByteArray() throws Exception {
@@ -136,6 +73,20 @@ public class TestMessagePackStaticMethods extends TestCase {
 		byte[] f = MessagePack.pack(createUserDefinedClass(), tClass(UserDefinedClass.class));
 
 		{
+			String  aobj = MessagePack.unpack(a, String.class);
+			Integer bobj = MessagePack.unpack(b, Integer.class);
+			Object  cobj = MessagePack.unpack(c, Object.class);
+			ProvidedClass eobj = MessagePack.unpack(e, ProvidedClass.class);
+			UserDefinedClass fobj = MessagePack.unpack(f, UserDefinedClass.class);
+
+			assertEquals(aobj, "msgpack");
+			assertEquals(bobj, (Integer)1);
+			assertEquals(cobj, null);
+			assertEquals(eobj, createProvidedClass());
+			assertEquals(fobj, createUserDefinedClass());
+		}
+
+		{
 			Object aobj = MessagePack.unpack(a, TString);
 			Object bobj = MessagePack.unpack(b, TInteger);
 			Object cobj_any = MessagePack.unpack(c, TAny);
@@ -152,20 +103,6 @@ public class TestMessagePackStaticMethods extends TestCase {
 			assertEquals(eobj, createProvidedClass());
 			assertEquals(fobj, createUserDefinedClass());
 		}
-
-		{
-			String  aobj = MessagePack.unpack(a, String.class);
-			Integer bobj = MessagePack.unpack(b, Integer.class);
-			Object  cobj = MessagePack.unpack(c, Object.class);
-			ProvidedClass eobj = MessagePack.unpack(e, ProvidedClass.class);
-			UserDefinedClass fobj = MessagePack.unpack(f, UserDefinedClass.class);
-
-			assertEquals(aobj, "msgpack");
-			assertEquals(bobj, (Integer)1);
-			assertEquals(cobj, null);
-			assertEquals(eobj, createProvidedClass());
-			assertEquals(fobj, createUserDefinedClass());
-		}
 	}
 
 	@Test
@@ -185,6 +122,25 @@ public class TestMessagePackStaticMethods extends TestCase {
 
 		{
 			InputStream ain = new ByteArrayInputStream(aout.toByteArray());
+			String  aobj = MessagePack.unpack(ain, String.class);
+			InputStream bin = new ByteArrayInputStream(bout.toByteArray());
+			Integer bobj = MessagePack.unpack(bin, Integer.class);
+			InputStream cin = new ByteArrayInputStream(cout.toByteArray());
+			Object  cobj = MessagePack.unpack(cin, Object.class);
+			InputStream ein = new ByteArrayInputStream(eout.toByteArray());
+			ProvidedClass eobj = MessagePack.unpack(ein, ProvidedClass.class);
+			InputStream fin = new ByteArrayInputStream(fout.toByteArray());
+			UserDefinedClass fobj = MessagePack.unpack(fin, UserDefinedClass.class);
+
+			assertEquals(aobj, "msgpack");
+			assertEquals(bobj, (Integer)1);
+			assertEquals(cobj, null);
+			assertEquals(eobj, createProvidedClass());
+			assertEquals(fobj, createUserDefinedClass());
+		}
+
+		{
+			InputStream ain = new ByteArrayInputStream(aout.toByteArray());
 			Object aobj = MessagePack.unpack(ain, TString);
 			InputStream bin = new ByteArrayInputStream(bout.toByteArray());
 			Object bobj = MessagePack.unpack(bin, TInteger);
@@ -207,24 +163,69 @@ public class TestMessagePackStaticMethods extends TestCase {
 			assertEquals(eobj, createProvidedClass());
 			assertEquals(fobj, createUserDefinedClass());
 		}
+	}
+
+	@Test
+	public void testPackToByteArray() throws Exception {
+		byte[] a = MessagePack.pack("msgpack");
+		byte[] b = MessagePack.pack((Object)1);
+		byte[] c = MessagePack.pack((Object)null);
+		byte[] d = MessagePack.pack(createStringList());
+		byte[] e = MessagePack.pack(createProvidedClass());
+		byte[] f = MessagePack.pack(createUserDefinedClass_dynamic());
+
+		{
+			MessagePackObject aobj = MessagePack.unpack(a);
+			MessagePackObject bobj = MessagePack.unpack(b);
+			MessagePackObject cobj = MessagePack.unpack(c);
+			MessagePackObject dobj = MessagePack.unpack(d);
+			MessagePackObject eobj = MessagePack.unpack(e);
+			MessagePackObject fobj = MessagePack.unpack(f);
+
+			assertEquals(aobj, RawType.create("msgpack"));
+			assertEquals(bobj, IntegerType.create(1));
+			assertEquals(cobj, NilType.create());
+			assertEquals(dobj, createStringList_dynamic());
+			assertEquals(eobj, createProvidedClass_dynamic());
+			assertEquals(fobj, createUserDefinedClass_dynamic());
+		}
+	}
+
+	@Test
+	public void testPackToStream() throws Exception {
+		ByteArrayOutputStream aout = new ByteArrayOutputStream();
+		MessagePack.pack(aout, "msgpack");
+		ByteArrayOutputStream bout = new ByteArrayOutputStream();
+		MessagePack.pack(bout, (Object)1);
+		ByteArrayOutputStream cout = new ByteArrayOutputStream();
+		MessagePack.pack(cout, (Object)null);
+		ByteArrayOutputStream dout = new ByteArrayOutputStream();
+		MessagePack.pack(dout, createStringList());
+		ByteArrayOutputStream eout = new ByteArrayOutputStream();
+		MessagePack.pack(eout, createProvidedClass());
+		ByteArrayOutputStream fout = new ByteArrayOutputStream();
+		MessagePack.pack(fout, createUserDefinedClass());
 
 		{
 			InputStream ain = new ByteArrayInputStream(aout.toByteArray());
-			String  aobj = MessagePack.unpack(ain, String.class);
+			MessagePackObject aobj = MessagePack.unpack(ain);
 			InputStream bin = new ByteArrayInputStream(bout.toByteArray());
-			Integer bobj = MessagePack.unpack(bin, Integer.class);
+			MessagePackObject bobj = MessagePack.unpack(bin);
 			InputStream cin = new ByteArrayInputStream(cout.toByteArray());
-			Object  cobj = MessagePack.unpack(cin, Object.class);
+			MessagePackObject cobj = MessagePack.unpack(cin);
+			InputStream din = new ByteArrayInputStream(dout.toByteArray());
+			MessagePackObject dobj = MessagePack.unpack(din);
 			InputStream ein = new ByteArrayInputStream(eout.toByteArray());
-			ProvidedClass eobj = MessagePack.unpack(ein, ProvidedClass.class);
+			MessagePackObject eobj = MessagePack.unpack(ein);
 			InputStream fin = new ByteArrayInputStream(fout.toByteArray());
-			UserDefinedClass fobj = MessagePack.unpack(fin, UserDefinedClass.class);
+			MessagePackObject fobj = MessagePack.unpack(fin);
 
-			assertEquals(aobj, "msgpack");
-			assertEquals(bobj, (Integer)1);
-			assertEquals(cobj, null);
-			assertEquals(eobj, createProvidedClass());
-			assertEquals(fobj, createUserDefinedClass());
+			assertEquals(aobj, RawType.create("msgpack"));
+			assertEquals(bobj, IntegerType.create(1));
+			assertEquals(cobj, NilType.create());
+			assertEquals(dobj, createStringList_dynamic());
+			assertEquals(eobj, createProvidedClass_dynamic());
+			assertEquals(fobj, createUserDefinedClass_dynamic());
 		}
 	}