Drop deprecated char operations: correct test data.

This commit is contained in:
Ilya Gorbunov
2015-07-02 18:04:54 +03:00
parent e8aff3360a
commit 39b27751df
11 changed files with 17 additions and 281 deletions
@@ -2,76 +2,10 @@ package foo
fun box(): String {
assertEquals(75, 10 + 'A')
assertEquals(75, (10: Short) + 'A')
assertEquals(75, (10: Byte) + 'A')
assertEquals(75.0, 10.0 + 'A')
assertEquals(75.0, 10.0f + 'A')
assertEquals(75L, 10L + 'A')
assertEquals(75, 'A' + 10)
assertEquals(75, 'A' + (10: Short))
assertEquals(75, 'A' + (10: Byte))
assertEquals(75.0, 'A' + 10.0)
assertEquals(75.0, 'A' + 10.0f)
assertEquals(75L, 'A' + 10L)
assertEquals(-55, 10 - 'A')
assertEquals(-55, (10: Short) - 'A')
assertEquals(-55, (10: Byte) - 'A')
assertEquals(-55.0, 10.0 - 'A')
assertEquals(-55.0, 10.0f - 'A')
assertEquals(-55L, 10L - 'A')
assertEquals(55, 'A' - 10)
assertEquals(55, 'A' - (10: Short))
assertEquals(55, 'A' - (10: Byte))
assertEquals(55.0, 'A' - 10.0)
assertEquals(55.0, 'A' - 10.0f)
assertEquals(55L, 'A' - 10L)
assertEquals(650, 10 * 'A')
assertEquals(650, (10: Short) * 'A')
assertEquals(650, (10: Byte) * 'A')
assertEquals(650.0, 10.0 * 'A')
assertEquals(650.0, 10.0f * 'A')
assertEquals(650L, 10L * 'A')
assertEquals(650, 'A' * 10)
assertEquals(650, 'A' * (10: Short))
assertEquals(650, 'A' * (10: Byte))
assertEquals(650.0, 'A' * 10.0)
assertEquals(650.0, 'A' * 10.0f)
assertEquals(650L, 'A' * 10L)
assertEquals(1, 100 / 'A')
assertEquals(1, (100: Short) / 'A')
assertEquals(1, (100: Byte) / 'A')
assertEquals(100.0 / 65.0, 100.0 / 'A')
assertEquals(100.0 / 65.0, 100.0f / 'A')
assertEquals(1L, 100L / 'A')
assertEquals(6, 'A' / 10)
assertEquals(6, 'A' / (10: Short))
assertEquals(6, 'A' / (10: Byte))
assertEquals(6.5, 'A' / 10.0)
assertEquals(6.5, 'A' / 10.0f)
assertEquals(6L, 'A' / 10L)
assertEquals(35, 100 % 'A')
assertEquals(35, (100: Short) % 'A')
assertEquals(35, (100: Byte) % 'A')
// TODO Uncomment when KT-5860 (Double.mod(Char) is absent) will be fixed
//assertEquals(35.0, 100.0 % 'A')
assertEquals(35.0, 100.0f % 'A')
assertEquals(35L, 100L % 'A')
assertEquals(5, 'A' % 10)
assertEquals(5, 'A' % (10: Short))
assertEquals(5, 'A' % (10: Byte))
assertEquals(5.0, 'A' % 10.0)
assertEquals(5.0, 'A' % 10.0f)
assertEquals(5L, 'A' % 10L)
assertEquals(4, '4' - '0')
return "OK"
}
@@ -2,19 +2,10 @@ package foo
fun box(): String {
assertEquals(true, 64 < 'A')
assertEquals(true, (64: Short) < 'A')
assertEquals(true, (64: Byte) < 'A')
assertEquals(true, 64L < 'A')
assertEquals(true, 64.0 < 'A')
assertEquals(true, 64.0f < 'A')
assertEquals(true, 'A' > 64)
assertEquals(true, 'A' > (64: Short))
assertEquals(true, 'A' > (64: Byte))
assertEquals(true, 'A' > 64L)
assertEquals(true, 'A' > 64.0)
assertEquals(true, 'A' > 64.0f)
assertEquals(true, 'A' < '\uFFFF')
assertEquals(true, 'A' > '\u0000')
assertEquals(true, 'A' <= '\u0041')
assertEquals(true, 'A' >= '\u0041')
return "OK"
}
@@ -21,9 +21,5 @@ fun box(): String {
--x
assertEquals('C', x)
assertEquals(67, +x)
assertEquals(-67, -x)
return "OK"
}
@@ -19,7 +19,6 @@ fun box(): String {
assertEquals(-1, 1 compareTo (2:Byte))
assertEquals(-1, 1 compareTo 2.0)
assertEquals(-1, 1 compareTo 2.0f)
assertEquals(-1, 1 compareTo 'A')
assertEquals(1, 10 compareTo 2L)
assertEquals(1, 10 compareTo 2)
@@ -43,7 +42,6 @@ fun box(): String {
assertEquals(-1, (1: Short) compareTo (2:Byte))
assertEquals(-1, (1: Short) compareTo 2.0)
assertEquals(-1, (1: Short) compareTo 2.0f)
assertEquals(-1, (1: Short) compareTo 'A')
assertEquals(1, (10: Byte) compareTo 2L)
assertEquals(-1, (10: Byte) compareTo 7540113804746346429L)
@@ -53,7 +51,6 @@ fun box(): String {
assertEquals(1, ((10: Byte): Comparable<Byte>) compareTo (2:Byte))
assertEquals(1, (10: Byte) compareTo 2.0)
assertEquals(1, (10: Byte) compareTo 2.0f)
assertEquals(-1, (10: Byte) compareTo 'A')
assertEquals(0, 2.0 compareTo 2L)
assertEquals(-1, 2.0 compareTo 7540113804746346429L)
@@ -63,7 +60,6 @@ fun box(): String {
assertEquals(0, 2.0 compareTo 2.0)
assertEquals(0, (2.0: Comparable<Double>) compareTo 2.0)
assertEquals(0, 2.0 compareTo 2.0f)
assertEquals(-1, 2.0 compareTo 'A')
assertEquals(1, 3.0f compareTo 2L)
assertEquals(-1, 3.0f compareTo 7540113804746346429L)
@@ -72,7 +68,6 @@ fun box(): String {
assertEquals(1, 3.0f compareTo (2:Byte))
assertEquals(1, 3.0f compareTo 2.0)
assertEquals(1, 3.0f compareTo 2.0f)
assertEquals(-1, 3.0f compareTo 'A')
assertEquals(1, (3.0f: Comparable<Float>) compareTo 2.0f)
assertEquals(1, 10L compareTo 2L)
@@ -83,15 +78,7 @@ fun box(): String {
assertEquals(1, 10L compareTo (2:Byte))
assertEquals(1, 10L compareTo 2.0)
assertEquals(1, 10L compareTo 2.0f)
assertEquals(-1, 10L compareTo 'A')
assertEquals(-1, 'A' compareTo 200L)
assertEquals(-1, 'A' compareTo 7540113804746346429L)
assertEquals(1, 'A' compareTo 2)
assertEquals(1, 'A' compareTo (2:Short))
assertEquals(1, 'A' compareTo (2:Byte))
assertEquals(1, 'A' compareTo 2.0)
assertEquals(1, 'A' compareTo 2.0f)
assertEquals(0, 'A' compareTo 'A')
assertEquals(-1, 1L compareTo 2L)