diff options
author | Paul Phillips <paulp@improving.org> | 2009-10-20 21:15:44 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2009-10-20 21:15:44 +0000 |
commit | 9dc0426d05b5aa36a8cd7acb998e00bbbe843dbc (patch) | |
tree | 3a83f4862bfa7c451c48ab72cc4c4e96754d23a1 | |
parent | 2d1242bd5e2486c1ba785d39e81408d418dacc13 (diff) | |
download | scala-9dc0426d05b5aa36a8cd7acb998e00bbbe843dbc.tar.gz scala-9dc0426d05b5aa36a8cd7acb998e00bbbe843dbc.tar.bz2 scala-9dc0426d05b5aa36a8cd7acb998e00bbbe843dbc.zip |
Updated remaining test case to reflect the slig...
Updated remaining test case to reflect the slightly differing semantics
of the Ordering fix.
-rw-r--r-- | test/files/neg/checksensible.check | 34 | ||||
-rw-r--r-- | test/files/neg/checksensible.scala | 2 | ||||
-rw-r--r-- | test/files/neg/checksensibleUnit.check | 7 | ||||
-rw-r--r-- | test/files/neg/checksensibleUnit.scala | 5 |
4 files changed, 26 insertions, 22 deletions
diff --git a/test/files/neg/checksensible.check b/test/files/neg/checksensible.check index df1266066e..9d0487f9a2 100644 --- a/test/files/neg/checksensible.check +++ b/test/files/neg/checksensible.check @@ -1,50 +1,44 @@ checksensible.scala:1: error: class Test needs to be abstract, since method isabstract is not defined class Test { ^ -checksensible.scala:3: warning: comparing values of types Ordered[Unit] and Unit using `>' will always yield false - println((c = 1) > 0) - ^ -checksensible.scala:4: warning: comparing values of types Ordered[Unit] and Unit using `<=' will always yield true - println((c = 1) <= 0) - ^ -checksensible.scala:5: warning: comparing values of types Unit and Int using `==' will always yield false +checksensible.scala:3: warning: comparing values of types Unit and Int using `==' will always yield false println((c = 1) == 0) ^ -checksensible.scala:7: warning: comparing values of types Int and java.lang.String using `==' will always yield false +checksensible.scala:5: warning: comparing values of types Int and java.lang.String using `==' will always yield false println(1 == "abc") ^ -checksensible.scala:8: warning: comparing values of types Int and Boolean using `!=' will always yield true +checksensible.scala:6: warning: comparing values of types Int and Boolean using `!=' will always yield true println(1 != true) ^ -checksensible.scala:10: warning: comparing a fresh object using `==' will always yield false +checksensible.scala:8: warning: comparing a fresh object using `==' will always yield false println(((x: Int) => x + 1) == null) ^ -checksensible.scala:11: warning: comparing a fresh object using `==' will always yield false +checksensible.scala:9: warning: comparing a fresh object using `==' will always yield false println(new Object == new Object) ^ -checksensible.scala:12: warning: comparing a fresh object using `!=' will always yield true +checksensible.scala:10: warning: comparing a fresh object using `!=' will always yield true println(new Exception() != new Exception()) ^ -checksensible.scala:15: warning: comparing values of types Int and Null using `==' will always yield false +checksensible.scala:13: warning: comparing values of types Int and Null using `==' will always yield false if (foo.length == null) // == 0 makes more sense, but still ^ -checksensible.scala:24: warning: comparing values of types Unit and Int using `!=' will always yield true +checksensible.scala:22: warning: comparing values of types Unit and Int using `!=' will always yield true while ((c = in.read) != -1) ^ -checksensible.scala:30: warning: comparing values of types Unit and Boolean using `==' will always yield false +checksensible.scala:28: warning: comparing values of types Unit and Boolean using `==' will always yield false println({} == true) ^ -checksensible.scala:32: warning: comparing a fresh object using `==' will always yield false +checksensible.scala:30: warning: comparing a fresh object using `==' will always yield false println(new Object == 1) ^ -checksensible.scala:33: warning: comparing values of types Int and java.lang.Object using `==' will always yield false +checksensible.scala:31: warning: comparing values of types Int and java.lang.Object using `==' will always yield false println(1 == (new Object)) ^ -checksensible.scala:37: warning: comparing values of types Int and Unit using `!=' will always yield true +checksensible.scala:35: warning: comparing values of types Int and Unit using `!=' will always yield true println(1 != println) ^ -checksensible.scala:38: warning: comparing values of types Int and Symbol using `!=' will always yield true +checksensible.scala:36: warning: comparing values of types Int and Symbol using `!=' will always yield true println(1 != 'sym) ^ -15 warnings found +13 warnings found one error found diff --git a/test/files/neg/checksensible.scala b/test/files/neg/checksensible.scala index f895d09d0b..092c08592f 100644 --- a/test/files/neg/checksensible.scala +++ b/test/files/neg/checksensible.scala @@ -1,7 +1,5 @@ class Test { var c = 0 - println((c = 1) > 0) - println((c = 1) <= 0) println((c = 1) == 0) println(1 == "abc") diff --git a/test/files/neg/checksensibleUnit.check b/test/files/neg/checksensibleUnit.check new file mode 100644 index 0000000000..1de1aa8031 --- /dev/null +++ b/test/files/neg/checksensibleUnit.check @@ -0,0 +1,7 @@ +checksensibleUnit.scala:3: error: value > is not a member of Unit + println((c = 1) > 0) + ^ +checksensibleUnit.scala:4: error: value <= is not a member of Unit + println((c = 1) <= 0) + ^ +two errors found diff --git a/test/files/neg/checksensibleUnit.scala b/test/files/neg/checksensibleUnit.scala new file mode 100644 index 0000000000..11c3b67ea2 --- /dev/null +++ b/test/files/neg/checksensibleUnit.scala @@ -0,0 +1,5 @@ +class Test { + var c = 0 + println((c = 1) > 0) + println((c = 1) <= 0) +} |