From 265ac7ac52a920bba0e7c101103d8cbe7d65d18c Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 17 Nov 2014 17:31:15 +0100 Subject: Moving java tests to pos --- .../java-interop/failing/t1459/AbstractBase.java | 5 ++++ .../disabled/java-interop/failing/t1459/App.scala | 18 ++++++++++++++ .../java-interop/failing/t1459/Caller.java | 7 ++++++ .../disabled/java-interop/failing/t1751/A1_2.scala | 2 -- .../disabled/java-interop/failing/t1751/A2_1.scala | 2 -- .../java-interop/failing/t1751/SuiteClasses.java | 3 --- .../java-interop/failing/t2569/Child.scala | 9 +++++++ .../java-interop/failing/t2569/Parent.java | 13 ++++++++++ tests/disabled/java-interop/failing/t294/Ann.java | 3 --- tests/disabled/java-interop/failing/t294/Ann2.java | 3 --- .../java-interop/failing/t294/Test_1.scala | 7 ------ .../java-interop/failing/t294/Test_2.scala | 1 - .../java-interop/failing/varargs-bridge/A.java | 8 +++++++ .../java-interop/failing/varargs-bridge/B.scala | 7 ++++++ tests/disabled/java-interop/pos/t0288/Foo.scala | 9 ------- tests/disabled/java-interop/pos/t0288/Outer.java | 9 ------- .../disabled/java-interop/pos/t0695/JavaClass.java | 5 ---- tests/disabled/java-interop/pos/t0695/Test.scala | 3 --- tests/disabled/java-interop/pos/t1101/J.java | 1 - tests/disabled/java-interop/pos/t1101/S.scala | 1 - tests/disabled/java-interop/pos/t1102/J.java | 4 ---- tests/disabled/java-interop/pos/t1102/S.scala | 1 - tests/disabled/java-interop/pos/t1150/J.java | 4 ---- tests/disabled/java-interop/pos/t1150/S.scala | 4 ---- tests/disabled/java-interop/pos/t1152/J.java | 1 - tests/disabled/java-interop/pos/t1152/S.scala | 2 -- tests/disabled/java-interop/pos/t1176/J.java | 4 ---- tests/disabled/java-interop/pos/t1176/S.scala | 1 - tests/disabled/java-interop/pos/t1186/t1186.java | 8 ------- tests/disabled/java-interop/pos/t1196/J.java | 1 - tests/disabled/java-interop/pos/t1196/S.scala | 1 - tests/disabled/java-interop/pos/t1197/J.java | 2 -- tests/disabled/java-interop/pos/t1197/S.scala | 2 -- tests/disabled/java-interop/pos/t1203b/J.java | 1 - tests/disabled/java-interop/pos/t1203b/S.scala | 1 - tests/disabled/java-interop/pos/t1230/J.java | 1 - tests/disabled/java-interop/pos/t1230/S.scala | 1 - tests/disabled/java-interop/pos/t1231/J.java | 1 - tests/disabled/java-interop/pos/t1231/S.scala | 1 - tests/disabled/java-interop/pos/t1232/J.java | 2 -- tests/disabled/java-interop/pos/t1232/J2.java | 2 -- tests/disabled/java-interop/pos/t1232/S.scala | 2 -- tests/disabled/java-interop/pos/t1235/Test.java | 9 ------- tests/disabled/java-interop/pos/t1254/t1254.java | 28 ---------------------- tests/disabled/java-interop/pos/t1263/Test.java | 17 ------------- tests/disabled/java-interop/pos/t1263/test.scala | 10 -------- .../java-interop/pos/t1409/AbstractImpl.java | 3 --- .../java-interop/pos/t1409/ConcreteImpl.scala | 3 --- .../java-interop/pos/t1409/OuterInterface.java | 5 ---- .../java-interop/pos/t1459/AbstractBase.java | 5 ---- tests/disabled/java-interop/pos/t1459/App.scala | 18 -------------- tests/disabled/java-interop/pos/t1459/Caller.java | 7 ------ .../pos/t1642/JavaCallingScalaHashMap.java | 8 ------- tests/disabled/java-interop/pos/t1711/Seq.scala | 12 ---------- tests/disabled/java-interop/pos/t1711/Test.java | 6 ----- tests/disabled/java-interop/pos/t1745/J.java | 10 -------- tests/disabled/java-interop/pos/t1745/S.scala | 7 ------ tests/disabled/java-interop/pos/t1782/Ann.java | 3 --- tests/disabled/java-interop/pos/t1782/Days.java | 3 --- .../java-interop/pos/t1782/ImplementedBy.java | 3 --- tests/disabled/java-interop/pos/t1782/Test_1.scala | 16 ------------- tests/disabled/java-interop/pos/t1836/J.java | 1 - tests/disabled/java-interop/pos/t1836/S.scala | 1 - tests/disabled/java-interop/pos/t1840/J.java | 4 ---- tests/disabled/java-interop/pos/t1840/S.scala | 2 -- .../java-interop/pos/t1937/NumberGenerator.java | 7 ------ tests/disabled/java-interop/pos/t2377/Q.java | 12 ---------- tests/disabled/java-interop/pos/t2377/a.scala | 8 ------- tests/disabled/java-interop/pos/t2409/J.java | 4 ---- tests/disabled/java-interop/pos/t2409/t2409.scala | 1 - .../disabled/java-interop/pos/t2413/TestJava.java | 7 ------ .../java-interop/pos/t2413/TestScalac.scala | 23 ------------------ tests/disabled/java-interop/pos/t2433/A.java | 4 ---- tests/disabled/java-interop/pos/t2433/B.java | 4 ---- tests/disabled/java-interop/pos/t2433/Test.scala | 3 --- tests/disabled/java-interop/pos/t2464/JavaOne.java | 5 ---- .../java-interop/pos/t2464/ScalaOne_1.scala | 6 ----- .../disabled/java-interop/pos/t2464/t2464_2.scala | 3 --- tests/disabled/java-interop/pos/t2569/Child.scala | 9 ------- tests/disabled/java-interop/pos/t2569/Parent.java | 13 ---------- tests/disabled/java-interop/pos/t2764/Ann.java | 5 ---- tests/disabled/java-interop/pos/t2764/Enum.java | 5 ---- tests/disabled/java-interop/pos/t2764/Use.scala | 6 ----- tests/disabled/java-interop/pos/t2940/Cycle.java | 3 --- tests/disabled/java-interop/pos/t2940/Error.scala | 12 ---------- .../pos/t2956/BeanDefinitionVisitor.java | 6 ----- tests/disabled/java-interop/pos/t2956/t2956.scala | 7 ------ .../java-interop/pos/varargs-bridge/A.java | 8 ------- .../java-interop/pos/varargs-bridge/B.scala | 7 ------ tests/new/t296.scala | 5 ++++ tests/pos/java-interop/t0288/Foo.scala | 9 +++++++ tests/pos/java-interop/t0288/Outer.java | 9 +++++++ tests/pos/java-interop/t0695/JavaClass.java | 5 ++++ tests/pos/java-interop/t0695/Test.scala | 3 +++ tests/pos/java-interop/t1101/J.java | 1 + tests/pos/java-interop/t1101/S.scala | 1 + tests/pos/java-interop/t1102/J.java | 4 ++++ tests/pos/java-interop/t1102/S.scala | 1 + tests/pos/java-interop/t1150/J.java | 4 ++++ tests/pos/java-interop/t1150/S.scala | 4 ++++ tests/pos/java-interop/t1152/J.java | 1 + tests/pos/java-interop/t1152/S.scala | 2 ++ tests/pos/java-interop/t1176/J.java | 4 ++++ tests/pos/java-interop/t1176/S.scala | 1 + tests/pos/java-interop/t1186/t1186.java | 8 +++++++ tests/pos/java-interop/t1196/J.java | 1 + tests/pos/java-interop/t1196/S.scala | 1 + tests/pos/java-interop/t1197/J.java | 2 ++ tests/pos/java-interop/t1197/S.scala | 2 ++ tests/pos/java-interop/t1203b/J.java | 1 + tests/pos/java-interop/t1203b/S.scala | 1 + tests/pos/java-interop/t1230/J.java | 1 + tests/pos/java-interop/t1230/S.scala | 1 + tests/pos/java-interop/t1231/J.java | 1 + tests/pos/java-interop/t1231/S.scala | 1 + tests/pos/java-interop/t1232/J.java | 2 ++ tests/pos/java-interop/t1232/J2.java | 2 ++ tests/pos/java-interop/t1232/S.scala | 2 ++ tests/pos/java-interop/t1235/Test.java | 9 +++++++ tests/pos/java-interop/t1254/t1254.java | 28 ++++++++++++++++++++++ tests/pos/java-interop/t1263/Test.java | 17 +++++++++++++ tests/pos/java-interop/t1263/test.scala | 10 ++++++++ tests/pos/java-interop/t1409/AbstractImpl.java | 3 +++ tests/pos/java-interop/t1409/ConcreteImpl.scala | 3 +++ tests/pos/java-interop/t1409/OuterInterface.java | 5 ++++ .../t1642/JavaCallingScalaHashMap.java | 8 +++++++ tests/pos/java-interop/t1711/Seq.scala | 12 ++++++++++ tests/pos/java-interop/t1711/Test.java | 6 +++++ tests/pos/java-interop/t1745/J.java | 10 ++++++++ tests/pos/java-interop/t1745/S.scala | 7 ++++++ tests/pos/java-interop/t1751/A1_2.scala | 2 ++ tests/pos/java-interop/t1751/A2_1.scala | 2 ++ tests/pos/java-interop/t1751/SuiteClasses.java | 3 +++ tests/pos/java-interop/t1782/Ann.java | 3 +++ tests/pos/java-interop/t1782/Days.java | 3 +++ tests/pos/java-interop/t1782/ImplementedBy.java | 3 +++ tests/pos/java-interop/t1782/Test_1.scala | 16 +++++++++++++ tests/pos/java-interop/t1836/J.java | 1 + tests/pos/java-interop/t1836/S.scala | 1 + tests/pos/java-interop/t1840/J.java | 4 ++++ tests/pos/java-interop/t1840/S.scala | 2 ++ tests/pos/java-interop/t1937/NumberGenerator.java | 7 ++++++ tests/pos/java-interop/t2377/Q.java | 12 ++++++++++ tests/pos/java-interop/t2377/a.scala | 8 +++++++ tests/pos/java-interop/t2409/J.java | 4 ++++ tests/pos/java-interop/t2409/t2409.scala | 1 + tests/pos/java-interop/t2413/TestJava.java | 7 ++++++ tests/pos/java-interop/t2413/TestScalac.scala | 23 ++++++++++++++++++ tests/pos/java-interop/t2433/A.java | 4 ++++ tests/pos/java-interop/t2433/B.java | 4 ++++ tests/pos/java-interop/t2433/Test.scala | 3 +++ tests/pos/java-interop/t2464/JavaOne.java | 5 ++++ tests/pos/java-interop/t2464/ScalaOne_1.scala | 6 +++++ tests/pos/java-interop/t2464/t2464_2.scala | 3 +++ tests/pos/java-interop/t2764/Ann.java | 5 ++++ tests/pos/java-interop/t2764/Enum.java | 5 ++++ tests/pos/java-interop/t2764/Use.scala | 6 +++++ tests/pos/java-interop/t294/Ann.java | 3 +++ tests/pos/java-interop/t294/Ann2.java | 3 +++ tests/pos/java-interop/t294/Test_1.scala | 7 ++++++ tests/pos/java-interop/t294/Test_2.scala | 1 + tests/pos/java-interop/t2940/Cycle.java | 3 +++ tests/pos/java-interop/t2940/Error.scala | 12 ++++++++++ .../java-interop/t2956/BeanDefinitionVisitor.java | 6 +++++ tests/pos/java-interop/t2956/t2956.scala | 7 ++++++ 165 files changed, 450 insertions(+), 445 deletions(-) create mode 100755 tests/disabled/java-interop/failing/t1459/AbstractBase.java create mode 100755 tests/disabled/java-interop/failing/t1459/App.scala create mode 100755 tests/disabled/java-interop/failing/t1459/Caller.java delete mode 100644 tests/disabled/java-interop/failing/t1751/A1_2.scala delete mode 100644 tests/disabled/java-interop/failing/t1751/A2_1.scala delete mode 100644 tests/disabled/java-interop/failing/t1751/SuiteClasses.java create mode 100644 tests/disabled/java-interop/failing/t2569/Child.scala create mode 100644 tests/disabled/java-interop/failing/t2569/Parent.java delete mode 100644 tests/disabled/java-interop/failing/t294/Ann.java delete mode 100644 tests/disabled/java-interop/failing/t294/Ann2.java delete mode 100644 tests/disabled/java-interop/failing/t294/Test_1.scala delete mode 100644 tests/disabled/java-interop/failing/t294/Test_2.scala create mode 100644 tests/disabled/java-interop/failing/varargs-bridge/A.java create mode 100644 tests/disabled/java-interop/failing/varargs-bridge/B.scala delete mode 100644 tests/disabled/java-interop/pos/t0288/Foo.scala delete mode 100644 tests/disabled/java-interop/pos/t0288/Outer.java delete mode 100644 tests/disabled/java-interop/pos/t0695/JavaClass.java delete mode 100644 tests/disabled/java-interop/pos/t0695/Test.scala delete mode 100644 tests/disabled/java-interop/pos/t1101/J.java delete mode 100644 tests/disabled/java-interop/pos/t1101/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1102/J.java delete mode 100644 tests/disabled/java-interop/pos/t1102/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1150/J.java delete mode 100644 tests/disabled/java-interop/pos/t1150/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1152/J.java delete mode 100644 tests/disabled/java-interop/pos/t1152/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1176/J.java delete mode 100644 tests/disabled/java-interop/pos/t1176/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1186/t1186.java delete mode 100644 tests/disabled/java-interop/pos/t1196/J.java delete mode 100644 tests/disabled/java-interop/pos/t1196/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1197/J.java delete mode 100644 tests/disabled/java-interop/pos/t1197/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1203b/J.java delete mode 100644 tests/disabled/java-interop/pos/t1203b/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1230/J.java delete mode 100644 tests/disabled/java-interop/pos/t1230/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1231/J.java delete mode 100644 tests/disabled/java-interop/pos/t1231/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1232/J.java delete mode 100644 tests/disabled/java-interop/pos/t1232/J2.java delete mode 100644 tests/disabled/java-interop/pos/t1232/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1235/Test.java delete mode 100644 tests/disabled/java-interop/pos/t1254/t1254.java delete mode 100644 tests/disabled/java-interop/pos/t1263/Test.java delete mode 100644 tests/disabled/java-interop/pos/t1263/test.scala delete mode 100644 tests/disabled/java-interop/pos/t1409/AbstractImpl.java delete mode 100644 tests/disabled/java-interop/pos/t1409/ConcreteImpl.scala delete mode 100644 tests/disabled/java-interop/pos/t1409/OuterInterface.java delete mode 100755 tests/disabled/java-interop/pos/t1459/AbstractBase.java delete mode 100755 tests/disabled/java-interop/pos/t1459/App.scala delete mode 100755 tests/disabled/java-interop/pos/t1459/Caller.java delete mode 100644 tests/disabled/java-interop/pos/t1642/JavaCallingScalaHashMap.java delete mode 100644 tests/disabled/java-interop/pos/t1711/Seq.scala delete mode 100644 tests/disabled/java-interop/pos/t1711/Test.java delete mode 100644 tests/disabled/java-interop/pos/t1745/J.java delete mode 100644 tests/disabled/java-interop/pos/t1745/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1782/Ann.java delete mode 100644 tests/disabled/java-interop/pos/t1782/Days.java delete mode 100644 tests/disabled/java-interop/pos/t1782/ImplementedBy.java delete mode 100644 tests/disabled/java-interop/pos/t1782/Test_1.scala delete mode 100644 tests/disabled/java-interop/pos/t1836/J.java delete mode 100644 tests/disabled/java-interop/pos/t1836/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1840/J.java delete mode 100644 tests/disabled/java-interop/pos/t1840/S.scala delete mode 100644 tests/disabled/java-interop/pos/t1937/NumberGenerator.java delete mode 100644 tests/disabled/java-interop/pos/t2377/Q.java delete mode 100644 tests/disabled/java-interop/pos/t2377/a.scala delete mode 100644 tests/disabled/java-interop/pos/t2409/J.java delete mode 100644 tests/disabled/java-interop/pos/t2409/t2409.scala delete mode 100644 tests/disabled/java-interop/pos/t2413/TestJava.java delete mode 100644 tests/disabled/java-interop/pos/t2413/TestScalac.scala delete mode 100755 tests/disabled/java-interop/pos/t2433/A.java delete mode 100755 tests/disabled/java-interop/pos/t2433/B.java delete mode 100755 tests/disabled/java-interop/pos/t2433/Test.scala delete mode 100644 tests/disabled/java-interop/pos/t2464/JavaOne.java delete mode 100644 tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala delete mode 100644 tests/disabled/java-interop/pos/t2464/t2464_2.scala delete mode 100644 tests/disabled/java-interop/pos/t2569/Child.scala delete mode 100644 tests/disabled/java-interop/pos/t2569/Parent.java delete mode 100644 tests/disabled/java-interop/pos/t2764/Ann.java delete mode 100644 tests/disabled/java-interop/pos/t2764/Enum.java delete mode 100644 tests/disabled/java-interop/pos/t2764/Use.scala delete mode 100644 tests/disabled/java-interop/pos/t2940/Cycle.java delete mode 100644 tests/disabled/java-interop/pos/t2940/Error.scala delete mode 100644 tests/disabled/java-interop/pos/t2956/BeanDefinitionVisitor.java delete mode 100755 tests/disabled/java-interop/pos/t2956/t2956.scala delete mode 100644 tests/disabled/java-interop/pos/varargs-bridge/A.java delete mode 100644 tests/disabled/java-interop/pos/varargs-bridge/B.scala create mode 100644 tests/new/t296.scala create mode 100644 tests/pos/java-interop/t0288/Foo.scala create mode 100644 tests/pos/java-interop/t0288/Outer.java create mode 100644 tests/pos/java-interop/t0695/JavaClass.java create mode 100644 tests/pos/java-interop/t0695/Test.scala create mode 100644 tests/pos/java-interop/t1101/J.java create mode 100644 tests/pos/java-interop/t1101/S.scala create mode 100644 tests/pos/java-interop/t1102/J.java create mode 100644 tests/pos/java-interop/t1102/S.scala create mode 100644 tests/pos/java-interop/t1150/J.java create mode 100644 tests/pos/java-interop/t1150/S.scala create mode 100644 tests/pos/java-interop/t1152/J.java create mode 100644 tests/pos/java-interop/t1152/S.scala create mode 100644 tests/pos/java-interop/t1176/J.java create mode 100644 tests/pos/java-interop/t1176/S.scala create mode 100644 tests/pos/java-interop/t1186/t1186.java create mode 100644 tests/pos/java-interop/t1196/J.java create mode 100644 tests/pos/java-interop/t1196/S.scala create mode 100644 tests/pos/java-interop/t1197/J.java create mode 100644 tests/pos/java-interop/t1197/S.scala create mode 100644 tests/pos/java-interop/t1203b/J.java create mode 100644 tests/pos/java-interop/t1203b/S.scala create mode 100644 tests/pos/java-interop/t1230/J.java create mode 100644 tests/pos/java-interop/t1230/S.scala create mode 100644 tests/pos/java-interop/t1231/J.java create mode 100644 tests/pos/java-interop/t1231/S.scala create mode 100644 tests/pos/java-interop/t1232/J.java create mode 100644 tests/pos/java-interop/t1232/J2.java create mode 100644 tests/pos/java-interop/t1232/S.scala create mode 100644 tests/pos/java-interop/t1235/Test.java create mode 100644 tests/pos/java-interop/t1254/t1254.java create mode 100644 tests/pos/java-interop/t1263/Test.java create mode 100644 tests/pos/java-interop/t1263/test.scala create mode 100644 tests/pos/java-interop/t1409/AbstractImpl.java create mode 100644 tests/pos/java-interop/t1409/ConcreteImpl.scala create mode 100644 tests/pos/java-interop/t1409/OuterInterface.java create mode 100644 tests/pos/java-interop/t1642/JavaCallingScalaHashMap.java create mode 100644 tests/pos/java-interop/t1711/Seq.scala create mode 100644 tests/pos/java-interop/t1711/Test.java create mode 100644 tests/pos/java-interop/t1745/J.java create mode 100644 tests/pos/java-interop/t1745/S.scala create mode 100644 tests/pos/java-interop/t1751/A1_2.scala create mode 100644 tests/pos/java-interop/t1751/A2_1.scala create mode 100644 tests/pos/java-interop/t1751/SuiteClasses.java create mode 100644 tests/pos/java-interop/t1782/Ann.java create mode 100644 tests/pos/java-interop/t1782/Days.java create mode 100644 tests/pos/java-interop/t1782/ImplementedBy.java create mode 100644 tests/pos/java-interop/t1782/Test_1.scala create mode 100644 tests/pos/java-interop/t1836/J.java create mode 100644 tests/pos/java-interop/t1836/S.scala create mode 100644 tests/pos/java-interop/t1840/J.java create mode 100644 tests/pos/java-interop/t1840/S.scala create mode 100644 tests/pos/java-interop/t1937/NumberGenerator.java create mode 100644 tests/pos/java-interop/t2377/Q.java create mode 100644 tests/pos/java-interop/t2377/a.scala create mode 100644 tests/pos/java-interop/t2409/J.java create mode 100644 tests/pos/java-interop/t2409/t2409.scala create mode 100644 tests/pos/java-interop/t2413/TestJava.java create mode 100644 tests/pos/java-interop/t2413/TestScalac.scala create mode 100755 tests/pos/java-interop/t2433/A.java create mode 100755 tests/pos/java-interop/t2433/B.java create mode 100755 tests/pos/java-interop/t2433/Test.scala create mode 100644 tests/pos/java-interop/t2464/JavaOne.java create mode 100644 tests/pos/java-interop/t2464/ScalaOne_1.scala create mode 100644 tests/pos/java-interop/t2464/t2464_2.scala create mode 100644 tests/pos/java-interop/t2764/Ann.java create mode 100644 tests/pos/java-interop/t2764/Enum.java create mode 100644 tests/pos/java-interop/t2764/Use.scala create mode 100644 tests/pos/java-interop/t294/Ann.java create mode 100644 tests/pos/java-interop/t294/Ann2.java create mode 100644 tests/pos/java-interop/t294/Test_1.scala create mode 100644 tests/pos/java-interop/t294/Test_2.scala create mode 100644 tests/pos/java-interop/t2940/Cycle.java create mode 100644 tests/pos/java-interop/t2940/Error.scala create mode 100644 tests/pos/java-interop/t2956/BeanDefinitionVisitor.java create mode 100755 tests/pos/java-interop/t2956/t2956.scala diff --git a/tests/disabled/java-interop/failing/t1459/AbstractBase.java b/tests/disabled/java-interop/failing/t1459/AbstractBase.java new file mode 100755 index 000000000..492419416 --- /dev/null +++ b/tests/disabled/java-interop/failing/t1459/AbstractBase.java @@ -0,0 +1,5 @@ +package base; + +public abstract class AbstractBase { + public abstract void doStuff(String... params); // !!! was Object.. +} \ No newline at end of file diff --git a/tests/disabled/java-interop/failing/t1459/App.scala b/tests/disabled/java-interop/failing/t1459/App.scala new file mode 100755 index 000000000..36e5022e9 --- /dev/null +++ b/tests/disabled/java-interop/failing/t1459/App.scala @@ -0,0 +1,18 @@ +package foo +import base._ + +object App extends scala.App { + class Concrete extends AbstractBase { + override def doStuff(params:java.lang.String*): Unit = println("doStuff invoked") + } + + val impl = new Concrete + + //succeeds + impl.doStuff(null) + + val caller = new Caller + + // fails with AbstractMethodError + caller.callDoStuff(impl) +} diff --git a/tests/disabled/java-interop/failing/t1459/Caller.java b/tests/disabled/java-interop/failing/t1459/Caller.java new file mode 100755 index 000000000..4ae51d8c5 --- /dev/null +++ b/tests/disabled/java-interop/failing/t1459/Caller.java @@ -0,0 +1,7 @@ +package base; + +public class Caller { + public void callDoStuff(AbstractBase impl) { + impl.doStuff("abc"); // was new Object()); + } +} \ No newline at end of file diff --git a/tests/disabled/java-interop/failing/t1751/A1_2.scala b/tests/disabled/java-interop/failing/t1751/A1_2.scala deleted file mode 100644 index 354d5eecd..000000000 --- a/tests/disabled/java-interop/failing/t1751/A1_2.scala +++ /dev/null @@ -1,2 +0,0 @@ -@SuiteClasses(Array(classOf[A2])) -class A1 diff --git a/tests/disabled/java-interop/failing/t1751/A2_1.scala b/tests/disabled/java-interop/failing/t1751/A2_1.scala deleted file mode 100644 index c768062e4..000000000 --- a/tests/disabled/java-interop/failing/t1751/A2_1.scala +++ /dev/null @@ -1,2 +0,0 @@ -@SuiteClasses(Array()) -class A2 diff --git a/tests/disabled/java-interop/failing/t1751/SuiteClasses.java b/tests/disabled/java-interop/failing/t1751/SuiteClasses.java deleted file mode 100644 index a415e4f57..000000000 --- a/tests/disabled/java-interop/failing/t1751/SuiteClasses.java +++ /dev/null @@ -1,3 +0,0 @@ -public @interface SuiteClasses { - public Class[] value(); -} diff --git a/tests/disabled/java-interop/failing/t2569/Child.scala b/tests/disabled/java-interop/failing/t2569/Child.scala new file mode 100644 index 000000000..64f4dc172 --- /dev/null +++ b/tests/disabled/java-interop/failing/t2569/Child.scala @@ -0,0 +1,9 @@ +package varargs + + class Child extends Parent { + + override def concatenate(strings: String*): String = + strings map("\"" + _ + "\"") mkString("(", ", ", ")") + + } + diff --git a/tests/disabled/java-interop/failing/t2569/Parent.java b/tests/disabled/java-interop/failing/t2569/Parent.java new file mode 100644 index 000000000..89421becb --- /dev/null +++ b/tests/disabled/java-interop/failing/t2569/Parent.java @@ -0,0 +1,13 @@ +package varargs; + + public class Parent { + + public String concatenate(String... strings) { + StringBuilder builder = new StringBuilder(); + for (String s : strings) { + builder.append(s); + } + return builder.toString(); + } + + } diff --git a/tests/disabled/java-interop/failing/t294/Ann.java b/tests/disabled/java-interop/failing/t294/Ann.java deleted file mode 100644 index 934ca4629..000000000 --- a/tests/disabled/java-interop/failing/t294/Ann.java +++ /dev/null @@ -1,3 +0,0 @@ -public @interface Ann { - public Ann2[] nested(); -} diff --git a/tests/disabled/java-interop/failing/t294/Ann2.java b/tests/disabled/java-interop/failing/t294/Ann2.java deleted file mode 100644 index 025b79e79..000000000 --- a/tests/disabled/java-interop/failing/t294/Ann2.java +++ /dev/null @@ -1,3 +0,0 @@ -public @interface Ann2 { - public int value(); -} diff --git a/tests/disabled/java-interop/failing/t294/Test_1.scala b/tests/disabled/java-interop/failing/t294/Test_1.scala deleted file mode 100644 index ff1f34b10..000000000 --- a/tests/disabled/java-interop/failing/t294/Test_1.scala +++ /dev/null @@ -1,7 +0,0 @@ -// 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/tests/disabled/java-interop/failing/t294/Test_2.scala b/tests/disabled/java-interop/failing/t294/Test_2.scala deleted file mode 100644 index 9fb1c6e17..000000000 --- a/tests/disabled/java-interop/failing/t294/Test_2.scala +++ /dev/null @@ -1 +0,0 @@ -class Test2 extends Test diff --git a/tests/disabled/java-interop/failing/varargs-bridge/A.java b/tests/disabled/java-interop/failing/varargs-bridge/A.java new file mode 100644 index 000000000..3cd92864b --- /dev/null +++ b/tests/disabled/java-interop/failing/varargs-bridge/A.java @@ -0,0 +1,8 @@ +package test; +public class A { + + int foo(int... x) { + return x.length; + } + +} \ No newline at end of file diff --git a/tests/disabled/java-interop/failing/varargs-bridge/B.scala b/tests/disabled/java-interop/failing/varargs-bridge/B.scala new file mode 100644 index 000000000..efd81b0bf --- /dev/null +++ b/tests/disabled/java-interop/failing/varargs-bridge/B.scala @@ -0,0 +1,7 @@ +package test +class B extends A { + override def foo(x: Int*): Int = x.length + 1 +} +object B extends App { + println(new B().foo(1, 2, 3)) +} diff --git a/tests/disabled/java-interop/pos/t0288/Foo.scala b/tests/disabled/java-interop/pos/t0288/Foo.scala deleted file mode 100644 index 778ba65f5..000000000 --- a/tests/disabled/java-interop/pos/t0288/Foo.scala +++ /dev/null @@ -1,9 +0,0 @@ -package test2; - -import test.Outer; - -class Foo extends Outer{ - - val bar = new Inner(); // Shouldn't this work? - -} diff --git a/tests/disabled/java-interop/pos/t0288/Outer.java b/tests/disabled/java-interop/pos/t0288/Outer.java deleted file mode 100644 index bea3e3f8d..000000000 --- a/tests/disabled/java-interop/pos/t0288/Outer.java +++ /dev/null @@ -1,9 +0,0 @@ -package test; - -public class Outer{ - - public class Inner{ - - } - -} diff --git a/tests/disabled/java-interop/pos/t0695/JavaClass.java b/tests/disabled/java-interop/pos/t0695/JavaClass.java deleted file mode 100644 index a765f7e32..000000000 --- a/tests/disabled/java-interop/pos/t0695/JavaClass.java +++ /dev/null @@ -1,5 +0,0 @@ -public class JavaClass { - class InnerClass { - public A method() { return null; } - } -} diff --git a/tests/disabled/java-interop/pos/t0695/Test.scala b/tests/disabled/java-interop/pos/t0695/Test.scala deleted file mode 100644 index 7318867bf..000000000 --- a/tests/disabled/java-interop/pos/t0695/Test.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends JavaClass[AnyRef] { - var field: InnerClass = null -} diff --git a/tests/disabled/java-interop/pos/t1101/J.java b/tests/disabled/java-interop/pos/t1101/J.java deleted file mode 100644 index 2bc1d53e0..000000000 --- a/tests/disabled/java-interop/pos/t1101/J.java +++ /dev/null @@ -1 +0,0 @@ -class J { enum E { E1 } } diff --git a/tests/disabled/java-interop/pos/t1101/S.scala b/tests/disabled/java-interop/pos/t1101/S.scala deleted file mode 100644 index af7a591e5..000000000 --- a/tests/disabled/java-interop/pos/t1101/S.scala +++ /dev/null @@ -1 +0,0 @@ -class S { val x: J.E = null; System.out.println(J.E.E1) } diff --git a/tests/disabled/java-interop/pos/t1102/J.java b/tests/disabled/java-interop/pos/t1102/J.java deleted file mode 100644 index 530102b91..000000000 --- a/tests/disabled/java-interop/pos/t1102/J.java +++ /dev/null @@ -1,4 +0,0 @@ -class J { - enum E { E1 } - void foo(E e) { } -} diff --git a/tests/disabled/java-interop/pos/t1102/S.scala b/tests/disabled/java-interop/pos/t1102/S.scala deleted file mode 100644 index 9beee8d90..000000000 --- a/tests/disabled/java-interop/pos/t1102/S.scala +++ /dev/null @@ -1 +0,0 @@ -class S(j:J) { j.foo(J.E.E1) } diff --git a/tests/disabled/java-interop/pos/t1150/J.java b/tests/disabled/java-interop/pos/t1150/J.java deleted file mode 100644 index 68fa04a17..000000000 --- a/tests/disabled/java-interop/pos/t1150/J.java +++ /dev/null @@ -1,4 +0,0 @@ -class J { - static void bbb (Boolean b) { } - static void ddd (Double d) { } -} diff --git a/tests/disabled/java-interop/pos/t1150/S.scala b/tests/disabled/java-interop/pos/t1150/S.scala deleted file mode 100644 index 41dd06403..000000000 --- a/tests/disabled/java-interop/pos/t1150/S.scala +++ /dev/null @@ -1,4 +0,0 @@ -object S { - J.bbb(new java.lang.Boolean(true)) - J.ddd(new java.lang.Double(0)) -} diff --git a/tests/disabled/java-interop/pos/t1152/J.java b/tests/disabled/java-interop/pos/t1152/J.java deleted file mode 100644 index 6e562e573..000000000 --- a/tests/disabled/java-interop/pos/t1152/J.java +++ /dev/null @@ -1 +0,0 @@ -class J { java.util.List k = null; } diff --git a/tests/disabled/java-interop/pos/t1152/S.scala b/tests/disabled/java-interop/pos/t1152/S.scala deleted file mode 100644 index 7f751c509..000000000 --- a/tests/disabled/java-interop/pos/t1152/S.scala +++ /dev/null @@ -1,2 +0,0 @@ -class S2(fn:(J)=>Any) -object S { new S2(_.k) } diff --git a/tests/disabled/java-interop/pos/t1176/J.java b/tests/disabled/java-interop/pos/t1176/J.java deleted file mode 100644 index 0d82c75fc..000000000 --- a/tests/disabled/java-interop/pos/t1176/J.java +++ /dev/null @@ -1,4 +0,0 @@ -class J { - J() { } - J( java.util.Collection collection ) { } -} diff --git a/tests/disabled/java-interop/pos/t1176/S.scala b/tests/disabled/java-interop/pos/t1176/S.scala deleted file mode 100644 index a7fc3e0ce..000000000 --- a/tests/disabled/java-interop/pos/t1176/S.scala +++ /dev/null @@ -1 +0,0 @@ -class S { new J } diff --git a/tests/disabled/java-interop/pos/t1186/t1186.java b/tests/disabled/java-interop/pos/t1186/t1186.java deleted file mode 100644 index 5f2607623..000000000 --- a/tests/disabled/java-interop/pos/t1186/t1186.java +++ /dev/null @@ -1,8 +0,0 @@ -import scala.collection.immutable.Map; - -class Test { - - void foo() { - Map map = null; - } -} diff --git a/tests/disabled/java-interop/pos/t1196/J.java b/tests/disabled/java-interop/pos/t1196/J.java deleted file mode 100644 index 2ec7a711b..000000000 --- a/tests/disabled/java-interop/pos/t1196/J.java +++ /dev/null @@ -1 +0,0 @@ -class J { static void foo(Class c) { } } diff --git a/tests/disabled/java-interop/pos/t1196/S.scala b/tests/disabled/java-interop/pos/t1196/S.scala deleted file mode 100644 index f17cd249a..000000000 --- a/tests/disabled/java-interop/pos/t1196/S.scala +++ /dev/null @@ -1 +0,0 @@ -object S { J.foo(null) } diff --git a/tests/disabled/java-interop/pos/t1197/J.java b/tests/disabled/java-interop/pos/t1197/J.java deleted file mode 100644 index b4e0a4255..000000000 --- a/tests/disabled/java-interop/pos/t1197/J.java +++ /dev/null @@ -1,2 +0,0 @@ -class J { interface K { } } - diff --git a/tests/disabled/java-interop/pos/t1197/S.scala b/tests/disabled/java-interop/pos/t1197/S.scala deleted file mode 100644 index 7c9c15440..000000000 --- a/tests/disabled/java-interop/pos/t1197/S.scala +++ /dev/null @@ -1,2 +0,0 @@ -object S extends J.K - diff --git a/tests/disabled/java-interop/pos/t1203b/J.java b/tests/disabled/java-interop/pos/t1203b/J.java deleted file mode 100644 index 7fae118e0..000000000 --- a/tests/disabled/java-interop/pos/t1203b/J.java +++ /dev/null @@ -1 +0,0 @@ -interface J { int j = 200 ; } diff --git a/tests/disabled/java-interop/pos/t1203b/S.scala b/tests/disabled/java-interop/pos/t1203b/S.scala deleted file mode 100644 index 68eac4bf6..000000000 --- a/tests/disabled/java-interop/pos/t1203b/S.scala +++ /dev/null @@ -1 +0,0 @@ -object S { J.j } diff --git a/tests/disabled/java-interop/pos/t1230/J.java b/tests/disabled/java-interop/pos/t1230/J.java deleted file mode 100644 index 35aefd250..000000000 --- a/tests/disabled/java-interop/pos/t1230/J.java +++ /dev/null @@ -1 +0,0 @@ -class J { public int foo ; } diff --git a/tests/disabled/java-interop/pos/t1230/S.scala b/tests/disabled/java-interop/pos/t1230/S.scala deleted file mode 100644 index 530dd4b85..000000000 --- a/tests/disabled/java-interop/pos/t1230/S.scala +++ /dev/null @@ -1 +0,0 @@ -object S extends App { (new J).foo = 5 } diff --git a/tests/disabled/java-interop/pos/t1231/J.java b/tests/disabled/java-interop/pos/t1231/J.java deleted file mode 100644 index 6b24205e5..000000000 --- a/tests/disabled/java-interop/pos/t1231/J.java +++ /dev/null @@ -1 +0,0 @@ -enum J { j1 } diff --git a/tests/disabled/java-interop/pos/t1231/S.scala b/tests/disabled/java-interop/pos/t1231/S.scala deleted file mode 100644 index f14aa2561..000000000 --- a/tests/disabled/java-interop/pos/t1231/S.scala +++ /dev/null @@ -1 +0,0 @@ -object S extends App { println(J.j1) } diff --git a/tests/disabled/java-interop/pos/t1232/J.java b/tests/disabled/java-interop/pos/t1232/J.java deleted file mode 100644 index 2d9e3bbd5..000000000 --- a/tests/disabled/java-interop/pos/t1232/J.java +++ /dev/null @@ -1,2 +0,0 @@ -package j; -public class J { public enum E { e1 } } diff --git a/tests/disabled/java-interop/pos/t1232/J2.java b/tests/disabled/java-interop/pos/t1232/J2.java deleted file mode 100644 index 29237780a..000000000 --- a/tests/disabled/java-interop/pos/t1232/J2.java +++ /dev/null @@ -1,2 +0,0 @@ -import s.S; -class J2 { } diff --git a/tests/disabled/java-interop/pos/t1232/S.scala b/tests/disabled/java-interop/pos/t1232/S.scala deleted file mode 100644 index 1b6bca732..000000000 --- a/tests/disabled/java-interop/pos/t1232/S.scala +++ /dev/null @@ -1,2 +0,0 @@ -package s -class S { j.J.E.e1 } diff --git a/tests/disabled/java-interop/pos/t1235/Test.java b/tests/disabled/java-interop/pos/t1235/Test.java deleted file mode 100644 index 7bb83a849..000000000 --- a/tests/disabled/java-interop/pos/t1235/Test.java +++ /dev/null @@ -1,9 +0,0 @@ -import scala.collection.immutable.HashMap; - -public class Test { - - void foo() { - new HashMap(); - } -} - diff --git a/tests/disabled/java-interop/pos/t1254/t1254.java b/tests/disabled/java-interop/pos/t1254/t1254.java deleted file mode 100644 index 17e1c60bf..000000000 --- a/tests/disabled/java-interop/pos/t1254/t1254.java +++ /dev/null @@ -1,28 +0,0 @@ -/* Taken from ticket #1254. Tests Java signatures in mirror classes and that - Nothing is translated to Nothing$. -*/ - -import scala.None; - -// This compiles with javac but fails with Eclipse java compiler: -// 'The type scala.Nothing cannot be resolved. It is indirectly referenced from required .class files' -class NothingBug3 { - public NothingBug3() { - scala.Option o = scala.None$.MODULE$; - - test(o); - None.toLeft(new scala.runtime.AbstractFunction0() { - public Integer apply() { return 0; } - }); - } - - public void test(scala.Option f) {} -} - -// This compiles with javac but fails with Eclipse java compiler: -// 'The type scala.Nothing cannot be resolved. It is indirectly referenced from required .class files' -class NothingBug4 { - public NothingBug4() { - scala.Option o = scala.None$.MODULE$; - } -} diff --git a/tests/disabled/java-interop/pos/t1263/Test.java b/tests/disabled/java-interop/pos/t1263/Test.java deleted file mode 100644 index 1718a9909..000000000 --- a/tests/disabled/java-interop/pos/t1263/Test.java +++ /dev/null @@ -1,17 +0,0 @@ -package test; - -import java.rmi.RemoteException; - -import test.Map; - -@SuppressWarnings("unchecked") -public class Test implements Map { - public Map.MapTo plus(String o) { - return null; - } - - public int $tag() throws RemoteException { - return 0; - } -} - diff --git a/tests/disabled/java-interop/pos/t1263/test.scala b/tests/disabled/java-interop/pos/t1263/test.scala deleted file mode 100644 index 92d8c1cdf..000000000 --- a/tests/disabled/java-interop/pos/t1263/test.scala +++ /dev/null @@ -1,10 +0,0 @@ -package test - -trait Map[A, +B] { - def plus(key: A): MapTo = new MapTo(key) - - class MapTo(key: A) { - def arrow [B1 >: B](value: B1) = null - } -} - diff --git a/tests/disabled/java-interop/pos/t1409/AbstractImpl.java b/tests/disabled/java-interop/pos/t1409/AbstractImpl.java deleted file mode 100644 index b22a94fa1..000000000 --- a/tests/disabled/java-interop/pos/t1409/AbstractImpl.java +++ /dev/null @@ -1,3 +0,0 @@ -public abstract class AbstractImpl implements OuterInterface { - public abstract InnerInterface create(); - } diff --git a/tests/disabled/java-interop/pos/t1409/ConcreteImpl.scala b/tests/disabled/java-interop/pos/t1409/ConcreteImpl.scala deleted file mode 100644 index d427e957e..000000000 --- a/tests/disabled/java-interop/pos/t1409/ConcreteImpl.scala +++ /dev/null @@ -1,3 +0,0 @@ -class ConcreteImpl extends AbstractImpl { - def create : OuterInterface.InnerInterface = null - } diff --git a/tests/disabled/java-interop/pos/t1409/OuterInterface.java b/tests/disabled/java-interop/pos/t1409/OuterInterface.java deleted file mode 100644 index dd288ceea..000000000 --- a/tests/disabled/java-interop/pos/t1409/OuterInterface.java +++ /dev/null @@ -1,5 +0,0 @@ -public interface OuterInterface { - public interface InnerInterface { - public void foo(); - } - } diff --git a/tests/disabled/java-interop/pos/t1459/AbstractBase.java b/tests/disabled/java-interop/pos/t1459/AbstractBase.java deleted file mode 100755 index 492419416..000000000 --- a/tests/disabled/java-interop/pos/t1459/AbstractBase.java +++ /dev/null @@ -1,5 +0,0 @@ -package base; - -public abstract class AbstractBase { - public abstract void doStuff(String... params); // !!! was Object.. -} \ No newline at end of file diff --git a/tests/disabled/java-interop/pos/t1459/App.scala b/tests/disabled/java-interop/pos/t1459/App.scala deleted file mode 100755 index 36e5022e9..000000000 --- a/tests/disabled/java-interop/pos/t1459/App.scala +++ /dev/null @@ -1,18 +0,0 @@ -package foo -import base._ - -object App extends scala.App { - class Concrete extends AbstractBase { - override def doStuff(params:java.lang.String*): Unit = println("doStuff invoked") - } - - val impl = new Concrete - - //succeeds - impl.doStuff(null) - - val caller = new Caller - - // fails with AbstractMethodError - caller.callDoStuff(impl) -} diff --git a/tests/disabled/java-interop/pos/t1459/Caller.java b/tests/disabled/java-interop/pos/t1459/Caller.java deleted file mode 100755 index 4ae51d8c5..000000000 --- a/tests/disabled/java-interop/pos/t1459/Caller.java +++ /dev/null @@ -1,7 +0,0 @@ -package base; - -public class Caller { - public void callDoStuff(AbstractBase impl) { - impl.doStuff("abc"); // was new Object()); - } -} \ No newline at end of file diff --git a/tests/disabled/java-interop/pos/t1642/JavaCallingScalaHashMap.java b/tests/disabled/java-interop/pos/t1642/JavaCallingScalaHashMap.java deleted file mode 100644 index 976e465ff..000000000 --- a/tests/disabled/java-interop/pos/t1642/JavaCallingScalaHashMap.java +++ /dev/null @@ -1,8 +0,0 @@ -import scala.collection.immutable.HashMap; -import scala.collection.immutable.Map; - -public class JavaCallingScalaHashMap { - public static void main( String[] args ) { - Map hashMap = new HashMap(); - } -} diff --git a/tests/disabled/java-interop/pos/t1711/Seq.scala b/tests/disabled/java-interop/pos/t1711/Seq.scala deleted file mode 100644 index c18f05cd7..000000000 --- a/tests/disabled/java-interop/pos/t1711/Seq.scala +++ /dev/null @@ -1,12 +0,0 @@ -package com - -object Sequence { - - def filteringFunction[V](filter: V => Boolean): List[V] => List[V] = { - def include(v: V) = - filter(v) - (l: List[V]) => l.filter(include) - } - -} - diff --git a/tests/disabled/java-interop/pos/t1711/Test.java b/tests/disabled/java-interop/pos/t1711/Test.java deleted file mode 100644 index 5ec0f2297..000000000 --- a/tests/disabled/java-interop/pos/t1711/Test.java +++ /dev/null @@ -1,6 +0,0 @@ -import com.Sequence; - -public class Test { - void foo() { - } -} diff --git a/tests/disabled/java-interop/pos/t1745/J.java b/tests/disabled/java-interop/pos/t1745/J.java deleted file mode 100644 index 8444eabb2..000000000 --- a/tests/disabled/java-interop/pos/t1745/J.java +++ /dev/null @@ -1,10 +0,0 @@ -class J { - S1 s1; - S2 s2; - - String s = bar(S3.foo(), S3.bar("def")); - - private String bar(String s1, String s2) { - return s1 + s2; - } -} diff --git a/tests/disabled/java-interop/pos/t1745/S.scala b/tests/disabled/java-interop/pos/t1745/S.scala deleted file mode 100644 index 84c437133..000000000 --- a/tests/disabled/java-interop/pos/t1745/S.scala +++ /dev/null @@ -1,7 +0,0 @@ -case class S1(n: Int) { } -case class S2(n: Int, p: Int) { } -class S3 { } -object S3 { - def foo() = "abc" - def bar[T](x: T): T = x -} diff --git a/tests/disabled/java-interop/pos/t1782/Ann.java b/tests/disabled/java-interop/pos/t1782/Ann.java deleted file mode 100644 index 0dcfbd2ed..000000000 --- a/tests/disabled/java-interop/pos/t1782/Ann.java +++ /dev/null @@ -1,3 +0,0 @@ -public @interface Ann { - public Days value(); -} diff --git a/tests/disabled/java-interop/pos/t1782/Days.java b/tests/disabled/java-interop/pos/t1782/Days.java deleted file mode 100644 index 203a87b1c..000000000 --- a/tests/disabled/java-interop/pos/t1782/Days.java +++ /dev/null @@ -1,3 +0,0 @@ -public enum Days { - Friday, Sunday -} diff --git a/tests/disabled/java-interop/pos/t1782/ImplementedBy.java b/tests/disabled/java-interop/pos/t1782/ImplementedBy.java deleted file mode 100644 index 6aa8b4fa9..000000000 --- a/tests/disabled/java-interop/pos/t1782/ImplementedBy.java +++ /dev/null @@ -1,3 +0,0 @@ -public @interface ImplementedBy { - public Class value(); -} diff --git a/tests/disabled/java-interop/pos/t1782/Test_1.scala b/tests/disabled/java-interop/pos/t1782/Test_1.scala deleted file mode 100644 index 47495c082..000000000 --- a/tests/disabled/java-interop/pos/t1782/Test_1.scala +++ /dev/null @@ -1,16 +0,0 @@ -@ImplementedBy(classOf[Provider]) -trait Service { - def someMethod(): Unit -} - -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/tests/disabled/java-interop/pos/t1836/J.java b/tests/disabled/java-interop/pos/t1836/J.java deleted file mode 100644 index a009a59e2..000000000 --- a/tests/disabled/java-interop/pos/t1836/J.java +++ /dev/null @@ -1 +0,0 @@ -public abstract class J { protected J(T id) { } } diff --git a/tests/disabled/java-interop/pos/t1836/S.scala b/tests/disabled/java-interop/pos/t1836/S.scala deleted file mode 100644 index 88ce1063e..000000000 --- a/tests/disabled/java-interop/pos/t1836/S.scala +++ /dev/null @@ -1 +0,0 @@ -class S extends J("") diff --git a/tests/disabled/java-interop/pos/t1840/J.java b/tests/disabled/java-interop/pos/t1840/J.java deleted file mode 100644 index fd98b6c4a..000000000 --- a/tests/disabled/java-interop/pos/t1840/J.java +++ /dev/null @@ -1,4 +0,0 @@ -package p; -class J { - J() {} -} diff --git a/tests/disabled/java-interop/pos/t1840/S.scala b/tests/disabled/java-interop/pos/t1840/S.scala deleted file mode 100644 index ff513d2c1..000000000 --- a/tests/disabled/java-interop/pos/t1840/S.scala +++ /dev/null @@ -1,2 +0,0 @@ -package p -class S { new J } diff --git a/tests/disabled/java-interop/pos/t1937/NumberGenerator.java b/tests/disabled/java-interop/pos/t1937/NumberGenerator.java deleted file mode 100644 index 59d604733..000000000 --- a/tests/disabled/java-interop/pos/t1937/NumberGenerator.java +++ /dev/null @@ -1,7 +0,0 @@ -package br.com.caelum.caelumweb2.money; - -public class NumberGenerator { - public String generate() { - return null; - } -} diff --git a/tests/disabled/java-interop/pos/t2377/Q.java b/tests/disabled/java-interop/pos/t2377/Q.java deleted file mode 100644 index e3d11c70e..000000000 --- a/tests/disabled/java-interop/pos/t2377/Q.java +++ /dev/null @@ -1,12 +0,0 @@ -public final class Q { - public static final class Stage { - public static Builder newBuilder() { return new Builder(); } - public static final class Builder { } - public Builder toBuilder() { return newBuilder(); } - } - public static final class WorkUnit { - public static Builder newBuilder() { return new Builder(); } - public static final class Builder { } - public Builder toBuilder() { return newBuilder(); } - } -} diff --git a/tests/disabled/java-interop/pos/t2377/a.scala b/tests/disabled/java-interop/pos/t2377/a.scala deleted file mode 100644 index bda59ce0d..000000000 --- a/tests/disabled/java-interop/pos/t2377/a.scala +++ /dev/null @@ -1,8 +0,0 @@ -import Q._ - -class Bop(var workUnit: WorkUnit) { - def addStages(stageBuilder: Stage.Builder): Unit = { - val builder = workUnit.toBuilder - () - } -} diff --git a/tests/disabled/java-interop/pos/t2409/J.java b/tests/disabled/java-interop/pos/t2409/J.java deleted file mode 100644 index 6b7c45ff6..000000000 --- a/tests/disabled/java-interop/pos/t2409/J.java +++ /dev/null @@ -1,4 +0,0 @@ -class J { - static class J2 { } - J(J2 j2) { } -} diff --git a/tests/disabled/java-interop/pos/t2409/t2409.scala b/tests/disabled/java-interop/pos/t2409/t2409.scala deleted file mode 100644 index 0412f7d82..000000000 --- a/tests/disabled/java-interop/pos/t2409/t2409.scala +++ /dev/null @@ -1 +0,0 @@ -object S { new J(null) } diff --git a/tests/disabled/java-interop/pos/t2413/TestJava.java b/tests/disabled/java-interop/pos/t2413/TestJava.java deleted file mode 100644 index 252c01fbc..000000000 --- a/tests/disabled/java-interop/pos/t2413/TestJava.java +++ /dev/null @@ -1,7 +0,0 @@ -package pack; - -public class TestJava { - protected String repeatParam(String ... items) { - return "nothing"; - } -} diff --git a/tests/disabled/java-interop/pos/t2413/TestScalac.scala b/tests/disabled/java-interop/pos/t2413/TestScalac.scala deleted file mode 100644 index 098e852dd..000000000 --- a/tests/disabled/java-interop/pos/t2413/TestScalac.scala +++ /dev/null @@ -1,23 +0,0 @@ -import pack.TestJava - -class Foo extends TestJava { - - // THIS METHOD YIELDS TO CRASH -/* def foomethod : Option[String] => Unit = { - case None => - val path = repeatParam("s","a","b","c") - () - case Some(error) => - () - } - - // THIS IS OK - def foomethod2 : String = repeatParam("s","a"); - - // THIS IS OK - val aVal = repeatParam("1","2","3") */ - - // THIS YIELDS TO CRASH - for (a <- 1 to 4 ; anotherVal = repeatParam("1","2","3")) - yield anotherVal -} diff --git a/tests/disabled/java-interop/pos/t2433/A.java b/tests/disabled/java-interop/pos/t2433/A.java deleted file mode 100755 index 340690c40..000000000 --- a/tests/disabled/java-interop/pos/t2433/A.java +++ /dev/null @@ -1,4 +0,0 @@ -class A223 extends B223.Inner { - static class Inner {} - void foo() {} -} \ No newline at end of file diff --git a/tests/disabled/java-interop/pos/t2433/B.java b/tests/disabled/java-interop/pos/t2433/B.java deleted file mode 100755 index 151dd71ca..000000000 --- a/tests/disabled/java-interop/pos/t2433/B.java +++ /dev/null @@ -1,4 +0,0 @@ -class B223 { - static class Inner {} - void m(A223.Inner x) {} -} \ No newline at end of file diff --git a/tests/disabled/java-interop/pos/t2433/Test.scala b/tests/disabled/java-interop/pos/t2433/Test.scala deleted file mode 100755 index 02fd89b64..000000000 --- a/tests/disabled/java-interop/pos/t2433/Test.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test { - (new A223).foo() -} diff --git a/tests/disabled/java-interop/pos/t2464/JavaOne.java b/tests/disabled/java-interop/pos/t2464/JavaOne.java deleted file mode 100644 index ff36868a0..000000000 --- a/tests/disabled/java-interop/pos/t2464/JavaOne.java +++ /dev/null @@ -1,5 +0,0 @@ -class ClassTwo { - public static class Child { - public void func2() {return ;} - } -} diff --git a/tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala b/tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala deleted file mode 100644 index 1caf8ecae..000000000 --- a/tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala +++ /dev/null @@ -1,6 +0,0 @@ -class ScalaClassOne extends ClassTwo.Child { - def func4() = { - func2 - } -} - diff --git a/tests/disabled/java-interop/pos/t2464/t2464_2.scala b/tests/disabled/java-interop/pos/t2464/t2464_2.scala deleted file mode 100644 index 13a52c952..000000000 --- a/tests/disabled/java-interop/pos/t2464/t2464_2.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test { - val c1 = new ScalaClassOne -} diff --git a/tests/disabled/java-interop/pos/t2569/Child.scala b/tests/disabled/java-interop/pos/t2569/Child.scala deleted file mode 100644 index 64f4dc172..000000000 --- a/tests/disabled/java-interop/pos/t2569/Child.scala +++ /dev/null @@ -1,9 +0,0 @@ -package varargs - - class Child extends Parent { - - override def concatenate(strings: String*): String = - strings map("\"" + _ + "\"") mkString("(", ", ", ")") - - } - diff --git a/tests/disabled/java-interop/pos/t2569/Parent.java b/tests/disabled/java-interop/pos/t2569/Parent.java deleted file mode 100644 index 89421becb..000000000 --- a/tests/disabled/java-interop/pos/t2569/Parent.java +++ /dev/null @@ -1,13 +0,0 @@ -package varargs; - - public class Parent { - - public String concatenate(String... strings) { - StringBuilder builder = new StringBuilder(); - for (String s : strings) { - builder.append(s); - } - return builder.toString(); - } - - } diff --git a/tests/disabled/java-interop/pos/t2764/Ann.java b/tests/disabled/java-interop/pos/t2764/Ann.java deleted file mode 100644 index 184fc6e86..000000000 --- a/tests/disabled/java-interop/pos/t2764/Ann.java +++ /dev/null @@ -1,5 +0,0 @@ -package bippy; - -public @interface Ann { - Enum value(); -} diff --git a/tests/disabled/java-interop/pos/t2764/Enum.java b/tests/disabled/java-interop/pos/t2764/Enum.java deleted file mode 100644 index fe0755953..000000000 --- a/tests/disabled/java-interop/pos/t2764/Enum.java +++ /dev/null @@ -1,5 +0,0 @@ -package bippy; - -public enum Enum { - VALUE; -} diff --git a/tests/disabled/java-interop/pos/t2764/Use.scala b/tests/disabled/java-interop/pos/t2764/Use.scala deleted file mode 100644 index b0c108907..000000000 --- a/tests/disabled/java-interop/pos/t2764/Use.scala +++ /dev/null @@ -1,6 +0,0 @@ -package bippy - -class Use { - @Ann(Enum.VALUE) - def foo: Unit = {} -} diff --git a/tests/disabled/java-interop/pos/t2940/Cycle.java b/tests/disabled/java-interop/pos/t2940/Cycle.java deleted file mode 100644 index eef6c23b5..000000000 --- a/tests/disabled/java-interop/pos/t2940/Cycle.java +++ /dev/null @@ -1,3 +0,0 @@ -public interface Cycle> { - void doStuff(); -} \ No newline at end of file diff --git a/tests/disabled/java-interop/pos/t2940/Error.scala b/tests/disabled/java-interop/pos/t2940/Error.scala deleted file mode 100644 index 92f08f580..000000000 --- a/tests/disabled/java-interop/pos/t2940/Error.scala +++ /dev/null @@ -1,12 +0,0 @@ -abstract class Error { - val c: Cycle[_] -} - -object Test { - trait Quux[T] extends Cycle[Quux[T]] - val x = new Quux[Int] { def doStuff(): Unit = { } } - - def main(args: Array[String]): Unit = { - - } -} diff --git a/tests/disabled/java-interop/pos/t2956/BeanDefinitionVisitor.java b/tests/disabled/java-interop/pos/t2956/BeanDefinitionVisitor.java deleted file mode 100644 index 2ff5daa25..000000000 --- a/tests/disabled/java-interop/pos/t2956/BeanDefinitionVisitor.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.Map; -public class BeanDefinitionVisitor { - @SuppressWarnings("unchecked") - protected void visitMap(Map mapVal) { - } -} diff --git a/tests/disabled/java-interop/pos/t2956/t2956.scala b/tests/disabled/java-interop/pos/t2956/t2956.scala deleted file mode 100755 index 33803874b..000000000 --- a/tests/disabled/java-interop/pos/t2956/t2956.scala +++ /dev/null @@ -1,7 +0,0 @@ -import scala.collection.JavaConversions._ - -class Outer { - protected class Inner extends BeanDefinitionVisitor { - protected def visitMap(mapVal: Map[_, _]): Unit = () - } -} diff --git a/tests/disabled/java-interop/pos/varargs-bridge/A.java b/tests/disabled/java-interop/pos/varargs-bridge/A.java deleted file mode 100644 index 3cd92864b..000000000 --- a/tests/disabled/java-interop/pos/varargs-bridge/A.java +++ /dev/null @@ -1,8 +0,0 @@ -package test; -public class A { - - int foo(int... x) { - return x.length; - } - -} \ No newline at end of file diff --git a/tests/disabled/java-interop/pos/varargs-bridge/B.scala b/tests/disabled/java-interop/pos/varargs-bridge/B.scala deleted file mode 100644 index efd81b0bf..000000000 --- a/tests/disabled/java-interop/pos/varargs-bridge/B.scala +++ /dev/null @@ -1,7 +0,0 @@ -package test -class B extends A { - override def foo(x: Int*): Int = x.length + 1 -} -object B extends App { - println(new B().foo(1, 2, 3)) -} diff --git a/tests/new/t296.scala b/tests/new/t296.scala new file mode 100644 index 000000000..bb3b22984 --- /dev/null +++ b/tests/new/t296.scala @@ -0,0 +1,5 @@ +object Bug { + def foo (l: => String, l1: => String) : String = 12 match { + case 12 => l1 + case _ => l} +} diff --git a/tests/pos/java-interop/t0288/Foo.scala b/tests/pos/java-interop/t0288/Foo.scala new file mode 100644 index 000000000..778ba65f5 --- /dev/null +++ b/tests/pos/java-interop/t0288/Foo.scala @@ -0,0 +1,9 @@ +package test2; + +import test.Outer; + +class Foo extends Outer{ + + val bar = new Inner(); // Shouldn't this work? + +} diff --git a/tests/pos/java-interop/t0288/Outer.java b/tests/pos/java-interop/t0288/Outer.java new file mode 100644 index 000000000..bea3e3f8d --- /dev/null +++ b/tests/pos/java-interop/t0288/Outer.java @@ -0,0 +1,9 @@ +package test; + +public class Outer{ + + public class Inner{ + + } + +} diff --git a/tests/pos/java-interop/t0695/JavaClass.java b/tests/pos/java-interop/t0695/JavaClass.java new file mode 100644 index 000000000..a765f7e32 --- /dev/null +++ b/tests/pos/java-interop/t0695/JavaClass.java @@ -0,0 +1,5 @@ +public class JavaClass { + class InnerClass { + public A method() { return null; } + } +} diff --git a/tests/pos/java-interop/t0695/Test.scala b/tests/pos/java-interop/t0695/Test.scala new file mode 100644 index 000000000..7318867bf --- /dev/null +++ b/tests/pos/java-interop/t0695/Test.scala @@ -0,0 +1,3 @@ +object Test extends JavaClass[AnyRef] { + var field: InnerClass = null +} diff --git a/tests/pos/java-interop/t1101/J.java b/tests/pos/java-interop/t1101/J.java new file mode 100644 index 000000000..2bc1d53e0 --- /dev/null +++ b/tests/pos/java-interop/t1101/J.java @@ -0,0 +1 @@ +class J { enum E { E1 } } diff --git a/tests/pos/java-interop/t1101/S.scala b/tests/pos/java-interop/t1101/S.scala new file mode 100644 index 000000000..af7a591e5 --- /dev/null +++ b/tests/pos/java-interop/t1101/S.scala @@ -0,0 +1 @@ +class S { val x: J.E = null; System.out.println(J.E.E1) } diff --git a/tests/pos/java-interop/t1102/J.java b/tests/pos/java-interop/t1102/J.java new file mode 100644 index 000000000..530102b91 --- /dev/null +++ b/tests/pos/java-interop/t1102/J.java @@ -0,0 +1,4 @@ +class J { + enum E { E1 } + void foo(E e) { } +} diff --git a/tests/pos/java-interop/t1102/S.scala b/tests/pos/java-interop/t1102/S.scala new file mode 100644 index 000000000..9beee8d90 --- /dev/null +++ b/tests/pos/java-interop/t1102/S.scala @@ -0,0 +1 @@ +class S(j:J) { j.foo(J.E.E1) } diff --git a/tests/pos/java-interop/t1150/J.java b/tests/pos/java-interop/t1150/J.java new file mode 100644 index 000000000..68fa04a17 --- /dev/null +++ b/tests/pos/java-interop/t1150/J.java @@ -0,0 +1,4 @@ +class J { + static void bbb (Boolean b) { } + static void ddd (Double d) { } +} diff --git a/tests/pos/java-interop/t1150/S.scala b/tests/pos/java-interop/t1150/S.scala new file mode 100644 index 000000000..41dd06403 --- /dev/null +++ b/tests/pos/java-interop/t1150/S.scala @@ -0,0 +1,4 @@ +object S { + J.bbb(new java.lang.Boolean(true)) + J.ddd(new java.lang.Double(0)) +} diff --git a/tests/pos/java-interop/t1152/J.java b/tests/pos/java-interop/t1152/J.java new file mode 100644 index 000000000..6e562e573 --- /dev/null +++ b/tests/pos/java-interop/t1152/J.java @@ -0,0 +1 @@ +class J { java.util.List k = null; } diff --git a/tests/pos/java-interop/t1152/S.scala b/tests/pos/java-interop/t1152/S.scala new file mode 100644 index 000000000..7f751c509 --- /dev/null +++ b/tests/pos/java-interop/t1152/S.scala @@ -0,0 +1,2 @@ +class S2(fn:(J)=>Any) +object S { new S2(_.k) } diff --git a/tests/pos/java-interop/t1176/J.java b/tests/pos/java-interop/t1176/J.java new file mode 100644 index 000000000..0d82c75fc --- /dev/null +++ b/tests/pos/java-interop/t1176/J.java @@ -0,0 +1,4 @@ +class J { + J() { } + J( java.util.Collection collection ) { } +} diff --git a/tests/pos/java-interop/t1176/S.scala b/tests/pos/java-interop/t1176/S.scala new file mode 100644 index 000000000..a7fc3e0ce --- /dev/null +++ b/tests/pos/java-interop/t1176/S.scala @@ -0,0 +1 @@ +class S { new J } diff --git a/tests/pos/java-interop/t1186/t1186.java b/tests/pos/java-interop/t1186/t1186.java new file mode 100644 index 000000000..5f2607623 --- /dev/null +++ b/tests/pos/java-interop/t1186/t1186.java @@ -0,0 +1,8 @@ +import scala.collection.immutable.Map; + +class Test { + + void foo() { + Map map = null; + } +} diff --git a/tests/pos/java-interop/t1196/J.java b/tests/pos/java-interop/t1196/J.java new file mode 100644 index 000000000..2ec7a711b --- /dev/null +++ b/tests/pos/java-interop/t1196/J.java @@ -0,0 +1 @@ +class J { static void foo(Class c) { } } diff --git a/tests/pos/java-interop/t1196/S.scala b/tests/pos/java-interop/t1196/S.scala new file mode 100644 index 000000000..f17cd249a --- /dev/null +++ b/tests/pos/java-interop/t1196/S.scala @@ -0,0 +1 @@ +object S { J.foo(null) } diff --git a/tests/pos/java-interop/t1197/J.java b/tests/pos/java-interop/t1197/J.java new file mode 100644 index 000000000..b4e0a4255 --- /dev/null +++ b/tests/pos/java-interop/t1197/J.java @@ -0,0 +1,2 @@ +class J { interface K { } } + diff --git a/tests/pos/java-interop/t1197/S.scala b/tests/pos/java-interop/t1197/S.scala new file mode 100644 index 000000000..7c9c15440 --- /dev/null +++ b/tests/pos/java-interop/t1197/S.scala @@ -0,0 +1,2 @@ +object S extends J.K + diff --git a/tests/pos/java-interop/t1203b/J.java b/tests/pos/java-interop/t1203b/J.java new file mode 100644 index 000000000..7fae118e0 --- /dev/null +++ b/tests/pos/java-interop/t1203b/J.java @@ -0,0 +1 @@ +interface J { int j = 200 ; } diff --git a/tests/pos/java-interop/t1203b/S.scala b/tests/pos/java-interop/t1203b/S.scala new file mode 100644 index 000000000..68eac4bf6 --- /dev/null +++ b/tests/pos/java-interop/t1203b/S.scala @@ -0,0 +1 @@ +object S { J.j } diff --git a/tests/pos/java-interop/t1230/J.java b/tests/pos/java-interop/t1230/J.java new file mode 100644 index 000000000..35aefd250 --- /dev/null +++ b/tests/pos/java-interop/t1230/J.java @@ -0,0 +1 @@ +class J { public int foo ; } diff --git a/tests/pos/java-interop/t1230/S.scala b/tests/pos/java-interop/t1230/S.scala new file mode 100644 index 000000000..530dd4b85 --- /dev/null +++ b/tests/pos/java-interop/t1230/S.scala @@ -0,0 +1 @@ +object S extends App { (new J).foo = 5 } diff --git a/tests/pos/java-interop/t1231/J.java b/tests/pos/java-interop/t1231/J.java new file mode 100644 index 000000000..6b24205e5 --- /dev/null +++ b/tests/pos/java-interop/t1231/J.java @@ -0,0 +1 @@ +enum J { j1 } diff --git a/tests/pos/java-interop/t1231/S.scala b/tests/pos/java-interop/t1231/S.scala new file mode 100644 index 000000000..f14aa2561 --- /dev/null +++ b/tests/pos/java-interop/t1231/S.scala @@ -0,0 +1 @@ +object S extends App { println(J.j1) } diff --git a/tests/pos/java-interop/t1232/J.java b/tests/pos/java-interop/t1232/J.java new file mode 100644 index 000000000..2d9e3bbd5 --- /dev/null +++ b/tests/pos/java-interop/t1232/J.java @@ -0,0 +1,2 @@ +package j; +public class J { public enum E { e1 } } diff --git a/tests/pos/java-interop/t1232/J2.java b/tests/pos/java-interop/t1232/J2.java new file mode 100644 index 000000000..29237780a --- /dev/null +++ b/tests/pos/java-interop/t1232/J2.java @@ -0,0 +1,2 @@ +import s.S; +class J2 { } diff --git a/tests/pos/java-interop/t1232/S.scala b/tests/pos/java-interop/t1232/S.scala new file mode 100644 index 000000000..1b6bca732 --- /dev/null +++ b/tests/pos/java-interop/t1232/S.scala @@ -0,0 +1,2 @@ +package s +class S { j.J.E.e1 } diff --git a/tests/pos/java-interop/t1235/Test.java b/tests/pos/java-interop/t1235/Test.java new file mode 100644 index 000000000..7bb83a849 --- /dev/null +++ b/tests/pos/java-interop/t1235/Test.java @@ -0,0 +1,9 @@ +import scala.collection.immutable.HashMap; + +public class Test { + + void foo() { + new HashMap(); + } +} + diff --git a/tests/pos/java-interop/t1254/t1254.java b/tests/pos/java-interop/t1254/t1254.java new file mode 100644 index 000000000..17e1c60bf --- /dev/null +++ b/tests/pos/java-interop/t1254/t1254.java @@ -0,0 +1,28 @@ +/* Taken from ticket #1254. Tests Java signatures in mirror classes and that + Nothing is translated to Nothing$. +*/ + +import scala.None; + +// This compiles with javac but fails with Eclipse java compiler: +// 'The type scala.Nothing cannot be resolved. It is indirectly referenced from required .class files' +class NothingBug3 { + public NothingBug3() { + scala.Option o = scala.None$.MODULE$; + + test(o); + None.toLeft(new scala.runtime.AbstractFunction0() { + public Integer apply() { return 0; } + }); + } + + public void test(scala.Option f) {} +} + +// This compiles with javac but fails with Eclipse java compiler: +// 'The type scala.Nothing cannot be resolved. It is indirectly referenced from required .class files' +class NothingBug4 { + public NothingBug4() { + scala.Option o = scala.None$.MODULE$; + } +} diff --git a/tests/pos/java-interop/t1263/Test.java b/tests/pos/java-interop/t1263/Test.java new file mode 100644 index 000000000..1718a9909 --- /dev/null +++ b/tests/pos/java-interop/t1263/Test.java @@ -0,0 +1,17 @@ +package test; + +import java.rmi.RemoteException; + +import test.Map; + +@SuppressWarnings("unchecked") +public class Test implements Map { + public Map.MapTo plus(String o) { + return null; + } + + public int $tag() throws RemoteException { + return 0; + } +} + diff --git a/tests/pos/java-interop/t1263/test.scala b/tests/pos/java-interop/t1263/test.scala new file mode 100644 index 000000000..92d8c1cdf --- /dev/null +++ b/tests/pos/java-interop/t1263/test.scala @@ -0,0 +1,10 @@ +package test + +trait Map[A, +B] { + def plus(key: A): MapTo = new MapTo(key) + + class MapTo(key: A) { + def arrow [B1 >: B](value: B1) = null + } +} + diff --git a/tests/pos/java-interop/t1409/AbstractImpl.java b/tests/pos/java-interop/t1409/AbstractImpl.java new file mode 100644 index 000000000..b22a94fa1 --- /dev/null +++ b/tests/pos/java-interop/t1409/AbstractImpl.java @@ -0,0 +1,3 @@ +public abstract class AbstractImpl implements OuterInterface { + public abstract InnerInterface create(); + } diff --git a/tests/pos/java-interop/t1409/ConcreteImpl.scala b/tests/pos/java-interop/t1409/ConcreteImpl.scala new file mode 100644 index 000000000..d427e957e --- /dev/null +++ b/tests/pos/java-interop/t1409/ConcreteImpl.scala @@ -0,0 +1,3 @@ +class ConcreteImpl extends AbstractImpl { + def create : OuterInterface.InnerInterface = null + } diff --git a/tests/pos/java-interop/t1409/OuterInterface.java b/tests/pos/java-interop/t1409/OuterInterface.java new file mode 100644 index 000000000..dd288ceea --- /dev/null +++ b/tests/pos/java-interop/t1409/OuterInterface.java @@ -0,0 +1,5 @@ +public interface OuterInterface { + public interface InnerInterface { + public void foo(); + } + } diff --git a/tests/pos/java-interop/t1642/JavaCallingScalaHashMap.java b/tests/pos/java-interop/t1642/JavaCallingScalaHashMap.java new file mode 100644 index 000000000..976e465ff --- /dev/null +++ b/tests/pos/java-interop/t1642/JavaCallingScalaHashMap.java @@ -0,0 +1,8 @@ +import scala.collection.immutable.HashMap; +import scala.collection.immutable.Map; + +public class JavaCallingScalaHashMap { + public static void main( String[] args ) { + Map hashMap = new HashMap(); + } +} diff --git a/tests/pos/java-interop/t1711/Seq.scala b/tests/pos/java-interop/t1711/Seq.scala new file mode 100644 index 000000000..c18f05cd7 --- /dev/null +++ b/tests/pos/java-interop/t1711/Seq.scala @@ -0,0 +1,12 @@ +package com + +object Sequence { + + def filteringFunction[V](filter: V => Boolean): List[V] => List[V] = { + def include(v: V) = + filter(v) + (l: List[V]) => l.filter(include) + } + +} + diff --git a/tests/pos/java-interop/t1711/Test.java b/tests/pos/java-interop/t1711/Test.java new file mode 100644 index 000000000..5ec0f2297 --- /dev/null +++ b/tests/pos/java-interop/t1711/Test.java @@ -0,0 +1,6 @@ +import com.Sequence; + +public class Test { + void foo() { + } +} diff --git a/tests/pos/java-interop/t1745/J.java b/tests/pos/java-interop/t1745/J.java new file mode 100644 index 000000000..8444eabb2 --- /dev/null +++ b/tests/pos/java-interop/t1745/J.java @@ -0,0 +1,10 @@ +class J { + S1 s1; + S2 s2; + + String s = bar(S3.foo(), S3.bar("def")); + + private String bar(String s1, String s2) { + return s1 + s2; + } +} diff --git a/tests/pos/java-interop/t1745/S.scala b/tests/pos/java-interop/t1745/S.scala new file mode 100644 index 000000000..84c437133 --- /dev/null +++ b/tests/pos/java-interop/t1745/S.scala @@ -0,0 +1,7 @@ +case class S1(n: Int) { } +case class S2(n: Int, p: Int) { } +class S3 { } +object S3 { + def foo() = "abc" + def bar[T](x: T): T = x +} diff --git a/tests/pos/java-interop/t1751/A1_2.scala b/tests/pos/java-interop/t1751/A1_2.scala new file mode 100644 index 000000000..354d5eecd --- /dev/null +++ b/tests/pos/java-interop/t1751/A1_2.scala @@ -0,0 +1,2 @@ +@SuiteClasses(Array(classOf[A2])) +class A1 diff --git a/tests/pos/java-interop/t1751/A2_1.scala b/tests/pos/java-interop/t1751/A2_1.scala new file mode 100644 index 000000000..c768062e4 --- /dev/null +++ b/tests/pos/java-interop/t1751/A2_1.scala @@ -0,0 +1,2 @@ +@SuiteClasses(Array()) +class A2 diff --git a/tests/pos/java-interop/t1751/SuiteClasses.java b/tests/pos/java-interop/t1751/SuiteClasses.java new file mode 100644 index 000000000..a415e4f57 --- /dev/null +++ b/tests/pos/java-interop/t1751/SuiteClasses.java @@ -0,0 +1,3 @@ +public @interface SuiteClasses { + public Class[] value(); +} diff --git a/tests/pos/java-interop/t1782/Ann.java b/tests/pos/java-interop/t1782/Ann.java new file mode 100644 index 000000000..0dcfbd2ed --- /dev/null +++ b/tests/pos/java-interop/t1782/Ann.java @@ -0,0 +1,3 @@ +public @interface Ann { + public Days value(); +} diff --git a/tests/pos/java-interop/t1782/Days.java b/tests/pos/java-interop/t1782/Days.java new file mode 100644 index 000000000..203a87b1c --- /dev/null +++ b/tests/pos/java-interop/t1782/Days.java @@ -0,0 +1,3 @@ +public enum Days { + Friday, Sunday +} diff --git a/tests/pos/java-interop/t1782/ImplementedBy.java b/tests/pos/java-interop/t1782/ImplementedBy.java new file mode 100644 index 000000000..6aa8b4fa9 --- /dev/null +++ b/tests/pos/java-interop/t1782/ImplementedBy.java @@ -0,0 +1,3 @@ +public @interface ImplementedBy { + public Class value(); +} diff --git a/tests/pos/java-interop/t1782/Test_1.scala b/tests/pos/java-interop/t1782/Test_1.scala new file mode 100644 index 000000000..47495c082 --- /dev/null +++ b/tests/pos/java-interop/t1782/Test_1.scala @@ -0,0 +1,16 @@ +@ImplementedBy(classOf[Provider]) +trait Service { + def someMethod(): Unit +} + +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/tests/pos/java-interop/t1836/J.java b/tests/pos/java-interop/t1836/J.java new file mode 100644 index 000000000..a009a59e2 --- /dev/null +++ b/tests/pos/java-interop/t1836/J.java @@ -0,0 +1 @@ +public abstract class J { protected J(T id) { } } diff --git a/tests/pos/java-interop/t1836/S.scala b/tests/pos/java-interop/t1836/S.scala new file mode 100644 index 000000000..88ce1063e --- /dev/null +++ b/tests/pos/java-interop/t1836/S.scala @@ -0,0 +1 @@ +class S extends J("") diff --git a/tests/pos/java-interop/t1840/J.java b/tests/pos/java-interop/t1840/J.java new file mode 100644 index 000000000..fd98b6c4a --- /dev/null +++ b/tests/pos/java-interop/t1840/J.java @@ -0,0 +1,4 @@ +package p; +class J { + J() {} +} diff --git a/tests/pos/java-interop/t1840/S.scala b/tests/pos/java-interop/t1840/S.scala new file mode 100644 index 000000000..ff513d2c1 --- /dev/null +++ b/tests/pos/java-interop/t1840/S.scala @@ -0,0 +1,2 @@ +package p +class S { new J } diff --git a/tests/pos/java-interop/t1937/NumberGenerator.java b/tests/pos/java-interop/t1937/NumberGenerator.java new file mode 100644 index 000000000..59d604733 --- /dev/null +++ b/tests/pos/java-interop/t1937/NumberGenerator.java @@ -0,0 +1,7 @@ +package br.com.caelum.caelumweb2.money; + +public class NumberGenerator { + public String generate() { + return null; + } +} diff --git a/tests/pos/java-interop/t2377/Q.java b/tests/pos/java-interop/t2377/Q.java new file mode 100644 index 000000000..e3d11c70e --- /dev/null +++ b/tests/pos/java-interop/t2377/Q.java @@ -0,0 +1,12 @@ +public final class Q { + public static final class Stage { + public static Builder newBuilder() { return new Builder(); } + public static final class Builder { } + public Builder toBuilder() { return newBuilder(); } + } + public static final class WorkUnit { + public static Builder newBuilder() { return new Builder(); } + public static final class Builder { } + public Builder toBuilder() { return newBuilder(); } + } +} diff --git a/tests/pos/java-interop/t2377/a.scala b/tests/pos/java-interop/t2377/a.scala new file mode 100644 index 000000000..bda59ce0d --- /dev/null +++ b/tests/pos/java-interop/t2377/a.scala @@ -0,0 +1,8 @@ +import Q._ + +class Bop(var workUnit: WorkUnit) { + def addStages(stageBuilder: Stage.Builder): Unit = { + val builder = workUnit.toBuilder + () + } +} diff --git a/tests/pos/java-interop/t2409/J.java b/tests/pos/java-interop/t2409/J.java new file mode 100644 index 000000000..6b7c45ff6 --- /dev/null +++ b/tests/pos/java-interop/t2409/J.java @@ -0,0 +1,4 @@ +class J { + static class J2 { } + J(J2 j2) { } +} diff --git a/tests/pos/java-interop/t2409/t2409.scala b/tests/pos/java-interop/t2409/t2409.scala new file mode 100644 index 000000000..0412f7d82 --- /dev/null +++ b/tests/pos/java-interop/t2409/t2409.scala @@ -0,0 +1 @@ +object S { new J(null) } diff --git a/tests/pos/java-interop/t2413/TestJava.java b/tests/pos/java-interop/t2413/TestJava.java new file mode 100644 index 000000000..252c01fbc --- /dev/null +++ b/tests/pos/java-interop/t2413/TestJava.java @@ -0,0 +1,7 @@ +package pack; + +public class TestJava { + protected String repeatParam(String ... items) { + return "nothing"; + } +} diff --git a/tests/pos/java-interop/t2413/TestScalac.scala b/tests/pos/java-interop/t2413/TestScalac.scala new file mode 100644 index 000000000..098e852dd --- /dev/null +++ b/tests/pos/java-interop/t2413/TestScalac.scala @@ -0,0 +1,23 @@ +import pack.TestJava + +class Foo extends TestJava { + + // THIS METHOD YIELDS TO CRASH +/* def foomethod : Option[String] => Unit = { + case None => + val path = repeatParam("s","a","b","c") + () + case Some(error) => + () + } + + // THIS IS OK + def foomethod2 : String = repeatParam("s","a"); + + // THIS IS OK + val aVal = repeatParam("1","2","3") */ + + // THIS YIELDS TO CRASH + for (a <- 1 to 4 ; anotherVal = repeatParam("1","2","3")) + yield anotherVal +} diff --git a/tests/pos/java-interop/t2433/A.java b/tests/pos/java-interop/t2433/A.java new file mode 100755 index 000000000..340690c40 --- /dev/null +++ b/tests/pos/java-interop/t2433/A.java @@ -0,0 +1,4 @@ +class A223 extends B223.Inner { + static class Inner {} + void foo() {} +} \ No newline at end of file diff --git a/tests/pos/java-interop/t2433/B.java b/tests/pos/java-interop/t2433/B.java new file mode 100755 index 000000000..151dd71ca --- /dev/null +++ b/tests/pos/java-interop/t2433/B.java @@ -0,0 +1,4 @@ +class B223 { + static class Inner {} + void m(A223.Inner x) {} +} \ No newline at end of file diff --git a/tests/pos/java-interop/t2433/Test.scala b/tests/pos/java-interop/t2433/Test.scala new file mode 100755 index 000000000..02fd89b64 --- /dev/null +++ b/tests/pos/java-interop/t2433/Test.scala @@ -0,0 +1,3 @@ +object Test { + (new A223).foo() +} diff --git a/tests/pos/java-interop/t2464/JavaOne.java b/tests/pos/java-interop/t2464/JavaOne.java new file mode 100644 index 000000000..ff36868a0 --- /dev/null +++ b/tests/pos/java-interop/t2464/JavaOne.java @@ -0,0 +1,5 @@ +class ClassTwo { + public static class Child { + public void func2() {return ;} + } +} diff --git a/tests/pos/java-interop/t2464/ScalaOne_1.scala b/tests/pos/java-interop/t2464/ScalaOne_1.scala new file mode 100644 index 000000000..1caf8ecae --- /dev/null +++ b/tests/pos/java-interop/t2464/ScalaOne_1.scala @@ -0,0 +1,6 @@ +class ScalaClassOne extends ClassTwo.Child { + def func4() = { + func2 + } +} + diff --git a/tests/pos/java-interop/t2464/t2464_2.scala b/tests/pos/java-interop/t2464/t2464_2.scala new file mode 100644 index 000000000..13a52c952 --- /dev/null +++ b/tests/pos/java-interop/t2464/t2464_2.scala @@ -0,0 +1,3 @@ +object Test { + val c1 = new ScalaClassOne +} diff --git a/tests/pos/java-interop/t2764/Ann.java b/tests/pos/java-interop/t2764/Ann.java new file mode 100644 index 000000000..184fc6e86 --- /dev/null +++ b/tests/pos/java-interop/t2764/Ann.java @@ -0,0 +1,5 @@ +package bippy; + +public @interface Ann { + Enum value(); +} diff --git a/tests/pos/java-interop/t2764/Enum.java b/tests/pos/java-interop/t2764/Enum.java new file mode 100644 index 000000000..fe0755953 --- /dev/null +++ b/tests/pos/java-interop/t2764/Enum.java @@ -0,0 +1,5 @@ +package bippy; + +public enum Enum { + VALUE; +} diff --git a/tests/pos/java-interop/t2764/Use.scala b/tests/pos/java-interop/t2764/Use.scala new file mode 100644 index 000000000..b0c108907 --- /dev/null +++ b/tests/pos/java-interop/t2764/Use.scala @@ -0,0 +1,6 @@ +package bippy + +class Use { + @Ann(Enum.VALUE) + def foo: Unit = {} +} diff --git a/tests/pos/java-interop/t294/Ann.java b/tests/pos/java-interop/t294/Ann.java new file mode 100644 index 000000000..934ca4629 --- /dev/null +++ b/tests/pos/java-interop/t294/Ann.java @@ -0,0 +1,3 @@ +public @interface Ann { + public Ann2[] nested(); +} diff --git a/tests/pos/java-interop/t294/Ann2.java b/tests/pos/java-interop/t294/Ann2.java new file mode 100644 index 000000000..025b79e79 --- /dev/null +++ b/tests/pos/java-interop/t294/Ann2.java @@ -0,0 +1,3 @@ +public @interface Ann2 { + public int value(); +} diff --git a/tests/pos/java-interop/t294/Test_1.scala b/tests/pos/java-interop/t294/Test_1.scala new file mode 100644 index 000000000..ff1f34b10 --- /dev/null +++ b/tests/pos/java-interop/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/tests/pos/java-interop/t294/Test_2.scala b/tests/pos/java-interop/t294/Test_2.scala new file mode 100644 index 000000000..9fb1c6e17 --- /dev/null +++ b/tests/pos/java-interop/t294/Test_2.scala @@ -0,0 +1 @@ +class Test2 extends Test diff --git a/tests/pos/java-interop/t2940/Cycle.java b/tests/pos/java-interop/t2940/Cycle.java new file mode 100644 index 000000000..eef6c23b5 --- /dev/null +++ b/tests/pos/java-interop/t2940/Cycle.java @@ -0,0 +1,3 @@ +public interface Cycle> { + void doStuff(); +} \ No newline at end of file diff --git a/tests/pos/java-interop/t2940/Error.scala b/tests/pos/java-interop/t2940/Error.scala new file mode 100644 index 000000000..92f08f580 --- /dev/null +++ b/tests/pos/java-interop/t2940/Error.scala @@ -0,0 +1,12 @@ +abstract class Error { + val c: Cycle[_] +} + +object Test { + trait Quux[T] extends Cycle[Quux[T]] + val x = new Quux[Int] { def doStuff(): Unit = { } } + + def main(args: Array[String]): Unit = { + + } +} diff --git a/tests/pos/java-interop/t2956/BeanDefinitionVisitor.java b/tests/pos/java-interop/t2956/BeanDefinitionVisitor.java new file mode 100644 index 000000000..2ff5daa25 --- /dev/null +++ b/tests/pos/java-interop/t2956/BeanDefinitionVisitor.java @@ -0,0 +1,6 @@ +import java.util.Map; +public class BeanDefinitionVisitor { + @SuppressWarnings("unchecked") + protected void visitMap(Map mapVal) { + } +} diff --git a/tests/pos/java-interop/t2956/t2956.scala b/tests/pos/java-interop/t2956/t2956.scala new file mode 100755 index 000000000..33803874b --- /dev/null +++ b/tests/pos/java-interop/t2956/t2956.scala @@ -0,0 +1,7 @@ +import scala.collection.JavaConversions._ + +class Outer { + protected class Inner extends BeanDefinitionVisitor { + protected def visitMap(mapVal: Map[_, _]): Unit = () + } +} -- cgit v1.2.3