Fix test cases and range check of extension types

xerial · xerial · commit c14c87ccba56 · 2015-06-15T16:36:43.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/ExtensionTypeHeader.java b/msgpack-core/src/main/java/org/msgpack/core/ExtensionTypeHeader.java
@@ -16,7 +16,7 @@ public ExtensionTypeHeader(byte type, int length) {
     }
 
     public static byte checkedCastToByte(int code) {
-        checkArgument(code < Byte.MIN_VALUE && code > Byte.MAX_VALUE, "Extension type code must be within the range of byte");
+        checkArgument(Byte.MIN_VALUE <= code && code <= Byte.MAX_VALUE, "Extension type code must be within the range of byte");
         return (byte) code;
     }
 
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala
@@ -414,17 +414,16 @@ class MessagePackTest extends MessagePackSpec  {
     }
 
     "pack/unpack extension types" taggedAs("ext") in {
-      forAll { (dataLen: Int, tpe: Int) =>
+      forAll { (dataLen: Int, tpe: Byte) =>
         val l = Math.abs(dataLen)
-        val t = Math.abs(tpe) % 128
         whenever(l >= 0) {
-          val ext = new ExtensionTypeHeader(ExtensionTypeHeader.checkedCastToByte(l), t)
+          val ext = new ExtensionTypeHeader(ExtensionTypeHeader.checkedCastToByte(tpe), l)
           check(ext, _.packExtensionTypeHeader(ext.getType, ext.getLength), _.unpackExtensionTypeHeader())
         }
       }
 
       for(l <- testHeaderLength) {
-        val ext = new ExtensionTypeHeader(ExtensionTypeHeader.checkedCastToByte(l), Random.nextInt(128))
+        val ext = new ExtensionTypeHeader(ExtensionTypeHeader.checkedCastToByte(Random.nextInt(128)), l)
         check(ext, _.packExtensionTypeHeader(ext.getType, ext.getLength), _.unpackExtensionTypeHeader())
       }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public ExtensionTypeHeader(byte type, int length) {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public static byte checkedCastToByte(int code) {`
`19`		`- checkArgument(code < Byte.MIN_VALUE && code > Byte.MAX_VALUE, "Extension type code must be within the range of byte");`
	`19`	`+ checkArgument(Byte.MIN_VALUE <= code && code <= Byte.MAX_VALUE, "Extension type code must be within the range of byte");`
`20`	`20`	`return (byte) code;`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -414,17 +414,16 @@ class MessagePackTest extends MessagePackSpec {`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`"pack/unpack extension types" taggedAs("ext") in {`
`417`		`- forAll { (dataLen: Int, tpe: Int) =>`
	`417`	`+ forAll { (dataLen: Int, tpe: Byte) =>`
`418`	`418`	`val l = Math.abs(dataLen)`
`419`		`- val t = Math.abs(tpe) % 128`
`420`	`419`	`whenever(l >= 0) {`
`421`		`- val ext = new ExtensionTypeHeader(ExtensionTypeHeader.checkedCastToByte(l), t)`
	`420`	`+ val ext = new ExtensionTypeHeader(ExtensionTypeHeader.checkedCastToByte(tpe), l)`
`422`	`421`	`check(ext, _.packExtensionTypeHeader(ext.getType, ext.getLength), _.unpackExtensionTypeHeader())`
`423`	`422`	`}`
`424`	`423`	`}`
`425`	`424`
`426`	`425`	`for(l <- testHeaderLength) {`
`427`		`- val ext = new ExtensionTypeHeader(ExtensionTypeHeader.checkedCastToByte(l), Random.nextInt(128))`
	`426`	`+ val ext = new ExtensionTypeHeader(ExtensionTypeHeader.checkedCastToByte(Random.nextInt(128)), l)`
`428`	`427`	`check(ext, _.packExtensionTypeHeader(ext.getType, ext.getLength), _.unpackExtensionTypeHeader())`
`429`	`428`	`}`
`430`	`429`