From 1f3355d71499212df24b96ed9d12e4727bca425c Mon Sep 17 00:00:00 2001 From: michelou Date: Tue, 14 Jun 2005 17:22:31 +0000 Subject: - added more test cases. --- test/files/pos/attributes.scala | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'test/files/pos/attributes.scala') diff --git a/test/files/pos/attributes.scala b/test/files/pos/attributes.scala index fdf24b5168..ab30e2cdeb 100644 --- a/test/files/pos/attributes.scala +++ b/test/files/pos/attributes.scala @@ -3,43 +3,53 @@ [serializable] class C1; [serializable,volatile] class C2; [serializable][volatile] class C3; +[serializable][volatile,serializable] class C4; [serializable] trait T1; [serializable,volatile] trait T2; [serializable][volatile] trait T3; +[serializable][volatile,serializable] trait T4; [serializable] object O1 extends C1; [serializable,volatile] object O2 extends C2; [serializable][volatile] object O3 extends C3; +[serializable][volatile,serializable] object O4 extends C4; -object O4 { +object O5 { final val n = 2; [SerialVersionUID(0)] class C1; [SerialVersionUID(n)] class C2; + [SerialVersionUID(0),SerialVersionUID(n)] class C3; + [SerialVersionUID(0)][SerialVersionUID(n)] class C4; } abstract class A1 { [serializable] var y1: C1; [serializable,volatile] var y2: C2; [serializable][volatile] var y3: C3; + [serializable][volatile,serializable] var y4: C4; [serializable] def foo1: C1; [serializable,volatile] def foo2: C2; [serializable][volatile] def foo3: C3; + [serializable][volatile,serializable] def foo4: C4; } -object O5 { +object O6 { [serializable] val x1 = new C1; [serializable,volatile] val x2 = new C2; [serializable][volatile] val x3 = new C3; + [serializable][volatile,serializable] val x4 = new C4; [serializable] var y1: C1 = _; [serializable,volatile] var y2: C2 = _; [serializable][volatile] var y3: C3 = _; + [serializable][volatile,serializable] var y4: C4 = _; [serializable] private def foo1 = x1; [serializable,volatile] private def foo2 = x2; [serializable][volatile] protected def foo3 = x3; + [serializable][volatile,serializable] protected def foo4 = x4; } object myAttrs { @@ -47,7 +57,7 @@ object myAttrs { class a2(x: Int) extends scala.Attribute; class a3(x: a1) extends scala.Attribute; } -object O6 { +object O7 { class a1 extends scala.Attribute; class a2(x: Int) extends scala.Attribute; class a3(x: a1) extends scala.Attribute; -- cgit v1.2.3