Skip to content

asShort in ImmutableLongValueImpl should check isInShortRange #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
komamitsu merged 3 commits into from
Nov 11, 2015
Merged

asShort in ImmutableLongValueImpl should check isInShortRange #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
382845b
Fixed: asShort in LongValueImpl should check isInShortRange instead o…
mecp Nov 4, 2015
919ab70
added tests for integer value range checks and casts
mecp Nov 10, 2015
6b9d5d3
fixed integer literal related issue in integer range check test
mecp Nov 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableLongValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public byte asByte()
@Override
public short asShort()
{
if (!isInByteRange()) {
if (!isInShortRange()) {
throw new MessageIntegerOverflowException(value);
}
return (short) value;
Expand Down
31 changes: 30 additions & 1 deletion msgpack-core/src/test/scala/org/msgpack/value/ValueTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package org.msgpack.value

import java.math.BigInteger

import org.msgpack.core._

import scala.util.parsing.json.JSON
Expand Down Expand Up @@ -97,5 +96,35 @@ class ValueTest extends MessagePackSpec

}

"check appropriate range for integers" in {
import ValueFactory._
import java.lang.Byte
import java.lang.Short

newInteger(Byte.MAX_VALUE).asByte() shouldBe Byte.MAX_VALUE
newInteger(Byte.MIN_VALUE).asByte() shouldBe Byte.MIN_VALUE
newInteger(Short.MAX_VALUE).asShort() shouldBe Short.MAX_VALUE
newInteger(Short.MIN_VALUE).asShort() shouldBe Short.MIN_VALUE
newInteger(Integer.MAX_VALUE).asInt() shouldBe Integer.MAX_VALUE
newInteger(Integer.MIN_VALUE).asInt() shouldBe Integer.MIN_VALUE
intercept[MessageIntegerOverflowException] {
newInteger(Byte.MAX_VALUE+1).asByte()
}
intercept[MessageIntegerOverflowException] {
newInteger(Byte.MIN_VALUE-1).asByte()
}
intercept[MessageIntegerOverflowException] {
newInteger(Short.MAX_VALUE+1).asShort()
}
intercept[MessageIntegerOverflowException] {
newInteger(Short.MIN_VALUE-1).asShort()
}
intercept[MessageIntegerOverflowException] {
newInteger(Integer.MAX_VALUE+1.toLong).asInt()
}
intercept[MessageIntegerOverflowException] {
newInteger(Integer.MIN_VALUE-1.toLong).asInt()
}
}
}
}