azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing api: radix overloads, mathContext and scale overloads, orNull overloads

Browse Source 
Move string-to-number conversions and their tests near to existing ones

Add documentation and copyrights.
This commit is contained in:
Ilya Gorbunov
2017-05-24 08:33:15 +03:00
parent e86e080088
commit b89e5b2708
5 changed files with 309 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/numbers/MathJVMTest.kt
+32 -20
View File
@@ -6,6 +6,8 @@ import java.math.BigDecimal
import kotlin.test.*
import org.junit.Test
import java.math.MathContext
import java.math.RoundingMode
class MathTest {
@Test fun testBigInteger() {
@@ -29,15 +31,33 @@ class MathTest {
assertEquals(BigInteger("1"), a xor b)
assertEquals(BigInteger("4"), a shl 1)
assertEquals(BigInteger("1"), a shr 1)
assertEquals(BigInteger("0"), a shr 2)
assertEquals(BigInteger("-4"), -a shl 1)
assertEquals(BigInteger("-1"), -a shr 1)
assertEquals(BigInteger("-1"), -a shr 2)
assertEquals(BigInteger("2"), "2".toBigInteger())
assertEquals(BigInteger("-3"), "-3".toBigInteger())
assertEquals(BigInteger("2"), 2.toBigInteger())
assertEquals(BigInteger("-3"), -3L.toBigInteger())
assertEquals(BigDecimal("2"), a.toBigDecimal())
assertEquals(BigDecimal("0.02"), a.toBigDecimal(2))
assertEquals(BigDecimal("2E+2"), a.toBigDecimal(-2))
assertEquals(BigDecimal("2.6E+3"), BigInteger("253").toBigDecimal(-1, MathContext(2, RoundingMode.UP)))
assertEquals(BigDecimal("2.6E+2"), BigInteger("253").toBigDecimal(mathContext = MathContext(2, RoundingMode.UP)))
assertEquals(BigDecimal("3"), BigInteger("253").toBigDecimal(2, MathContext(1, RoundingMode.UP)))
var c = 2.toBigInteger()
assertEquals(BigInteger("2"), c++)
assertEquals(BigInteger("3"), c)
assertEquals(BigInteger("4"), ++c)
assertEquals(BigInteger("4"), c)
assertEquals(BigInteger("4"), c--)
assertEquals(BigInteger("3"), c)
assertEquals(BigInteger("2"), --c)
assertEquals(BigInteger("2"), c)
}
@Test fun testBigDecimal() {
@@ -56,29 +76,21 @@ class MathTest {
assertEquals(BigDecimal("3"), a.inc())
assertEquals(BigDecimal("1"), a.dec())
assertEquals(BigDecimal("2.5"), "2.5".toBigDecimal())
assertEquals(BigDecimal("-3"), "-3".toBigDecimal())
assertEquals(BigDecimal("2"), 2.toBigDecimal())
assertEquals(BigDecimal("-3"), -3L.toBigDecimal())
assertEquals(BigDecimal("2.0"), 2f.toBigDecimal())
assertEquals(BigDecimal("0.5"), 0.5.toBigDecimal())
var c = "1.5".toBigDecimal()
assertEquals(BigDecimal("1.5"), c++)
assertEquals(BigDecimal("2.5"), c)
assertEquals(BigDecimal("3.5"), ++c)
assertEquals(BigDecimal("3.5"), c)
assertEquals(BigDecimal("3.5"), c--)
assertEquals(BigDecimal("2.5"), c)
assertEquals(BigDecimal("1.5"), --c)
assertEquals(BigDecimal("1.5"), c)
}
@Test fun mutatingBigNumbers() {
var a = 2.toBigInteger()
var b = "1.5".toBigDecimal()
a++
b++
assertEquals(BigInteger("3"), a)
assertEquals(BigDecimal("2.5"), b)
--a
--b
assertEquals(BigInteger("2"), a)
assertEquals(BigDecimal("1.5"), b)
}
}
libraries/stdlib/test/text/StringNumberConversionTest.kt
+60
View File
@@ -224,6 +224,66 @@ class StringNumberConversionTest {
assertFailsWith<IllegalArgumentException>("Expected to fail with radix 37") { 37L.toString(radix = 37) }
assertFailsWith<IllegalArgumentException>("Expected to fail with radix 1") { 1L.toString(radix = 1) }
}
@kotlin.jvm.JvmVersion
@Test fun toBigInteger() {
compareConversion(String::toBigInteger, String::toBigIntegerOrNull) {
assertProduces("0", java.math.BigInteger.ZERO)
assertProduces("1", java.math.BigInteger.ONE)
assertProduces("-1", java.math.BigInteger.ONE.negate())
assertProduces("100000000000000000000", java.math.BigInteger("100000000000000000000"))
assertFailsOrNull("")
assertFailsOrNull("-")
assertFailsOrNull("a")
assertFailsOrNull("-x")
assertFailsOrNull("1000 000")
}
compareConversionWithRadix(String::toBigInteger, String::toBigIntegerOrNull) {
assertProduces(16, "ABCDEF90ABCDEF9012345678", java.math.BigInteger("ABCDEF90ABCDEF9012345678", 16))
assertProduces(36, "HazelnutHazelnut", java.math.BigInteger.valueOf(1356099454469L).let { it.multiply(java.math.BigInteger.valueOf(36).pow(8)).add(it) })
assertFailsOrNull(16, "EFG")
assertFailsOrNull(10, "-1A")
assertFailsOrNull(2, "-")
assertFailsOrNull(3, "")
assertFailsWith<IllegalArgumentException>("Expected to fail with radix 37") { "37".toBigInteger(radix = 37) }
assertFailsWith<IllegalArgumentException>("Expected to fail with radix 1") { "1".toBigIntegerOrNull(radix = 1) }
}
}
@kotlin.jvm.JvmVersion
@Test fun toBigDecimal() {
fun bd(value: String) = java.math.BigDecimal(value)
compareConversion(String::toBigDecimal, String::toBigDecimalOrNull) {
assertProduces("-77", bd("-77"))
assertProduces("-77.0", bd("-77.0"))
assertProduces("77.", bd("77"))
assertProduces("123456789012345678901234567890.123456789", bd("123456789012345678901234567890.123456789"))
assertProduces("-1.77", bd("-1.77"))
assertProduces("+.77", bd("0.77"))
assertProduces("7.7e1", bd("77"))
assertProduces("+770e-1", bd("77.0"))
assertFailsOrNull("7..7")
assertFailsOrNull("\t-77 \n")
assertFailsOrNull("007 not a number")
assertFailsOrNull("")
assertFailsOrNull(" ")
}
var mc = java.math.MathContext(3, java.math.RoundingMode.UP)
compareConversion( { it.toBigDecimal(mc) }, { it.toBigDecimalOrNull(mc) }) {
assertProduces("1.991", bd("2.00"))
mc = java.math.MathContext(1, java.math.RoundingMode.UNNECESSARY)
assertFailsWith<ArithmeticException> { "2.991".toBigDecimal(mc) }
assertFailsWith<ArithmeticException> { "2.991".toBigDecimalOrNull(mc) }
}
}
}