Skip to content
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

fix(engine): transform big numeric values #133

Merged
merged 1 commit into from
Jun 5, 2020
Merged

fix(engine): transform big numeric values #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 feel-engine/src/main/scala/org/camunda/feel/impl/JavaValueMapper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class JavaValueMapper extends CustomValueMapper {

case ValNumber(number) =>
Some(
if (number.isWhole) {
if (number.isWhole && number.isValidLong) {
number.longValue: java.lang.Long
} else {
number.doubleValue: java.lang.Double
Expand Down
32 changes: 29 additions & 3 deletions feel-engine/src/test/scala/org/camunda/feel/impl/spi/JavaValueMapperTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,38 @@ class JavaValueMapperTest extends FlatSpec with Matchers {
ValueMapper.CompositeValueMapper(
List(DefaultValueMapper.instance, new JavaValueMapper()))

"The JavaValueMapper" should "return number as Java Double" in {
"The JavaValueMapper" should "return whole number as java.lang.Long" in {

valueMapper.unpackVal(ValNumber(2)) should be(new java.lang.Long(2))
}

it should "return floating point number as java.lang.Double" in {

valueMapper.unpackVal(ValNumber(2.4)) should be(new java.lang.Double(2.4))
}

it should "return list as Java List" in {
it should "return Long.MAX_VALUE as java.lang.Long" in {

valueMapper.unpackVal(ValNumber(Long.MaxValue)) should be(
java.lang.Long.MAX_VALUE
)
}

it should "return Double.MAX_VALUE as java.lang.Double" in {

valueMapper.unpackVal(ValNumber(Double.MaxValue)) should be(
java.lang.Double.MAX_VALUE
)
}

it should "return Float.MAX_VALUE as java.lang.Double" in {

valueMapper.unpackVal(ValNumber(Float.MaxValue)) should be(
new java.lang.Double(Float.MaxValue)
)
}

it should "return list as java.util.List" in {

val list = new java.util.ArrayList[String]
list.add("a")
Expand All @@ -43,7 +69,7 @@ class JavaValueMapperTest extends FlatSpec with Matchers {
list)
}

it should "return context as Java Map" in {
it should "return context as java.util.Map" in {

val map = new java.util.HashMap[String, String]
map.put("x", "1")
Expand Down