summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-08-20 10:45:26 +0000
committermichelou <michelou@epfl.ch>2007-08-20 10:45:26 +0000
commit5eadca1408d20df1484459309206f97aefc1688d (patch)
tree36c7c7a25abe44551e4799746491e40d45e50bd2
parent9e118bbf6afd6497ae129d30e2398620c515fafc (diff)
downloadscala-5eadca1408d20df1484459309206f97aefc1688d.tar.gz
scala-5eadca1408d20df1484459309206f97aefc1688d.tar.bz2
scala-5eadca1408d20df1484459309206f97aefc1688d.zip
fixed contrib #747
-rw-r--r--src/library/scala/testing/SUnit.scala13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/library/scala/testing/SUnit.scala b/src/library/scala/testing/SUnit.scala
index aeb829af44..a3d189cc9d 100644
--- a/src/library/scala/testing/SUnit.scala
+++ b/src/library/scala/testing/SUnit.scala
@@ -151,9 +151,10 @@ object SUnit {
/** this class defined useful assert methods */
trait Assert {
+
/** fails if expected != actual */
def assertEquals[A](msg: String, expected: A, actual: => A) {
- if (expected != actual) fail(msg)
+ if (expected != actual) fail(msg, expected, actual)
}
/** fails if expected != actual */
@@ -172,7 +173,7 @@ object SUnit {
}
/** fails if null eq actual */
- def assertNotNull(msg:String, actual: => AnyRef) {
+ def assertNotNull(msg: String, actual: => AnyRef) {
if (null eq actual) fail(msg)
}
@@ -254,8 +255,14 @@ object SUnit {
/** throws <code>AssertFailed</code> with given message <code>msg</code>.
*/
- def fail(msg: String) {
+ private def fail(msg: String) {
throw new AssertFailed(msg)
}
+
+ private def fail[A](msg: String, expected: A, actual: => A) {
+ throw new AssertFailed(msg +
+ ", expected: " + expected +
+ ", actual: " + actual)
+ }
}
}