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

Make unary minus and unary plus return int for byte and short

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2013-12-19 17:42:28 +04:00
parent 802c1b772f
commit 4329c42e3f
23 changed files with 76 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/language/RangeIterationTest.kt
+2 -2
View File
@@ -45,8 +45,8 @@ public class RangeIterationTest {
test fun emptyRange() {
doTest(10..5, 10, 5, 1, listOf())
doTest(10.toByte()..-5.toByte(), 10.toByte(), -5.toByte(), 1, listOf())
doTest(10.toShort()..-5.toShort(), 10.toShort(), -5.toShort(), 1, listOf())
doTest(10.toByte()..(-5).toByte(), 10.toByte(), (-5).toByte(), 1, listOf())
doTest(10.toShort()..(-5).toShort(), 10.toShort(), (-5).toShort(), 1, listOf())
doTest(10.toLong()..-5.toLong(), 10.toLong(), -5.toLong(), 1.toLong(), listOf())
doTest('z'..'a', 'z', 'a', 1, listOf())
libraries/stdlib/test/language/RangeTest.kt
+10 -10
View File
@@ -23,12 +23,12 @@ public class RangeTest {
}
test fun byteRange() {
val range = -5.toByte()..9.toByte()
assertFalse(-100.toByte() in range)
assertFalse(-6.toByte() in range)
val range = (-5).toByte()..9.toByte()
assertFalse((-100).toByte() in range)
assertFalse((-6).toByte() in range)
assertTrue(-5.toByte() in range)
assertTrue(-4.toByte() in range)
assertTrue((-5).toByte() in range)
assertTrue((-4).toByte() in range)
assertTrue(0.toByte() in range)
assertTrue(3.toByte() in range)
assertTrue(8.toByte() in range)
@@ -39,12 +39,12 @@ public class RangeTest {
}
test fun shortRange() {
val range = -5.toShort()..9.toShort()
assertFalse(-1000.toShort() in range)
assertFalse(-6.toShort() in range)
val range = (-5).toShort()..9.toShort()
assertFalse((-1000).toShort() in range)
assertFalse((-6).toShort() in range)
assertTrue(-5.toShort() in range)
assertTrue(-4.toShort() in range)
assertTrue((-5).toShort() in range)
assertTrue((-4).toShort() in range)
assertTrue(0.toShort() in range)
assertTrue(3.toShort() in range)
assertTrue(8.toShort() in range)