add tests from scala/test/files/{pos,neg}

with explicit Unit return type

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/untried/neg/t4457_1.scala b/tests/untried/neg/t4457_1.scala
new file mode 100644
index 000000000..11dae1097
--- /dev/null
+++ b/tests/untried/neg/t4457_1.scala
@@ -0,0 +1,33 @@
+object ImplicitConvAmbiguity2 {
+
+  class N[T]
+  class NE[T] extends N[T]
+  class NN[T] extends N[T]
+  class NQ[T] extends N[T]
+  class NZ[T] extends N[T]
+  class AA[A]
+  class BB[A]
+
+  implicit def conv1(i: Float) = new NE[Float]
+  implicit def conv3(op: AA[java.util.TooManyListenersException]) = new N[java.util.TooManyListenersException]
+  implicit def conv4(op: AA[Float]) = new N[Float]
+  implicit def conv7(i: Float) = new NZ[Float]
+  implicit def conv5(e: BB[java.util.GregorianCalendar]) = new N[java.util.GregorianCalendar]
+
+  // These two will be in conflict in typeMe1
+  def aFunc[A](a: NE[A]) = new AA[A]
+  def aFunc[A](a: NZ[A]) = new AA[Float]
+
+  def aFunc[A](a: NN[A]) = new BB[A]
+  def aFunc[A](a: NQ[A]) = new BB[A]
+
+  def bFunc[T](e1: N[T]) = {}
+
+  def typeMe1: Unit = {
+    val x = aFunc(4F)
+    bFunc(x)
+  }
+  def typeMe2: Unit = {
+    bFunc(aFunc(4F))
+  }
+}