Merge branch '2.5.x' of https://github.com/alibaba/dubbo

rolandhe · Feb 26, 2018 · bf556c0 · bf556c0
2 parents e2015f5 + 08da452
commit bf556c0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 29 deletions.
diff --git a/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/Hessian2StringShortTest.java b/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/Hessian2StringShortTest.java
@@ -1,12 +1,17 @@
 package com.alibaba.com.caucho.hessian.io;
 
+import com.alibaba.com.caucho.hessian.io.base.SerializeTestBase;
+import com.alibaba.com.caucho.hessian.io.beans.Hessian2StringShortType;
+import com.alibaba.com.caucho.hessian.io.beans.PersonType;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.junit.Test;
 
 import static junit.framework.TestCase.assertEquals;
@@ -15,7 +20,7 @@
 /**
  * @author jason.shang@hotmail.com
  */
-public class Hessian2StringShortTest {
+public class Hessian2StringShortTest extends SerializeTestBase {
 
     @Test
     public void serialize_string_short_map_then_deserialize() throws Exception {
@@ -26,16 +31,7 @@ public void serialize_string_short_map_then_deserialize() throws Exception {
         stringShortMap.put("last", (short)60);
         stringShort.stringShortMap = stringShortMap;
 
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        Hessian2Output out = new Hessian2Output(bout);
-
-        out.writeObject(stringShort);
-        out.flush();
-
-        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-        Hessian2Input input = new Hessian2Input(bin);
-
-        Hessian2StringShortType deserialize = (Hessian2StringShortType) input.readObject();
+        Hessian2StringShortType deserialize = baseHession2Serialize(stringShort);
         assertTrue(deserialize.stringShortMap != null);
         assertTrue(deserialize.stringShortMap.size() == 2);
         assertTrue(deserialize.stringShortMap.get("last") instanceof Short);
@@ -52,16 +48,7 @@ public void serialize_string_byte_map_then_deserialize() throws Exception {
         stringByteMap.put("last", (byte)60);
         stringShort.stringByteMap = stringByteMap;
 
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        Hessian2Output out = new Hessian2Output(bout);
-
-        out.writeObject(stringShort);
-        out.flush();
-
-        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-        Hessian2Input input = new Hessian2Input(bin);
-
-        Hessian2StringShortType deserialize = (Hessian2StringShortType) input.readObject();
+        Hessian2StringShortType deserialize = baseHession2Serialize(stringShort);
         assertTrue(deserialize.stringByteMap != null);
         assertTrue(deserialize.stringByteMap.size() == 2);
         assertTrue(deserialize.stringByteMap.get("last") instanceof Byte);
@@ -145,8 +132,7 @@ public void serialize_list_then_deserialize() throws Exception {
 
         ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
         Hessian2Input input = new Hessian2Input(bin);
-        List deserialize = (List) input.readObject(ArrayList.class, Short.class);
-//        List deserialize = (List) input.readObject();
+        List<Short> deserialize = (List) input.readObject(ArrayList.class, Short.class);
         assertTrue(deserialize != null);
         assertTrue(deserialize.size() == 2);
         assertTrue(deserialize.get(1) instanceof Short);

diff --git a/...o/hessian/io/Hessian2StringShortType.java → ...ian/io/beans/Hessian2StringShortType.java b/...o/hessian/io/Hessian2StringShortType.java → ...ian/io/beans/Hessian2StringShortType.java
@@ -1,4 +1,4 @@
-package com.alibaba.com.caucho.hessian.io;
+package com.alibaba.com.caucho.hessian.io.beans;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -11,11 +11,11 @@
  */
 public class Hessian2StringShortType implements Serializable {
 
-    Map<String, Short> stringShortMap;
+    public Map<String, Short> stringShortMap;
 
-    Map<String, Byte> stringByteMap;
+    public Map<String, Byte> stringByteMap;
 
-    Map<String, PersonType> stringPersonTypeMap;
+    public Map<String, PersonType> stringPersonTypeMap;
 
     public Hessian2StringShortType(){
 

diff --git a/...aba/com/caucho/hessian/io/PersonType.java → ...m/caucho/hessian/io/beans/PersonType.java b/...aba/com/caucho/hessian/io/PersonType.java → ...m/caucho/hessian/io/beans/PersonType.java
@@ -1,7 +1,6 @@
-package com.alibaba.com.caucho.hessian.io;
+package com.alibaba.com.caucho.hessian.io.beans;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.List;
 
 /**