From ed3ead06fed19f4dfc4a9a0becaa22d8952d99c1 Mon Sep 17 00:00:00 2001 From: takeshita Date: Wed, 20 Apr 2011 20:35:23 +0900 Subject: [PATCH] Implement array message pack --- .../scala/org/msgpack/JavassistTypeScalaTemplateBuilder.scala | 4 ++-- scala/src/test/scala/org/msgpack/SampleClass.scala | 2 +- scala/src/test/scala/org/msgpack/ScalaMessagePackSpec.scala | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scala/src/main/scala/org/msgpack/JavassistTypeScalaTemplateBuilder.scala b/scala/src/main/scala/org/msgpack/JavassistTypeScalaTemplateBuilder.scala index d9efff4f..177a114b 100644 --- a/scala/src/main/scala/org/msgpack/JavassistTypeScalaTemplateBuilder.scala +++ b/scala/src/main/scala/org/msgpack/JavassistTypeScalaTemplateBuilder.scala @@ -541,8 +541,8 @@ class ScalaFieldEntry(name : String) extends IFieldEntry{ def getJavaTypeName = { if(getType.isArray){ - //TODO implement here - getType.getName() + getType.getComponentType.getName + "[]" + }else{ getType.getName() } diff --git a/scala/src/test/scala/org/msgpack/SampleClass.scala b/scala/src/test/scala/org/msgpack/SampleClass.scala index acaf7b3f..8294b89c 100644 --- a/scala/src/test/scala/org/msgpack/SampleClass.scala +++ b/scala/src/test/scala/org/msgpack/SampleClass.scala @@ -72,7 +72,7 @@ class BasicalTypes{ var dateVar : Date = null - + var intArray : Array[Int] = Array() } diff --git a/scala/src/test/scala/org/msgpack/ScalaMessagePackSpec.scala b/scala/src/test/scala/org/msgpack/ScalaMessagePackSpec.scala index 8f464000..8fdc4230 100644 --- a/scala/src/test/scala/org/msgpack/ScalaMessagePackSpec.scala +++ b/scala/src/test/scala/org/msgpack/ScalaMessagePackSpec.scala @@ -51,6 +51,7 @@ class ScalaMessagePackTest extends Specification with JUnit /*with ScalaCheck*/ v.doubleVar = 2.5 v.strVar = "fugafuga" v.dateVar = new Date(1233333) + v.intArray = Array(1,2,3,4,5) val b = ScalaMessagePack.pack(v) val des : BasicalTypes = ScalaMessagePack.unpack[BasicalTypes](b) @@ -63,6 +64,7 @@ class ScalaMessagePackTest extends Specification with JUnit /*with ScalaCheck*/ des.doubleVar must be_==(v.doubleVar) des.strVar must be_==(v.strVar) des.dateVar must be_==(v.dateVar) + des.intArray must containAll(v.intArray) }