aboutsummaryrefslogtreecommitdiff
path: root/tests/pos
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2016-07-27 23:26:58 -0700
committerGitHub <noreply@github.com>2016-07-27 23:26:58 -0700
commit79e0fe02708a115140f53678499c423c773123c4 (patch)
tree4388cd4c3d03bd48058466cf9b4a41abf048ecf7 /tests/pos
parent48d6460865f4b83e6df42551ce55319805ad7342 (diff)
parent04e6d5e5ad39d046a977de1bfd4563287e5b0f41 (diff)
downloaddotty-79e0fe02708a115140f53678499c423c773123c4.tar.gz
dotty-79e0fe02708a115140f53678499c423c773123c4.tar.bz2
dotty-79e0fe02708a115140f53678499c423c773123c4.zip
Merge pull request #1289 from dotty-staging/fix/partest-separate
partest: Enable separate compilation
Diffstat (limited to 'tests/pos')
-rw-r--r--tests/pos/annot.scala2
-rw-r--r--tests/pos/java-interop/t1263/Test.java17
-rw-r--r--tests/pos/java-interop/t1263/test.scala10
-rw-r--r--tests/pos/java-interop/t1745/J.java10
-rw-r--r--tests/pos/java-interop/t1745/S.scala7
-rw-r--r--tests/pos/java-interop/volatile/Foo.java (renamed from tests/pos/java-interop/volatile/volatile.java)0
6 files changed, 1 insertions, 45 deletions
diff --git a/tests/pos/annot.scala b/tests/pos/annot.scala
index e6e4f8051..dec6af945 100644
--- a/tests/pos/annot.scala
+++ b/tests/pos/annot.scala
@@ -9,7 +9,7 @@ class Test {
@SuppressWarnings(Array("hi", "foo")) def foo2() = ??? //can be deferred as there is a non-generic method
- @SuppressWarnings("hi") def foo3() = ??? // can be written in java and is serialized this way in bytecode. doesn't typecheck
+ @SuppressWarnings(Array("hi")) def foo3() = ??? // can be written in java and is serialized this way in bytecode. doesn't typecheck
@Transient(false) def bar = ???
diff --git a/tests/pos/java-interop/t1263/Test.java b/tests/pos/java-interop/t1263/Test.java
deleted file mode 100644
index 1718a9909..000000000
--- a/tests/pos/java-interop/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<String, String> {
- 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
deleted file mode 100644
index 92d8c1cdf..000000000
--- a/tests/pos/java-interop/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/pos/java-interop/t1745/J.java b/tests/pos/java-interop/t1745/J.java
deleted file mode 100644
index 8444eabb2..000000000
--- a/tests/pos/java-interop/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/pos/java-interop/t1745/S.scala b/tests/pos/java-interop/t1745/S.scala
deleted file mode 100644
index 84c437133..000000000
--- a/tests/pos/java-interop/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/pos/java-interop/volatile/volatile.java b/tests/pos/java-interop/volatile/Foo.java
index c6a607b4d..c6a607b4d 100644
--- a/tests/pos/java-interop/volatile/volatile.java
+++ b/tests/pos/java-interop/volatile/Foo.java