diff options
Diffstat (limited to 'test/files/jvm')
-rw-r--r-- | test/files/jvm/t2511.check | 3 | ||||
-rw-r--r-- | test/files/jvm/t2511.scala | 7 | ||||
-rw-r--r-- | test/files/jvm/t3003/Annot.java | 4 | ||||
-rw-r--r-- | test/files/jvm/t3003/Test_1.scala | 9 |
4 files changed, 19 insertions, 4 deletions
diff --git a/test/files/jvm/t2511.check b/test/files/jvm/t2511.check index ec747fa47d..004b8e2031 100644 --- a/test/files/jvm/t2511.check +++ b/test/files/jvm/t2511.check @@ -1 +1,2 @@ -null
\ No newline at end of file +null +bippy diff --git a/test/files/jvm/t2511.scala b/test/files/jvm/t2511.scala index d4b5e83d0f..eb57dc503d 100644 --- a/test/files/jvm/t2511.scala +++ b/test/files/jvm/t2511.scala @@ -4,6 +4,7 @@ object Test { trait IMyMessage extends Serializable { @transient var message: String = null + var message2: String = null } class MyMessage extends IMyMessage @@ -13,6 +14,7 @@ object Test { val out = new ObjectOutputStream(buf) val m = new MyMessage m.message = "foo" + m.message2 = "bippy" out.writeObject(m) out.flush buf.toByteArray @@ -25,6 +27,9 @@ object Test { def main(args: Array[String]) { val m = unserialize(serialize) - println(m.message) + // Xcheckinit freaks out here but its nullness is what we're testing + try println(m.message) + catch { case _: UninitializedFieldError => println("null") } + println(m.message2) } } diff --git a/test/files/jvm/t3003/Annot.java b/test/files/jvm/t3003/Annot.java index 1d5f206fd7..30dcb66bd7 100644 --- a/test/files/jvm/t3003/Annot.java +++ b/test/files/jvm/t3003/Annot.java @@ -1,4 +1,6 @@ -@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) +import java.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) public @interface Annot { Class<?> optionType(); } diff --git a/test/files/jvm/t3003/Test_1.scala b/test/files/jvm/t3003/Test_1.scala index ec7f220c94..8ec08bebc6 100644 --- a/test/files/jvm/t3003/Test_1.scala +++ b/test/files/jvm/t3003/Test_1.scala @@ -3,6 +3,13 @@ class C { } object Test { def main(args: Array[String]) { - println(classOf[C].getDeclaredFields.toList.sortBy(f => f.getName).map(f => f.getAnnotations.toList)) + val xs = ( + classOf[C].getDeclaredFields.toList + . sortBy(f => f.getName) + . map(f => f.getAnnotations.toList) + . filterNot (_.isEmpty) // there are extra fields under -Xcheckinit + ) + + println(xs) } } |