From fdfabc9f8862da5982830017e21b0628a00356eb Mon Sep 17 00:00:00 2001
From: frsyuki <frsyuki@users.sourceforge.jp>
Date: Wed, 18 Aug 2010 22:51:23 +0900
Subject: [PATCH] java: adds cross-language test case

---
 .../main/java/org/msgpack/UnpackerImpl.java   |   1 +
 java/src/test/java/org/msgpack/TestCases.java |  46 ++++++++++++++++++
 java/src/test/resources/cases.json            |   1 +
 java/src/test/resources/cases.mpac            | Bin 0 -> 213 bytes
 java/src/test/resources/cases_compact.mpac    | Bin 0 -> 116 bytes
 5 files changed, 48 insertions(+)
 create mode 100644 java/src/test/java/org/msgpack/TestCases.java
 create mode 100644 java/src/test/resources/cases.json
 create mode 100644 java/src/test/resources/cases.mpac
 create mode 100644 java/src/test/resources/cases_compact.mpac

diff --git a/java/src/main/java/org/msgpack/UnpackerImpl.java b/java/src/main/java/org/msgpack/UnpackerImpl.java
index cfd3d22b..d4f99e38 100644
--- a/java/src/main/java/org/msgpack/UnpackerImpl.java
+++ b/java/src/main/java/org/msgpack/UnpackerImpl.java
@@ -308,6 +308,7 @@ public class UnpackerImpl {
 							break _push;
 						}
 						cs = ACS_RAW_VALUE;
+						break _fixed_trail_again;
 					case ACS_RAW_VALUE: {
 							byte[] raw = new byte[trail];
 							System.arraycopy(src, n, raw, 0, trail);
diff --git a/java/src/test/java/org/msgpack/TestCases.java b/java/src/test/java/org/msgpack/TestCases.java
new file mode 100644
index 00000000..632645ff
--- /dev/null
+++ b/java/src/test/java/org/msgpack/TestCases.java
@@ -0,0 +1,46 @@
+package org.msgpack;
+
+import java.io.*;
+import java.util.*;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class TestCases {
+	public void feedFile(Unpacker pac, String path) throws Exception {
+		FileInputStream input = new FileInputStream(path);
+		byte[] buffer = new byte[32*1024];
+		while(true) {
+			int count = input.read(buffer);
+			if(count < 0) {
+				break;
+			}
+			pac.feed(buffer, 0, count);
+		}
+	}
+
+	@Test
+	public void testCases() throws Exception {
+		System.out.println( new File(".").getAbsoluteFile().getParent() );
+
+
+		Unpacker pac = new Unpacker();
+		Unpacker pac_compact = new Unpacker();
+
+		feedFile(pac, "src/test/resources/cases.mpac");
+		feedFile(pac_compact, "src/test/resources/cases_compact.mpac");
+
+		UnpackResult result = new UnpackResult();
+		while(pac.next(result)) {
+			UnpackResult result_compact = new UnpackResult();
+			assertTrue( pac_compact.next(result_compact) );
+			System.out.println("obj: "+result_compact.getData());
+			if(!result.getData().equals(result_compact.getData())) {
+				System.out.println("compact: "+result_compact.getData().asString());
+				System.out.println("data   : "+result.getData().asString());
+			}
+			assertTrue( result.getData().equals(result_compact.getData()) );
+		}
+	}
+};
+
diff --git a/java/src/test/resources/cases.json b/java/src/test/resources/cases.json
new file mode 100644
index 00000000..fd390d48
--- /dev/null
+++ b/java/src/test/resources/cases.json
@@ -0,0 +1 @@
+[false,true,null,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,127,127,255,65535,4294967295,-32,-32,-128,-32768,-2147483648,0.0,-0.0,1.0,-1.0,"a","a","a","","","",[0],[0],[0],[],[],[],{},{},{},{"a":97},{"a":97},{"a":97},[[]],[["a"]]]
\ No newline at end of file
diff --git a/java/src/test/resources/cases.mpac b/java/src/test/resources/cases.mpac
new file mode 100644
index 0000000000000000000000000000000000000000..5ec08c6a9af42d9568eb429a209a639616e94711
GIT binary patch
literal 213
zcmXYp!4<+V3`3R4n8lOSY|v~#CV>aXw2-v7Qc6c)17ihrkbe}**V_dHM&J(DgGLop
zU?R;l%8FI9$y_sy>V|HFdDW~{neAn-roN|Wd+OcH160;F91fo!<?|nsEC}-SG{|WI
eNQhVw@M4I5MI-12y!m@fA{&A`pPaFeG07JPby0o*

literal 0
HcmV?d00001

diff --git a/java/src/test/resources/cases_compact.mpac b/java/src/test/resources/cases_compact.mpac
new file mode 100644
index 0000000000000000000000000000000000000000..8812442dc3397357b87abed41084894666dc03ca
GIT binary patch
literal 116
zcmX?f_y7Y8{0D*h`ZNE}{{Mdt#D4JLLc_%dhD!}V6{lgUPJ?(LaN7O@l(8SmSeOWc
e3l=Px$N+*9CQN8(XlPuRm<YoYCrq5UFcAQU@GzDD

literal 0
HcmV?d00001