diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-12-14 12:01:53 +0000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-12-14 12:01:53 +0000 |
commit | 461c798dbf0653ed8d89d7bd6cbd94366f6572f7 (patch) | |
tree | a0abf0216ed107e2b6edcc7cc847fa39ae52d514 /test | |
parent | 1db89021e52efd946054c98add2f855d050453c4 (diff) | |
download | scala-461c798dbf0653ed8d89d7bd6cbd94366f6572f7.tar.gz scala-461c798dbf0653ed8d89d7bd6cbd94366f6572f7.tar.bz2 scala-461c798dbf0653ed8d89d7bd6cbd94366f6572f7.zip |
integration of java and scala deprecation
Diffstat (limited to 'test')
-rw-r--r-- | test/files/jvm/deprecation/Defs.java | 12 | ||||
-rw-r--r-- | test/files/jvm/deprecation/Test_1.scala | 17 | ||||
-rw-r--r-- | test/files/jvm/deprecation/Use_2.java | 10 |
3 files changed, 39 insertions, 0 deletions
diff --git a/test/files/jvm/deprecation/Defs.java b/test/files/jvm/deprecation/Defs.java new file mode 100644 index 0000000000..52101c342a --- /dev/null +++ b/test/files/jvm/deprecation/Defs.java @@ -0,0 +1,12 @@ +public class Defs { + /** @deprecated */ + public int i = 1; + + /** @deprecated */ + public int bar() { return 0; } + + /** @deprecated */ + public class Inner { + public int buz() { return 0; } + } +} diff --git a/test/files/jvm/deprecation/Test_1.scala b/test/files/jvm/deprecation/Test_1.scala new file mode 100644 index 0000000000..92173f94e2 --- /dev/null +++ b/test/files/jvm/deprecation/Test_1.scala @@ -0,0 +1,17 @@ +class Test { + def test { + val d = new Defs + val u = d.i + 1 + d.i = 2 + val v = d.bar() + val i = new d.Inner + val w = i.buz() + } + + @deprecated("no longer!") class Inner { + @deprecated("uncool") def f: Int = 1 + @deprecated("this one as well!") var g = -1 + } +} + +object Test { def main(args: Array[String]) { } } diff --git a/test/files/jvm/deprecation/Use_2.java b/test/files/jvm/deprecation/Use_2.java new file mode 100644 index 0000000000..65da8a8fac --- /dev/null +++ b/test/files/jvm/deprecation/Use_2.java @@ -0,0 +1,10 @@ +class Use_2 { + public int test() { + Test u = new Test(); + Test.Inner a = u.new Inner(); + int i = a.f(); + int j = a.g(); + a.g_$eq(5); + return i + j; + } +}
\ No newline at end of file |