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.

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 parsing for Long in scientific notation #673

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion ast/jvm/src/test/scala/jawn/ast/AstTestPlatform.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ package org.typelevel.jawn
package ast

import org.scalacheck.Prop
import Prop.{forAll, forAllNoShrink}

import Prop.forAll
import scala.util.Try

import ArbitraryUtil.expNotationNums

private[jawn] trait AstTestPlatform { self: AstTest =>

Expand All @@ -37,4 +40,10 @@ private[jawn] trait AstTestPlatform { self: AstTest =>
)
}

property(".asDouble") = forAllNoShrink { (expForm: (String, Double)) =>
Prop(
JParser.parseUnsafe(expForm._1).getDouble == Try(JParser.parseUnsafe(expForm._1).asDouble).toOption &&
JParser.parseUnsafe(expForm._1).asDouble == expForm._2
)
}
}
4 changes: 2 additions & 2 deletions ast/shared/src/main/scala/jawn/ast/JValue.scala
Original file line number Diff line number Diff line change
Expand Up @@ -254,13 +254,13 @@ case class DeferNum(s: String) extends JNum {
lazy val n: Double = java.lang.Double.parseDouble(s)

final override def getInt: Option[Int] = Some(n.toInt)
final override def getLong: Option[Long] = Some(util.parseLongUnsafe(s))
final override def getLong: Option[Long] = Some(n.toLong)
final override def getDouble: Option[Double] = Some(n)
final override def getBigInt: Option[BigInt] = Some(BigDecimal(s).toBigInt)
final override def getBigDecimal: Option[BigDecimal] = Some(BigDecimal(s))

final override def asInt: Int = n.toInt
final override def asLong: Long = util.parseLongUnsafe(s)
final override def asLong: Long = n.toLong
final override def asDouble: Double = n
final override def asBigInt: BigInt = BigDecimal(s).toBigInt
final override def asBigDecimal: BigDecimal = BigDecimal(s)
Expand Down
13 changes: 13 additions & 0 deletions ast/shared/src/test/scala/jawn/ArbitraryUtil.scala
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,17 @@ object ArbitraryUtil {

implicit lazy val arbitraryJValue: Arbitrary[JValue] =
Arbitrary(jvalue())

// Valid JSON numbers with an exact double representation and in the Long range

implicit lazy val expNotationNums: Arbitrary[(String, Double)] = Arbitrary[(String, Double)] {
Gen.oneOf(
("2e3", 2e3),
("2.5e0", 2.5e0),
("2e+3", 2e+3),
("2.5e-1", 2.5e-1),
("9.223372036854776e18", 9.223372036854776e18),
("-9.223372036854776e+18", -9.223372036854776e18)
)
}
}
32 changes: 30 additions & 2 deletions ast/shared/src/test/scala/jawn/AstTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ package org.typelevel.jawn
package ast

import org.scalacheck.{Prop, Properties}
import scala.util.{Success, Try}

import scala.util.{Success, Try}
import ArbitraryUtil._
import Prop.forAll
import Prop.{forAll, forAllNoShrink}

class AstTest extends Properties("AstTest") with AstTestPlatform {

Expand Down Expand Up @@ -62,20 +62,41 @@ class AstTest extends Properties("AstTest") with AstTestPlatform {
)
}

property(".asInt") = forAllNoShrink { (expForm: (String, Double)) =>
Prop(
JParser.parseUnsafe(expForm._1).getInt == Try(JParser.parseUnsafe(expForm._1).asInt).toOption &&
JParser.parseUnsafe(expForm._1).asInt == expForm._2.intValue()
)
}

property(".getLong") = forAll { (n: Long) =>
Prop(
JNum(n).getLong == Some(n) &&
JParser.parseUnsafe(n.toString).getLong == Some(n)
)
}

property(".asLong") = forAllNoShrink { (expForm: (String, Double)) =>
Prop(
JParser.parseUnsafe(expForm._1).getLong == Try(JParser.parseUnsafe(expForm._1).asLong).toOption &&
JParser.parseUnsafe(expForm._1).asLong == expForm._2.longValue()
)
}

property(".getBigInt") = forAll { (n: BigInt) =>
Prop(
JNum(n.toString).getBigInt == Some(n) &&
JParser.parseUnsafe(n.toString).getBigInt == Some(n)
)
}

property(".asBigInt") = forAllNoShrink { (expForm: (String, Double)) =>
Prop(
JParser.parseUnsafe(expForm._1).getBigInt == Try(JParser.parseUnsafe(expForm._1).asBigInt).toOption &&
JParser.parseUnsafe(expForm._1).asBigInt == BigDecimal(expForm._2).toBigInt()
)
}

property(".getBigDecimal") = forAll { (n: BigDecimal) =>
if (Try(BigDecimal(n.toString)) == Success(n))
Prop(
Expand All @@ -85,4 +106,11 @@ class AstTest extends Properties("AstTest") with AstTestPlatform {
else
Prop(true)
}

property(".asBigDecimal") = forAllNoShrink { (expForm: (String, Double)) =>
Prop(
JParser.parseUnsafe(expForm._1).getBigDecimal == Try(JParser.parseUnsafe(expForm._1).asBigDecimal).toOption &&
JParser.parseUnsafe(expForm._1).asBigDecimal == BigDecimal(expForm._2)
)
}
}
Loading