new tests

7 files changed, 53 insertions, 0 deletions

diff --git a/test/files/neg/t3015.check b/test/files/neg/t3015.check
new file mode 100644
index 0000000000..32809b0669
--- /dev/null
+++ b/test/files/neg/t3015.check
@@ -0,0 +1,11 @@
+t3015.scala:7: error: scrutinee is incompatible with pattern type;
+ found   : _$1 where type _$1
+ required: java.lang.String
+  val b(foo) = "foo" 
+       ^
+t3015.scala:7: error: type mismatch;
+ found   : _$1(in value foo) where type _$1(in value foo) <: java.lang.String
+ required: (some other)_$1(in value foo) where type (some other)_$1(in value foo)
+  val b(foo) = "foo" 
+      ^
+two errors found
diff --git a/test/files/neg/t3015.scala b/test/files/neg/t3015.scala
new file mode 100644
index 0000000000..0bd53e7a03
--- /dev/null
+++ b/test/files/neg/t3015.scala
@@ -0,0 +1,8 @@
+class UnApp[P] {
+  def unapply(a: P): Option[P] = Some(a)
+}
+
+object Test extends Application {
+  val b: UnApp[_] = new UnApp[String]
+  val b(foo) = "foo"
+}
diff --git a/test/files/neg/t3115.check b/test/files/neg/t3115.check
new file mode 100644
index 0000000000..a5b97d71df
--- /dev/null
+++ b/test/files/neg/t3115.check
@@ -0,0 +1,10 @@
+t3115.scala:6: warning: object Math in object sc is deprecated: 
+  println(sc.Math)
+             ^
+t3115.scala:7: warning: object Math in package scala is deprecated: use scala.math package instead
+  println(scala.Math)
+                ^
+t3115.scala:8: warning: object Math in package scala is deprecated: use scala.math package instead
+  scala.Math.Pi
+        ^
+three warnings found
diff --git a/test/files/neg/t3115.scala b/test/files/neg/t3115.scala
new file mode 100755
index 0000000000..4aeeb4063e
--- /dev/null
+++ b/test/files/neg/t3115.scala
@@ -0,0 +1,9 @@
+object sc {
+  @deprecated("") object Math
+}
+
+object Test {
+  println(sc.Math)
+  println(scala.Math)
+  scala.Math.Pi
+}
diff --git a/test/files/pos/t3037.scala b/test/files/pos/t3037.scala
index d613ebb28c..b71ffe0418 100644
--- a/test/files/pos/t3037.scala
+++ b/test/files/pos/t3037.scala
@@ -5,4 +5,9 @@ object A {
     case "a" => 1
     case _ => "a"
   }).asInstanceOf[Object])
+  def foo[T](x: T) = x
+  var x: Int = 1
+  var y: Long = 1L
+  x = foo(x)
+  y = foo(y)
 }
diff --git a/test/files/run/t3026.check b/test/files/run/t3026.check
new file mode 100644
index 0000000000..8c29b615fa
--- /dev/null
+++ b/test/files/run/t3026.check
@@ -0,0 +1,2 @@
+RED
+YELLOW
diff --git a/test/files/run/t3026.scala b/test/files/run/t3026.scala
new file mode 100755
index 0000000000..22dde9cc03
--- /dev/null
+++ b/test/files/run/t3026.scala
@@ -0,0 +1,8 @@
+object Test {
+  abstract class Colour
+  case object RED extends Colour
+  case object YELLOW extends Colour
+  val items = Array(RED, YELLOW)
+
+  def main(args: Array[String]): Unit = items foreach println
+}