diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 05:49:38 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 05:49:38 -0700 |
commit | 9c7915715d2a00f62b597b9d4eff1c36c36e14ba (patch) | |
tree | f28854c253485a7fbeda4c2864cb4359543c566d /test/pending/pos | |
parent | a5dcbbc54d48610289218ea3b4d85b47f7cf607c (diff) | |
parent | 1729b26500506530733753d44f9ce2a2597e0e33 (diff) | |
download | scala-9c7915715d2a00f62b597b9d4eff1c36c36e14ba.tar.gz scala-9c7915715d2a00f62b597b9d4eff1c36c36e14ba.tar.bz2 scala-9c7915715d2a00f62b597b9d4eff1c36c36e14ba.zip |
Merge pull request #921 from adriaanm/ticket-spuriousness
move test files that fail spuriously to pending
Diffstat (limited to 'test/pending/pos')
-rw-r--r-- | test/pending/pos/t1751.cmds | 3 | ||||
-rw-r--r-- | test/pending/pos/t1751/A1_2.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/t1751/A2_1.scala | 2 | ||||
-rw-r--r-- | test/pending/pos/t1751/SuiteClasses.java | 3 | ||||
-rw-r--r-- | test/pending/pos/t1782.cmds | 2 | ||||
-rw-r--r-- | test/pending/pos/t1782/Ann.java | 3 | ||||
-rw-r--r-- | test/pending/pos/t1782/Days.java | 3 | ||||
-rw-r--r-- | test/pending/pos/t1782/ImplementedBy.java | 3 | ||||
-rw-r--r-- | test/pending/pos/t1782/Test_1.scala | 16 | ||||
-rw-r--r-- | test/pending/pos/t294.cmds | 3 | ||||
-rw-r--r-- | test/pending/pos/t294/Ann.java | 3 | ||||
-rw-r--r-- | test/pending/pos/t294/Ann2.java | 3 | ||||
-rw-r--r-- | test/pending/pos/t294/Test_1.scala | 7 | ||||
-rw-r--r-- | test/pending/pos/t294/Test_2.scala | 1 |
14 files changed, 54 insertions, 0 deletions
diff --git a/test/pending/pos/t1751.cmds b/test/pending/pos/t1751.cmds new file mode 100644 index 0000000000..d4a4898ffd --- /dev/null +++ b/test/pending/pos/t1751.cmds @@ -0,0 +1,3 @@ +javac SuiteClasses.java +scalac A2_1.scala +scalac A1_2.scala diff --git a/test/pending/pos/t1751/A1_2.scala b/test/pending/pos/t1751/A1_2.scala new file mode 100644 index 0000000000..354d5eecd0 --- /dev/null +++ b/test/pending/pos/t1751/A1_2.scala @@ -0,0 +1,2 @@ +@SuiteClasses(Array(classOf[A2])) +class A1 diff --git a/test/pending/pos/t1751/A2_1.scala b/test/pending/pos/t1751/A2_1.scala new file mode 100644 index 0000000000..c768062e43 --- /dev/null +++ b/test/pending/pos/t1751/A2_1.scala @@ -0,0 +1,2 @@ +@SuiteClasses(Array()) +class A2 diff --git a/test/pending/pos/t1751/SuiteClasses.java b/test/pending/pos/t1751/SuiteClasses.java new file mode 100644 index 0000000000..a415e4f572 --- /dev/null +++ b/test/pending/pos/t1751/SuiteClasses.java @@ -0,0 +1,3 @@ +public @interface SuiteClasses { + public Class<?>[] value(); +} diff --git a/test/pending/pos/t1782.cmds b/test/pending/pos/t1782.cmds new file mode 100644 index 0000000000..61f3d3788e --- /dev/null +++ b/test/pending/pos/t1782.cmds @@ -0,0 +1,2 @@ +javac Ann.java Days.java ImplementedBy.java +scalac Test_1.scala diff --git a/test/pending/pos/t1782/Ann.java b/test/pending/pos/t1782/Ann.java new file mode 100644 index 0000000000..0dcfbd2ed7 --- /dev/null +++ b/test/pending/pos/t1782/Ann.java @@ -0,0 +1,3 @@ +public @interface Ann { + public Days value(); +} diff --git a/test/pending/pos/t1782/Days.java b/test/pending/pos/t1782/Days.java new file mode 100644 index 0000000000..203a87b1c2 --- /dev/null +++ b/test/pending/pos/t1782/Days.java @@ -0,0 +1,3 @@ +public enum Days { + Friday, Sunday +} diff --git a/test/pending/pos/t1782/ImplementedBy.java b/test/pending/pos/t1782/ImplementedBy.java new file mode 100644 index 0000000000..6aa8b4fa9e --- /dev/null +++ b/test/pending/pos/t1782/ImplementedBy.java @@ -0,0 +1,3 @@ +public @interface ImplementedBy { + public Class<?> value(); +} diff --git a/test/pending/pos/t1782/Test_1.scala b/test/pending/pos/t1782/Test_1.scala new file mode 100644 index 0000000000..6467a74c29 --- /dev/null +++ b/test/pending/pos/t1782/Test_1.scala @@ -0,0 +1,16 @@ +@ImplementedBy(classOf[Provider]) +trait Service { + def someMethod() +} + +class Provider + extends Service +{ + // test enumeration java annotations + @Ann(Days.Friday) def someMethod() = () + + // #2103 + @scala.beans.BeanProperty + @Ann(value = Days.Sunday) + val t2103 = "test" +} diff --git a/test/pending/pos/t294.cmds b/test/pending/pos/t294.cmds new file mode 100644 index 0000000000..62c9a5a068 --- /dev/null +++ b/test/pending/pos/t294.cmds @@ -0,0 +1,3 @@ +javac Ann.java Ann2.java +scalac Test_1.scala +scalac Test_2.scala diff --git a/test/pending/pos/t294/Ann.java b/test/pending/pos/t294/Ann.java new file mode 100644 index 0000000000..934ca46297 --- /dev/null +++ b/test/pending/pos/t294/Ann.java @@ -0,0 +1,3 @@ +public @interface Ann { + public Ann2[] nested(); +} diff --git a/test/pending/pos/t294/Ann2.java b/test/pending/pos/t294/Ann2.java new file mode 100644 index 0000000000..025b79e794 --- /dev/null +++ b/test/pending/pos/t294/Ann2.java @@ -0,0 +1,3 @@ +public @interface Ann2 { + public int value(); +} diff --git a/test/pending/pos/t294/Test_1.scala b/test/pending/pos/t294/Test_1.scala new file mode 100644 index 0000000000..ff1f34b10e --- /dev/null +++ b/test/pending/pos/t294/Test_1.scala @@ -0,0 +1,7 @@ +// also test pickling of java annotations; Test_2.scala will +// read this class file +@Ann(nested = Array(new Ann2(10))) class Test { + @Ann2(100) var ctx: Object = _ + @Ann(nested = Array()) def foo = 10 + @Ann(nested = Array(new Ann2(10), new Ann2(23))) val bam = -3 +} diff --git a/test/pending/pos/t294/Test_2.scala b/test/pending/pos/t294/Test_2.scala new file mode 100644 index 0000000000..9fb1c6e175 --- /dev/null +++ b/test/pending/pos/t294/Test_2.scala @@ -0,0 +1 @@ +class Test2 extends Test |