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

Remove unnecessary Char.toChar from tests.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-07-05 03:18:29 +03:00
parent 456bab40d1
commit f440d97e04
12 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt
Vendored
+3 -3
View File
@@ -55,13 +55,13 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
val range5 = (MinC + 5).toChar() downTo MinC step 3
val range5 = (MinC + 5) downTo MinC step 3
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MinC + 5).toChar(), (MinC + 2).toChar())) {
return "Wrong elements for (MinC + 5).toChar() downTo MinC step 3: $list5"
if (list5 != listOf<Char>((MinC + 5), (MinC + 2))) {
return "Wrong elements for (MinC + 5) downTo MinC step 3: $list5"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt
Vendored
+3 -3
View File
@@ -55,13 +55,13 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
val range5 = (MaxC - 5).toChar()..MaxC step 3
val range5 = (MaxC - 5)..MaxC step 3
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MaxC - 5).toChar(), (MaxC - 2).toChar())) {
return "Wrong elements for (MaxC - 5).toChar()..MaxC step 3: $list5"
if (list5 != listOf<Char>((MaxC - 5), (MaxC - 2))) {
return "Wrong elements for (MaxC - 5)..MaxC step 3: $list5"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt
Vendored
+3 -3
View File
@@ -55,13 +55,13 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
val range5 = (MaxC - 2).toChar()..MaxC
val range5 = (MaxC - 2)..MaxC
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MaxC - 2).toChar(), (MaxC - 1).toChar(), MaxC)) {
return "Wrong elements for (MaxC - 2).toChar()..MaxC: $list5"
if (list5 != listOf<Char>((MaxC - 2), (MaxC - 1), MaxC)) {
return "Wrong elements for (MaxC - 2)..MaxC: $list5"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt
Vendored
+3 -3
View File
@@ -55,13 +55,13 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
val range5 = (MinC + 2).toChar() downTo MinC step 1
val range5 = (MinC + 2) downTo MinC step 1
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MinC + 2).toChar(), (MinC + 1).toChar(), MinC)) {
return "Wrong elements for (MinC + 2).toChar() downTo MinC step 1: $list5"
if (list5 != listOf<Char>((MinC + 2), (MinC + 1), MinC)) {
return "Wrong elements for (MinC + 2) downTo MinC step 1: $list5"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
Vendored
+3 -3
View File
@@ -55,13 +55,13 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
val range5 = (MaxC - 2).toChar()..MaxC step 2
val range5 = (MaxC - 2)..MaxC step 2
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MaxC - 2).toChar(), MaxC)) {
return "Wrong elements for (MaxC - 2).toChar()..MaxC step 2: $list5"
if (list5 != listOf<Char>((MaxC - 2), MaxC)) {
return "Wrong elements for (MaxC - 2)..MaxC step 2: $list5"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt
Vendored
+3 -3
View File
@@ -51,12 +51,12 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
for (i in (MinC + 5).toChar() downTo MinC step 3) {
for (i in (MinC + 5) downTo MinC step 3) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MinC + 5).toChar(), (MinC + 2).toChar())) {
return "Wrong elements for (MinC + 5).toChar() downTo MinC step 3: $list5"
if (list5 != listOf<Char>((MinC + 5), (MinC + 2))) {
return "Wrong elements for (MinC + 5) downTo MinC step 3: $list5"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt
Vendored
+3 -3
View File
@@ -51,12 +51,12 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
for (i in (MaxC - 5).toChar()..MaxC step 3) {
for (i in (MaxC - 5)..MaxC step 3) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MaxC - 5).toChar(), (MaxC - 2).toChar())) {
return "Wrong elements for (MaxC - 5).toChar()..MaxC step 3: $list5"
if (list5 != listOf<Char>((MaxC - 5), (MaxC - 2))) {
return "Wrong elements for (MaxC - 5)..MaxC step 3: $list5"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt
Vendored
+3 -3
View File
@@ -51,12 +51,12 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
for (i in (MaxC - 2).toChar()..MaxC) {
for (i in (MaxC - 2)..MaxC) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MaxC - 2).toChar(), (MaxC - 1).toChar(), MaxC)) {
return "Wrong elements for (MaxC - 2).toChar()..MaxC: $list5"
if (list5 != listOf<Char>((MaxC - 2), (MaxC - 1), MaxC)) {
return "Wrong elements for (MaxC - 2)..MaxC: $list5"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt
Vendored
+3 -3
View File
@@ -51,12 +51,12 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
for (i in (MinC + 2).toChar() downTo MinC step 1) {
for (i in (MinC + 2) downTo MinC step 1) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MinC + 2).toChar(), (MinC + 1).toChar(), MinC)) {
return "Wrong elements for (MinC + 2).toChar() downTo MinC step 1: $list5"
if (list5 != listOf<Char>((MinC + 2), (MinC + 1), MinC)) {
return "Wrong elements for (MinC + 2) downTo MinC step 1: $list5"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
Vendored
+3 -3
View File
@@ -51,12 +51,12 @@ fun box(): String {
}
val list5 = ArrayList<Char>()
for (i in (MaxC - 2).toChar()..MaxC step 2) {
for (i in (MaxC - 2)..MaxC step 2) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MaxC - 2).toChar(), MaxC)) {
return "Wrong elements for (MaxC - 2).toChar()..MaxC step 2: $list5"
if (list5 != listOf<Char>((MaxC - 2), MaxC)) {
return "Wrong elements for (MaxC - 2)..MaxC step 2: $list5"
}
return "OK"
libraries/stdlib/test/collections/ArraysJVMTest.kt
+2 -2
View File
@@ -21,7 +21,7 @@ class ArraysJVMTest {
checkContent(longArrayOf(0, 1, 2, 3, 4, 5).copyOf().iterator(), 6) { it.toLong() }
checkContent(floatArrayOf(0.toFloat(), 1.toFloat(), 2.toFloat(), 3.toFloat()).copyOf().iterator(), 4) { it.toFloat() }
checkContent(doubleArrayOf(0.0, 1.0, 2.0, 3.0, 4.0, 5.0).copyOf().iterator(), 6) { it.toDouble() }
checkContent(charArrayOf('0', '1', '2', '3', '4', '5').copyOf().iterator(), 6) { ('0' + it).toChar() }
checkContent(charArrayOf('0', '1', '2', '3', '4', '5').copyOf().iterator(), 6) { '0' + it }
}
test fun copyOfRange() {
@@ -32,7 +32,7 @@ class ArraysJVMTest {
checkContent(longArrayOf(0, 1, 2, 3, 4, 5).copyOfRange(0, 3).iterator(), 3) { it.toLong() }
checkContent(floatArrayOf(0.toFloat(), 1.toFloat(), 2.toFloat(), 3.toFloat()).copyOfRange(0, 3).iterator(), 3) { it.toFloat() }
checkContent(doubleArrayOf(0.0, 1.0, 2.0, 3.0, 4.0, 5.0).copyOfRange(0, 3).iterator(), 3) { it.toDouble() }
checkContent(charArrayOf('0', '1', '2', '3', '4', '5').copyOfRange(0, 3).iterator(), 3) { ('0' + it).toChar() }
checkContent(charArrayOf('0', '1', '2', '3', '4', '5').copyOfRange(0, 3).iterator(), 3) { '0' + it }
}
test fun reduce() {
libraries/stdlib/test/language/RangeIterationJVMTest.kt
+5 -5
View File
@@ -75,7 +75,7 @@ public class RangeIterationJVMTest {
doTest((MaxS - 2).toShort()..MaxS, (MaxS - 2).toShort(), MaxS, 1, listOf((MaxS - 2).toShort(), (MaxS - 1).toShort(), MaxS))
doTest((MaxL - 2).toLong()..MaxL, (MaxL - 2).toLong(), MaxL, 1.toLong(), listOf((MaxL - 2).toLong(), (MaxL - 1).toLong(), MaxL))
doTest((MaxC - 2).toChar()..MaxC, (MaxC - 2).toChar(), MaxC, 1, listOf((MaxC - 2).toChar(), (MaxC - 1).toChar(), MaxC))
doTest((MaxC - 2)..MaxC, (MaxC - 2), MaxC, 1, listOf((MaxC - 2), (MaxC - 1), MaxC))
}
test fun maxValueToMinValue() {
@@ -102,7 +102,7 @@ public class RangeIterationJVMTest {
doTest((MaxS - 2).toShort()..MaxS step 2, (MaxS - 2).toShort(), MaxS, 2, listOf((MaxS - 2).toShort(), MaxS))
doTest((MaxL - 2).toLong()..MaxL step 2, (MaxL - 2).toLong(), MaxL, 2.toLong(), listOf((MaxL - 2).toLong(), MaxL))
doTest((MaxC - 2).toChar()..MaxC step 2, (MaxC - 2).toChar(), MaxC, 2, listOf((MaxC - 2).toChar(), MaxC))
doTest((MaxC - 2)..MaxC step 2, (MaxC - 2), MaxC, 2, listOf((MaxC - 2), MaxC))
}
test fun progressionMaxValueToMinValue() {
@@ -129,7 +129,7 @@ public class RangeIterationJVMTest {
doTest((MaxS - 5).toShort()..MaxS step 3, (MaxS - 5).toShort(), MaxS, 3, listOf((MaxS - 5).toShort(), (MaxS - 2).toShort()))
doTest((MaxL - 5).toLong()..MaxL step 3, (MaxL - 5).toLong(), MaxL, 3.toLong(), listOf((MaxL - 5).toLong(), (MaxL - 2).toLong()))
doTest((MaxC - 5).toChar()..MaxC step 3, (MaxC - 5).toChar(), MaxC, 3, listOf((MaxC - 5).toChar(), (MaxC - 2).toChar()))
doTest((MaxC - 5)..MaxC step 3, (MaxC - 5), MaxC, 3, listOf((MaxC - 5), (MaxC - 2)))
}
test fun progressionDownToMinValue() {
@@ -138,7 +138,7 @@ public class RangeIterationJVMTest {
doTest((MinS + 2).toShort() downTo MinS step 1, (MinS + 2).toShort(), MinS, -1, listOf((MinS + 2).toShort(), (MinS + 1).toShort(), MinS))
doTest((MinL + 2).toLong() downTo MinL step 1, (MinL + 2).toLong(), MinL, -1.toLong(), listOf((MinL + 2).toLong(), (MinL + 1).toLong(), MinL))
doTest((MinC + 2).toChar() downTo MinC step 1, (MinC + 2).toChar(), MinC, -1, listOf((MinC + 2).toChar(), (MinC + 1).toChar(), MinC))
doTest((MinC + 2) downTo MinC step 1, (MinC + 2), MinC, -1, listOf((MinC + 2), (MinC + 1), MinC))
}
test fun inexactDownToMinValue() {
@@ -147,6 +147,6 @@ public class RangeIterationJVMTest {
doTest((MinS + 5).toShort() downTo MinS step 3, (MinS + 5).toShort(), MinS, -3, listOf((MinS + 5).toShort(), (MinS + 2).toShort()))
doTest((MinL + 5).toLong() downTo MinL step 3, (MinL + 5).toLong(), MinL, -3.toLong(), listOf((MinL + 5).toLong(), (MinL + 2).toLong()))
doTest((MinC + 5).toChar() downTo MinC step 3, (MinC + 5).toChar(), MinC, -3, listOf((MinC + 5).toChar(), (MinC + 2).toChar()))
doTest((MinC + 5) downTo MinC step 3, (MinC + 5), MinC, -3, listOf((MinC + 5), (MinC + 2)))
}
}