diff options
| -rw-r--r-- | sources/scala/UnitTest.scala | 51 |
1 files changed, 35 insertions, 16 deletions
diff --git a/sources/scala/UnitTest.scala b/sources/scala/UnitTest.scala index e5cefb94df..1973ab08c5 100644 --- a/sources/scala/UnitTest.scala +++ b/sources/scala/UnitTest.scala @@ -2,40 +2,59 @@ package scala ; object UnitTest { + def message_passedOK:Unit = { + System.out.println("passed ok") + } + + def message_failed( actual:String, expected:String ):Unit = { + System.out.print("failed! we got"); + System.out.print( "\""+ actual +"\"" ); + System.out.println(" but expected " + expected) + } + + def testEquals[a]( actual: a, expected: a ):Unit = { + + if( actual == expected ) + { + message_passedOK + } + else + { + message_failed( actual.toString(), expected.toString() ) + } + + } // testEquals + def test[b,a]( doit:b => a, input: b, - expectedResult:a ):Unit = { - - if( doit(input) == expectedResult ) + expected:a ):Unit = { + val actual = doit( input ); + if( actual == expected ) { - System.out.println("passed ok") + message_passedOK } else { - System.out.print("failed! we got"); - System.out.print( "\""+doit(input).toString()+"\"" ); - System.out.println(" but expected "+expectedResult) + message_failed( actual.toString(), expected.toString() ) } - } // testAlg + } // test def test2[c,b,a]( doit:(c,b) => a, in1: c, in2: b, - expectedResult:a ):Unit = { - - if( doit(in1,in2) == expectedResult ) + expected:a ):Unit = { + val actual = doit( in1, in2 ); + if( actual == expected ) { - System.out.println("passed ok") + message_passedOK; } else { - System.out.print("failed! we got"); - System.out.print( "\""+doit(in1,in2).toString()+"\"" ); - System.out.println(" but expected "+expectedResult) + message_failed( actual.toString(), expected.toString() ) } - } // testAlg + } // test2 } // unitTest |