From 28113d4604f1a403aa7611028ab8fcc217c3449c Mon Sep 17 00:00:00 2001 From: michelou Date: Mon, 14 Aug 2006 13:25:12 +0000 Subject: added contrib #176 to test file run/literals.scala --- test/files/run/literals.check | 2 + test/files/run/literals.scala | 166 ++++++++++++++++++++++-------------------- 2 files changed, 88 insertions(+), 80 deletions(-) (limited to 'test/files/run') diff --git a/test/files/run/literals.check b/test/files/run/literals.check index b2a96ecd3f..030e3350c1 100644 --- a/test/files/run/literals.check +++ b/test/files/run/literals.check @@ -4,6 +4,8 @@ test 65.asInstanceOf[char] == 'A' was successful test "\141\142" == "ab" was successful test "\0x61\0x62".trim() == "x61\0x62" was successful +test (65 : Byte) == 'A' was successful + test 01 == 1 was successful test 010 == 8 was successful test 0X01 == 1 was successful diff --git a/test/files/run/literals.scala b/test/files/run/literals.scala index 50da72b655..85f755969f 100644 --- a/test/files/run/literals.scala +++ b/test/files/run/literals.scala @@ -9,15 +9,16 @@ object Test { /* I add a couple of Unicode identifier tests here temporarily */ - def \u03b1\u03c1\u03b5\u03c4\u03b7 = "alpha rho epsilon tau eta"; + def \u03b1\u03c1\u03b5\u03c4\u03b7 = "alpha rho epsilon tau eta" - case class GGG(i:int) { - def \u03b1\u03b1( that:GGG ) = i+that.i; + case class GGG(i: Int) { + def \u03b1\u03b1(that: GGG) = i + that.i } + def check_success[a](name: String, closure: => a, expected: a): Unit = { - Console.print("test " + name); + Console.print("test " + name) try { - val actual: a = closure; + val actual: a = closure if (actual == expected) { Console.print(" was successful"); } else { @@ -33,102 +34,107 @@ object Test { def main(args: Array[String]) = { // char - check_success("'\\u0024' == '$'", '\u0024', '$'); - check_success("'\\u005f' == '_'", '\u005f', '_'); - check_success("65.asInstanceOf[char] == 'A'", 65.asInstanceOf[char], 'A'); - check_success("\"\\141\\142\" == \"ab\"", "\141\142", "ab"); - check_success("\"\\0x61\\0x62\".trim() == \"x61\\0x62\"", "\0x61\0x62".trim(), "x61\0x62"); + check_success("'\\u0024' == '$'", '\u0024', '$') + check_success("'\\u005f' == '_'", '\u005f', '_') + check_success("65.asInstanceOf[char] == 'A'", 65.asInstanceOf[char], 'A') + check_success("\"\\141\\142\" == \"ab\"", "\141\142", "ab") + check_success("\"\\0x61\\0x62\".trim() == \"x61\\0x62\"", "\0x61\0x62".trim(), "x61\0x62") - Console.println; + Console.println - // int - check_success("01 == 1", 01, 1); - check_success("010 == 8", 010, 8); - check_success("0X01 == 1", 0X01, 1); - check_success("0x01 == 1", 0x01, 1); - check_success("0x10 == 16", 0x10, 16); - check_success("0xa == 10", 0xa, 10); - check_success("0x0a == 10", 0x0a, 10); - - check_success("+01 == 1", +01, 1); - check_success("+010 == 8", +010, 8); - check_success("+0x01 == 1", +0x01, 1); - check_success("+0x10 == 16", +0x10, 16); - check_success("+0xa == 10", +0xa, 10); - check_success("+0x0a == 10", +0x0a, 10); - - check_success("-01 == -1", -01, -1); - check_success("-010 == -8", -010, -8); - check_success("-0x01 == -1", -0x01, -1); - check_success("-0x10 == -16", -0x10, -16); - check_success("-0xa == -10", -0xa, -10); - check_success("-0x0a == -10", -0x0a, -10); - - check_success("017777777777 == 2147483647", 017777777777, 2147483647); - check_success("020000000000 == -2147483648", 020000000000, -2147483648); - check_success("037777777777 == -1", 037777777777, -1); - - check_success("0x7fffffff == 2147483647", 0x7fffffff, 2147483647); - check_success("0x80000000 == -2147483648", 0x80000000, -2147483648); - check_success("0xffffffff == -1", 0xffffffff, -1); + // boolean + check_success("(65 : Byte) == 'A'", (65: Byte) == 'A', true) // contrib #176 - Console.println; + Console.println + + // int + check_success("01 == 1", 01, 1) + check_success("010 == 8", 010, 8) + check_success("0X01 == 1", 0X01, 1) + check_success("0x01 == 1", 0x01, 1) + check_success("0x10 == 16", 0x10, 16) + check_success("0xa == 10", 0xa, 10) + check_success("0x0a == 10", 0x0a, 10) + + check_success("+01 == 1", +01, 1) + check_success("+010 == 8", +010, 8) + check_success("+0x01 == 1", +0x01, 1) + check_success("+0x10 == 16", +0x10, 16) + check_success("+0xa == 10", +0xa, 10) + check_success("+0x0a == 10", +0x0a, 10) + + check_success("-01 == -1", -01, -1) + check_success("-010 == -8", -010, -8) + check_success("-0x01 == -1", -0x01, -1) + check_success("-0x10 == -16", -0x10, -16) + check_success("-0xa == -10", -0xa, -10) + check_success("-0x0a == -10", -0x0a, -10) + + check_success("017777777777 == 2147483647", 017777777777, 2147483647) + check_success("020000000000 == -2147483648", 020000000000, -2147483648) + check_success("037777777777 == -1", 037777777777, -1) + + check_success("0x7fffffff == 2147483647", 0x7fffffff, 2147483647) + check_success("0x80000000 == -2147483648", 0x80000000, -2147483648) + check_success("0xffffffff == -1", 0xffffffff, -1) + + Console.println // long - check_success("1l == 1L", 1l, 1L); - check_success("1L == 1l", 1L, 1l); - check_success("1.asInstanceOf[long] == 1l", 1.asInstanceOf[long], 1l); + check_success("1l == 1L", 1l, 1L) + check_success("1L == 1l", 1L, 1l) + check_success("1.asInstanceOf[long] == 1l", 1.asInstanceOf[long], 1l) check_success("0777777777777777777777L == 9223372036854775807L", - 0777777777777777777777L, 9223372036854775807L); + 0777777777777777777777L, 9223372036854775807L) check_success("01000000000000000000000L == -9223372036854775808L", - 01000000000000000000000L, -9223372036854775808L); + 01000000000000000000000L, -9223372036854775808L) check_success("01777777777777777777777L == -1L", - 01777777777777777777777L, -1L); + 01777777777777777777777L, -1L) check_success("0x7fffffffffffffffL == 9223372036854775807L", - 0x7fffffffffffffffL, 9223372036854775807L); + 0x7fffffffffffffffL, 9223372036854775807L) check_success("0x8000000000000000L == -9223372036854775808L", - 0x8000000000000000L, -9223372036854775808L); + 0x8000000000000000L, -9223372036854775808L) check_success("0xffffffffffffffffL == -1L", - 0xffffffffffffffffL, -1L); + 0xffffffffffffffffL, -1L) - Console.println; + Console.println // see JLS at address: // http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#230798 // float - check_success("1e1f == 10.0f", 1e1f, 10.0f); - check_success("2.f == 2.0f", 2.f, 2.0f); - check_success(".3f == 0.3f", .3f, 0.3f); - check_success("0f == 0.0f", 0f, 0.0f); - check_success("3.14f == 3.14f", 3.14f, 3.14f); - check_success("6.022e23f == 6.022e23f", 6.022e23f, 6.022e23f); - check_success("09f == 9.0f", 09f, 9.0f); - check_success("1.asInstanceOf[float] == 1.0", 1.asInstanceOf[float], 1.0f); - check_success("1l.asInstanceOf[float] == 1.0", 1l.asInstanceOf[float], 1.0f); - - Console.println; + check_success("1e1f == 10.0f", 1e1f, 10.0f) + check_success("2.f == 2.0f", 2.f, 2.0f) + check_success(".3f == 0.3f", .3f, 0.3f) + check_success("0f == 0.0f", 0f, 0.0f) + check_success("3.14f == 3.14f", 3.14f, 3.14f) + check_success("6.022e23f == 6.022e23f", 6.022e23f, 6.022e23f) + check_success("09f == 9.0f", 09f, 9.0f) + check_success("1.asInstanceOf[float] == 1.0", 1.asInstanceOf[float], 1.0f) + check_success("1l.asInstanceOf[float] == 1.0", 1l.asInstanceOf[float], 1.0f) + + Console.println // double - check_success("1e1 == 10.0", 1e1, 10.0); - check_success("2. == 2.0", 2., 2.0); - check_success("2.d == 2.0", 2.d, 2.0); - check_success(".3 == 0.3", .3, 0.3); - check_success("0.0 == 0.0", 0.0, 0.0); - check_success("0d == 0.0", 0d, 0.0); - check_success("3.14 == 3.14", 3.14, 3.14); - check_success("1e-9d == 1.0e-9", 1e-9d, 1.0e-9); - check_success("1e137 == 1.0e137", 1e137, 1.0e137); - check_success("1.asInstanceOf[double] == 1.0", 1.asInstanceOf[double], 1.0); - check_success("1l.asInstanceOf[double] == 1.0", 1l.asInstanceOf[double], 1.0); - - Console.println; - check_success("\"\".length()", "\u001a".length(), 1); - - val ggg = GGG( 1 ) \u03b1\u03b1 GGG( 2 ); - check_success("ggg == 3", ggg, 3); + check_success("1e1 == 10.0", 1e1, 10.0) + check_success("2. == 2.0", 2., 2.0) + check_success("2.d == 2.0", 2.d, 2.0) + check_success(".3 == 0.3", .3, 0.3) + check_success("0.0 == 0.0", 0.0, 0.0) + check_success("0d == 0.0", 0d, 0.0) + check_success("3.14 == 3.14", 3.14, 3.14) + check_success("1e-9d == 1.0e-9", 1e-9d, 1.0e-9) + check_success("1e137 == 1.0e137", 1e137, 1.0e137) + check_success("1.asInstanceOf[double] == 1.0", 1.asInstanceOf[double], 1.0) + check_success("1l.asInstanceOf[double] == 1.0", 1l.asInstanceOf[double], 1.0) + + Console.println + check_success("\"\".length()", "\u001a".length(), 1) + + val ggg = GGG(1) \u03b1\u03b1 GGG(2) + check_success("ggg == 3", ggg, 3) } } -- cgit v1.2.3